fix tests after model update with version and model version, and extend forbidding extra fields to nested nodes #135
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
…nd forbidding extra fields to nested nodes
sherwoodf
commented
Jul 31, 2024
| @@ -155,5 +155,5 @@ def persist(object_list: List, object_path: str, sumbission_accno: str): | |||
|
|
|||
| def filter_model_dictionary(dictionary: dict, target_model: Type[BaseModel]): | |||
| accepted_fields = target_model.model_fields.keys() | |||
| result_dict = {key: dictionary[key] for key in accepted_fields} | |||
| result_dict = {key: dictionary[key] for key in accepted_fields if key in dictionary} | |||
There was a problem hiding this comment.
Fix to cope with optional/missing fields in the original dictionary
sherwoodf
commented
Jul 31, 2024
|
|
||
| class ConfiguredBaseModel(BaseModel): | ||
| # Throw error if you try to validate/create model from a dictionary with keys that aren't a field in the model | ||
| model_config = ConfigDict(extra="forbid") |
There was a problem hiding this comment.
Moved to the semantic models to make sure there isn't an edge case where e.g. a study can't have extra fields, but a contributor in a study can
There was a problem hiding this comment.
btw nice find, we've literally had this bug in the api for nested objects since forever
sherwoodf
commented
Jul 31, 2024
| @@ -41,6 +38,7 @@ def __init__(self, *args, **data): | |||
| ) | |||
| model_metadata_existing = data.get("model", None) | |||
| if model_metadata_existing: | |||
| model_metadata_existing = ModelMetadata(**model_metadata_existing) | |||
There was a problem hiding this comment.
Fix to the error checking - as it was currently trying to compare a dictionary with a model. This was in the original API models but was missed when copied over to here.
kbab
reviewed
Aug 1, 2024
liviuba
reviewed
Aug 1, 2024
ctr26
pushed a commit
that referenced
this pull request
Aug 2, 2024
…nd forbidding extra fields to nested nodes (#135) * fix tests after model update with version and model version, and extend forbidding extra fields to nested nodes * Update experimental_imaging_dataset.py * Update utils.py
ctr26
pushed a commit
that referenced
this pull request
Aug 2, 2024
…nd forbidding extra fields to nested nodes (#135) * fix tests after model update with version and model version, and extend forbidding extra fields to nested nodes * Update experimental_imaging_dataset.py * Update utils.py
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.
Fixes tests broken by: #128 (review)
Also moves the configuration that forbids extra fields into the semantic models file to be inherited instead of BaseModel. This stops extra fields from being passed into models that govern 'nested'/'embedded' json objects inside other json objects
Also updates the filter model dictionary function to work with/expect optional fields.