Skip to content

Conversation

bjhargrave
Copy link
Contributor

Changes

Which issue is resolved by this Pull Request:
Resolves #989

Description of your changes:

We introduce a relaxed schema as v1 which will accept all existing
taxonomy files in the main branch of the taxonomy repo. The current
v1 schema is renamed to v2 and will be used for future contributions
to the taxonomy repo.

Fixes #989

Depends on #913
and instructlab/schema#11

@bjhargrave bjhargrave added the hold In-progress PR. Tag should be removed before merge. label Apr 25, 2024
@github-actions github-actions bot added documentation Improvements or additions to documentation testing Relates to testing labels Apr 25, 2024
@bjhargrave
Copy link
Contributor Author

This PR will need rebasing once #913 and instructlab/schema#11 are merged.

Copy link
Contributor

mergify bot commented Apr 29, 2024

This pull request has merge conflicts that must be resolved before it can be
merged. @bjhargrave please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@github-actions github-actions bot removed the documentation Improvements or additions to documentation label Apr 29, 2024
@bjhargrave bjhargrave removed the needs-rebase This Pull Request needs to be rebased label Apr 29, 2024
@russellb
Copy link
Member

@bjhargrave can you clarify the hold on this? Was it just so #913 goes in first?

@bjhargrave
Copy link
Contributor Author

can you clarify the hold on this? Was it just so #913 goes in first?

#913 is now merged. But we also need to merge instructlab/schema#11 before this PR. I did not merge the schema PR until we agreed to this overall schema v1/v2 concept in the cli.

@bjhargrave
Copy link
Contributor Author

@russellb It would be nice to get a review on this since the issue addressed by this PR is in the 5/2 milestone.

@russellb
Copy link
Member

@bjhargrave it should now merge once you remove the hold label

bjhargrave added a commit to instructlab/schema that referenced this pull request Apr 29, 2024
schema: Define a relaxed schema as v1 and move current schema to v2

See instructlab/instructlab#1009
We introduce a relaxed schema as v1 which will accept all existing
taxonomy files in the main branch of the taxonomy repo. The current
v1 schema is renamed to v2 and will be used for future contributions
to the taxonomy repo.

Fixes instructlab#989

Depends on instructlab#913
and instructlab/schema#11

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
@bjhargrave bjhargrave removed the hold In-progress PR. Tag should be removed before merge. label Apr 29, 2024
@mergify mergify bot merged commit 7cc2232 into instructlab:main Apr 29, 2024
@bjhargrave bjhargrave deleted the relaxed-schema branch April 29, 2024 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testing Relates to testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ilab generate fails with schema errors when used with existing skills in the instructlab/taxonomy repo
2 participants