bugfix: correct indentation of additionalProperties that are union types #266

end_to_end_tests/golden-record-custom/custom_e2e/models/__init__.py

@@ -12,6 +12,8 @@
     ModelWithAdditionalPropertiesInlinedAdditionalProperty,
 )
 from .model_with_additional_properties_refed import ModelWithAdditionalPropertiesRefed
+from .model_with_any_json_properties import ModelWithAnyJsonProperties
+from .model_with_any_json_properties_additional_property import ModelWithAnyJsonPropertiesAdditionalProperty
 from .model_with_primitive_additional_properties import ModelWithPrimitiveAdditionalProperties
 from .model_with_primitive_additional_properties_a_date_holder import ModelWithPrimitiveAdditionalPropertiesADateHolder
 from .model_with_union_property import ModelWithUnionProperty

end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties.py

@@ -0,0 +1,97 @@
+from typing import Any, Dict, List, Union, cast
+
+import attr
+
+from ..models.model_with_any_json_properties_additional_property import ModelWithAnyJsonPropertiesAdditionalProperty
+from ..types import Unset
+
+
+@attr.s(auto_attribs=True)
+class ModelWithAnyJsonProperties:
+    """  """
+
+    additional_properties: Dict[
+        str, Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]
+    ] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+
+        field_dict: Dict[str, Any] = {}
+        for prop_name, prop in self.additional_properties.items():
+            if isinstance(prop, ModelWithAnyJsonPropertiesAdditionalProperty):
+                field_dict[prop_name] = prop.to_dict()
+
+            elif isinstance(prop, list):
+                field_dict[prop_name] = prop
+
+            elif isinstance(prop, str):
+                field_dict[prop_name] = prop
+            elif isinstance(prop, float):
+                field_dict[prop_name] = prop
+            elif isinstance(prop, int):
+                field_dict[prop_name] = prop
+            else:
+                field_dict[prop_name] = prop
+
+        field_dict.update({})
+
+        return field_dict
+
+    @staticmethod
+    def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAnyJsonProperties":
+        d = src_dict.copy()
+        model_with_any_json_properties = ModelWithAnyJsonProperties()
+
+        additional_properties = {}
+        for prop_name, prop_dict in d.items():
+
+            def _parse_additional_property(
+                data: Any,
+            ) -> Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]:
+                data = None if isinstance(data, Unset) else data
+                additional_property: Union[
+                    ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool
+                ]
+                try:
+                    additional_property = ModelWithAnyJsonPropertiesAdditionalProperty.from_dict(data)
+
+                    return additional_property
+                except:  # noqa: E722
+                    pass
+                try:
+                    additional_property = cast(List[str], data)
+
+                    return additional_property
+                except:  # noqa: E722
+                    pass
+                return cast(str, prop_dict)
+                return cast(float, prop_dict)
+                return cast(int, prop_dict)
+                return cast(bool, prop_dict)
+
+            additional_property = _parse_additional_property(prop_dict)
+
+            additional_properties[prop_name] = additional_property
+
+        model_with_any_json_properties.additional_properties = additional_properties
+        return model_with_any_json_properties
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(
+        self, key: str
+    ) -> Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]:
+        return self.additional_properties[key]
+
+    def __setitem__(
+        self, key: str, value: Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]
+    ) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_any_json_properties_additional_property.py

@@ -0,0 +1,42 @@
+from typing import Any, Dict, List
+
+import attr
+
+
+@attr.s(auto_attribs=True)
+class ModelWithAnyJsonPropertiesAdditionalProperty:
+    """  """
+
+    additional_properties: Dict[str, str] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+
+        return field_dict
+
+    @staticmethod
+    def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAnyJsonPropertiesAdditionalProperty":
+        d = src_dict.copy()
+        model_with_any_json_properties_additional_property = ModelWithAnyJsonPropertiesAdditionalProperty()
+
+        model_with_any_json_properties_additional_property.additional_properties = d
+        return model_with_any_json_properties_additional_property
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> str:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: str) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

@@ -12,6 +12,8 @@
     ModelWithAdditionalPropertiesInlinedAdditionalProperty,
 )
 from .model_with_additional_properties_refed import ModelWithAdditionalPropertiesRefed
+from .model_with_any_json_properties import ModelWithAnyJsonProperties
+from .model_with_any_json_properties_additional_property import ModelWithAnyJsonPropertiesAdditionalProperty
 from .model_with_primitive_additional_properties import ModelWithPrimitiveAdditionalProperties
 from .model_with_primitive_additional_properties_a_date_holder import ModelWithPrimitiveAdditionalPropertiesADateHolder
 from .model_with_union_property import ModelWithUnionProperty

end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties.py

@@ -0,0 +1,97 @@
+from typing import Any, Dict, List, Union, cast
+
+import attr
+
+from ..models.model_with_any_json_properties_additional_property import ModelWithAnyJsonPropertiesAdditionalProperty
+from ..types import Unset
+
+
+@attr.s(auto_attribs=True)
+class ModelWithAnyJsonProperties:
+    """  """
+
+    additional_properties: Dict[
+        str, Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]
+    ] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+
+        field_dict: Dict[str, Any] = {}
+        for prop_name, prop in self.additional_properties.items():
+            if isinstance(prop, ModelWithAnyJsonPropertiesAdditionalProperty):
+                field_dict[prop_name] = prop.to_dict()
+
+            elif isinstance(prop, list):
+                field_dict[prop_name] = prop
+
+            elif isinstance(prop, str):
+                field_dict[prop_name] = prop
+            elif isinstance(prop, float):
+                field_dict[prop_name] = prop
+            elif isinstance(prop, int):
+                field_dict[prop_name] = prop
+            else:
+                field_dict[prop_name] = prop
+
+        field_dict.update({})
+
+        return field_dict
+
+    @staticmethod
+    def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAnyJsonProperties":
+        d = src_dict.copy()
+        model_with_any_json_properties = ModelWithAnyJsonProperties()
+
+        additional_properties = {}
+        for prop_name, prop_dict in d.items():
+
+            def _parse_additional_property(
+                data: Any,
+            ) -> Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]:
+                data = None if isinstance(data, Unset) else data
+                additional_property: Union[
+                    ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool
+                ]
+                try:
+                    additional_property = ModelWithAnyJsonPropertiesAdditionalProperty.from_dict(data)
+
+                    return additional_property
+                except:  # noqa: E722
+                    pass
+                try:
+                    additional_property = cast(List[str], data)
+
+                    return additional_property
+                except:  # noqa: E722
+                    pass
+                return cast(str, prop_dict)
+                return cast(float, prop_dict)
+                return cast(int, prop_dict)
+                return cast(bool, prop_dict)
+
+            additional_property = _parse_additional_property(prop_dict)
+
+            additional_properties[prop_name] = additional_property
+
+        model_with_any_json_properties.additional_properties = additional_properties
+        return model_with_any_json_properties
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(
+        self, key: str
+    ) -> Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]:
+        return self.additional_properties[key]
+
+    def __setitem__(
+        self, key: str, value: Union[ModelWithAnyJsonPropertiesAdditionalProperty, List[str], str, float, int, bool]
+    ) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties_additional_property.py

@@ -0,0 +1,42 @@
+from typing import Any, Dict, List
+
+import attr
+
+
+@attr.s(auto_attribs=True)
+class ModelWithAnyJsonPropertiesAdditionalProperty:
+    """  """
+
+    additional_properties: Dict[str, str] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+
+        return field_dict
+
+    @staticmethod
+    def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAnyJsonPropertiesAdditionalProperty":
+        d = src_dict.copy()
+        model_with_any_json_properties_additional_property = ModelWithAnyJsonPropertiesAdditionalProperty()
+
+        model_with_any_json_properties_additional_property.additional_properties = d
+        return model_with_any_json_properties_additional_property
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> str:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: str) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/openapi.json

@@ -806,6 +806,38 @@
         "additionalProperties": {
           "$ref": "#/components/schemas/AnEnum"
         }
+      },
+      "ModelWithAnyJsonProperties": {
+        "title": "ModelWithAnyJsonProperties",
+        "type": "object",
+        "additionalProperties": {
+          "anyOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        }
       }
     }
   }

openapi_python_client/parser/properties/__init__.py

@@ -135,6 +135,10 @@ def get_type_string(self, no_optional: bool = False) -> str:
             type_string = f"Union[Unset, {type_string}]"
         return type_string
 
+    def get_instance_type_string(self) -> str:
+        """Get a string representation of runtime type that should be used for `isinstance` checks"""
+        return "list"
+
     def get_imports(self, *, prefix: str) -> Set[str]:
         """
         Get a set of import strings that should be included when this property is used somewhere

openapi_python_client/parser/properties/property.py

@@ -48,6 +48,10 @@ def get_type_string(self, no_optional: bool = False) -> str:
             type_string = f"Union[Unset, {type_string}]"
         return type_string
 
+    def get_instance_type_string(self) -> str:
+        """Get a string representation of runtime type that should be used for `isinstance` checks"""
+        return self.get_type_string(no_optional=True)
+
     # noinspection PyUnusedLocal
     def get_imports(self, *, prefix: str) -> Set[str]:
         """

openapi_python_client/templates/model.pyi

@@ -51,7 +51,7 @@ class {{ model.reference.class_name }}:
         {% if model.additional_properties.template %}
         {% from "property_templates/" + model.additional_properties.template import transform %}
         for prop_name, prop in self.additional_properties.items():
-            {{ transform(model.additional_properties, "prop", "field_dict[prop_name]") | indent(4) }}
+            {{ transform(model.additional_properties, "prop", "field_dict[prop_name]") | indent(12) }}
         {% else %}
         field_dict.update(self.additional_properties)
         {% endif %}

openapi_python_client/templates/property_templates/union_property.pyi

@@ -15,7 +15,7 @@ def _parse_{{ property.python_name }}(data: Any) -> {{ property.get_type_string(
     {{ construct(inner_property, "data", initial_value="UNSET") | indent(4) }}
     return {{ property.python_name }}
     {% else %}
-    return {{ source }}
+    return cast({{ inner_property.get_type_string() }}, {{ source }})
     {% endif %}
     {% endfor %}
 
@@ -39,9 +39,9 @@ elif {{ source }} is None:
 {% endif %}
 {% for inner_property in property.inner_properties %}
     {% if loop.first and property.required and not property.nullable %}{# No if UNSET or if None statement before this #}
-if isinstance({{ source }}, {{ inner_property.get_type_string(no_optional=True) }}):
+if isinstance({{ source }}, {{ inner_property.get_instance_type_string() }}):
     {% elif not loop.last %}
-elif isinstance({{ source }}, {{ inner_property.get_type_string(no_optional=True) }}):
+elif isinstance({{ source }}, {{ inner_property.get_instance_type_string() }}):
     {% else %}
 else:
     {% endif %}