openapi-python-generator 1.2.1.dev1757310194__tar.gz → 1.2.1.dev1757315868__tar.gz

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/PKG-INFO

@@ -1,17 +1,16 @@
 Metadata-Version: 2.1
 Name: openapi-python-generator
-Version: 1.2.1.dev1757310194
+Version: 1.2.1.dev1757315868
 Summary: Openapi Python Generator
 Home-page: https://github.com/MarcoMuellner/openapi-python-generator
 License: MIT
 Keywords: OpenAPI,Generator,Python,async
 Author: Marco Müllner
 Author-email: muellnermarco@gmail.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 3 - Alpha
 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
@@ -19,6 +18,7 @@ Requires-Dist: Jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: black (>=21.10b0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: httpx[all] (>=0.28.0,<0.29.0)
+Requires-Dist: importlib-metadata (>=8.7.0,<9.0.0)
 Requires-Dist: isort (>=5.10.1)
 Requires-Dist: openapi-pydantic (>=0.5.1,<0.6.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-python-generator"
-version = "1.2.1.dev.1757310194"
+version = "1.2.1.dev.1757315868"
 description = "Openapi Python Generator"
 authors = ["Marco Müllner <muellnermarco@gmail.com>"]
 license = "MIT"
@@ -17,7 +17,7 @@ keywords = ["OpenAPI", "Generator", "Python", "async"]
 Changelog = "https://github.com/MarcoMuellner/openapi-python-generator/releases"
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 httpx = {extras = ["all"], version = "^0.28.0"}
 pydantic = "^2.10.2"
 orjson = "^3.9.15"
@@ -27,18 +27,15 @@ black = ">=21.10b0"
 isort = ">=5.10.1"
 openapi-pydantic = "^0.5.1"
 pyyaml = "^6.0.2"
+importlib-metadata = "^8.7.0"
 
 [tool.poetry.group.dev.dependencies]
 Pygments = ">=2.10.0"
 coverage = {extras = ["toml"], version = "^6.4.1"}
 darglint = ">=1.8.1"
-flake8 = ">=3.0.1"
-flake8-bandit = ">=2.1.2"
-flake8-bugbear = ">=21.9.2"
-flake8-docstrings = ">=1.6.0"
-flake8-rst-docstrings = ">=0.2.5"
+ruff = ">=0.12.12"
 furo = ">=2021.11.12"
-mypy = ">=0.930"
+ty = "^0.0.1a20"
 pep8-naming = ">=0.10.1"
 pre-commit = ">=2.16.0"
 pre-commit-hooks = ">=4.1.0"
@@ -53,6 +50,7 @@ fastapi = "^0.115.5"
 uvicorn = "^0.18.1"
 respx = "^0.22.0"
 aiohttp = "^3.8.3"
+responses = "^0.25.8"
 
 [tool.poetry.scripts]
 openapi-python-generator = "openapi_python_generator.__main__:main"
@@ -86,3 +84,23 @@ show_error_context = true
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.ruff]
+exclude = ["tests/*"]
+line-length = 120
+
+[tool.ruff.lint]
+ignore = ["E501"]
+select = [
+    "B",
+    "B9",
+    "C",
+    "E",
+    "F",
+    "I",
+    "S",
+    "W",
+]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 25

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/setup.py

@@ -19,6 +19,7 @@ install_requires = \
  'black>=21.10b0',
  'click>=8.1.3,<9.0.0',
  'httpx[all]>=0.28.0,<0.29.0',
+ 'importlib-metadata>=8.7.0,<9.0.0',
  'isort>=5.10.1',
  'openapi-pydantic>=0.5.1,<0.6.0',
  'orjson>=3.9.15,<4.0.0',
@@ -31,7 +32,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'openapi-python-generator',
-    'version': '1.2.1.dev1757310194',
+    'version': '1.2.1.dev1757315868',
     'description': 'Openapi Python Generator',
     'long_description': "# Openapi Python Generator\n\n[![PyPI](https://img.shields.io/pypi/v/openapi-python-generator.svg)][pypi_]\n[![Status](https://img.shields.io/pypi/status/openapi-python-generator.svg)][status]\n[![Python Version](https://img.shields.io/pypi/pyversions/openapi-python-generator)][python version]\n[![License](https://img.shields.io/pypi/l/openapi-python-generator)][license]\n\n[![](https://img.shields.io/static/v1?label=documentation&message=enabled&color=<COLOR>)][documentation]\n[![Tests](https://github.com/MarcoMuellner/openapi-python-generator/workflows/Tests/badge.svg)][tests]\n[![Codecov](https://codecov.io/gh/MarcoMuellner/openapi-python-generator/branch/main/graph/badge.svg)][codecov]\n\n[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)][pre-commit]\n[![Black](https://img.shields.io/badge/code%20style-black-000000.svg)][black]\n\n[pypi_]: https://pypi.org/project/openapi-python-generator/\n[status]: https://pypi.org/project/openapi-python-generator/\n[python version]: https://pypi.org/project/openapi-python-generator\n[documentation]: https://marcomuellner.github.io/openapi-python-generator/\n[tests]: https://github.com/MarcoMuellner/openapi-python-generator/actions?workflow=Tests\n[codecov]: https://app.codecov.io/gh/MarcoMuellner/openapi-python-generator\n[pre-commit]: https://github.com/pre-commit/pre-commit\n[black]: https://github.com/psf/black\n\n![](logo.png)\n\n---\n__Documentation:__ [here][documentation]\n\n---\n\n## Features\n\n- __Ease of use__. Provide input, output and the library, and the generator will do the rest.\n- __Type safety and type hinting.__ __OpenAPI python generator__ makes heavy use of pydantic models to provide type-safe data structures.\n- __Support for multiple rest frameworks.__ __OpenAPI python generator__ currently supports the following:\n    - [httpx](https://pypi.org/project/httpx/)\n    - [requests](https://pypi.org/project/requests/)\n    - [aiohttp](https://pypi.org/project/aiohttp/)\n- __Async and sync code generation support__, depending on the framework. It will automatically create both for frameworks that support both.\n- __Easily extendable using Jinja2 templates__. The code is designed to be easily extendable and should support even more languages and frameworks in the future.\n- __Fully tested__. Every generated code is automatically tested against the OpenAPI spec and we have 100% coverage.\n- __Usage as CLI or as library__.\n\n## Requirements\n\n- Python 3.7+\n\n## Installation\n\nYou can install _Openapi Python Generator_ via [pip] from [PyPI]:\n\n```console\n$ pip install openapi-python-generator\n```\n\n## Usage\n\nPlease see the [Quick start page] for details.\n\n## Roadmap\n\n- Support for all commonly used http libraries in the python ecosystem (~~requests~~, urllib, ...)\n- Support for multiple languages\n- Support for multiple authentication schemes\n- Support custom themes\n\n## Contributing\n\nContributions are very welcome.\nTo learn more, see the [Contributor Guide].\n\n## License\n\nDistributed under the terms of the [MIT license][license],\n_Openapi Python Generator_ is free and open source software.\n\n## Issues\n\nIf you encounter any problems,\nplease [file an issue] along with a detailed description.\n\n## Credits\n\nSpecial thanks to the peeps from [openapi-schema-pydantic](https://github.com/kuimono/openapi-schema-pydantic),\nwhich already did a lot of the legwork by providing a pydantic schema for the OpenAPI 3.0.0+ specification.\n\nThis project was generated from [@cjolowicz]'s [Hypermodern Python Cookiecutter] template.\n\n[@cjolowicz]: https://github.com/cjolowicz\n[pypi]: https://pypi.org/\n[hypermodern python cookiecutter]: https://github.com/cjolowicz/cookiecutter-hypermodern-python\n[file an issue]: https://github.com/MarcoMuellner/openapi-python-generator/issues\n[pip]: https://pip.pypa.io/\n\n<!-- github-only -->\n\n[license]: https://github.com/MarcoMuellner/openapi-python-generator/blob/main/LICENSE\n[contributor guide]: https://github.com/MarcoMuellner/openapi-python-generator/blob/main/CONTRIBUTING.md\n[Quick start page]: https://marcomuellner.github.io/openapi-python-generator/quick_start/\n",
     'author': 'Marco Müllner',
@@ -44,7 +45,7 @@ setup_kwargs = {
     'package_data': package_data,
     'install_requires': install_requires,
     'entry_points': entry_points,
-    'python_requires': '>=3.8,<4.0',
+    'python_requires': '>=3.9,<4.0',
 }
 
 

openapi_python_generator-1.2.1.dev1757315868/src/openapi_python_generator/__init__.py

@@ -0,0 +1,17 @@
+"""Python client from an OPENAPI 3.0+ specification in seconds."""
+
+try:
+    from importlib.metadata import (
+        PackageNotFoundError,  # type: ignore
+        version,
+    )
+except ImportError:  # pragma: no cover
+    from importlib_metadata import (
+        PackageNotFoundError,  # type: ignore
+        version,  # type: ignore
+    )
+
+try:
+    __version__ = version(__name__)
+except PackageNotFoundError:  # pragma: no cover
+    __version__ = "unknown"

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/__main__.py

@@ -72,7 +72,7 @@ def main(
     generate_data(
         source,
         output,
-        library,
+        library if library is not None else HTTPLibrary.httpx,
         env_token_name,
         use_orjson,
         custom_template_path,

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/common.py

@@ -1,6 +1,5 @@
 from enum import Enum
-from typing import Dict
-from typing import Optional
+from typing import Dict, Optional
 
 from openapi_python_generator.models import LibraryConfig
 

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/generate_data.py

@@ -1,30 +1,26 @@
 from pathlib import Path
-from typing import List
-from typing import Optional
-from typing import Union
+from typing import List, Optional, Union
 
 import black
-from black.report import NothingChanged  # type: ignore
 import click
 import httpx
 import isort
 import orjson
 import yaml  # type: ignore
-from httpx import ConnectError
-from httpx import ConnectTimeout
+from black.report import NothingChanged  # type: ignore
+from httpx import ConnectError, ConnectTimeout
 from pydantic import ValidationError
 
 from .common import FormatOptions, Formatter, HTTPLibrary, PydanticVersion
-from .language_converters.python.jinja_config import SERVICE_TEMPLATE
-from .language_converters.python.jinja_config import create_jinja_env
+from .language_converters.python.jinja_config import SERVICE_TEMPLATE, create_jinja_env
 from .models import ConversionResult
-from .version_detector import detect_openapi_version
 from .parsers import (
-    parse_openapi_3_0,
-    parse_openapi_3_1,
     generate_code_3_0,
     generate_code_3_1,
+    parse_openapi_3_0,
+    parse_openapi_3_1,
 )
+from .version_detector import detect_openapi_version
 
 
 def write_code(path: Path, content: str, formatter: Formatter) -> None:

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/language_converters/python/api_config_generator.py

@@ -6,8 +6,6 @@ from openapi_python_generator.common import PydanticVersion
 from openapi_python_generator.language_converters.python.jinja_config import (
     API_CONFIG_TEMPLATE,
     API_CONFIG_TEMPLATE_PYDANTIC_V2,
-)
-from openapi_python_generator.language_converters.python.jinja_config import (
     create_jinja_env,
 )
 from openapi_python_generator.models import APIConfig

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/language_converters/python/common.py

@@ -2,9 +2,8 @@ import keyword
 import re
 from typing import Optional
 
-
 _use_orjson: bool = False
-_custom_template_path: str = None
+_custom_template_path: Optional[str] = None
 _symbol_ascii_strip_re = re.compile(r"[^A-Za-z0-9_]")
 
 

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/language_converters/python/generator.py

@@ -14,8 +14,7 @@ from openapi_python_generator.language_converters.python.model_generator import
 from openapi_python_generator.language_converters.python.service_generator import (
     generate_services,
 )
-from openapi_python_generator.models import ConversionResult
-from openapi_python_generator.models import LibraryConfig
+from openapi_python_generator.models import ConversionResult, LibraryConfig
 
 # Type alias for both OpenAPI versions
 OpenAPISpec = Union[OpenAPI30, OpenAPI31]

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/language_converters/python/jinja_config.py

@@ -1,12 +1,9 @@
 from pathlib import Path
 
-from jinja2 import ChoiceLoader
-from jinja2 import Environment
-from jinja2 import FileSystemLoader
+from jinja2 import ChoiceLoader, Environment, FileSystemLoader
 
 from . import common
 
-
 ENUM_TEMPLATE = "enum.jinja2"
 MODELS_TEMPLATE = "models.jinja2"
 MODELS_TEMPLATE_PYDANTIC_V2 = "models_pydantic_2.jinja2"

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/language_converters/python/model_generator.py

@@ -1,40 +1,41 @@
 import itertools
 import re
-from typing import List, Union
-from typing import Optional
+from typing import List, Optional, Union
 
 import click
 from openapi_pydantic.v3.v3_0 import (
-    Schema as Schema30,
-    Reference as Reference30,
     Components as Components30,
 )
+from openapi_pydantic.v3.v3_0 import (
+    Reference as Reference30,
+)
+from openapi_pydantic.v3.v3_0 import (
+    Schema as Schema30,
+)
 from openapi_pydantic.v3.v3_1 import (
-    Schema as Schema31,
-    Reference as Reference31,
     Components as Components31,
 )
-
-# Type aliases for compatibility
-Schema = Union[Schema30, Schema31]
-Reference = Union[Reference30, Reference31]
-Components = Union[Components30, Components31]
+from openapi_pydantic.v3.v3_1 import (
+    Reference as Reference31,
+)
+from openapi_pydantic.v3.v3_1 import (
+    Schema as Schema31,
+)
 
 from openapi_python_generator.common import PydanticVersion
 from openapi_python_generator.language_converters.python import common
 from openapi_python_generator.language_converters.python.jinja_config import (
     ENUM_TEMPLATE,
-    MODELS_TEMPLATE_PYDANTIC_V2,
-)
-from openapi_python_generator.language_converters.python.jinja_config import (
     MODELS_TEMPLATE,
-)
-from openapi_python_generator.language_converters.python.jinja_config import (
+    MODELS_TEMPLATE_PYDANTIC_V2,
     create_jinja_env,
 )
-from openapi_python_generator.models import Model
-from openapi_python_generator.models import Property
-from openapi_python_generator.models import TypeConversion
+from openapi_python_generator.models import Model, Property, TypeConversion
+
+# Type aliases for compatibility
+Schema = Union[Schema30, Schema31]
+Reference = Union[Reference30, Reference31]
+Components = Union[Components30, Components31]
 
 
 def type_converter(  # noqa: C901
@@ -88,7 +89,7 @@ def type_converter(  # noqa: C901
                 conversions.append(type_converter(sub_schema, True))
             else:
                 import_type = common.normalize_symbol(sub_schema.ref.split("/")[-1])
-                if import_type == model_name:
+                if import_type == model_name and model_name is not None:
                     conversions.append(
                         TypeConversion(
                             original_type=sub_schema.ref,

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/language_converters/python/service_generator.py

@@ -1,34 +1,40 @@
 import re
-from typing import Any
-from typing import Dict
-from typing import List
-from typing import Literal
-from typing import Optional
-from typing import Tuple
-from typing import Union
+from typing import Any, Dict, List, Literal, Optional, Tuple, Union
 
 import click
 from openapi_pydantic.v3 import (
-    Reference,
-    Schema,
     Operation,
     Parameter,
-    Response,
     PathItem,
+    Reference,
+    Response,
+    Schema,
+)
+from openapi_pydantic.v3.v3_0 import (
+    MediaType as MediaType30,
 )
 
 # Import version-specific types for isinstance checks
 from openapi_pydantic.v3.v3_0 import (
     Reference as Reference30,
-    Schema as Schema30,
+)
+from openapi_pydantic.v3.v3_0 import (
     Response as Response30,
-    MediaType as MediaType30,
+)
+from openapi_pydantic.v3.v3_0 import (
+    Schema as Schema30,
+)
+from openapi_pydantic.v3.v3_1 import (
+    MediaType as MediaType31,
 )
 from openapi_pydantic.v3.v3_1 import (
     Reference as Reference31,
-    Schema as Schema31,
+)
+from openapi_pydantic.v3.v3_1 import (
     Response as Response31,
-    MediaType as MediaType31,
+)
+from openapi_pydantic.v3.v3_1 import (
+    Schema as Schema31,
 )
 
 from openapi_python_generator.language_converters.python import common
@@ -39,11 +45,13 @@ from openapi_python_generator.language_converters.python.jinja_config import (
 from openapi_python_generator.language_converters.python.model_generator import (
     type_converter,
 )
-from openapi_python_generator.models import LibraryConfig
-from openapi_python_generator.models import OpReturnType
-from openapi_python_generator.models import Service
-from openapi_python_generator.models import ServiceOperation
-from openapi_python_generator.models import TypeConversion
+from openapi_python_generator.models import (
+    LibraryConfig,
+    OpReturnType,
+    Service,
+    ServiceOperation,
+    TypeConversion,
+)
 
 
 # Helper functions for isinstance checks across OpenAPI versions
@@ -52,16 +60,18 @@ def is_response_type(obj) -> bool:
     return isinstance(obj, (Response30, Response31))
 
 
-def create_media_type_for_reference(reference_obj):
+def create_media_type_for_reference(
+    reference_obj: Response30 | Reference30 | Response31 | Reference31,
+):
     """Create a MediaType wrapper for a reference object, using the correct version"""
     # Check which version the reference object belongs to
     if isinstance(reference_obj, Reference30):
-        return MediaType30(schema=reference_obj)
+        return MediaType30(schema=reference_obj)  # type: ignore - pydantic issue with generics
     elif isinstance(reference_obj, Reference31):
-        return MediaType31(schema=reference_obj)
+        return MediaType31(schema=reference_obj)  # type: ignore - pydantic issue with generics
     else:
         # Fallback to v3.0 for generic Reference
-        return MediaType30(schema=reference_obj)
+        return MediaType30(schema=reference_obj)  # type: ignore - pydantic issue with generics
 
 
 def is_media_type(obj) -> bool:
@@ -183,13 +193,16 @@ def generate_params(operation: Operation) -> str:
         if isinstance(rb_content, dict) and any(
             rb_content.get(i) is not None for i in operation_request_body_types
         ):
-            get_keyword = [i for i in operation_request_body_types if rb_content.get(i)][
-                0
-            ]
+            get_keyword = [
+                i for i in operation_request_body_types if rb_content.get(i)
+            ][0]
             content = rb_content.get(get_keyword)
             if content is not None and hasattr(content, "media_type_schema"):
                 mts = getattr(content, "media_type_schema", None)
-                if isinstance(mts, (Reference, Reference30, Reference31, Schema, Schema30, Schema31)):
+                if isinstance(
+                    mts,
+                    (Reference, Reference30, Reference31, Schema, Schema30, Schema31),
+                ):
                     params += f"{_generate_params_from_content(mts)}, "
                 else:  # pragma: no cover
                     raise Exception(
@@ -256,8 +269,8 @@ def generate_return_type(operation: Operation) -> OpReturnType:
 
     if is_response_type(chosen_response):
         # It's a Response type, access content safely
-        if hasattr(chosen_response, "content") and getattr(chosen_response, "content") is not None:  # type: ignore
-            media_type_schema = getattr(chosen_response, "content").get("application/json")  # type: ignore
+        if hasattr(chosen_response, "content") and chosen_response.content is not None:  # type: ignore
+            media_type_schema = chosen_response.content.get("application/json")  # type: ignore
     elif is_reference_type(chosen_response):
         media_type_schema = create_media_type_for_reference(chosen_response)
 
@@ -281,9 +294,8 @@ def generate_return_type(operation: Operation) -> OpReturnType:
             )
         elif is_schema_type(inner_schema):
             converted_result = type_converter(inner_schema, True)  # type: ignore
-            if (
-                "array" in converted_result.original_type
-                and isinstance(converted_result.import_types, list)
+            if "array" in converted_result.original_type and isinstance(
+                converted_result.import_types, list
             ):
                 matched = re.findall(r"List\[(.+)\]", converted_result.converted_type)
                 if len(matched) > 0:
@@ -332,8 +344,8 @@ def generate_services(
         # operation-level parameters so they get turned into function args.
         try:
             path_level_params = []
-            if hasattr(path, "parameters") and getattr(path, "parameters") is not None:  # type: ignore
-                path_level_params = [p for p in getattr(path, "parameters") if p is not None]  # type: ignore
+            if hasattr(path, "parameters") and path.parameters is not None:  # type: ignore
+                path_level_params = [p for p in path.parameters if p is not None]  # type: ignore
             if path_level_params:
                 existing_names = set()
                 if op.parameters is not None:
@@ -346,21 +358,28 @@ def generate_services(
                             op.parameters = []  # type: ignore
                         op.parameters.append(p)  # type: ignore
         except Exception:  # pragma: no cover
+            print(
+                f"Error merging path-level parameters for {path_name}"
+            )  # pragma: no cover
             pass
 
         params = generate_params(op)
         # Fallback: ensure all {placeholders} in path are present as function params
         try:
-            placeholder_names = [m.group(1) for m in re.finditer(r"\{([^}/]+)\}", path_name)]
+            placeholder_names = [
+                m.group(1) for m in re.finditer(r"\{([^}/]+)\}", path_name)
+            ]
             existing_param_names = {
-                p.split(":")[0].strip()
-                for p in params.split(",") if ":" in p
+                p.split(":")[0].strip() for p in params.split(",") if ":" in p
             }
             for ph in placeholder_names:
                 norm_ph = common.normalize_symbol(ph)
                 if norm_ph not in existing_param_names and norm_ph:
                     params = f"{norm_ph}: Any, " + params
         except Exception:  # pragma: no cover
+            print(
+                f"Error ensuring path placeholders in params for {path_name}"
+            )  # pragma: no cover
             pass
         operation_id = generate_operation_id(op, http_operation, path_name)
         query_params = generate_query_params(op)
@@ -419,7 +438,7 @@ def generate_services(
         if not so.tag:
             so.tag = "default"
 
-    tags = set([so.tag for so in service_ops])
+    tags = list({so.tag for so in service_ops})
 
     for tag in tags:
         services.append(

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/models.py

@@ -1,14 +1,21 @@
-from typing import List, Union
-from typing import Optional
+from typing import List, Optional, Union
 
 from openapi_pydantic.v3.v3_0 import (
     Operation as Operation30,
+)
+from openapi_pydantic.v3.v3_0 import (
     PathItem as PathItem30,
+)
+from openapi_pydantic.v3.v3_0 import (
     Schema as Schema30,
 )
 from openapi_pydantic.v3.v3_1 import (
     Operation as Operation31,
+)
+from openapi_pydantic.v3.v3_1 import (
     PathItem as PathItem31,
+)
+from openapi_pydantic.v3.v3_1 import (
     Schema as Schema31,
 )
 from pydantic import BaseModel

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/parsers/__init__.py

@@ -2,8 +2,8 @@
 OpenAPI parsers for different specification versions.
 """
 
-from .openapi_30 import parse_openapi_3_0, generate_code_3_0
-from .openapi_31 import parse_openapi_3_1, generate_code_3_1
+from .openapi_30 import generate_code_3_0, parse_openapi_3_0
+from .openapi_31 import generate_code_3_1, parse_openapi_3_1
 
 __all__ = [
     "parse_openapi_3_0",

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/parsers/openapi_30.py

@@ -26,7 +26,7 @@ def parse_openapi_3_0(spec_data: dict) -> OpenAPI:
     Raises:
         ValidationError: If the specification is invalid
     """
-    return OpenAPI(**spec_data)
+    return OpenAPI(**spec_data)  # type: ignore - pydantic issue with extra fields
 
 
 def generate_code_3_0(

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/parsers/openapi_31.py

@@ -26,7 +26,7 @@ def parse_openapi_3_1(spec_data: dict) -> OpenAPI:
     Raises:
         ValidationError: If the specification is invalid
     """
-    return OpenAPI(**spec_data)
+    return OpenAPI(**spec_data)  # type: ignore - pydantic issue with extra fields
 
 
 def generate_code_3_1(

{openapi_python_generator-1.2.1.dev1757310194 → openapi_python_generator-1.2.1.dev1757315868}/src/openapi_python_generator/version_detector.py

@@ -2,7 +2,7 @@
 OpenAPI version detection utilities.
 """
 
-from typing import Dict, Any, Literal
+from typing import Any, Dict, Literal
 
 OpenAPIVersion = Literal["3.0", "3.1"]
 

openapi_python_generator-1.2.1.dev1757310194/src/openapi_python_generator/__init__.py

@@ -1,13 +0,0 @@
-"""Python client from an OPENAPI 3.0+ specification in seconds."""
-
-try:
-    from importlib.metadata import PackageNotFoundError  # type: ignore
-    from importlib.metadata import version
-except ImportError:  # pragma: no cover
-    from importlib_metadata import PackageNotFoundError  # type: ignore
-    from importlib_metadata import version  # type: ignore
-
-try:
-    __version__ = version(__name__)
-except PackageNotFoundError:  # pragma: no cover
-    __version__ = "unknown"