BF: Fix bug and other improvement in SchemaBuilder.add_class()
#338
Conversation
This file contains 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
- Remove use of `kwargs` in setting `cls` if it's given as `ClassDefinition` - Correct detection of duplicating classes - Ensure `slots` is correct type when `use_attributes=True`
|
If you could add a test which would demonstrate (fail) the issue without this fix, that would be great. |
cmungall
requested changes
Aug 30, 2024
There was a problem hiding this comment.
Thanks @candleindark - do you think you can add the test as @yarikoptic suggests?
I think I can do that. Any suggestion in where is the best place to put these tests. |
|
Hmm, I thought we had a test_schemabuilder here https://github.com/linkml/linkml-runtime/tree/main/tests/test_utils but it seems not... if you can start one that would be great. We favor simple pytest style tests. |
The example is outdated since `SchemaBuilder` no longer resides in `linkml.utils.schema_builder`
In this way, the slot definition in `slots` can be added to the class as an attribute, better than raising an exception
candleindark
force-pushed
the
add-class-improv
branch
from
9cc06b2
to
e2256f1
Compare
The bundling is actually not needed. The type annotation of `slots` already ensures that it is a list or `None`
Test the case of adding a class with a name that is the same as a class that already exists in the schema
… dict This can simplify the code
…tion` This time with detection of unsupported fields provided by `kwargs`
cmungall
approved these changes
Oct 1, 2024
|
@cmungall Tests are provided for the changes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR does the following.
kwargsin setting the class to be added with an unacceptable attribute ifclsis given as aClassDefinitionobject (test provided)slotsisNonewhileuse_attributesisTrue(test provided)SchemaBuilderto have the correct import statement (no test needed)use_attributesparam in the docstring (no test needed)slot_usageparam according to the behavior of existing code. (no test needed)replace_if_presentanduse_attributesparams (no test needed)Point 1 is included in this PR because the following lines are unneeded for the cases in which
clsis given as adictorstrand are inconsistent with the behavior ofSchemaBuilder.add_slot()andSchemaBuilder.add_enum(). In bothSchemaBuilder.add_slot()andSchemaBuilder.add_enum(), if the first argument is of the target type,SlotDefinitionandEnumDefinitionrespectively,kwargsis ignored.linkml-runtime/linkml_runtime/utils/schema_builder.py
Lines 101 to 102 in 9fd5a3e