From 460700e0f724b78301381f8febd725650f782f3c Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Thu, 25 May 2023 10:27:17 +0000 Subject: [PATCH] AUDIT: Apply more suggestions from Review --- src/caosadvancedtools/models/parser.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/caosadvancedtools/models/parser.py b/src/caosadvancedtools/models/parser.py index c15f3d1b..b88c8945 100644 --- a/src/caosadvancedtools/models/parser.py +++ b/src/caosadvancedtools/models/parser.py @@ -618,14 +618,13 @@ class Parser(object): class JsonSchemaParser(Parser): """Extends the yaml parser to read in datamodels defined in a json schema. - **EXPERIMENTAL:** While this calss can already be used to create data models + **EXPERIMENTAL:** While this class can already be used to create data models from basic json schemas, there are the following limitations and missing features: * Due to limitations of json-schema itself, we currently do not support inheritance in the imported data models * The same goes for suggested properties of RecordTypes - * Currently, ``$defs`` and ``$ref`` in the input schema are not resolved. * Already defined RecordTypes and (scalar) Properties can't be re-used as list properties * Reference properties that are different from the referenced RT. (Although @@ -689,7 +688,7 @@ class JsonSchemaParser(Parser): our : DataModel The datamodel defined in `model_dict` """ - # @review Timm Fitschen 2022-02-30 + # @review Timm Fitschen 2023-05-25 if isinstance(model_dict, dict): model_dict = [model_dict] @@ -761,7 +760,7 @@ class JsonSchemaParser(Parser): raise JsonSchemaDefinitionError(f"Unkown atomic type in {elt}.") def _treat_element(self, elt: dict, name: str): - # @review Timm Fitschen 2022-02-30 + # @review Timm Fitschen 2023-05-25 force_list = False if name in self.model: return self.model[name], force_list @@ -805,7 +804,7 @@ class JsonSchemaParser(Parser): return ent, force_list def _treat_record_type(self, elt: dict, name: str): - # @review Timm Fitschen 2022-02-30 + # @review Timm Fitschen 2023-05-25 rt = db.RecordType(name=name) if "required" in elt: required = elt["required"] -- GitLab