openapi-python-generator 2.0.1.dev1758361866__tar.gz → 2.0.1.dev1758565728__tar.gz

{openapi_python_generator-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/PKG-INFO

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

{openapi_python_generator-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/pyproject.toml

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

{openapi_python_generator-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/setup.py

@@ -32,7 +32,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'openapi-python-generator',
-    'version': '2.0.1.dev1758361866',
+    'version': '2.0.1.dev1758565728',
     '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-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/src/openapi_python_generator/language_converters/python/common.py

@@ -49,8 +49,10 @@ def normalize_symbol(symbol: str) -> str:
     :param symbol: name of the identifier
     :return: normalized identifier name
     """
-    symbol = symbol.replace("-", "_")
+    symbol = symbol.replace("-", "_").replace(" ", "_")
     normalized_symbol = _symbol_ascii_strip_re.sub("", symbol)
     if normalized_symbol in keyword.kwlist:
         normalized_symbol = normalized_symbol + "_"
+    if len(normalized_symbol) > 0 and normalized_symbol[0].isnumeric():
+        normalized_symbol = "_" + normalized_symbol
     return normalized_symbol

{openapi_python_generator-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/src/openapi_python_generator/language_converters/python/jinja_config.py

@@ -16,7 +16,7 @@ TEMPLATE_PATH = Path(__file__).parent / "templates"
 
 def create_jinja_env():
     custom_template_path = common.get_custom_template_path()
-    return Environment(
+    environment = Environment(
         loader=(
             ChoiceLoader(
                 [
@@ -30,3 +30,7 @@ def create_jinja_env():
         autoescape=True,
         trim_blocks=True,
     )
+
+    environment.filters["normalize_symbol"] = common.normalize_symbol
+
+    return environment

{openapi_python_generator-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/src/openapi_python_generator/language_converters/python/model_generator.py

@@ -1,5 +1,4 @@
 import itertools
-import re
 from typing import List, Optional, Union
 
 import click
@@ -414,10 +413,8 @@ def generate_models(
         name = common.normalize_symbol(schema_name)
         if schema_or_reference.enum is not None:
             value_dict = schema_or_reference.model_dump()
-            regex = re.compile(r"[\s\/=\*\+]+")
             value_dict["enum"] = [
-                re.sub(regex, "_", i) if isinstance(i, str) else f"value_{i}"
-                for i in value_dict["enum"]
+                (common.normalize_symbol(str(i)).upper(), i) for i in value_dict["enum"]
             ]
             m = Model(
                 file_name=name,

openapi_python_generator-2.0.1.dev1758565728/src/openapi_python_generator/language_converters/python/templates/enum.jinja2

@@ -0,0 +1,11 @@
+from enum import Enum
+
+class {{ name }}(str, Enum):
+    {% for enumItemIdent, enumItem in enum %}
+
+    {% if enumItem is string %}
+    {{ enumItemIdent }} = '{{ enumItem }}'
+    {% else %}
+    {{ enumItemIdent }} = {{ enumItem }}
+    {% endif %}
+    {% endfor %}

{openapi_python_generator-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/src/openapi_python_generator/language_converters/python/templates/models.jinja2

@@ -20,5 +20,5 @@ class {{ schema_name }}(BaseModel):
     """
     {% for property in properties %}
 
-    {{ property.name | replace("@","") | replace("-","_") }} : {{ property.type.converted_type | safe }} = Field(alias="{{ property.name }}" {% if not property.required %}, default = {{ property.default }} {% endif %})
+    {{ property.name | normalize_symbol }} : {{ property.type.converted_type | safe }} = Field(alias="{{ property.name }}" {% if not property.required %}, default = {{ property.default }} {% endif %})
     {% endfor %}

{openapi_python_generator-2.0.1.dev1758361866 → openapi_python_generator-2.0.1.dev1758565728}/src/openapi_python_generator/language_converters/python/templates/models_pydantic_2.jinja2

@@ -24,5 +24,5 @@ class {{ schema_name }}(BaseModel):
     }
     {% 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 %}
+    {{ property.name | normalize_symbol }} : {{ property.type.converted_type | safe }} = Field(validation_alias="{{ property.name }}" {% if not property.required %}, default = {{ property.default }} {% endif %})
+    {% endfor %}

openapi_python_generator-2.0.1.dev1758361866/src/openapi_python_generator/language_converters/python/templates/enum.jinja2

@@ -1,9 +0,0 @@
-from enum import Enum
-
-class {{ name }}(str, Enum):
-    {% for enumItem in enum %}
-
-    {% if enumItem is string %}
-    {{ enumItem.upper() }} = '{{ enumItem }}'{% else %}
-    value_{{ enumItem }} = {{ enumItem }}{% endif %}
-    {% endfor %}