ab-openapi-python-generator 2.2.0__tar.gz → 2.2.2__tar.gz

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/PKG-INFO

@@ -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 → ab_openapi_python_generator-2.2.2}/docs/tutorial/index.md

@@ -788,7 +788,7 @@ only sync (for __requests__) or only async (for __aiohttp__) services.
     ``` py
     ...
     async def async_root__get() -> RootResponse:
-        base_path = APIConfig().base_path
+        base_url = APIConfig().base_url
         path = f"/"
         headers = {
             "Content-Type": "application/json",
@@ -797,7 +797,7 @@ only sync (for __requests__) or only async (for __aiohttp__) services.
         }
         query_params = {}
 
-        with httpx.AsyncClient(base_url=base_path) as client:
+        with httpx.AsyncClient(base_url=base_url) as client:
             response = await client.request(
                 method="get",
                 url=path,
@@ -815,7 +815,7 @@ only sync (for __requests__) or only async (for __aiohttp__) services.
     ``` py
     ...
     def root__get() -> RootResponse:
-        base_path = APIConfig().base_path
+        base_url = APIConfig().base_url
         path = f"/"
         headers = {
             "Content-Type": "application/json",
@@ -824,7 +824,7 @@ only sync (for __requests__) or only async (for __aiohttp__) services.
         }
         query_params = {}
 
-        with httpx.Client(base_url=base_path) as client:
+        with httpx.Client(base_url=base_url) as client:
             response = client.request(
                 method="get",
                 url=path,

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ab-openapi-python-generator"
-version = "2.2.0"
+version = "2.2.2"
 description = "Openapi Python Generator"
 authors = [
     { name = "Marco Müllner", email = "muellnermarco@gmail.com" },

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/src/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-2.2.0 → ab_openapi_python_generator-2.2.2}/src/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-2.2.0 → ab_openapi_python_generator-2.2.2}/src/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-2.2.0 → ab_openapi_python_generator-2.2.2}/src/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-2.2.0 → ab_openapi_python_generator-2.2.2}/src/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-2.2.0 → ab_openapi_python_generator-2.2.2}/src/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-2.2.0 → ab_openapi_python_generator-2.2.2}/src/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 → ab_openapi_python_generator-2.2.2}/tests/test_generated_code.py

@@ -131,10 +131,10 @@ def test_generate_code(
 
     # Get the base URL from the API config
     if custom_ip is not None:
-        api_config_instance.base_path = custom_ip
+        api_config_instance.base_url = custom_ip
         base_url = custom_ip
     else:
-        base_url = api_config_instance.base_path
+        base_url = api_config_instance.base_url
 
     # Ensure base_url doesn't have trailing slash for consistent URL construction
     base_url = base_url.rstrip("/")
@@ -431,7 +431,7 @@ async def _run_service_tests_aiohttp(
         port = sockets[0].getsockname()[1]
 
     base_url = f"{scheme}://{host}:{port}"
-    api_config_instance.base_path = base_url
+    api_config_instance.base_url = base_url
 
     try:
         # Call async generated functions

ab_openapi_python_generator-2.2.2/tests/test_jinja_no_autoescape.py

@@ -0,0 +1,10 @@
+def test_jinja_no_autoescape():
+    from ab_openapi_python_generator.language_converters.python.jinja_config import (
+        create_jinja_env,
+    )
+
+    env = create_jinja_env()
+    template = env.from_string("{{ s }}")
+    out = template.render(s="'scope' : scope,")
+    assert "'" not in out
+    assert out == "'scope' : scope,"

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/tests/test_openapi_30.py

@@ -190,7 +190,7 @@ class TestOpenAPI30:
             assert (output_dir / "__init__.py").exists()
             assert (output_dir / "models").exists()
             assert (output_dir / "services").exists()
-            assert (output_dir / "api_config.py").exists()
+            assert (output_dir / "exceptions").exists()
 
             # Check model structure
             assert (output_dir / "models" / "__init__.py").exists()

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/tests/test_openapi_31.py

@@ -242,7 +242,7 @@ class TestOpenAPI31:
             assert (output_dir / "__init__.py").exists()
             assert (output_dir / "models").exists()
             assert (output_dir / "services").exists()
-            assert (output_dir / "api_config.py").exists()
+            assert (output_dir / "exceptions").exists()
 
             # Check model structure
             assert (output_dir / "models" / "__init__.py").exists()

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/tests/test_openapi_31_completeness.py

@@ -356,8 +356,8 @@ class TestOpenAPI31Completeness:
             # Verify basic structure
             assert (temp_path / "__init__.py").exists()
             assert (temp_path / "models").exists()
-            assert (temp_path / "services").exists()
-            assert (temp_path / "api_config.py").exists()
+            assert (temp_path / "clients").exists()
+            assert (temp_path / "exceptions").exists()
 
             # Verify library-specific imports in services
             services_dir = temp_path / "services"
@@ -538,7 +538,7 @@ class TestOpenAPI31Completeness:
             # Verify files exist
             assert (temp_path / "__init__.py").exists()
             assert (temp_path / "models").exists()
-            assert (temp_path / "services").exists()
+            assert (temp_path / "clients").exists()
 
             # Check for orjson usage if enabled
             if use_orjson:

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/tests/test_openapi_31_coverage.py

@@ -327,8 +327,8 @@ class TestOpenAPI31SupportedFeatures:
 
             # Verify files exist
             assert (temp_path / "models").exists()
-            assert (temp_path / "services").exists()
-            assert (temp_path / "api_config.py").exists()
+            assert (temp_path / "clients").exists()
+            assert (temp_path / "exceptions").exists()
 
             # Check that the code compiles
             models_dir = temp_path / "models"

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/tests/test_openapi_31_schema_features.py

@@ -394,9 +394,9 @@ class TestOpenAPI31SchemaFeatures:
             )
 
             # Verify files are generated
-            assert (temp_path / "models.py").exists()
-            assert (temp_path / "services" / "general_service.py").exists()
-            assert (temp_path / "api_config.py").exists()
+            assert (temp_path / "models").exists()
+            assert (temp_path / "clients").exists()
+            assert (temp_path / "exceptions").exists()
 
             # Verify the generated code compiles
             models_content = (temp_path / "models.py").read_text()

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/tests/test_swagger_petstore_30.py

@@ -129,7 +129,7 @@ class TestSwaggerPetstore30:
             assert (output_dir / "__init__.py").exists()
             assert (output_dir / "models").exists()
             assert (output_dir / "services").exists()
-            assert (output_dir / "api_config.py").exists()
+            assert (output_dir / "exceptions").exists()
 
             # Check model files
             models_dir = output_dir / "models"
@@ -169,7 +169,7 @@ class TestSwaggerPetstore30:
 
             # Basic validation that output was created
             assert output_dir.exists()
-            assert (output_dir / "api_config.py").exists()
+            assert (output_dir / "exceptions").exists()
 
     def test_petstore_30_model_generation(self, petstore_30_spec):
         """Test that model generation works correctly for Petstore 3.0."""

{ab_openapi_python_generator-2.2.0 → ab_openapi_python_generator-2.2.2}/tests/test_swagger_petstore_31.py

@@ -148,8 +148,8 @@ class TestSwaggerPetstore31:
             # Check that files were generated
             assert (output_dir / "__init__.py").exists()
             assert (output_dir / "models").exists()
-            assert (output_dir / "services").exists()
-            assert (output_dir / "api_config.py").exists()
+            assert (output_dir / "clients").exists()
+            assert (output_dir / "exceptions").exists()
 
             # Check model files
             models_dir = output_dir / "models"
@@ -189,7 +189,7 @@ class TestSwaggerPetstore31:
 
             # Basic validation that output was created
             assert output_dir.exists()
-            assert (output_dir / "api_config.py").exists()
+            assert (output_dir / "exceptions").exists()
 
     @pytest.mark.parametrize("use_orjson", [True, False])
     def test_petstore_31_with_orjson_options(self, petstore_31_spec_path, use_orjson):
@@ -207,7 +207,7 @@ class TestSwaggerPetstore31:
 
             # Basic validation that output was created
             assert output_dir.exists()
-            assert (output_dir / "api_config.py").exists()
+            assert (output_dir / "exceptions").exists()
 
     def test_petstore_31_uuid_parameters(self, petstore_31_spec):
         """Test that UUID parameters in Petstore 3.1 are handled correctly."""