Extends marshmallow (#203)

* Better handling of extended models - special handling for marshmallow and ui/marshmallow to simplify the extended model

* Handling imports in extended schemas

oarepo_model_builder/datatypes/components/marshmallow/array.py

@@ -13,6 +13,9 @@ def _create_marshmallow_field(
     ):
         f = []
         datatypes.call_components(section.item, field_accessor, fields=f)
+        if not f:
+            return
+
         item_field: MarshmallowField = f[0]
         f = []
         super()._create_marshmallow_field(
@@ -22,6 +25,9 @@ def _create_marshmallow_field(
             fields=f,
             item_field=item_field,
         )
+        if not f:
+            return
+
         fld: MarshmallowField = f[0]
         fld.imports.extend(item_field.imports)
         fld.reference = item_field.reference

oarepo_model_builder/profiles/record.py

@@ -11,6 +11,7 @@
 from oarepo_model_builder.schema import ModelSchema
 from oarepo_model_builder.utils.deepmerge import deepmerge
 from oarepo_model_builder.utils.dict import dict_get
+from oarepo_model_builder.utils.python_name import base_name
 
 
 class RecordProfile(Profile):
@@ -114,10 +115,14 @@ def marshmallow_merge(target, source, stack):
         return None  # use default merging
 
     if "class" in source:
-        target.setdefault("base-classes", []).append(source["class"])
+        target.setdefault("base-classes", []).append(base_name(source["class"]))
         target.setdefault("imports", []).append({"import": source["class"]})
     elif "base-classes" in source:
-        target.setdefault("base-classes", []).extend(source["base-classes"])
+        target_base_classes = target.setdefault("base-classes", [])
+        target_imports = target.setdefault("imports", [])
         for bc in source["base-classes"]:
-            target.setdefault("imports", []).append({"import": bc})
+            target_base_classes.append(base_name(bc))
+            if "." in bc:
+                target_imports.append({"import": bc})
+        target_imports.extend(source.get("imports", []))
     return target

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder
-version = 4.0.28
+version = 4.0.29
 description = A utility library that generates OARepo required data model files from a JSON specification file
 authors = Miroslav Bauer <[email protected]>, Miroslav Simek <[email protected]>
 readme = README.md

tests/test_extend.py

@@ -1,3 +1,5 @@
+from pprint import pprint
+
 import json5
 
 from oarepo_model_builder.entrypoints import create_builder_from_entrypoints
@@ -54,13 +56,14 @@ def test_extend_in_model():
     )
     RecordProfile().build(model, "record", ["record"], "", builder)
     schema = fs.read("test/services/records/schema.py")
-    assert "class TestSchema(aaa.BlahSchema)" in schema
-    assert "class TestMetadataSchema(aaa.BlahMetadataSchema)" in schema
+    pprint(schema)
+    assert "class TestSchema(BlahSchema)" in schema
+    assert "class TestMetadataSchema(BlahMetadataSchema)" in schema
     assert "metadata = ma.fields.Nested(lambda: TestMetadataSchema())" in schema
 
     schema = fs.read("test/services/records/ui_schema.py")
-    assert "class TestUISchema(aaa.BlahUISchema)" in schema
-    assert "class TestMetadataUISchema(aaa.BlahMetadataUISchema)" in schema
+    assert "class TestUISchema(BlahUISchema)" in schema
+    assert "class TestMetadataUISchema(BlahMetadataUISchema)" in schema
     assert "metadata = ma.fields.Nested(lambda: TestMetadataUISchema())" in schema