openapi-python-generator 0.5.1.dev1710539733__tar.gz → 1.0.0__tar.gz

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/PKG-INFO

@@ -1,17 +1,16 @@
 Metadata-Version: 2.1
 Name: openapi-python-generator
-Version: 0.5.1.dev1710539733
+Version: 1.0.0
 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.7,<4.0
+Requires-Python: >=3.8,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -21,9 +20,9 @@ Requires-Dist: black (>=21.10b0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: httpx[all] (>=0.23.0,<0.24.0)
 Requires-Dist: isort (>=5.10.1)
-Requires-Dist: openapi-schema-pydantic (>=1.2.3,<2.0.0)
-Requires-Dist: orjson (>=3.7.2,<4.0.0)
-Requires-Dist: pydantic (>=1.9.1,<2.0.0)
+Requires-Dist: openapi-pydantic (>=0.5.0,<0.6.0)
+Requires-Dist: orjson (>=3.9.15,<4.0.0)
+Requires-Dist: pydantic (>=2.10.2,<3.0.0)
 Project-URL: Changelog, https://github.com/MarcoMuellner/openapi-python-generator/releases
 Project-URL: Documentation, https://openapi-python-generator.readthedocs.io
 Project-URL: Repository, https://github.com/MarcoMuellner/openapi-python-generator

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-python-generator"
-version = "0.5.1.dev.1710539733"
+version = "1.0.0"
 description = "Openapi Python Generator"
 authors = ["Marco Müllner <muellnermarco@gmail.com>"]
 license = "MIT"
@@ -17,15 +17,15 @@ keywords = ["OpenAPI", "Generator", "Python", "async"]
 Changelog = "https://github.com/MarcoMuellner/openapi-python-generator/releases"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 httpx = {extras = ["all"], version = "^0.23.0"}
-pydantic = "^1.9.1"
-orjson = "^3.7.2"
-openapi-schema-pydantic = "^1.2.3"
+pydantic = "^2.10.2"
+orjson = "^3.9.15"
 Jinja2 = "^3.1.2"
 click = "^8.1.3"
 black = ">=21.10b0"
 isort = ">=5.10.1"
+openapi-pydantic = "^0.5.0"
 
 [tool.poetry.dev-dependencies]
 Pygments = ">=2.10.0"
@@ -48,7 +48,7 @@ typeguard = ">=2.13.3"
 xdoctest = {extras = ["colors"], version = ">=0.15.10"}
 myst-parser = {version = ">=0.16.1"}
 pytest-cov = "^3.0.0"
-fastapi = "^0.78.0"
+fastapi = "^0.115.5"
 uvicorn = "^0.18.1"
 respx = "^0.20.1"
 aiohttp = "^3.8.3"

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/setup.py

@@ -19,9 +19,9 @@ install_requires = \
  'click>=8.1.3,<9.0.0',
  'httpx[all]>=0.23.0,<0.24.0',
  'isort>=5.10.1',
- 'openapi-schema-pydantic>=1.2.3,<2.0.0',
- 'orjson>=3.7.2,<4.0.0',
- 'pydantic>=1.9.1,<2.0.0']
+ 'openapi-pydantic>=0.5.0,<0.6.0',
+ 'orjson>=3.9.15,<4.0.0',
+ 'pydantic>=2.10.2,<3.0.0']
 
 entry_points = \
 {'console_scripts': ['openapi-python-generator = '
@@ -29,7 +29,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'openapi-python-generator',
-    'version': '0.5.1.dev1710539733',
+    'version': '1.0.0',
     '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',
@@ -42,7 +42,7 @@ setup_kwargs = {
     'package_data': package_data,
     'install_requires': install_requires,
     'entry_points': entry_points,
-    'python_requires': '>=3.7,<4.0',
+    'python_requires': '>=3.8,<4.0',
 }
 
 

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/__main__.py

@@ -1,12 +1,12 @@
 from typing import Optional
+from enum import Enum
 
 import click
 
 from openapi_python_generator import __version__
-from openapi_python_generator.common import HTTPLibrary
+from openapi_python_generator.common import HTTPLibrary, PydanticVersion
 from openapi_python_generator.generate_data import generate_data
 
-
 @click.command()
 @click.argument("source")
 @click.argument("output")
@@ -38,6 +38,13 @@ from openapi_python_generator.generate_data import generate_data
     default=None,
     help="Custom template path to use. Allows overriding of the built in templates",
 )
+@click.option(
+    "--pydantic-version",
+    type=click.Choice(["v1", "v2"]),
+    default="v2",
+    show_default=True,
+    help="Pydantic version to use for generated models.",
+)
 @click.version_option(version=__version__)
 def main(
     source: str,
@@ -46,6 +53,7 @@ def main(
     env_token_name: Optional[str] = None,
     use_orjson: bool = False,
     custom_template_path: Optional[str] = None,
+    pydantic_version: PydanticVersion = PydanticVersion.V2,
 ) -> None:
     """
     Generate Python code from an OpenAPI 3.0 specification.
@@ -54,9 +62,9 @@ def main(
     an OUTPUT path, where the resulting client is created.
     """
     generate_data(
-        source, output, library, env_token_name, use_orjson, custom_template_path
+        source, output, library, env_token_name, use_orjson, custom_template_path,pydantic_version
     )
 
 
 if __name__ == "__main__":  # pragma: no cover
-    main()
+    main()

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/common.py

@@ -14,6 +14,10 @@ class HTTPLibrary(str, Enum):
     requests = "requests"
     aiohttp = "aiohttp"
 
+class PydanticVersion(str, Enum):
+    V1 = "v1"
+    V2 = "v2"
+
 
 library_config_dict: Dict[Optional[HTTPLibrary], LibraryConfig] = {
     HTTPLibrary.httpx: LibraryConfig(

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/generate_data.py

@@ -10,10 +10,10 @@ import orjson
 from black import NothingChanged
 from httpx import ConnectError
 from httpx import ConnectTimeout
-from openapi_schema_pydantic import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI
 from pydantic import ValidationError
 
-from .common import HTTPLibrary
+from .common import HTTPLibrary, PydanticVersion
 from .common import library_config_dict
 from .language_converters.python.generator import generator
 from .language_converters.python.jinja_config import SERVICE_TEMPLATE
@@ -56,7 +56,8 @@ def get_open_api(source: Union[str, Path]) -> OpenAPI:
             return OpenAPI(**orjson.loads(httpx.get(source).text))
 
         with open(source, "r") as f:
-            return OpenAPI(**orjson.loads(f.read()))
+            file_content = f.read()
+            return OpenAPI(**orjson.loads(file_content))
     except FileNotFoundError:
         click.echo(
             f"File {source} not found. Please make sure to pass the path to the OpenAPI 3.0 specification."
@@ -139,6 +140,7 @@ def generate_data(
     env_token_name: Optional[str] = None,
     use_orjson: bool = False,
     custom_template_path: Optional[str] = None,
+    pydantic_version: PydanticVersion = PydanticVersion.V2,
 ) -> None:
     """
     Generate Python code from an OpenAPI 3.0 specification.
@@ -152,6 +154,7 @@ def generate_data(
         env_token_name,
         use_orjson,
         custom_template_path,
+        pydantic_version,
     )
 
     write_data(result, output)

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/language_converters/python/api_config_generator.py

@@ -1,9 +1,10 @@
 from typing import Optional
 
-from openapi_schema_pydantic import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI
 
+from openapi_python_generator.common import PydanticVersion
 from openapi_python_generator.language_converters.python.jinja_config import (
-    API_CONFIG_TEMPLATE,
+    API_CONFIG_TEMPLATE, API_CONFIG_TEMPLATE_PYDANTIC_V2,
 )
 from openapi_python_generator.language_converters.python.jinja_config import (
     create_jinja_env,
@@ -12,15 +13,18 @@ from openapi_python_generator.models import APIConfig
 
 
 def generate_api_config(
-    data: OpenAPI, env_token_name: Optional[str] = None
+        data: OpenAPI, env_token_name: Optional[str] = None,
+        pydantic_version: PydanticVersion = PydanticVersion.V2,
 ) -> APIConfig:
     """
     Generate the API model.
     """
+
+    template_name = API_CONFIG_TEMPLATE_PYDANTIC_V2 if pydantic_version == PydanticVersion.V2 else API_CONFIG_TEMPLATE
     jinja_env = create_jinja_env()
     return APIConfig(
         file_name="api_config",
-        content=jinja_env.get_template(API_CONFIG_TEMPLATE).render(
+        content=jinja_env.get_template(template_name).render(
             env_token_name=env_token_name, **data.dict()
         ),
         base_url=data.servers[0].url if len(data.servers) > 0 else "NO SERVER",

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/language_converters/python/generator.py

@@ -1,7 +1,8 @@
 from typing import Optional
 
-from openapi_schema_pydantic import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI
 
+from openapi_python_generator.common import PydanticVersion
 from openapi_python_generator.language_converters.python import common
 from openapi_python_generator.language_converters.python.api_config_generator import (
     generate_api_config,
@@ -22,6 +23,7 @@ def generator(
     env_token_name: Optional[str] = None,
     use_orjson: bool = False,
     custom_template_path: Optional[str] = None,
+    pydantic_version: PydanticVersion = PydanticVersion.V2,
 ) -> ConversionResult:
     """
     Generate Python code from an OpenAPI 3.0 specification.
@@ -31,7 +33,7 @@ def generator(
     common.set_custom_template_path(custom_template_path)
 
     if data.components is not None:
-        models = generate_models(data.components)
+        models = generate_models(data.components, pydantic_version)
     else:
         models = []
 
@@ -40,7 +42,7 @@ def generator(
     else:
         services = []
 
-    api_config = generate_api_config(data, env_token_name)
+    api_config = generate_api_config(data, env_token_name, pydantic_version)
 
     return ConversionResult(
         models=models,

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/language_converters/python/jinja_config.py

@@ -9,9 +9,11 @@ from . import common
 
 ENUM_TEMPLATE = "enum.jinja2"
 MODELS_TEMPLATE = "models.jinja2"
+MODELS_TEMPLATE_PYDANTIC_V2 = "models_pydantic_2.jinja2"
 SERVICE_TEMPLATE = "service.jinja2"
 HTTPX_TEMPLATE = "httpx.jinja2"
 API_CONFIG_TEMPLATE = "apiconfig.jinja2"
+API_CONFIG_TEMPLATE_PYDANTIC_V2 = "apiconfig_pydantic_2.jinja2"
 TEMPLATE_PATH = Path(__file__).parent / "templates"
 
 

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/language_converters/python/model_generator.py

@@ -4,13 +4,12 @@ from typing import List
 from typing import Optional
 
 import click
-from openapi_schema_pydantic import Components
-from openapi_schema_pydantic import Reference
-from openapi_schema_pydantic import Schema
+from openapi_pydantic.v3.v3_0 import Schema, Reference, Components
 
+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,
+    ENUM_TEMPLATE, MODELS_TEMPLATE_PYDANTIC_V2,
 )
 from openapi_python_generator.language_converters.python.jinja_config import (
     MODELS_TEMPLATE,
@@ -24,9 +23,9 @@ from openapi_python_generator.models import TypeConversion
 
 
 def type_converter(  # noqa: C901
-    schema: Schema,
-    required: bool = False,
-    model_name: Optional[str] = None,
+        schema: Schema,
+        required: bool = False,
+        model_name: Optional[str] = None,
 ) -> TypeConversion:
     """
     Converts an OpenAPI type to a Python type.
@@ -42,7 +41,7 @@ def type_converter(  # noqa: C901
         pre_type = "Optional["
         post_type = "]"
 
-    original_type = schema.type if schema.type is not None else "object"
+    original_type = schema.type.value if schema.type is not None else "object"
     import_types: Optional[List[str]] = None
 
     if schema.allOf is not None:
@@ -71,13 +70,13 @@ def type_converter(  # noqa: C901
                     )
 
         original_type = (
-            "tuple<" + ",".join([i.original_type for i in conversions]) + ">"
+                "tuple<" + ",".join([i.original_type for i in conversions]) + ">"
         )
         if len(conversions) == 1:
             converted_type = conversions[0].converted_type
         else:
             converted_type = (
-                "Tuple[" + ",".join([i.converted_type for i in conversions]) + "]"
+                    "Tuple[" + ",".join([i.converted_type for i in conversions]) + "]"
             )
 
         converted_type = pre_type + converted_type + post_type
@@ -103,14 +102,14 @@ def type_converter(  # noqa: C901
                     )
                 )
         original_type = (
-            "union<" + ",".join([i.original_type for i in conversions]) + ">"
+                "union<" + ",".join([i.original_type for i in conversions]) + ">"
         )
 
         if len(conversions) == 1:
             converted_type = conversions[0].converted_type
         else:
             converted_type = (
-                "Union[" + ",".join([i.converted_type for i in conversions]) + "]"
+                    "Union[" + ",".join([i.converted_type for i in conversions]) + "]"
             )
 
         converted_type = pre_type + converted_type + post_type
@@ -122,13 +121,13 @@ def type_converter(  # noqa: C901
     # We only want to auto convert to datetime if orjson is used throghout the code, otherwise we can not
     # serialize it to JSON.
     elif schema.type == "string" and (
-        schema.schema_format is None or not common.get_use_orjson()
+            schema.schema_format is None or not common.get_use_orjson()
     ):
         converted_type = pre_type + "str" + post_type
     elif (
-        schema.type == "string"
-        and schema.schema_format.startswith("uuid")
-        and common.get_use_orjson()
+            schema.type == "string"
+            and schema.schema_format.startswith("uuid")
+            and common.get_use_orjson()
     ):
         if len(schema.schema_format) > 4 and schema.schema_format[4].isnumeric():
             uuid_type = schema.schema_format.upper()
@@ -156,7 +155,8 @@ def type_converter(  # noqa: C901
             original_type = "array<" + converted_reference.type.original_type + ">"
             retVal += converted_reference.type.converted_type
         elif isinstance(schema.items, Schema):
-            original_type = "array<" + str(schema.items.type) + ">"
+            original_type = "array<" + (
+                str(schema.items.type.value) if schema.items.type is not None else "unknown") + ">"
             retVal += type_converter(schema.items, True).converted_type
         else:
             original_type = "array<unknown>"
@@ -180,7 +180,7 @@ def type_converter(  # noqa: C901
 
 
 def _generate_property_from_schema(
-    model_name: str, name: str, schema: Schema, parent_schema: Optional[Schema] = None
+        model_name: str, name: str, schema: Schema, parent_schema: Optional[Schema] = None
 ) -> Property:
     """
     Generates a property from a schema. It takes the type of the schema and converts it to a python type, and then
@@ -192,24 +192,30 @@ def _generate_property_from_schema(
     :return: Property
     """
     required = (
-        parent_schema is not None
-        and parent_schema.required is not None
-        and name in parent_schema.required
+            parent_schema is not None
+            and parent_schema.required is not None
+            and name in parent_schema.required
     )
+
+    import_type = None
+    if required:
+        import_type = [] if name == model_name else [name]
+
     return Property(
         name=name,
         type=type_converter(schema, required, model_name),
         required=required,
         default=None if required else "None",
+        import_type=import_type,
     )
 
 
 def _generate_property_from_reference(
-    model_name: str,
-    name: str,
-    reference: Reference,
-    parent_schema: Optional[Schema] = None,
-    force_required: bool = False,
+        model_name: str,
+        name: str,
+        reference: Reference,
+        parent_schema: Optional[Schema] = None,
+        force_required: bool = False,
 ) -> Property:
     """
     Generates a property from a reference. It takes the name of the reference as the type, and then
@@ -221,10 +227,10 @@ def _generate_property_from_reference(
     :return: Property and model to be imported by the file
     """
     required = (
-        parent_schema is not None
-        and parent_schema.required is not None
-        and name in parent_schema.required
-    ) or force_required
+                       parent_schema is not None
+                       and parent_schema.required is not None
+                       and name in parent_schema.required
+               ) or force_required
     import_model = common.normalize_symbol(reference.ref.split("/")[-1])
 
     if import_model == model_name:
@@ -252,13 +258,14 @@ def _generate_property_from_reference(
     )
 
 
-def generate_models(components: Components) -> List[Model]:
+def generate_models(components: Components, pydantic_version: PydanticVersion = PydanticVersion.V2) -> List[Model]:
     """
     Receives components from an OpenAPI 3.0 specification and generates the models from it.
     It does so, by iterating over the components.schemas dictionary. For each schema, it checks if
     it is a normal schema (i.e. simple type like string, integer, etc.), a reference to another schema, or
     an array of types/references. It then computes pydantic models from it using jinja2
     :param components: The components from an OpenAPI 3.0 specification.
+    :param pydantic_version: The version of pydantic to use.
     :return: A list of models.
     """
     models: List[Model] = []
@@ -309,7 +316,9 @@ def generate_models(components: Components) -> List[Model]:
                 )
             properties.append(conv_property)
 
-        generated_content = jinja_env.get_template(MODELS_TEMPLATE).render(
+        template_name = MODELS_TEMPLATE_PYDANTIC_V2 if pydantic_version == PydanticVersion.V2 else MODELS_TEMPLATE
+
+        generated_content = jinja_env.get_template(template_name).render(
             schema_name=name, schema=schema_or_reference, properties=properties
         )
 

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/language_converters/python/service_generator.py

@@ -7,14 +7,7 @@ from typing import Tuple
 from typing import Union
 
 import click
-from openapi_schema_pydantic import MediaType
-from openapi_schema_pydantic import Operation
-from openapi_schema_pydantic import Parameter
-from openapi_schema_pydantic import PathItem
-from openapi_schema_pydantic import Reference
-from openapi_schema_pydantic import RequestBody
-from openapi_schema_pydantic import Response
-from openapi_schema_pydantic import Schema
+from openapi_pydantic.v3.v3_0 import Reference, Schema, Operation, Parameter, RequestBody, Response, MediaType, PathItem
 
 from openapi_python_generator.language_converters.python import common
 from openapi_python_generator.language_converters.python.common import normalize_symbol

openapi_python_generator-1.0.0/src/openapi_python_generator/language_converters/python/templates/apiconfig_pydantic_2.jinja2

@@ -0,0 +1,42 @@
+{% if env_token_name is not none %}import os{% endif %}
+
+from pydantic import BaseModel, Field
+from typing import Optional, Union
+
+class APIConfig(BaseModel):
+    model_config = {
+        "validate_assignment": True
+    }
+
+    base_path: str = {% if servers|length > 0 %} '{{ servers[0].url }}' {% else %} 'NO SERVER' {% endif %}
+
+    verify: Union[bool, str] = True
+{% if env_token_name is none %}
+    access_token : Optional[str] = None
+{% endif %}
+
+    def get_access_token(self) -> Optional[str]:
+{% if env_token_name is not none %}
+        try:
+            return os.environ['{{ env_token_name }}']
+        except KeyError:
+            return None
+{% else %}
+        return self.access_token
+{% endif %}
+
+    def set_access_token(self, value : str):
+{% if env_token_name is not none %}
+        raise Exception("This client was generated with an environment variable for the access token. Please set the environment variable '{{ env_token_name }}' to the access token.")
+{% else %}
+        self.access_token = value
+{% endif %}
+
+class HTTPException(Exception):
+    def __init__(self, status_code: int, message: str):
+        self.status_code = status_code
+        self.message = message
+        super().__init__(f"{status_code} {message}")
+
+    def __str__(self):
+        return f"{self.status_code} {self.message}"

openapi_python_generator-1.0.0/src/openapi_python_generator/language_converters/python/templates/models_pydantic_2.jinja2

@@ -0,0 +1,26 @@
+from typing import *
+from pydantic import BaseModel, Field
+{% for property in properties %}
+{% if property.type.import_types is not none %}
+{% for import_type in property.type.import_types %}
+{{ import_type }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+
+class {{ schema_name }}(BaseModel):
+    """
+    {{ schema.title }} model
+    {% if schema.description != None %}
+    {{ schema.description }}
+    {% endif %}
+
+    """
+    model_config = {
+        "populate_by_name": True,
+        "validate_assignment": True
+    }
+    {% for property in properties %}
+
+    {{ property.name | replace("@","") | replace("-","_") }} : {{ property.type.converted_type | safe }} = Field(validation_alias="{{ property.name }}" {% if not property.required %}, default = {{ property.default }} {% endif %})
+    {% endfor %}

{openapi_python_generator-0.5.1.dev1710539733 → openapi_python_generator-1.0.0}/src/openapi_python_generator/models.py

@@ -1,9 +1,7 @@
 from typing import List
 from typing import Optional
 
-from openapi_schema_pydantic import Operation
-from openapi_schema_pydantic import PathItem
-from openapi_schema_pydantic import Schema
+from openapi_pydantic.v3.v3_0 import Operation, PathItem, Schema
 from pydantic import BaseModel