openapi-python-generator 2.0.1.dev1758361866__py3-none-any.whl → 2.0.1.dev1758565728__py3-none-any.whl

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/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/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/language_converters/python/templates/enum.jinja2

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

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/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.dist-info → openapi_python_generator-2.0.1.dev1758565728.dist-info}/METADATA

@@ -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.dist-info → openapi_python_generator-2.0.1.dev1758565728.dist-info}/RECORD

@@ -5,18 +5,18 @@ openapi_python_generator/generate_data.py,sha256=Av7nXE6BvsE9eHWF6eOBhPCZWWC9pi-
 openapi_python_generator/language_converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openapi_python_generator/language_converters/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openapi_python_generator/language_converters/python/api_config_generator.py,sha256=obbYMFguKp2Pp97YoPd2NKE4n7gBDupbDIyyuynIW6Q,1020
-openapi_python_generator/language_converters/python/common.py,sha256=DJkX9AKTLkrSm3NVNw4KMVObP0B9w4r63UXKI_pc61w,1474
+openapi_python_generator/language_converters/python/common.py,sha256=gZHNhVC4OwGBlmr3h9Ffz3iILO1ykva9CrqhBfeYQXU,1616
 openapi_python_generator/language_converters/python/generator.py,sha256=BpgALeKsNgqSvQNQPoM8x1LYG9BmvA687eNdtvPO6UM,1681
-openapi_python_generator/language_converters/python/jinja_config.py,sha256=cdEFrFTSLu2D0tKg3ZN1kQPsFkFIrb9QAo8susH3Vz8,940
-openapi_python_generator/language_converters/python/model_generator.py,sha256=BHNqkcqvcu8GoyG9vWC61NYmPQH86fr10CTxCKsI2lU,19519
+openapi_python_generator/language_converters/python/jinja_config.py,sha256=FuNhGkJqBNaal_jkkirZqgzZOkiMImi-863mnG55n08,1042
+openapi_python_generator/language_converters/python/model_generator.py,sha256=8PURrVr7h5OvCYjxCHNPc4qFh1vGE1uEVRK6DGsDPrY,19428
 openapi_python_generator/language_converters/python/service_generator.py,sha256=38pyA53vOjd173WwCF5Bp3OhCkmOSKaBjCC2WhGiG4A,18547
 openapi_python_generator/language_converters/python/templates/aiohttp.jinja2,sha256=Ym3-KX8JH9-V75GqkfcXVgh7rnqlkOQU5DLaNd1Wma0,2135
 openapi_python_generator/language_converters/python/templates/apiconfig.jinja2,sha256=bvYMJV6YB2NZLLcqwozISdS86XLH8J6D8o3ZpfgJCjc,1256
 openapi_python_generator/language_converters/python/templates/apiconfig_pydantic_2.jinja2,sha256=_MzcHYEq9aoqSUEhZ-5SLbO80zgBeJnx5d7q3Q_usSo,1319
-openapi_python_generator/language_converters/python/templates/enum.jinja2,sha256=9R9Nv1g8GykflCWm9HgxCmSWvIJ9FTNkXlXOZSBaZvw,242
+openapi_python_generator/language_converters/python/templates/enum.jinja2,sha256=7dewyMLifUTe9xjCTE62deuncPiNkp7eGkIaY-IWsLo,263
 openapi_python_generator/language_converters/python/templates/httpx.jinja2,sha256=mg4QjPOAJwQY9BSxOsY1MRkvnaeU8_nbxTRCSGGU0Bk,2300
-openapi_python_generator/language_converters/python/templates/models.jinja2,sha256=5nKSOjbqGkK91wTR6AaSFQMDW0P4hR6fV-7oaVCPfwc,810
-openapi_python_generator/language_converters/python/templates/models_pydantic_2.jinja2,sha256=-cX_OvwItvrDVk9dssgZ2BowMFMNu3YfKEcA9XU0_bM,916
+openapi_python_generator/language_converters/python/templates/models.jinja2,sha256=Azr7dIvdq0p1DAd5Xm1Q-gJ-irWX9jMi-X7Ru44rISg,792
+openapi_python_generator/language_converters/python/templates/models_pydantic_2.jinja2,sha256=81biZZAwsgFT3v0bYiQYr5n4XFII3myZ7WC6vS_f_pw,899
 openapi_python_generator/language_converters/python/templates/requests.jinja2,sha256=8R3S5M26vQol-rXHuNVYuG4qc_skC9-G8x-6AZlqTXg,2043
 openapi_python_generator/language_converters/python/templates/service.jinja2,sha256=tt0Iu_JLaAlMPU73KTM7yntQjnkdvve53ShjgAGcmqY,213
 openapi_python_generator/models.py,sha256=uWkWofLHT9ELVoYcmLIfvBUeIo723V-EJ5_YWWateI4,2174
@@ -25,8 +25,8 @@ openapi_python_generator/parsers/openapi_30.py,sha256=YLA5_rIv_wkV2dyQp7M1_87170
 openapi_python_generator/parsers/openapi_31.py,sha256=c3YpAp6wg6PijM1YScHJgivFk6DLhAP_N6pnTLyRUck,1912
 openapi_python_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openapi_python_generator/version_detector.py,sha256=Cn7iG6_EnBdmjGmefJQ1cIBzbT28F0BeCEpoqksBGyQ,2142
-openapi_python_generator-2.0.1.dev1758361866.dist-info/METADATA,sha256=o_-8h8Cz5R33y51fWLZ2DX_UEA1azAPdPhdPPkYN1Ms,5441
-openapi_python_generator-2.0.1.dev1758361866.dist-info/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
-openapi_python_generator-2.0.1.dev1758361866.dist-info/entry_points.txt,sha256=hqE8T8yX5Pkeb2g__7yQrEazkBPwNgTbEHmoOkaYh80,83
-openapi_python_generator-2.0.1.dev1758361866.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-openapi_python_generator-2.0.1.dev1758361866.dist-info/RECORD,,
+openapi_python_generator-2.0.1.dev1758565728.dist-info/METADATA,sha256=ZgoPtKLtcDR0G7Y0PkJZTg7pMjSiZjrpzI3QHDtuQT8,5441
+openapi_python_generator-2.0.1.dev1758565728.dist-info/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
+openapi_python_generator-2.0.1.dev1758565728.dist-info/entry_points.txt,sha256=hqE8T8yX5Pkeb2g__7yQrEazkBPwNgTbEHmoOkaYh80,83
+openapi_python_generator-2.0.1.dev1758565728.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+openapi_python_generator-2.0.1.dev1758565728.dist-info/RECORD,,