openapi-python-client 0.21.7__tar.gz → 0.23.0__tar.gz

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/PKG-INFO

@@ -1,16 +1,16 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: openapi-python-client
-Version: 0.21.7
+Version: 0.23.0
 Summary: Generate modern Python clients from OpenAPI
 Project-URL: repository, https://github.com/openapi-generators/openapi-python-client
 Author-email: Dylan Anthony <contact@dylananthony.com>
 License: MIT
+License-File: LICENSE
 Keywords: Client,Generator,OpenAPI
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -18,17 +18,17 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Code Generators
 Classifier: Typing :: Typed
-Requires-Python: <4.0,>=3.8.1
-Requires-Dist: attrs>=21.3.0
+Requires-Python: <4.0,>=3.9
+Requires-Dist: attrs>=22.2.0
 Requires-Dist: colorama>=0.4.3; sys_platform == 'win32'
-Requires-Dist: httpx<0.28.0,>=0.20.0
+Requires-Dist: httpx<0.29.0,>=0.20.0
 Requires-Dist: jinja2<4.0.0,>=3.0.0
 Requires-Dist: pydantic<3.0.0,>=2.1.1
 Requires-Dist: python-dateutil<3.0.0,>=2.8.1
 Requires-Dist: ruamel-yaml<0.19.0,>=0.18.6
-Requires-Dist: ruff<0.8,>=0.2
+Requires-Dist: ruff<0.9,>=0.2
 Requires-Dist: shellingham<2.0.0,>=1.3.2
-Requires-Dist: typer<0.13,>0.6
+Requires-Dist: typer<0.16,>0.6
 Requires-Dist: typing-extensions<5.0.0,>=4.8.0
 Description-Content-Type: text/markdown
 
@@ -142,6 +142,16 @@ literal_enums: true
 
 This is especially useful if enum values, when transformed to their Python names, end up conflicting due to case sensitivity or special symbols.
 
+### generate_all_tags
+
+`openapi-python-client` generates module names within the `api` module based on the OpenAPI `tags` of each endpoint. 
+By default, only the _first_ tag is generated. If you want to generate **duplicate** endpoint functions using _every_ tag 
+listed, you can enable this option:
+
+```yaml
+generate_all_tags: true
+```
+
 ### project_name_override and package_name_override
 
 Used to change the name of generated client library project/package. If the project name is changed but an override for the package name

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/README.md

@@ -108,6 +108,16 @@ literal_enums: true
 
 This is especially useful if enum values, when transformed to their Python names, end up conflicting due to case sensitivity or special symbols.
 
+### generate_all_tags
+
+`openapi-python-client` generates module names within the `api` module based on the OpenAPI `tags` of each endpoint. 
+By default, only the _first_ tag is generated. If you want to generate **duplicate** endpoint functions using _every_ tag 
+listed, you can enable this option:
+
+```yaml
+generate_all_tags: true
+```
+
 ### project_name_override and package_name_override
 
 Used to change the name of generated client library project/package. If the project name is changed but an override for the package name

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/__init__.py

@@ -4,10 +4,11 @@ import json
 import mimetypes
 import shutil
 import subprocess
+from collections.abc import Sequence
 from importlib.metadata import version
 from pathlib import Path
 from subprocess import CalledProcessError
-from typing import Any, Dict, List, Optional, Sequence, Union
+from typing import Any, Optional, Union
 
 import httpcore
 import httpx
@@ -101,19 +102,17 @@ class Project:
             openapi=self.openapi,
             endpoint_collections_by_tag=self.openapi.endpoint_collections_by_tag,
         )
-        self.errors: List[GeneratorError] = []
+        self.errors: list[GeneratorError] = []
 
     def build(self) -> Sequence[GeneratorError]:
         """Create the project from templates"""
 
         print(f"Generating {self.project_dir}")
-        if self.config.overwrite:
-            shutil.rmtree(self.project_dir, ignore_errors=True)
-
         try:
             self.project_dir.mkdir()
         except FileExistsError:
-            return [GeneratorError(detail="Directory already exists. Delete it or use the --overwrite option.")]
+            if not self.config.overwrite:
+                return [GeneratorError(detail="Directory already exists. Delete it or use the --overwrite option.")]
         self._create_package()
         self._build_metadata()
         self._build_models()
@@ -147,8 +146,8 @@ class Project:
                 )
             )
 
-    def _get_errors(self) -> List[GeneratorError]:
-        errors: List[GeneratorError] = []
+    def _get_errors(self) -> list[GeneratorError]:
+        errors: list[GeneratorError] = []
         for collection in self.openapi.endpoint_collections_by_tag.values():
             errors.extend(collection.parse_errors)
         errors.extend(self.openapi.errors)
@@ -157,7 +156,7 @@ class Project:
 
     def _create_package(self) -> None:
         if self.package_dir != self.project_dir:
-            self.package_dir.mkdir()
+            self.package_dir.mkdir(exist_ok=True)
         # Package __init__.py
         package_init = self.package_dir / "__init__.py"
 
@@ -213,6 +212,7 @@ class Project:
     def _build_models(self) -> None:
         # Generate models
         models_dir = self.package_dir / "models"
+        shutil.rmtree(models_dir, ignore_errors=True)
         models_dir.mkdir()
         models_init = models_dir / "__init__.py"
         imports = []
@@ -258,6 +258,7 @@ class Project:
 
         # Generate endpoints
         api_dir = self.package_dir / "api"
+        shutil.rmtree(api_dir, ignore_errors=True)
         api_dir.mkdir()
         api_init_path = api_dir / "__init__.py"
         api_init_template = self.env.get_template("api_init.py.jinja")
@@ -325,7 +326,7 @@ def generate(
     return project.build()
 
 
-def _load_yaml_or_json(data: bytes, content_type: Optional[str]) -> Union[Dict[str, Any], GeneratorError]:
+def _load_yaml_or_json(data: bytes, content_type: Optional[str]) -> Union[dict[str, Any], GeneratorError]:
     if content_type == "application/json":
         try:
             return json.loads(data.decode())
@@ -339,7 +340,7 @@ def _load_yaml_or_json(data: bytes, content_type: Optional[str]) -> Union[Dict[s
             return GeneratorError(header=f"Invalid YAML from provided source: {err}")
 
 
-def _get_document(*, source: Union[str, Path], timeout: int) -> Union[Dict[str, Any], GeneratorError]:
+def _get_document(*, source: Union[str, Path], timeout: int) -> Union[dict[str, Any], GeneratorError]:
     yaml_bytes: bytes
     content_type: Optional[str]
     if isinstance(source, str):

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/cli.py

@@ -1,7 +1,8 @@
 import codecs
+from collections.abc import Sequence
 from pathlib import Path
 from pprint import pformat
-from typing import Optional, Sequence, Union
+from typing import Optional, Union
 
 import typer
 
@@ -9,7 +10,7 @@ from openapi_python_client import MetaType
 from openapi_python_client.config import Config, ConfigFile
 from openapi_python_client.parser.errors import ErrorLevel, GeneratorError, ParseError
 
-app = typer.Typer()
+app = typer.Typer(name="openapi-python-client")
 
 
 def _version_callback(value: bool) -> None:
@@ -62,7 +63,7 @@ def _process_config(
 # noinspection PyUnusedLocal
 
 
-@app.callback(name="openapi-python-client")
+@app.callback()
 def cli(
     version: bool = typer.Option(False, "--version", callback=_version_callback, help="Print the version and exit"),
 ) -> None:

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/config.py

@@ -2,7 +2,7 @@ import json
 import mimetypes
 from enum import Enum
 from pathlib import Path
-from typing import Dict, List, Optional, Union
+from typing import Optional, Union
 
 from attr import define
 from pydantic import BaseModel
@@ -34,14 +34,15 @@ class ConfigFile(BaseModel):
     See https://github.com/openapi-generators/openapi-python-client#configuration
     """
 
-    class_overrides: Optional[Dict[str, ClassOverride]] = None
-    content_type_overrides: Optional[Dict[str, str]] = None
+    class_overrides: Optional[dict[str, ClassOverride]] = None
+    content_type_overrides: Optional[dict[str, str]] = None
     project_name_override: Optional[str] = None
     package_name_override: Optional[str] = None
     package_version_override: Optional[str] = None
     use_path_prefixes_for_title_model_names: bool = True
-    post_hooks: Optional[List[str]] = None
+    post_hooks: Optional[list[str]] = None
     field_prefix: str = "field_"
+    generate_all_tags: bool = False
     http_timeout: int = 5
     literal_enums: bool = False
 
@@ -63,18 +64,19 @@ class Config:
     """Contains all the config values for the generator, from files, defaults, and CLI arguments."""
 
     meta_type: MetaType
-    class_overrides: Dict[str, ClassOverride]
+    class_overrides: dict[str, ClassOverride]
     project_name_override: Optional[str]
     package_name_override: Optional[str]
     package_version_override: Optional[str]
     use_path_prefixes_for_title_model_names: bool
-    post_hooks: List[str]
+    post_hooks: list[str]
     field_prefix: str
+    generate_all_tags: bool
     http_timeout: int
     literal_enums: bool
     document_source: Union[Path, str]
     file_encoding: str
-    content_type_overrides: Dict[str, str]
+    content_type_overrides: dict[str, str]
     overwrite: bool
     output_path: Optional[Path]
 
@@ -110,6 +112,7 @@ class Config:
             use_path_prefixes_for_title_model_names=config_file.use_path_prefixes_for_title_model_names,
             post_hooks=post_hooks,
             field_prefix=config_file.field_prefix,
+            generate_all_tags=config_file.generate_all_tags,
             http_timeout=config_file.http_timeout,
             literal_enums=config_file.literal_enums,
             document_source=document_source,

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/bodies.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Dict, List, Tuple, Union
+from typing import Union
 
 import attr
 
@@ -44,10 +44,10 @@ def body_from_data(
     *,
     data: oai.Operation,
     schemas: Schemas,
-    request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]],
+    request_bodies: dict[str, Union[oai.RequestBody, oai.Reference]],
     config: Config,
     endpoint_name: str,
-) -> Tuple[List[Union[Body, ParseError]], Schemas]:
+) -> tuple[list[Union[Body, ParseError]], Schemas]:
     """Adds form or JSON body to Endpoint if included in data"""
     body = _resolve_reference(data.request_body, request_bodies)
     if isinstance(body, ParseError):
@@ -55,7 +55,7 @@ def body_from_data(
     if body is None:
         return [], schemas
 
-    bodies: List[Union[Body, ParseError]] = []
+    bodies: list[Union[Body, ParseError]] = []
     body_content = body.content
     prefix_type_names = len(body_content) > 1
 
@@ -131,7 +131,7 @@ def body_from_data(
 
 
 def _resolve_reference(
-    body: Union[oai.RequestBody, oai.Reference, None], request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]]
+    body: Union[oai.RequestBody, oai.Reference, None], request_bodies: dict[str, Union[oai.RequestBody, oai.Reference]]
 ) -> Union[oai.RequestBody, ParseError, None]:
     if body is None:
         return None

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/errors.py

@@ -2,7 +2,7 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Optional
 
-__all__ = ["ErrorLevel", "GeneratorError", "ParseError", "PropertyError", "ParameterError"]
+__all__ = ["ErrorLevel", "GeneratorError", "ParameterError", "ParseError", "PropertyError"]
 
 from pydantic import BaseModel
 

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/openapi.py

@@ -1,8 +1,9 @@
 import re
+from collections.abc import Iterator
 from copy import deepcopy
 from dataclasses import dataclass, field
 from http import HTTPStatus
-from typing import Any, Dict, Iterator, List, Optional, Protocol, Set, Tuple, Union
+from typing import Any, Optional, Protocol, Union
 
 from pydantic import ValidationError
 
@@ -40,20 +41,20 @@ class EndpointCollection:
     """A bunch of endpoints grouped under a tag that will become a module"""
 
     tag: str
-    endpoints: List["Endpoint"] = field(default_factory=list)
-    parse_errors: List[ParseError] = field(default_factory=list)
+    endpoints: list["Endpoint"] = field(default_factory=list)
+    parse_errors: list[ParseError] = field(default_factory=list)
 
     @staticmethod
     def from_data(
         *,
-        data: Dict[str, oai.PathItem],
+        data: dict[str, oai.PathItem],
         schemas: Schemas,
         parameters: Parameters,
-        request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]],
+        request_bodies: dict[str, Union[oai.RequestBody, oai.Reference]],
         config: Config,
-    ) -> Tuple[Dict[utils.PythonIdentifier, "EndpointCollection"], Schemas, Parameters]:
+    ) -> tuple[dict[utils.PythonIdentifier, "EndpointCollection"], Schemas, Parameters]:
         """Parse the openapi paths data to get EndpointCollections by tag"""
-        endpoints_by_tag: Dict[utils.PythonIdentifier, EndpointCollection] = {}
+        endpoints_by_tag: dict[utils.PythonIdentifier, EndpointCollection] = {}
 
         methods = ["get", "put", "post", "delete", "options", "head", "patch", "trace"]
 
@@ -62,13 +63,18 @@ class EndpointCollection:
                 operation: Optional[oai.Operation] = getattr(path_data, method)
                 if operation is None:
                     continue
-                tag = utils.PythonIdentifier(value=(operation.tags or ["default"])[0], prefix="tag")
-                collection = endpoints_by_tag.setdefault(tag, EndpointCollection(tag=tag))
+
+                tags = [utils.PythonIdentifier(value=tag, prefix="tag") for tag in operation.tags or ["default"]]
+                if not config.generate_all_tags:
+                    tags = tags[:1]
+
+                collections = [endpoints_by_tag.setdefault(tag, EndpointCollection(tag=tag)) for tag in tags]
+
                 endpoint, schemas, parameters = Endpoint.from_data(
                     data=operation,
                     path=path,
                     method=method,
-                    tag=tag,
+                    tags=tags,
                     schemas=schemas,
                     parameters=parameters,
                     request_bodies=request_bodies,
@@ -86,15 +92,16 @@ class EndpointCollection:
                 if not isinstance(endpoint, ParseError):
                     endpoint = Endpoint.sort_parameters(endpoint=endpoint)
                 if isinstance(endpoint, ParseError):
-                    endpoint.header = (
-                        f"WARNING parsing {method.upper()} {path} within {tag}. Endpoint will not be generated."
-                    )
-                    collection.parse_errors.append(endpoint)
+                    endpoint.header = f"WARNING parsing {method.upper()} {path} within {'/'.join(tags)}. Endpoint will not be generated."
+                    for collection in collections:
+                        collection.parse_errors.append(endpoint)
                     continue
                 for error in endpoint.errors:
-                    error.header = f"WARNING parsing {method.upper()} {path} within {tag}."
-                    collection.parse_errors.append(error)
-                collection.endpoints.append(endpoint)
+                    error.header = f"WARNING parsing {method.upper()} {path} within {'/'.join(tags)}."
+                    for collection in collections:
+                        collection.parse_errors.append(error)
+                for collection in collections:
+                    collection.endpoints.append(endpoint)
 
         return endpoints_by_tag, schemas, parameters
 
@@ -117,7 +124,7 @@ class RequestBodyParser(Protocol):
 
     def __call__(
         self, *, body: oai.RequestBody, schemas: Schemas, parent_name: str, config: Config
-    ) -> Tuple[Union[Property, PropertyError, None], Schemas]: ...  # pragma: no cover
+    ) -> tuple[Union[Property, PropertyError, None], Schemas]: ...  # pragma: no cover
 
 
 @dataclass
@@ -131,21 +138,21 @@ class Endpoint:
     description: Optional[str]
     name: str
     requires_security: bool
-    tag: str
+    tags: list[PythonIdentifier]
     summary: Optional[str] = ""
-    relative_imports: Set[str] = field(default_factory=set)
-    query_parameters: List[Property] = field(default_factory=list)
-    path_parameters: List[Property] = field(default_factory=list)
-    header_parameters: List[Property] = field(default_factory=list)
-    cookie_parameters: List[Property] = field(default_factory=list)
-    responses: List[Response] = field(default_factory=list)
-    bodies: List[Body] = field(default_factory=list)
-    errors: List[ParseError] = field(default_factory=list)
+    relative_imports: set[str] = field(default_factory=set)
+    query_parameters: list[Property] = field(default_factory=list)
+    path_parameters: list[Property] = field(default_factory=list)
+    header_parameters: list[Property] = field(default_factory=list)
+    cookie_parameters: list[Property] = field(default_factory=list)
+    responses: list[Response] = field(default_factory=list)
+    bodies: list[Body] = field(default_factory=list)
+    errors: list[ParseError] = field(default_factory=list)
 
     @staticmethod
     def _add_responses(
         *, endpoint: "Endpoint", data: oai.Responses, schemas: Schemas, config: Config
-    ) -> Tuple["Endpoint", Schemas]:
+    ) -> tuple["Endpoint", Schemas]:
         endpoint = deepcopy(endpoint)
         for code, response_data in data.items():
             status_code: HTTPStatus
@@ -197,7 +204,7 @@ class Endpoint:
         schemas: Schemas,
         parameters: Parameters,
         config: Config,
-    ) -> Tuple[Union["Endpoint", ParseError], Schemas, Parameters]:
+    ) -> tuple[Union["Endpoint", ParseError], Schemas, Parameters]:
         """Process the defined `parameters` for an Endpoint.
 
         Any existing parameters will be ignored, so earlier instances of a parameter take precedence. PathItem
@@ -226,8 +233,8 @@ class Endpoint:
 
         endpoint = deepcopy(endpoint)
 
-        unique_parameters: Set[Tuple[str, oai.ParameterLocation]] = set()
-        parameters_by_location: Dict[str, List[Property]] = {
+        unique_parameters: set[tuple[str, oai.ParameterLocation]] = set()
+        parameters_by_location: dict[str, list[Property]] = {
             oai.ParameterLocation.QUERY: endpoint.query_parameters,
             oai.ParameterLocation.PATH: endpoint.path_parameters,
             oai.ParameterLocation.HEADER: endpoint.header_parameters,
@@ -304,7 +311,7 @@ class Endpoint:
         self,
         *,
         config: Config,
-        previously_modified_params: Optional[Set[Tuple[oai.ParameterLocation, str]]] = None,
+        previously_modified_params: Optional[set[tuple[oai.ParameterLocation, str]]] = None,
     ) -> Union["Endpoint", ParseError]:
         """Check for conflicting parameters
 
@@ -316,7 +323,7 @@ class Endpoint:
         unique python_name.
         """
         modified_params = previously_modified_params or set()
-        used_python_names: Dict[PythonIdentifier, Tuple[oai.ParameterLocation, Property]] = {}
+        used_python_names: dict[PythonIdentifier, tuple[oai.ParameterLocation, Property]] = {}
         reserved_names = ["client", "url"]
         for parameter in self.iter_all_parameters():
             location, prop = parameter
@@ -392,12 +399,12 @@ class Endpoint:
         data: oai.Operation,
         path: str,
         method: str,
-        tag: str,
+        tags: list[PythonIdentifier],
         schemas: Schemas,
         parameters: Parameters,
-        request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]],
+        request_bodies: dict[str, Union[oai.RequestBody, oai.Reference]],
         config: Config,
-    ) -> Tuple[Union["Endpoint", ParseError], Schemas, Parameters]:
+    ) -> tuple[Union["Endpoint", ParseError], Schemas, Parameters]:
         """Construct an endpoint from the OpenAPI data"""
 
         if data.operationId is None:
@@ -412,7 +419,7 @@ class Endpoint:
             description=utils.remove_string_escapes(data.description) if data.description else "",
             name=name,
             requires_security=bool(data.security),
-            tag=tag,
+            tags=tags,
         )
 
         result, schemas, parameters = Endpoint.add_parameters(
@@ -461,15 +468,15 @@ class Endpoint:
             return self.responses[0].prop.get_type_string(quoted=False)
         return f"Union[{', '.join(types)}]"
 
-    def iter_all_parameters(self) -> Iterator[Tuple[oai.ParameterLocation, Property]]:
+    def iter_all_parameters(self) -> Iterator[tuple[oai.ParameterLocation, Property]]:
         """Iterate through all the parameters of this endpoint"""
         yield from ((oai.ParameterLocation.PATH, param) for param in self.path_parameters)
         yield from ((oai.ParameterLocation.QUERY, param) for param in self.query_parameters)
         yield from ((oai.ParameterLocation.HEADER, param) for param in self.header_parameters)
         yield from ((oai.ParameterLocation.COOKIE, param) for param in self.cookie_parameters)
 
-    def list_all_parameters(self) -> List[Property]:
-        """Return a List of all the parameters of this endpoint"""
+    def list_all_parameters(self) -> list[Property]:
+        """Return a list of all the parameters of this endpoint"""
         return (
             self.path_parameters
             + self.query_parameters
@@ -487,12 +494,12 @@ class GeneratorData:
     description: Optional[str]
     version: str
     models: Iterator[ModelProperty]
-    errors: List[ParseError]
-    endpoint_collections_by_tag: Dict[utils.PythonIdentifier, EndpointCollection]
+    errors: list[ParseError]
+    endpoint_collections_by_tag: dict[utils.PythonIdentifier, EndpointCollection]
     enums: Iterator[Union[EnumProperty, LiteralEnumProperty]]
 
     @staticmethod
-    def from_dict(data: Dict[str, Any], *, config: Config) -> Union["GeneratorData", GeneratorError]:
+    def from_dict(data: dict[str, Any], *, config: Config) -> Union["GeneratorData", GeneratorError]:
         """Create an OpenAPI from dict"""
         try:
             openapi = oai.OpenAPI.model_validate(data)

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/properties/__init__.py

@@ -9,12 +9,12 @@ __all__ = [
     "Parameters",
     "Property",
     "Schemas",
-    "build_schemas",
     "build_parameters",
+    "build_schemas",
     "property_from_data",
 ]
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from attrs import evolve
 

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/properties/enum_property.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 __all__ = ["EnumProperty", "ValueType"]
 
-from typing import Any, ClassVar, List, Union, cast
+from typing import Any, ClassVar, Union, cast
 
 from attr import evolve
 from attrs import define
@@ -99,7 +99,7 @@ class EnumProperty(PropertyProtocol):
         if value_type not in (str, int):
             return PropertyError(header=f"Unsupported enum type {value_type}", data=data), schemas
         value_list = cast(
-            Union[List[int], List[str]], unchecked_value_list
+            Union[list[int], list[str]], unchecked_value_list
         )  # We checked this with all the value_types stuff
 
         if len(value_list) < len(enum):  # Only one of the values was None, that becomes a union

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/properties/list_property.py

@@ -106,10 +106,10 @@ class ListProperty(PropertyProtocol):
         return None  # pragma: no cover
 
     def get_base_type_string(self, *, quoted: bool = False) -> str:
-        return f"List[{self.inner_property.get_type_string(quoted=not self.inner_property.is_base_type)}]"
+        return f"list[{self.inner_property.get_type_string(quoted=not self.inner_property.is_base_type)}]"
 
     def get_base_json_type_string(self, *, quoted: bool = False) -> str:
-        return f"List[{self.inner_property.get_type_string(json=True, quoted=not self.inner_property.is_base_type)}]"
+        return f"list[{self.inner_property.get_type_string(json=True, quoted=not self.inner_property.is_base_type)}]"
 
     def get_instance_type_string(self) -> str:
         """Get a string representation of runtime type that should be used for `isinstance` checks"""
@@ -125,7 +125,7 @@ class ListProperty(PropertyProtocol):
         """
         imports = super().get_imports(prefix=prefix)
         imports.update(self.inner_property.get_imports(prefix=prefix))
-        imports.add("from typing import cast, List")
+        imports.add("from typing import cast")
         return imports
 
     def get_lazy_imports(self, *, prefix: str) -> set[str]:
@@ -151,7 +151,7 @@ class ListProperty(PropertyProtocol):
         if json:
             type_string = self.get_base_json_type_string()
         elif multipart:
-            type_string = "Tuple[None, bytes, str]"
+            type_string = "tuple[None, bytes, str]"
         else:
             type_string = self.get_base_type_string()
 

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/properties/literal_enum_property.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 __all__ = ["LiteralEnumProperty"]
 
-from typing import Any, ClassVar, List, Union, cast
+from typing import Any, ClassVar, Union, cast
 
 from attr import evolve
 from attrs import define
@@ -98,7 +98,7 @@ class LiteralEnumProperty(PropertyProtocol):
         if value_type not in (str, int):
             return PropertyError(header=f"Unsupported enum type {value_type}", data=data), schemas
         value_list = cast(
-            Union[List[int], List[str]], unchecked_value_list
+            Union[list[int], list[str]], unchecked_value_list
         )  # We checked this with all the value_types stuff
 
         if len(value_list) < len(enum):  # Only one of the values was None, that becomes a union

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/properties/model_property.py

@@ -32,7 +32,7 @@ class ModelProperty(PropertyProtocol):
     relative_imports: set[str] | None
     lazy_imports: set[str] | None
     additional_properties: Property | None
-    _json_type_string: ClassVar[str] = "Dict[str, Any]"
+    _json_type_string: ClassVar[str] = "dict[str, Any]"
 
     template: ClassVar[str] = "model_property.py.jinja"
     json_is_dict: ClassVar[bool] = True
@@ -154,7 +154,6 @@ class ModelProperty(PropertyProtocol):
         imports = super().get_imports(prefix=prefix)
         imports.update(
             {
-                "from typing import Dict",
                 "from typing import cast",
             }
         )
@@ -203,7 +202,7 @@ class ModelProperty(PropertyProtocol):
         if json:
             type_string = self.get_base_json_type_string()
         elif multipart:
-            type_string = "Tuple[None, bytes, str]"
+            type_string = "tuple[None, bytes, str]"
         else:
             type_string = self.get_base_type_string()
 

{openapi_python_client-0.21.7 → openapi_python_client-0.23.0}/openapi_python_client/parser/properties/protocol.py

@@ -116,7 +116,7 @@ class PropertyProtocol(Protocol):
         if json:
             type_string = self.get_base_json_type_string(quoted=quoted)
         elif multipart:
-            type_string = "Tuple[None, bytes, str]"
+            type_string = "tuple[None, bytes, str]"
         else:
             type_string = self.get_base_type_string(quoted=quoted)