fix: Fix bug parsing allOf in nested keys BNCH-20174 (#29)

Author: forest-benchling

openapi_python_client/parser/properties/__init__.py

@@ -268,9 +268,6 @@ def build_model_property(
 
     for key, value in all_props.items():
         prop_required = key in required_set
-        if not isinstance(value, oai.Reference) and value.allOf:
-            # resolved later
-            continue
         prop, schemas = property_from_data(
             name=key, required=prop_required, data=value, schemas=schemas, parent_name=class_name
         )
@@ -463,9 +460,6 @@ def _property_from_data(
         )
     if data.anyOf or data.oneOf:
         return build_union_property(data=data, name=name, required=required, schemas=schemas, parent_name=parent_name)
-    if not data.type:
-        return NoneProperty(name=name, required=required, nullable=False, default=None), schemas
-
     if data.type == "string":
         return _string_based_property(name=name, required=required, data=data), schemas
     elif data.type == "number":
@@ -500,8 +494,10 @@ def _property_from_data(
         )
     elif data.type == "array":
         return build_list_property(data=data, name=name, required=required, schemas=schemas, parent_name=parent_name)
-    elif data.type == "object":
+    elif data.type == "object" or data.allOf:
         return build_model_property(data=data, name=name, schemas=schemas, required=required, parent_name=parent_name)
+    elif not data.type:
+        return NoneProperty(name=name, required=required, nullable=False, default=None), schemas
     return PropertyError(data=data, detail=f"unknown type {data.type}"), schemas
 
 

tests/test_parser/test_properties/test_model_property.py

@@ -123,3 +123,79 @@ def test_resolve_references(mocker):
     assert all(p.required for p in model.required_properties)
     assert sorted(p.name for p in model.optional_properties) == ["Enum", "Int"]
     assert all(not p.required for p in model.optional_properties)
+
+
+def test_resolve_references_nested_allof(mocker):
+    import openapi_python_client.schema as oai
+    from openapi_python_client.parser.properties import build_model_property
+
+    schemas = {
+        "RefA": oai.Schema.construct(
+            title=mocker.MagicMock(),
+            description=mocker.MagicMock(),
+            required=["String"],
+            properties={
+                "String": oai.Schema.construct(type="string"),
+                "Enum": oai.Schema.construct(type="string", enum=["aValue"]),
+                "DateTime": oai.Schema.construct(type="string", format="date-time"),
+            },
+        ),
+        "RefB": oai.Schema.construct(
+            title=mocker.MagicMock(),
+            description=mocker.MagicMock(),
+            required=["DateTime"],
+            properties={
+                "Int": oai.Schema.construct(type="integer"),
+                "DateTime": oai.Schema.construct(type="string", format="date-time"),
+                "Float": oai.Schema.construct(type="number", format="float"),
+            },
+        ),
+        # Intentionally no properties defined
+        "RefC": oai.Schema.construct(
+            title=mocker.MagicMock(),
+            description=mocker.MagicMock(),
+        ),
+    }
+
+    model_schema = oai.Schema.construct(
+        type="object",
+        properties={
+            "Key": oai.Schema.construct(
+                allOf=[
+                    oai.Reference.construct(ref="#/components/schemas/RefA"),
+                    oai.Reference.construct(ref="#/components/schemas/RefB"),
+                    oai.Reference.construct(ref="#/components/schemas/RefC"),
+                    oai.Schema.construct(
+                        title=mocker.MagicMock(),
+                        description=mocker.MagicMock(),
+                        required=["Float"],
+                        properties={
+                            "String": oai.Schema.construct(type="string"),
+                            "Float": oai.Schema.construct(type="number", format="float"),
+                        },
+                    ),
+                ]
+            ),
+        }
+    )
+
+    components = {**schemas, "Model": model_schema}
+
+    from openapi_python_client.parser.properties import ModelProperty, Schemas
+
+    schemas_holder = Schemas()
+    model, schemas_holder = build_model_property(
+        data=model_schema, name="Model", required=True, schemas=schemas_holder, parent_name=None
+    )
+    model.resolve_references(components, schemas_holder)
+    assert sorted(p.name for p in model.required_properties) == []
+    assert sorted(p.name for p in model.optional_properties) == ["Key"]
+    assert all(not p.required for p in model.optional_properties)
+
+    key_property = model.optional_properties[0]
+    assert isinstance(key_property, ModelProperty)
+    key_property.resolve_references(components, schemas_holder)
+    assert sorted(p.name for p in key_property.required_properties) == ["DateTime", "Float", "String"]
+    assert all(p.required for p in key_property.required_properties)
+    assert sorted(p.name for p in key_property.optional_properties) == ["Enum", "Int"]
+    assert all(not p.required for p in key_property.optional_properties)