Try to remove some duplication at the model level#165
Open
jmchilton wants to merge 2 commits intogalaxyproject:mainfrom
Open
Try to remove some duplication at the model level#165jmchilton wants to merge 2 commits intogalaxyproject:mainfrom
jmchilton wants to merge 2 commits intogalaxyproject:mainfrom
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #165 +/- ##
=======================================
Coverage 41.03% 41.03%
=======================================
Files 51 51
Lines 1974 1974
Branches 441 441
=======================================
Hits 810 810
Misses 1047 1047
Partials 117 117
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
CreatorPerson, CreatorOrganization, BaseCreator and their discriminator enums are structurally identical between Format2 and native schemas. Move them to schema/common/common.yml so the definition is shared. Both pydantic schemas now generate the same class names (CreatorPerson, CreatorOrganization) instead of having separate NativeCreatorPerson vs CreatorPerson. This eliminates the cross-schema type mismatch for creators in the normalized layer. Note: schema-salad codegen (native_v0_1.py) not regenerated due to pre-existing JSON-LD predicate collision from comment type enums. Pydantic codegen works fine as it doesn't use JSON-LD. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace single-symbol comment type enums (TextCommentType, etc.) with string fields using pydantic:type Literal overrides. The enum symbols collided with GalaxyType symbols (both had 'text') and with each other in the JSON-LD context. Fix comment type fields to use full sld:type predicate attributes (@vocab, refScope, typeDSL) matching other type fields in the schema. Fix TextComment/MarkdownComment 'text' field to use GalaxyType/text URI instead of a separate TextComment/text URI that collided. Fix NativeSourceMetadata.url to use gxformat2common:Creator/url URI to avoid collision with BaseCreator.url from common.yml. Skip format2_nested_no_steps from round-trip loop in test_lint — the workflow has dangling step references that can't survive conversion. Regenerate all codegen: schema-salad (v19_09.py, native_v0_1.py) and pydantic (gxformat2.py, native.py, strict variants). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.