diff --git a/end_to_end_tests/docstrings-on-attributes-golden-record/my_test_api_client/client.py b/end_to_end_tests/docstrings-on-attributes-golden-record/my_test_api_client/client.py
@@ -1,5 +1,5 @@
 import ssl
-from typing import Any
+from typing import Any, Self
 
 import httpx
 from attrs import define, evolve, field
@@ -65,7 +65,7 @@ def with_timeout(self, timeout: httpx.Timeout) -> "Client":
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 
-    def set_httpx_client(self, client: httpx.Client) -> "Client":
+    def set_httpx_client(self, client: httpx.Client) -> Self:
         """Manually set the underlying httpx.Client
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -87,7 +87,7 @@ def get_httpx_client(self) -> httpx.Client:
             )
         return self._client
 
-    def __enter__(self) -> "Client":
+    def __enter__(self) -> Self:
         """Enter a context manager for self.client—you cannot enter twice (see httpx docs)"""
         self.get_httpx_client().__enter__()
         return self
@@ -96,7 +96,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for internal httpx.Client (see httpx docs)"""
         self.get_httpx_client().__exit__(*args, **kwargs)
 
-    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "Client":
+    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> Self:
         """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -118,7 +118,7 @@ def get_async_httpx_client(self) -> httpx.AsyncClient:
             )
         return self._async_client
 
-    async def __aenter__(self) -> "Client":
+    async def __aenter__(self) -> Self:
         """Enter a context manager for underlying httpx.AsyncClient—you cannot enter twice (see httpx docs)"""
         await self.get_async_httpx_client().__aenter__()
         return self
@@ -195,7 +195,7 @@ def with_timeout(self, timeout: httpx.Timeout) -> "AuthenticatedClient":
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 
-    def set_httpx_client(self, client: httpx.Client) -> "AuthenticatedClient":
+    def set_httpx_client(self, client: httpx.Client) -> Self:
         """Manually set the underlying httpx.Client
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -218,7 +218,7 @@ def get_httpx_client(self) -> httpx.Client:
             )
         return self._client
 
-    def __enter__(self) -> "AuthenticatedClient":
+    def __enter__(self) -> Self:
         """Enter a context manager for self.client—you cannot enter twice (see httpx docs)"""
         self.get_httpx_client().__enter__()
         return self
@@ -227,7 +227,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for internal httpx.Client (see httpx docs)"""
         self.get_httpx_client().__exit__(*args, **kwargs)
 
-    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "AuthenticatedClient":
+    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> Self:
         """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -250,7 +250,7 @@ def get_async_httpx_client(self) -> httpx.AsyncClient:
             )
         return self._async_client
 
-    async def __aenter__(self) -> "AuthenticatedClient":
+    async def __aenter__(self) -> Self:
         """Enter a context manager for underlying httpx.AsyncClient—you cannot enter twice (see httpx docs)"""
         await self.get_async_httpx_client().__aenter__()
         return self

diff --git a/end_to_end_tests/generated_client.py b/end_to_end_tests/generated_client.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 import sys
 import tempfile
-from typing import Any
+from typing import Any, Self
 
 from attrs import define
 import pytest
@@ -29,7 +29,7 @@ class GeneratedClientContext:
     monkeypatch: pytest.MonkeyPatch
     old_modules: set[str] | None = None
 
-    def __enter__(self) -> "GeneratedClientContext":
+    def __enter__(self) -> Self:
         self.monkeypatch.syspath_prepend(self.output_path)
         self.old_modules = set(sys.modules.keys())
         return self

diff --git a/end_to_end_tests/golden-record/my_test_api_client/client.py b/end_to_end_tests/golden-record/my_test_api_client/client.py
@@ -1,5 +1,5 @@
 import ssl
-from typing import Any
+from typing import Any, Self
 
 import httpx
 from attrs import define, evolve, field
@@ -69,7 +69,7 @@ def with_timeout(self, timeout: httpx.Timeout) -> "Client":
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 
-    def set_httpx_client(self, client: httpx.Client) -> "Client":
+    def set_httpx_client(self, client: httpx.Client) -> Self:
         """Manually set the underlying httpx.Client
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -91,7 +91,7 @@ def get_httpx_client(self) -> httpx.Client:
             )
         return self._client
 
-    def __enter__(self) -> "Client":
+    def __enter__(self) -> Self:
         """Enter a context manager for self.client—you cannot enter twice (see httpx docs)"""
         self.get_httpx_client().__enter__()
         return self
@@ -100,7 +100,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for internal httpx.Client (see httpx docs)"""
         self.get_httpx_client().__exit__(*args, **kwargs)
 
-    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "Client":
+    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> Self:
         """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -122,7 +122,7 @@ def get_async_httpx_client(self) -> httpx.AsyncClient:
             )
         return self._async_client
 
-    async def __aenter__(self) -> "Client":
+    async def __aenter__(self) -> Self:
         """Enter a context manager for underlying httpx.AsyncClient—you cannot enter twice (see httpx docs)"""
         await self.get_async_httpx_client().__aenter__()
         return self
@@ -203,7 +203,7 @@ def with_timeout(self, timeout: httpx.Timeout) -> "AuthenticatedClient":
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 
-    def set_httpx_client(self, client: httpx.Client) -> "AuthenticatedClient":
+    def set_httpx_client(self, client: httpx.Client) -> Self:
         """Manually set the underlying httpx.Client
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -226,7 +226,7 @@ def get_httpx_client(self) -> httpx.Client:
             )
         return self._client
 
-    def __enter__(self) -> "AuthenticatedClient":
+    def __enter__(self) -> Self:
         """Enter a context manager for self.client—you cannot enter twice (see httpx docs)"""
         self.get_httpx_client().__enter__()
         return self
@@ -235,7 +235,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for internal httpx.Client (see httpx docs)"""
         self.get_httpx_client().__exit__(*args, **kwargs)
 
-    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "AuthenticatedClient":
+    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> Self:
         """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
@@ -258,7 +258,7 @@ def get_async_httpx_client(self) -> httpx.AsyncClient:
             )
         return self._async_client
 
-    async def __aenter__(self) -> "AuthenticatedClient":
+    async def __aenter__(self) -> Self:
         """Enter a context manager for underlying httpx.AsyncClient—you cannot enter twice (see httpx docs)"""
         await self.get_async_httpx_client().__aenter__()
         return self

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/a_model.py b/end_to_end_tests/golden-record/my_test_api_client/models/a_model.py
@@ -81,8 +81,8 @@ class AModel:
     not_required_nullable_model: ModelWithUnionProperty | None | Unset = UNSET
 
     def to_dict(self) -> dict[str, Any]:
-        from ..models.free_form_model import FreeFormModel
-        from ..models.model_with_union_property import ModelWithUnionProperty
+        from ..models.free_form_model import FreeFormModel  # noqa: PLC0415
+        from ..models.model_with_union_property import ModelWithUnionProperty  # noqa: PLC0415
 
         an_enum_value = self.an_enum_value.value
 
@@ -256,8 +256,8 @@ def to_dict(self) -> dict[str, Any]:
 
     @classmethod
     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
+        from ..models.free_form_model import FreeFormModel  # noqa: PLC0415
+        from ..models.model_with_union_property import ModelWithUnionProperty  # noqa: PLC0415
 
         d = dict(src_dict)
         an_enum_value = AnEnum(d.pop("an_enum_value"))

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/an_all_of_enum.py b/end_to_end_tests/golden-record/my_test_api_client/models/an_all_of_enum.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class AnAllOfEnum(str, Enum):
+class AnAllOfEnum(StrEnum):
     A_DEFAULT = "a_default"
     BAR = "bar"
     FOO = "foo"

diff --git a/...n-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_a_item.py b/...n-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_a_item.py
@@ -46,7 +46,7 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     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,
+            AnArrayWithACircularRefInItemsObjectBItem,  # noqa: PLC0415
         )
 
         d = dict(src_dict)

diff --git a/...lient/models/an_array_with_a_circular_ref_in_items_object_additional_properties_a_item.py b/...lient/models/an_array_with_a_circular_ref_in_items_object_additional_properties_a_item.py
@@ -41,7 +41,7 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     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,
+            AnArrayWithACircularRefInItemsObjectAdditionalPropertiesBItem,  # noqa: PLC0415
         )
 
         d = dict(src_dict)

diff --git a/...lient/models/an_array_with_a_circular_ref_in_items_object_additional_properties_b_item.py b/...lient/models/an_array_with_a_circular_ref_in_items_object_additional_properties_b_item.py
@@ -41,7 +41,7 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     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,
+            AnArrayWithACircularRefInItemsObjectAdditionalPropertiesAItem,  # noqa: PLC0415
         )
 
         d = dict(src_dict)

diff --git a/...n-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_b_item.py b/...n-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_b_item.py
@@ -46,7 +46,7 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     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,
+            AnArrayWithACircularRefInItemsObjectAItem,  # noqa: PLC0415
         )
 
         d = dict(src_dict)

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/an_enum.py b/end_to_end_tests/golden-record/my_test_api_client/models/an_enum.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class AnEnum(str, Enum):
+class AnEnum(StrEnum):
     FIRST_VALUE = "FIRST_VALUE"
     SECOND_VALUE = "SECOND_VALUE"
 

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/an_enum_with_null.py b/end_to_end_tests/golden-record/my_test_api_client/models/an_enum_with_null.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class AnEnumWithNull(str, Enum):
+class AnEnumWithNull(StrEnum):
     FIRST_VALUE = "FIRST_VALUE"
     SECOND_VALUE = "SECOND_VALUE"
 

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/another_all_of_sub_model_type.py b/end_to_end_tests/golden-record/my_test_api_client/models/another_all_of_sub_model_type.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class AnotherAllOfSubModelType(str, Enum):
+class AnotherAllOfSubModelType(StrEnum):
     SUBMODEL = "submodel"
 
     def __str__(self) -> str:

diff --git a/...o_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py b/...o_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py
@@ -70,7 +70,7 @@ class BodyUploadFileTestsUploadPost:
 
     def to_dict(self) -> dict[str, Any]:
         from ..models.body_upload_file_tests_upload_post_some_nullable_object import (
-            BodyUploadFileTestsUploadPostSomeNullableObject,
+            BodyUploadFileTestsUploadPostSomeNullableObject,  # noqa: PLC0415
         )
 
         some_file = self.some_file.to_tuple()
@@ -172,7 +172,7 @@ def to_dict(self) -> dict[str, Any]:
 
     def to_multipart(self) -> types.RequestFiles:
         from ..models.body_upload_file_tests_upload_post_some_nullable_object import (
-            BodyUploadFileTestsUploadPostSomeNullableObject,
+            BodyUploadFileTestsUploadPostSomeNullableObject,  # noqa: PLC0415
         )
 
         files: types.RequestFiles = []
@@ -251,16 +251,18 @@ def to_multipart(self) -> types.RequestFiles:
 
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
-        from ..models.a_form_data import AFormData
+        from ..models.a_form_data import AFormData  # noqa: PLC0415
         from ..models.body_upload_file_tests_upload_post_additional_property import (
-            BodyUploadFileTestsUploadPostAdditionalProperty,
+            BodyUploadFileTestsUploadPostAdditionalProperty,  # noqa: PLC0415
         )
         from ..models.body_upload_file_tests_upload_post_some_nullable_object import (
-            BodyUploadFileTestsUploadPostSomeNullableObject,
+            BodyUploadFileTestsUploadPostSomeNullableObject,  # noqa: PLC0415
+        )
+        from ..models.body_upload_file_tests_upload_post_some_object import (
+            BodyUploadFileTestsUploadPostSomeObject,  # noqa: PLC0415
         )
-        from ..models.body_upload_file_tests_upload_post_some_object import BodyUploadFileTestsUploadPostSomeObject
         from ..models.body_upload_file_tests_upload_post_some_optional_object import (
-            BodyUploadFileTestsUploadPostSomeOptionalObject,
+            BodyUploadFileTestsUploadPostSomeOptionalObject,  # noqa: PLC0415
         )
 
         d = dict(src_dict)

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/different_enum.py b/end_to_end_tests/golden-record/my_test_api_client/models/different_enum.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class DifferentEnum(str, Enum):
+class DifferentEnum(StrEnum):
     DIFFERENT = "DIFFERENT"
     OTHER = "OTHER"
 

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/extended.py b/end_to_end_tests/golden-record/my_test_api_client/models/extended.py
@@ -84,8 +84,8 @@ class Extended:
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
-        from ..models.free_form_model import FreeFormModel
-        from ..models.model_with_union_property import ModelWithUnionProperty
+        from ..models.free_form_model import FreeFormModel  # noqa: PLC0415
+        from ..models.model_with_union_property import ModelWithUnionProperty  # noqa: PLC0415
 
         an_enum_value = self.an_enum_value.value
 
@@ -263,8 +263,8 @@ def to_dict(self) -> dict[str, Any]:
 
     @classmethod
     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
+        from ..models.free_form_model import FreeFormModel  # noqa: PLC0415
+        from ..models.model_with_union_property import ModelWithUnionProperty  # noqa: PLC0415
 
         d = dict(src_dict)
         an_enum_value = AnEnum(d.pop("an_enum_value"))

diff --git a/...s/golden-record/my_test_api_client/models/get_location_header_types_string_enum_header.py b/...s/golden-record/my_test_api_client/models/get_location_header_types_string_enum_header.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class GetLocationHeaderTypesStringEnumHeader(str, Enum):
+class GetLocationHeaderTypesStringEnumHeader(StrEnum):
     ONE = "one"
     THREE = "three"
     TWO = "two"

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/get_models_allof_response_200.py b/end_to_end_tests/golden-record/my_test_api_client/models/get_models_allof_response_200.py
@@ -57,8 +57,8 @@ def to_dict(self) -> dict[str, Any]:
 
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
-        from ..models.a_model import AModel
-        from ..models.extended import Extended
+        from ..models.a_model import AModel  # noqa: PLC0415
+        from ..models.extended import Extended  # noqa: PLC0415
 
         d = dict(src_dict)
         _aliased = d.pop("aliased", UNSET)

diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/http_validation_error.py b/end_to_end_tests/golden-record/my_test_api_client/models/http_validation_error.py
@@ -41,7 +41,7 @@ def to_dict(self) -> dict[str, Any]:
 
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
-        from ..models.validation_error import ValidationError
+        from ..models.validation_error import ValidationError  # noqa: PLC0415
 
         d = dict(src_dict)
         _detail = d.pop("detail", UNSET)

diff --git a/...tests/golden-record/my_test_api_client/models/model_with_additional_properties_inlined.py b/...tests/golden-record/my_test_api_client/models/model_with_additional_properties_inlined.py
@@ -45,7 +45,7 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.model_with_additional_properties_inlined_additional_property import (
-            ModelWithAdditionalPropertiesInlinedAdditionalProperty,
+            ModelWithAdditionalPropertiesInlinedAdditionalProperty,  # noqa: PLC0415
         )
 
         d = dict(src_dict)