feat: Allow any Mapping in generated from_dict functions (openapi-generators#1211)

Closes
openapi-generators#1203

---------

Co-authored-by: Dylan Anthony <[email protected]>

Author: 2 people

end_to_end_tests/docstrings-on-attributes-golden-record/my_test_api_client/models/model_with_description.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -43,8 +44,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         prop_with_no_desc = d.pop("propWithNoDesc", UNSET)
 
         prop_with_desc = d.pop("propWithDesc", UNSET)

end_to_end_tests/docstrings-on-attributes-golden-record/my_test_api_client/models/model_with_no_description.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -31,8 +32,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         prop_with_no_desc = d.pop("propWithNoDesc", UNSET)
 
         prop_with_desc = d.pop("propWithDesc", UNSET)

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -30,8 +31,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         model_type = d.pop("modelType", UNSET)
 
         a_discriminated_union_type_1 = cls(

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -30,8 +31,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         model_type = d.pop("modelType", UNSET)
 
         a_discriminated_union_type_2 = cls(

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -38,8 +39,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         an_required_field = d.pop("an_required_field")
 
         an_optional_field = d.pop("an_optional_field", UNSET)

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

@@ -1,4 +1,5 @@
 import datetime
+from collections.abc import Mapping
 from io import BytesIO
 from typing import Any, TypeVar, cast
 
@@ -213,8 +214,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         enum_properties_ref = []
         _enum_properties_ref = d.pop("enum_properties_ref")
         for componentsschemas_an_other_array_of_enum_item_data in _enum_properties_ref:

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -45,8 +46,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         a_sub_property = d.pop("a_sub_property", UNSET)
 
         type_ = d.pop("type", UNSET)

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -45,8 +46,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         a_sub_property = d.pop("a_sub_property", UNSET)
 
         type_ = d.pop("type", UNSET)

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -41,12 +42,12 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.an_array_with_a_circular_ref_in_items_object_b_item import (
             AnArrayWithACircularRefInItemsObjectBItem,
         )
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         circular = []
         _circular = d.pop("circular", UNSET)
         for componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data in _circular or []:

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -35,12 +36,12 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.an_array_with_a_circular_ref_in_items_object_additional_properties_b_item import (
             AnArrayWithACircularRefInItemsObjectAdditionalPropertiesBItem,
         )
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         an_array_with_a_circular_ref_in_items_object_additional_properties_a_item = cls()
 
         additional_properties = {}

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -35,12 +36,12 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.an_array_with_a_circular_ref_in_items_object_additional_properties_a_item import (
             AnArrayWithACircularRefInItemsObjectAdditionalPropertiesAItem,
         )
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         an_array_with_a_circular_ref_in_items_object_additional_properties_b_item = cls()
 
         additional_properties = {}

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -41,12 +42,12 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.an_array_with_a_circular_ref_in_items_object_a_item import (
             AnArrayWithACircularRefInItemsObjectAItem,
         )
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         circular = []
         _circular = d.pop("circular", UNSET)
         for componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data in _circular or []:

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -27,8 +28,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         an_array_with_a_recursive_ref_in_items_object_additional_properties_item = cls()
 
         additional_properties = {}

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -37,8 +38,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         recursive = []
         _recursive = d.pop("recursive", UNSET)
         for componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data in _recursive or []:

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -48,8 +49,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         another_sub_property = d.pop("another_sub_property", UNSET)
 
         _type_ = d.pop("type", UNSET)

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -30,8 +31,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         foo = d.pop("foo", UNSET)
 
         body_upload_file_tests_upload_post_additional_property = cls(

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -30,8 +31,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         bar = d.pop("bar", UNSET)
 
         body_upload_file_tests_upload_post_some_nullable_object = cls(

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -35,8 +36,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         num = d.pop("num")
 
         text = d.pop("text")

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -30,8 +31,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         foo = d.pop("foo")
 
         body_upload_file_tests_upload_post_some_optional_object = cls(

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

@@ -1,4 +1,5 @@
 import datetime
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union, cast
 from uuid import UUID
 
@@ -260,11 +261,11 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.free_form_model import FreeFormModel
         from ..models.model_with_union_property import ModelWithUnionProperty
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         an_enum_value = AnEnum(d.pop("an_enum_value"))
 
         an_allof_enum_with_overridden_default = AnAllOfEnum(d.pop("an_allof_enum_with_overridden_default"))

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -19,8 +20,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         free_form_model = cls()
 
         free_form_model.additional_properties = d

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -53,11 +54,11 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.a_model import AModel
         from ..models.extended import Extended
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         _aliased = d.pop("aliased", UNSET)
         aliased: Union[Unset, AModel]
         if isinstance(_aliased, Unset):

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

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, Literal, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
@@ -38,8 +39,8 @@ def to_dict(self) -> dict[str, Any]:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         type_ = cast(Literal["alpha"], d.pop("type"))
         if type_ != "alpha":
             raise ValueError(f"type must match const 'alpha', got '{type_}'")