ab-openapi-python-generator 2.2.0__py3-none-any.whl → 2.2.2__py3-none-any.whl

ab_openapi_python_generator/generate_data.py

@@ -125,7 +125,7 @@ def write_data(data: ConversionResult, output: Union[str, Path], formatter: Form
     Creates:
       - models/ (and models/__init__.py)
       - clients/ (and clients/__init__.py)
-      - exceptions.py (package root, if present)
+      - exceptions (package root/__init__.py)
       - __init__.py (package root)
     """
     out = Path(output)

ab_openapi_python_generator/language_converters/python/client_generator.py

@@ -363,34 +363,28 @@ def generate_clients(
     def _generate_service_operation(
         op: Operation, path_obj: PathItem, path_name: str, http_operation: str, async_type: bool
     ) -> ServiceOperation:
-        try:
-            path_level_params = []
-            if hasattr(path_obj, "parameters") and path_obj.parameters is not None:
-                path_level_params = [p for p in path_obj.parameters if p is not None]
-            if path_level_params:
-                existing_names = set()
-                if op.parameters is not None:
-                    for p in op.parameters:
-                        if isinstance(p, (Parameter30, Parameter31)):
-                            existing_names.add(p.name)
-                for p in path_level_params:
-                    if isinstance(p, (Parameter30, Parameter31)) and p.name not in existing_names:
-                        if op.parameters is None:
-                            op.parameters = []  # type: ignore
-                        op.parameters.append(p)  # type: ignore
-        except Exception:
-            pass
+        path_level_params = []
+        if hasattr(path_obj, "parameters") and path_obj.parameters is not None:
+            path_level_params = [p for p in path_obj.parameters if p is not None]
+        if path_level_params:
+            existing_names = set()
+            if op.parameters is not None:
+                for p in op.parameters:
+                    if isinstance(p, (Parameter30, Parameter31)):
+                        existing_names.add(p.name)
+            for p in path_level_params:
+                if isinstance(p, (Parameter30, Parameter31)) and p.name not in existing_names:
+                    if op.parameters is None:
+                        op.parameters = []  # type: ignore
+                    op.parameters.append(p)  # type: ignore
 
         params = generate_params(op)
-        try:
-            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}
-            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:
-            pass
+        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}
+        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
 
         operation_id = generate_operation_id(op, http_operation, path_name)
         query_params = generate_query_params(op)

ab_openapi_python_generator/language_converters/python/jinja_config.py

@@ -28,8 +28,9 @@ def create_jinja_env():
             if custom_template_path is not None
             else FileSystemLoader(TEMPLATE_PATH)
         ),
-        autoescape=True,
+        autoescape=False,
         trim_blocks=True,
+        lstrip_blocks=True,
     )
 
     environment.filters["normalize_symbol"] = common.normalize_symbol

ab_openapi_python_generator/language_converters/python/model_generator.py

@@ -266,7 +266,7 @@ def _discover_discriminated_unions(
             register_union(schema_name, schema)
 
     # 2) inline/property discriminated unions
-    for parent_name, parent_schema in components.schemas.items():
+    for _parent_name, parent_schema in components.schemas.items():
         props = getattr(parent_schema, "properties", None) or {}
         for prop_name, prop_schema in props.items():
             disc = getattr(prop_schema, "discriminator", None)

ab_openapi_python_generator/language_converters/python/templates/async_client_httpx_pydantic_2.jinja2

@@ -3,17 +3,17 @@
 from typing import Any, Dict, Optional, Union
 
 import httpx
-from pydantic import BaseModel
+from pydantic import BaseModel, HttpUrl
 
 from ..models import *
-{% set _base_path = servers[0].url if servers|length > 0 else "/" %}
+{% set _base_url = servers[0].url if servers|length > 0 else "/" %}
 from ..exceptions import HTTPException
 
 
 class AsyncClient(BaseModel):
     model_config = {"validate_assignment": True}
 
-    base_path: str = "{{ _base_path }}"
+    base_url: str = "{{ _base_url }}"
     verify: Union[bool, str] = True
 {% if env_token_name is none %}
     access_token: Optional[str] = None
@@ -41,7 +41,7 @@ class AsyncClient(BaseModel):
 
 {% for op in operations %}
     async def {{ op.operation_id }}(self{% if op.params %}, {{ op.params }}{% endif %}) -> Any:
-        base_path = self.base_path
+        base_url = self.base_url
         path = f"{{ op.path_name }}"
 
         headers = {
@@ -57,7 +57,7 @@ class AsyncClient(BaseModel):
         }
         query_params = {k: v for (k, v) in query_params.items() if v is not None}
 
-        async with httpx.AsyncClient(base_url=base_path, verify=self.verify) as client:
+        async with httpx.AsyncClient(base_url=base_url, verify=self.verify) as client:
             response = await client.request(
                 "{{ op.method }}",
                 httpx.URL(path),

ab_openapi_python_generator/language_converters/python/templates/sync_client_httpx_pydantic_2.jinja2

@@ -3,17 +3,17 @@
 from typing import Any, Dict, Optional, Union
 
 import httpx
-from pydantic import BaseModel
+from pydantic import BaseModel, HttpUrl
 
 from ..models import *
-{% set _base_path = servers[0].url if servers|length > 0 else "/" %}
+{% set _base_url = servers[0].url if servers|length > 0 else "/" %}
 from ..exceptions import HTTPException
 
 
 class SyncClient(BaseModel):
     model_config = {"validate_assignment": True}
 
-    base_path: str = "{{ _base_path }}"
+    base_url: str = "{{ _base_url }}"
     verify: Union[bool, str] = True
 {% if env_token_name is none %}
     access_token: Optional[str] = None
@@ -41,7 +41,7 @@ class SyncClient(BaseModel):
 
 {% for op in operations %}
     def {{ op.operation_id }}(self{% if op.params %}, {{ op.params }}{% endif %}) -> Any:
-        base_path = self.base_path
+        base_url = self.base_url
         path = f"{{ op.path_name }}"
 
         headers = {
@@ -57,7 +57,7 @@ class SyncClient(BaseModel):
         }
         query_params = {k: v for (k, v) in query_params.items() if v is not None}
 
-        with httpx.Client(base_url=base_path, verify=self.verify) as client:
+        with httpx.Client(base_url=base_url, verify=self.verify) as client:
             response = client.request(
                 "{{ op.method }}",
                 httpx.URL(path),

ab_openapi_python_generator/models.py

@@ -80,21 +80,6 @@ class Model(BaseModel):
     properties: List[Property] = []
 
 
-class Service(BaseModel):
-    file_name: str
-    operations: List[ServiceOperation]
-    content: str
-    async_client: Optional[bool] = False
-    library_import: str
-    use_orjson: bool = False
-
-
-class APIConfig(BaseModel):
-    file_name: str
-    base_url: str
-    content: str
-
-
 class ConversionResult(BaseModel):
     models: List[Model] = Field(default_factory=list)
     clients: List[Model] = Field(default_factory=list)

{ab_openapi_python_generator-2.2.0.dist-info → ab_openapi_python_generator-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ab-openapi-python-generator
-Version: 2.2.0
+Version: 2.2.2
 Summary: Openapi Python Generator
 Project-URL: Homepage, https://github.com/auth-broker/openapi-python-generator
 Project-URL: Repository, https://github.com/auth-broker/openapi-python-generator

{ab_openapi_python_generator-2.2.0.dist-info → ab_openapi_python_generator-2.2.2.dist-info}/RECORD

@@ -1,31 +1,31 @@
 ab_openapi_python_generator/__init__.py,sha256=ph2EznAu4nkHFruaG542m4TQ_xAvDlf36uKxtAkVP1s,460
 ab_openapi_python_generator/__main__.py,sha256=Vz0FsBvxQtyozKkZZFK_ag8XgJcx-5obRm44ogjD0Wk,2500
 ab_openapi_python_generator/common.py,sha256=rh6AxoWyL-jb5WbeLhiohvFUBUnevn4N7ixHPKTIiDM,1221
-ab_openapi_python_generator/generate_data.py,sha256=bxu0eETzJOiucX8CP2fLWer-iYZ9MbJ0JLvCaQfbDK4,7947
-ab_openapi_python_generator/models.py,sha256=b0AyJalyZSvGyi5f5xj5ymd_s9iR09kH1UurrJDxxck,2312
+ab_openapi_python_generator/generate_data.py,sha256=s71eWNKqEv5_v0Tfb2jnIME-JOag_Jz9gKxMGT5Veq8,7944
+ab_openapi_python_generator/models.py,sha256=pkuEbp4FrLhgoTzEZKnCVYBBvefX1oMJdbKAoMDTHfA,2031
 ab_openapi_python_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ab_openapi_python_generator/version_detector.py,sha256=PUDTpgDMHljUzxhLhMrCzHMdS3mgYQibWDiI4-vLRB4,2104
 ab_openapi_python_generator/language_converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ab_openapi_python_generator/language_converters/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ab_openapi_python_generator/language_converters/python/client_generator.py,sha256=LZj13DuaNZ_PD0-JafKnXQb4GUU427_N40YQuR_eLpU,18009
+ab_openapi_python_generator/language_converters/python/client_generator.py,sha256=6TknEdUyhsBvvez0Nn_JoZuj8rmwX3k1OEnNIAzJ09A,17817
 ab_openapi_python_generator/language_converters/python/common.py,sha256=gZHNhVC4OwGBlmr3h9Ffz3iILO1ykva9CrqhBfeYQXU,1616
 ab_openapi_python_generator/language_converters/python/exception_generator.py,sha256=a4iX53W8qhQ99Tkdk2sHPCq3HvtZp5JctTbObgsRX7I,653
 ab_openapi_python_generator/language_converters/python/generator.py,sha256=g-WTVLidcpDLqYW00VufmK0_jfRAM1ZVOSAcHyLAhOU,1664
-ab_openapi_python_generator/language_converters/python/jinja_config.py,sha256=yis4AERylbqVgb2WhDWr5tqiJ02OhzkEIaDekyTt4OE,1181
-ab_openapi_python_generator/language_converters/python/model_generator.py,sha256=LDO3X1tqdVOL6U9TXGbvyQCvrLoVXh-47K5PVXJO1HE,34542
+ab_openapi_python_generator/language_converters/python/jinja_config.py,sha256=EsASthmgh_XrwR7GiDooTyTiiIoqScz9HymvUpNBYFY,1210
+ab_openapi_python_generator/language_converters/python/model_generator.py,sha256=RoHO-R-fgmBL1osmzIoPEmYAUg-9BxUSThFSbUvQYoA,34543
 ab_openapi_python_generator/language_converters/python/templates/alias_union.jinja2,sha256=tndnrDky4srNRyB_HnUMZFW7HtoJvEfwIFteYIu0ELc,468
-ab_openapi_python_generator/language_converters/python/templates/async_client_httpx_pydantic_2.jinja2,sha256=UqLgyv4_Mk7LbvB9_wP4afmhWRRE-42w3mq1Sdbr8JY,2414
+ab_openapi_python_generator/language_converters/python/templates/async_client_httpx_pydantic_2.jinja2,sha256=U3O0BxYmbbQqmYKA1lctdd61I9f4BatF6_NgW2EOoz0,2417
 ab_openapi_python_generator/language_converters/python/templates/discriminator_enum.jinja2,sha256=GJZ_ih1eURnJRPZq5P_3aKhYB5iJHymj2fpuNSdM90Y,163
 ab_openapi_python_generator/language_converters/python/templates/enum.jinja2,sha256=7dewyMLifUTe9xjCTE62deuncPiNkp7eGkIaY-IWsLo,263
 ab_openapi_python_generator/language_converters/python/templates/http_exception.jinja2,sha256=BHy48PD74aU74NGWC98iciacmGotHuWw9CaOqnCL8Kc,294
 ab_openapi_python_generator/language_converters/python/templates/models.jinja2,sha256=s5PllbxiEENsZ5_fKSh1gKMJWhcLfBdH5744nKnAZsQ,797
 ab_openapi_python_generator/language_converters/python/templates/models_pydantic_2.jinja2,sha256=o6-OlV5upoZOAVx6aQbsaigPMTCi4Uuec-oP1FNDJ60,904
-ab_openapi_python_generator/language_converters/python/templates/sync_client_httpx_pydantic_2.jinja2,sha256=wGDXmQs1WTkMdHv-hE-UrHoWgY4hfA7vf7LujODeDRw,2390
+ab_openapi_python_generator/language_converters/python/templates/sync_client_httpx_pydantic_2.jinja2,sha256=aZlljl0OD5PLrGIn4MujZkhZG6XAvoPMvLEmIDWQhdc,2393
 ab_openapi_python_generator/parsers/__init__.py,sha256=UITDIV7rp3HAA1M8kQc_9cNG6e1tS2vDa4mTKua6aMY,300
 ab_openapi_python_generator/parsers/openapi_30.py,sha256=2Hq5Vl3V4NUHKol-OO2nmt8-Fh6Lqk-hJUys8s-4UNI,1924
 ab_openapi_python_generator/parsers/openapi_31.py,sha256=jyKYAKDRkqKUPSeP6xZuM6ZCE0JjuowAe_pbm01iqWE,1924
-ab_openapi_python_generator-2.2.0.dist-info/METADATA,sha256=qi60lgC1kgF1sdurWjGVach3oUXMlqmi0nic1JASRhQ,5186
-ab_openapi_python_generator-2.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ab_openapi_python_generator-2.2.0.dist-info/entry_points.txt,sha256=zezbCs2qP8lSUbcjL6cN5XHoHxf9JTe15CZYH8Yuzo0,90
-ab_openapi_python_generator-2.2.0.dist-info/licenses/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
-ab_openapi_python_generator-2.2.0.dist-info/RECORD,,
+ab_openapi_python_generator-2.2.2.dist-info/METADATA,sha256=Tx3Q2kw6jYYS9ifWRrkdWzQ1zv8F02bzPgeAmJv9Gyw,5186
+ab_openapi_python_generator-2.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ab_openapi_python_generator-2.2.2.dist-info/entry_points.txt,sha256=zezbCs2qP8lSUbcjL6cN5XHoHxf9JTe15CZYH8Yuzo0,90
+ab_openapi_python_generator-2.2.2.dist-info/licenses/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
+ab_openapi_python_generator-2.2.2.dist-info/RECORD,,