openapi-python-generator 1.2.1.dev1757315989__tar.gz → 1.2.1.dev1757316968__tar.gz

{openapi_python_generator-1.2.1.dev1757315989 → openapi_python_generator-1.2.1.dev1757316968}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openapi-python-generator
-Version: 1.2.1.dev1757315989
+Version: 1.2.1.dev1757316968
 Summary: Openapi Python Generator
 Home-page: https://github.com/MarcoMuellner/openapi-python-generator
 License: MIT

{openapi_python_generator-1.2.1.dev1757315989 → openapi_python_generator-1.2.1.dev1757316968}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-python-generator"
-version = "1.2.1.dev.1757315989"
+version = "1.2.1.dev.1757316968"
 description = "Openapi Python Generator"
 authors = ["Marco Müllner <muellnermarco@gmail.com>"]
 license = "MIT"

{openapi_python_generator-1.2.1.dev1757315989 → openapi_python_generator-1.2.1.dev1757316968}/setup.py

@@ -32,7 +32,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'openapi-python-generator',
-    'version': '1.2.1.dev1757315989',
+    'version': '1.2.1.dev1757316968',
     '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',

{openapi_python_generator-1.2.1.dev1757315989 → openapi_python_generator-1.2.1.dev1757316968}/src/openapi_python_generator/language_converters/python/model_generator.py

@@ -51,7 +51,7 @@ def type_converter(  # noqa: C901
     :return: The converted type
     """
     # Handle Reference objects by converting them to type references
-    if isinstance(schema, Reference):
+    if isinstance(schema, Reference30) or isinstance(schema, Reference31):
         import_type = common.normalize_symbol(schema.ref.split("/")[-1])
         if required:
             converted_type = import_type
@@ -85,7 +85,7 @@ def type_converter(  # noqa: C901
     if schema.allOf is not None:
         conversions = []
         for sub_schema in schema.allOf:
-            if isinstance(sub_schema, Schema):
+            if isinstance(sub_schema, Schema30) or isinstance(sub_schema, Schema31):
                 conversions.append(type_converter(sub_schema, True))
             else:
                 import_type = common.normalize_symbol(sub_schema.ref.split("/")[-1])
@@ -130,7 +130,7 @@ def type_converter(  # noqa: C901
         used = used if used is not None else []
         conversions = []
         for sub_schema in used:
-            if isinstance(sub_schema, Schema):
+            if isinstance(sub_schema, Schema30) or isinstance(sub_schema, Schema31):
                 conversions.append(type_converter(sub_schema, True))
             else:
                 import_type = common.normalize_symbol(sub_schema.ref.split("/")[-1])
@@ -191,14 +191,16 @@ def type_converter(  # noqa: C901
         converted_type = pre_type + "bool" + post_type
     elif schema.type == "array" or str(schema.type) == "DataType.ARRAY":
         retVal = pre_type + "List["
-        if isinstance(schema.items, Reference):
+        if isinstance(schema.items, Reference30) or isinstance(
+            schema.items, Reference31
+        ):
             converted_reference = _generate_property_from_reference(
                 model_name or "", "", schema.items, schema, required
             )
             import_types = converted_reference.type.import_types
             original_type = "array<" + converted_reference.type.original_type + ">"
             retVal += converted_reference.type.converted_type
-        elif isinstance(schema.items, Schema):
+        elif isinstance(schema.items, Schema30) or isinstance(schema.items, Schema31):
             type_str = schema.items.type
             if hasattr(type_str, "value"):
                 type_value = str(type_str.value) if type_str is not None else "unknown"
@@ -440,7 +442,7 @@ def generate_models(
             else {}
         )
         for prop_name, property in property_iterator:
-            if isinstance(property, Reference):
+            if isinstance(property, Reference30) or isinstance(property, Reference31):
                 conv_property = _generate_property_from_reference(
                     name, prop_name, property, schema_or_reference
                 )

{openapi_python_generator-1.2.1.dev1757315989 → openapi_python_generator-1.2.1.dev1757316968}/src/openapi_python_generator/language_converters/python/service_generator.py

@@ -61,7 +61,7 @@ def is_response_type(obj) -> bool:
 
 
 def create_media_type_for_reference(
-    reference_obj: Union[Response30, Reference30 , Response31 , Reference31],
+    reference_obj: Union[Response30, Reference30, Response31, Reference31],
 ):
     """Create a MediaType wrapper for a reference object, using the correct version"""
     # Check which version the reference object belongs to
@@ -96,7 +96,9 @@ def generate_body_param(operation: Operation) -> Union[str, None]:
     if operation.requestBody is None:
         return None
     else:
-        if isinstance(operation.requestBody, Reference):
+        if isinstance(operation.requestBody, Reference30) or isinstance(
+            operation.requestBody, Reference31
+        ):
             return "data.dict()"
 
         if operation.requestBody.content is None:
@@ -156,18 +158,24 @@ def generate_params(operation: Operation) -> str:
             required = False
             param_name_cleaned = common.normalize_symbol(param.name)
 
-            if isinstance(param.param_schema, Schema):
+            if isinstance(param.param_schema, Schema30) or isinstance(
+                param.param_schema, Schema31
+            ):
                 converted_result = (
                     f"{param_name_cleaned} : {type_converter(param.param_schema, param.required).converted_type}"
                     + ("" if param.required else " = None")
                 )
                 required = param.required
-            elif isinstance(param.param_schema, Reference):
+            elif isinstance(param.param_schema, Reference30) or isinstance(
+                param.param_schema, Reference31
+            ):
                 converted_result = (
                     f"{param_name_cleaned} : {param.param_schema.ref.split('/')[-1] }"
                     + (
                         ""
-                        if isinstance(param, Reference) or param.required
+                        if isinstance(param, Reference30)
+                        or isinstance(param, Reference31)
+                        or param.required
                         else " = None"
                     )
                 )