fix: avoid variable-shadowing collision in model from_dict

end_to_end_tests/baseline_openapi_3.0.json

@@ -2495,6 +2495,17 @@
           "type": "string"
         }
       },
+      "ModelWithSelfNamedProperty": {
+        "title": "ModelWithSelfNamedProperty",
+        "type": "object",
+        "properties": {
+          "model_with_self_named_property": {
+            "type": "string",
+            "format": "date"
+          }
+        },
+        "required": ["model_with_self_named_property"]
+      },
       "ModelWithAdditionalPropertiesRefed": {
         "title": "ModelWithAdditionalPropertiesRefed",
         "type": "object",

end_to_end_tests/baseline_openapi_3.1.yaml

@@ -2452,6 +2452,17 @@ info:
         "type": "string"
       }
     },
+    "ModelWithSelfNamedProperty": {
+      "title": "ModelWithSelfNamedProperty",
+      "type": "object",
+      "properties": {
+        "model_with_self_named_property": {
+          "type": "string",
+          "format": "date"
+        }
+      },
+      "required": ["model_with_self_named_property"]
+    },
     "ModelWithAdditionalPropertiesRefed": {
       "title": "ModelWithAdditionalPropertiesRefed",
       "type": "object",

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

@@ -24,7 +24,7 @@ class ModelWithDescription:
     it was the epoch of belief, it was the epoch of incredulity, it was the season of light, it was the season of
     darkness, it was the spring of hope, it was the winter of despair.
      """
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         prop_with_no_desc = self.prop_with_no_desc
@@ -54,15 +54,13 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
 
         prop_with_long_desc = d.pop("propWithLongDesc", UNSET)
 
-        model_with_description = cls(
+        return cls(
             prop_with_no_desc=prop_with_no_desc,
             prop_with_desc=prop_with_desc,
             prop_with_long_desc=prop_with_long_desc,
+            additional_properties=d,
         )
 
-        model_with_description.additional_properties = d
-        return model_with_description
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

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

@@ -16,7 +16,7 @@ class ModelWithNoDescription:
     prop_with_no_desc: str | Unset = UNSET
     prop_with_desc: str | Unset = UNSET
     """ This is a nice property. """
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         prop_with_no_desc = self.prop_with_no_desc
@@ -40,14 +40,12 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
 
         prop_with_desc = d.pop("propWithDesc", UNSET)
 
-        model_with_no_description = cls(
+        return cls(
             prop_with_no_desc=prop_with_no_desc,
             prop_with_desc=prop_with_desc,
+            additional_properties=d,
         )
 
-        model_with_no_description.additional_properties = d
-        return model_with_no_description
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

end_to_end_tests/golden-records/escapes-client/escapes_client/models/misc_metadata_escapes_body.py

@@ -11,7 +11,7 @@
 
 @_attrs_define
 class MiscMetadataEscapesBody:
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
 
@@ -23,10 +23,10 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         d = dict(src_dict)
-        misc_metadata_escapes_body = cls()
 
-        misc_metadata_escapes_body.additional_properties = d
-        return misc_metadata_escapes_body
+        return cls(
+            additional_properties=d,
+        )
 
     @property
     def additional_keys(self) -> list[str]:

end_to_end_tests/golden-records/escapes-client/escapes_client/models/non_string_example_body.py

@@ -24,7 +24,7 @@ class NonStringExampleBody:
     """
 
     dict_example: NonStringExampleBodyDictExample | Unset = UNSET
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         dict_example: dict[str, Any] | Unset = UNSET
@@ -51,13 +51,11 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         else:
             dict_example = NonStringExampleBodyDictExample.from_dict(_dict_example)
 
-        non_string_example_body = cls(
+        return cls(
             dict_example=dict_example,
+            additional_properties=d,
         )
 
-        non_string_example_body.additional_properties = d
-        return non_string_example_body
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

end_to_end_tests/golden-records/escapes-client/escapes_client/models/non_string_example_body_dict_example.py

@@ -17,7 +17,7 @@ class NonStringExampleBodyDictExample:
 
     """
 
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
 
@@ -29,10 +29,10 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         d = dict(src_dict)
-        non_string_example_body_dict_example = cls()
 
-        non_string_example_body_dict_example.additional_properties = d
-        return non_string_example_body_dict_example
+        return cls(
+            additional_properties=d,
+        )
 
     @property
     def additional_keys(self) -> list[str]:

end_to_end_tests/golden-records/escapes-client/escapes_client/models/property_escapes_model_title_printuh_oh.py

@@ -25,7 +25,7 @@ class PropertyEscapesModelTitlePrintuhOh:
     escaped_description: str | Unset = 'default value with \\"quotes\\"'
     escaped_enum: PropertyEscapesModelTitlePrintuhOhEscapedEnum | Unset = UNSET
     escaped_const: Literal["\\\" + print('uh oh') + \\\""] | Unset = UNSET
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         escaped_description = self.escaped_description
@@ -66,15 +66,13 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
                 f"escaped_const must match const '\\\\\" + print(\\'uh oh\\') + \\\\\"', got '{escaped_const}'"
             )
 
-        property_escapes_model_title_printuh_oh = cls(
+        return cls(
             escaped_description=escaped_description,
             escaped_enum=escaped_enum,
             escaped_const=escaped_const,
+            additional_properties=d,
         )
 
-        property_escapes_model_title_printuh_oh.additional_properties = d
-        return property_escapes_model_title_printuh_oh
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

end_to_end_tests/golden-records/escapes-client/escapes_client/models/schema_printuh_oh.py

@@ -11,7 +11,7 @@
 
 @_attrs_define
 class SchemaPrintuhOh:
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
 
@@ -23,10 +23,10 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         d = dict(src_dict)
-        schema_printuh_oh = cls()
 
-        schema_printuh_oh.additional_properties = d
-        return schema_printuh_oh
+        return cls(
+            additional_properties=d,
+        )
 
     @property
     def additional_keys(self) -> list[str]:

end_to_end_tests/golden-records/escapes-client/escapes_client/models/with_braces_path_body.py

@@ -11,7 +11,7 @@
 
 @_attrs_define
 class WithBracesPathBody:
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
 
@@ -23,10 +23,10 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         d = dict(src_dict)
-        with_braces_path_body = cls()
 
-        with_braces_path_body.additional_properties = d
-        return with_braces_path_body
+        return cls(
+            additional_properties=d,
+        )
 
     @property
     def additional_keys(self) -> list[str]:

end_to_end_tests/golden-records/my-enum-api-client/my_enum_api_client/models/a_model.py

@@ -100,12 +100,10 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
 
                 nested_list_of_enums.append(nested_list_of_enums_item)
 
-        a_model = cls(
+        return cls(
             an_enum_value=an_enum_value,
             an_allof_enum_with_overridden_default=an_allof_enum_with_overridden_default,
             any_value=any_value,
             an_optional_allof_enum=an_optional_allof_enum,
             nested_list_of_enums=nested_list_of_enums,
         )
-
-        return a_model

end_to_end_tests/golden-records/my-enum-api-client/my_enum_api_client/models/post_user_list_body.py

@@ -34,7 +34,7 @@ class PostUserListBody:
     an_allof_enum_with_overridden_default: AnAllOfEnum | Unset = "overridden_default"
     an_optional_allof_enum: AnAllOfEnum | Unset = UNSET
     nested_list_of_enums: list[list[DifferentEnum]] | Unset = UNSET
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         an_enum_value: list[str] | Unset = UNSET
@@ -220,18 +220,16 @@ def _parse_an_enum_value_with_null_item(data: object) -> AnEnumWithNull | None:
 
                 nested_list_of_enums.append(nested_list_of_enums_item)
 
-        post_user_list_body = cls(
+        return cls(
             an_enum_value=an_enum_value,
             an_enum_value_with_null=an_enum_value_with_null,
             an_enum_value_with_only_null=an_enum_value_with_only_null,
             an_allof_enum_with_overridden_default=an_allof_enum_with_overridden_default,
             an_optional_allof_enum=an_optional_allof_enum,
             nested_list_of_enums=nested_list_of_enums,
+            additional_properties=d,
         )
 
-        post_user_list_body.additional_properties = d
-        return post_user_list_body
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/models/__init__.py

@@ -72,6 +72,7 @@
 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_self_named_property import ModelWithSelfNamedProperty
 from .model_with_union_property import ModelWithUnionProperty
 from .model_with_union_property_inlined import ModelWithUnionPropertyInlined
 from .model_with_union_property_inlined_apples import ModelWithUnionPropertyInlinedApples
@@ -161,6 +162,7 @@
     "ModelWithPropertyRef",
     "ModelWithRecursiveRef",
     "ModelWithRecursiveRefInAdditionalProperties",
+    "ModelWithSelfNamedProperty",
     "ModelWithUnionProperty",
     "ModelWithUnionPropertyInlined",
     "ModelWithUnionPropertyInlinedApples",

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/models/a_discriminated_union_type_1.py

@@ -19,7 +19,7 @@ class ADiscriminatedUnionType1:
     """
 
     model_type: str | Unset = UNSET
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         model_type = self.model_type
@@ -37,13 +37,11 @@ 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(
+        return cls(
             model_type=model_type,
+            additional_properties=d,
         )
 
-        a_discriminated_union_type_1.additional_properties = d
-        return a_discriminated_union_type_1
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/models/a_discriminated_union_type_2.py

@@ -19,7 +19,7 @@ class ADiscriminatedUnionType2:
     """
 
     model_type: str | Unset = UNSET
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         model_type = self.model_type
@@ -37,13 +37,11 @@ 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(
+        return cls(
             model_type=model_type,
+            additional_properties=d,
         )
 
-        a_discriminated_union_type_2.additional_properties = d
-        return a_discriminated_union_type_2
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/models/a_form_data.py

@@ -21,7 +21,7 @@ class AFormData:
 
     an_required_field: str
     an_optional_field: str | Unset = UNSET
-    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+    additional_properties: dict[str, Any] = _attrs_field(factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         an_required_field = self.an_required_field
@@ -47,14 +47,12 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
 
         an_optional_field = d.pop("an_optional_field", UNSET)
 
-        a_form_data = cls(
+        return cls(
             an_required_field=an_required_field,
             an_optional_field=an_optional_field,
+            additional_properties=d,
         )
 
-        a_form_data.additional_properties = d
-        return a_form_data
-
     @property
     def additional_keys(self) -> list[str]:
         return list(self.additional_properties.keys())

end_to_end_tests/golden-records/my-test-api-client/my_test_api_client/models/a_model.py

@@ -509,7 +509,7 @@ def _parse_not_required_nullable_model(data: object) -> ModelWithUnionProperty |
 
         not_required_nullable_model = _parse_not_required_nullable_model(d.pop("not_required_nullable_model", UNSET))
 
-        a_model = cls(
+        return cls(
             an_enum_value=an_enum_value,
             an_allof_enum_with_overridden_default=an_allof_enum_with_overridden_default,
             a_camel_date_time=a_camel_date_time,
@@ -537,5 +537,3 @@ def _parse_not_required_nullable_model(data: object) -> ModelWithUnionProperty |
             not_required_model=not_required_model,
             not_required_nullable_model=not_required_nullable_model,
         )
-
-        return a_model