Add support for recursive/circular refs

This commit adds support for recursive and circular references in object
properties and additionalProperties, but not in allOf. The changes
include:

-Delayed processing of schema model properties
-Cascading removal of invalid schema reference dependencies
-Prevention of self import in ModelProperty relative imports
-Prevention of forward recursive type reference errors in generated modules
-Logging for detection of recursive references in allOf

Author: maz808

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

@@ -31,10 +31,16 @@
 from .model_with_additional_properties_refed import ModelWithAdditionalPropertiesRefed
 from .model_with_any_json_properties import ModelWithAnyJsonProperties
 from .model_with_any_json_properties_additional_property_type_0 import ModelWithAnyJsonPropertiesAdditionalPropertyType0
+from .model_with_circular_ref_a import ModelWithCircularRefA
+from .model_with_circular_ref_b import ModelWithCircularRefB
+from .model_with_circular_ref_in_additional_properties_a import ModelWithCircularRefInAdditionalPropertiesA
+from .model_with_circular_ref_in_additional_properties_b import ModelWithCircularRefInAdditionalPropertiesB
 from .model_with_date_time_property import ModelWithDateTimeProperty
 from .model_with_primitive_additional_properties import ModelWithPrimitiveAdditionalProperties
 from .model_with_primitive_additional_properties_a_date_holder import ModelWithPrimitiveAdditionalPropertiesADateHolder
 from .model_with_property_ref import ModelWithPropertyRef
+from .model_with_recursive_ref import ModelWithRecursiveRef
+from .model_with_recursive_ref_in_additional_properties import ModelWithRecursiveRefInAdditionalProperties
 from .model_with_union_property import ModelWithUnionProperty
 from .model_with_union_property_inlined import ModelWithUnionPropertyInlined
 from .model_with_union_property_inlined_fruit_type_0 import ModelWithUnionPropertyInlinedFruitType0

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/model_with_circular_ref_a.py

@@ -0,0 +1,65 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..models.model_with_circular_ref_b import ModelWithCircularRefB
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="ModelWithCircularRefA")
+
+
+@attr.s(auto_attribs=True)
+class ModelWithCircularRefA:
+    """
+    Attributes:
+        circular (Union[Unset, ModelWithCircularRefB]):
+    """
+
+    circular: Union[Unset, ModelWithCircularRefB] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        circular: Union[Unset, Dict[str, Any]] = UNSET
+        if not isinstance(self.circular, Unset):
+            circular = self.circular.to_dict()
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if circular is not UNSET:
+            field_dict["circular"] = circular
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        _circular = d.pop("circular", UNSET)
+        circular: Union[Unset, ModelWithCircularRefB]
+        if isinstance(_circular, Unset):
+            circular = UNSET
+        else:
+            circular = ModelWithCircularRefB.from_dict(_circular)
+
+        model_with_circular_ref_a = cls(
+            circular=circular,
+        )
+
+        model_with_circular_ref_a.additional_properties = d
+        return model_with_circular_ref_a
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> 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

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/model_with_circular_ref_b.py

@@ -0,0 +1,65 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..models.model_with_circular_ref_a import ModelWithCircularRefA
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="ModelWithCircularRefB")
+
+
+@attr.s(auto_attribs=True)
+class ModelWithCircularRefB:
+    """
+    Attributes:
+        circular (Union[Unset, ModelWithCircularRefA]):
+    """
+
+    circular: Union[Unset, ModelWithCircularRefA] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        circular: Union[Unset, Dict[str, Any]] = UNSET
+        if not isinstance(self.circular, Unset):
+            circular = self.circular.to_dict()
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if circular is not UNSET:
+            field_dict["circular"] = circular
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        _circular = d.pop("circular", UNSET)
+        circular: Union[Unset, ModelWithCircularRefA]
+        if isinstance(_circular, Unset):
+            circular = UNSET
+        else:
+            circular = ModelWithCircularRefA.from_dict(_circular)
+
+        model_with_circular_ref_b = cls(
+            circular=circular,
+        )
+
+        model_with_circular_ref_b.additional_properties = d
+        return model_with_circular_ref_b
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> 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

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/model_with_circular_ref_in_additional_properties_a.py

@@ -0,0 +1,54 @@
+from typing import Any, Dict, List, Type, TypeVar
+
+import attr
+
+from ..models.model_with_circular_ref_in_additional_properties_b import ModelWithCircularRefInAdditionalPropertiesB
+
+T = TypeVar("T", bound="ModelWithCircularRefInAdditionalPropertiesA")
+
+
+@attr.s(auto_attribs=True)
+class ModelWithCircularRefInAdditionalPropertiesA:
+    """ """
+
+    additional_properties: Dict[str, ModelWithCircularRefInAdditionalPropertiesB] = 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():
+            field_dict[prop_name] = prop.to_dict()
+
+        field_dict.update({})
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        model_with_circular_ref_in_additional_properties_a = cls()
+
+        additional_properties = {}
+        for prop_name, prop_dict in d.items():
+            additional_property = ModelWithCircularRefInAdditionalPropertiesB.from_dict(prop_dict)
+
+            additional_properties[prop_name] = additional_property
+
+        model_with_circular_ref_in_additional_properties_a.additional_properties = additional_properties
+        return model_with_circular_ref_in_additional_properties_a
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> ModelWithCircularRefInAdditionalPropertiesB:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: ModelWithCircularRefInAdditionalPropertiesB) -> 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

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/model_with_circular_ref_in_additional_properties_b.py

@@ -0,0 +1,54 @@
+from typing import Any, Dict, List, Type, TypeVar
+
+import attr
+
+from ..models.model_with_circular_ref_in_additional_properties_a import ModelWithCircularRefInAdditionalPropertiesA
+
+T = TypeVar("T", bound="ModelWithCircularRefInAdditionalPropertiesB")
+
+
+@attr.s(auto_attribs=True)
+class ModelWithCircularRefInAdditionalPropertiesB:
+    """ """
+
+    additional_properties: Dict[str, ModelWithCircularRefInAdditionalPropertiesA] = 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():
+            field_dict[prop_name] = prop.to_dict()
+
+        field_dict.update({})
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        model_with_circular_ref_in_additional_properties_b = cls()
+
+        additional_properties = {}
+        for prop_name, prop_dict in d.items():
+            additional_property = ModelWithCircularRefInAdditionalPropertiesA.from_dict(prop_dict)
+
+            additional_properties[prop_name] = additional_property
+
+        model_with_circular_ref_in_additional_properties_b.additional_properties = additional_properties
+        return model_with_circular_ref_in_additional_properties_b
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> ModelWithCircularRefInAdditionalPropertiesA:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: ModelWithCircularRefInAdditionalPropertiesA) -> 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

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/model_with_recursive_ref.py

@@ -0,0 +1,64 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="ModelWithRecursiveRef")
+
+
+@attr.s(auto_attribs=True)
+class ModelWithRecursiveRef:
+    """
+    Attributes:
+        recursive (Union[Unset, ModelWithRecursiveRef]):
+    """
+
+    recursive: Union[Unset, "ModelWithRecursiveRef"] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        recursive: Union[Unset, Dict[str, Any]] = UNSET
+        if not isinstance(self.recursive, Unset):
+            recursive = self.recursive.to_dict()
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if recursive is not UNSET:
+            field_dict["recursive"] = recursive
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        _recursive = d.pop("recursive", UNSET)
+        recursive: Union[Unset, ModelWithRecursiveRef]
+        if isinstance(_recursive, Unset):
+            recursive = UNSET
+        else:
+            recursive = ModelWithRecursiveRef.from_dict(_recursive)
+
+        model_with_recursive_ref = cls(
+            recursive=recursive,
+        )
+
+        model_with_recursive_ref.additional_properties = d
+        return model_with_recursive_ref
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> 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

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/model_with_recursive_ref_in_additional_properties.py

@@ -0,0 +1,52 @@
+from typing import Any, Dict, List, Type, TypeVar
+
+import attr
+
+T = TypeVar("T", bound="ModelWithRecursiveRefInAdditionalProperties")
+
+
+@attr.s(auto_attribs=True)
+class ModelWithRecursiveRefInAdditionalProperties:
+    """ """
+
+    additional_properties: Dict[str, "ModelWithRecursiveRefInAdditionalProperties"] = 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():
+            field_dict[prop_name] = prop.to_dict()
+
+        field_dict.update({})
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        model_with_recursive_ref_in_additional_properties = cls()
+
+        additional_properties = {}
+        for prop_name, prop_dict in d.items():
+            additional_property = ModelWithRecursiveRefInAdditionalProperties.from_dict(prop_dict)
+
+            additional_properties[prop_name] = additional_property
+
+        model_with_recursive_ref_in_additional_properties.additional_properties = additional_properties
+        return model_with_recursive_ref_in_additional_properties
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> "ModelWithRecursiveRefInAdditionalProperties":
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: "ModelWithRecursiveRefInAdditionalProperties") -> 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