ab-openapi-python-generator 2.2.1__tar.gz → 2.2.3__tar.gz

{ab_openapi_python_generator-2.2.1 → ab_openapi_python_generator-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ab-openapi-python-generator
-Version: 2.2.1
+Version: 2.2.3
 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.1 → ab_openapi_python_generator-2.2.3}/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.1 → ab_openapi_python_generator-2.2.3}/pyproject.toml

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

ab_openapi_python_generator-2.2.3/src/ab_openapi_python_generator/language_converters/python/templates/async_client_httpx_pydantic_2.jinja2

@@ -0,0 +1,146 @@
+{% if env_token_name is not none %}import os{% endif %}
+
+from __future__ import annotations
+
+from collections.abc import AsyncGenerator
+from typing import Any, Dict, Optional, Union
+import json
+
+import httpx
+from pydantic import BaseModel
+
+from ..models import *
+from ..exceptions import HTTPException
+
+{% set _base_url = servers[0].url if servers|length > 0 else "/" %}
+
+
+class AsyncClient(BaseModel):
+    model_config = {"validate_assignment": True}
+
+    base_url: str = "{{ _base_url }}"
+    verify: Union[bool, str] = True
+{% if env_token_name is none %}
+    access_token: Optional[str] = None
+{% endif %}
+
+    def get_access_token(self) -> Optional[str]:
+{% if env_token_name is not none %}
+        try:
+            return os.environ["{{ env_token_name }}"]
+        except KeyError:
+            return None
+{% else %}
+        return self.access_token
+{% endif %}
+
+    def set_access_token(self, value: str) -> None:
+{% if env_token_name is not none %}
+        raise Exception(
+            "This client was generated with an environment variable for the access token. "
+            "Please set '{{ env_token_name }}'."
+        )
+{% else %}
+        self.access_token = value
+{% endif %}
+
+{% for op in operations %}
+    async def {{ op.operation_id }}(self{% if op.params %}, {{ op.params }}{% endif %}) -> {%- if op.is_sse -%}
+AsyncGenerator[str | dict[str, Any], None]
+{%- else -%}
+{%- if op.return_type.type is none or op.return_type.type.converted_type is none -%}None
+{%- elif op.return_type.list_type is not none -%}list[{{ op.return_type.list_type }}]
+{%- else -%}{{ op.return_type.type.converted_type }}
+{%- endif -%}
+{%- endif -%}:
+        base_url = self.base_url
+        path = f"{{ op.path_name }}"
+
+        headers = {
+            "Content-Type": "application/json",
+{% if op.is_sse %}
+            "Accept": "text/event-stream",
+{% else %}
+            "Accept": "application/json",
+{% endif %}
+            "Authorization": f"Bearer { self.get_access_token() }",
+        }
+
+        query_params: Dict[str, Any] = {
+{% for qp in op.query_params %}
+            {{ qp }},
+{% endfor %}
+        }
+        query_params = {k: v for (k, v) in query_params.items() if v is not None}
+
+{% if op.is_sse %}
+        async with httpx.AsyncClient(base_url=base_url, verify=self.verify) as client:
+            async with client.stream(
+                "{{ op.method }}",
+                httpx.URL(path),
+                headers=headers,
+                params=query_params,
+{% if op.body_param %}
+                json={{ op.body_param }},
+{% endif %}
+            ) as response:
+                if response.status_code != {{ op.return_type.status_code }}:
+                    raise HTTPException(
+                        response.status_code,
+                        f"{{ op.operation_id }} failed with status code: {response.status_code}",
+                    )
+
+                async for line in response.aiter_lines():
+                    if not line:
+                        continue
+                    if line.startswith("data:"):
+                        payload = line[len("data:"):].strip()
+                        if not payload:
+                            continue
+                        if payload == "[DONE]":
+                            break
+                        try:
+                            obj = json.loads(payload)
+                            if isinstance(obj, dict):
+                                yield obj
+                            else:
+                                yield payload
+                        except Exception:
+                            yield payload
+                    else:
+                        # Non-data lines: yield as raw text for debugging/visibility
+                        yield line
+{% else %}
+        async with httpx.AsyncClient(base_url=base_url, verify=self.verify) as client:
+            response = await client.request(
+                "{{ op.method }}",
+                httpx.URL(path),
+                headers=headers,
+                params=query_params,
+{% if op.body_param %}
+                json={{ op.body_param }},
+{% endif %}
+            )
+
+        if response.status_code != {{ op.return_type.status_code }}:
+            raise HTTPException(
+                response.status_code,
+                f"{{ op.operation_id }} failed with status code: {response.status_code}",
+            )
+
+        body = None if {{ op.return_type.status_code }} == 204 else response.json()
+
+{% if op.return_type.type is none or op.return_type.type.converted_type is none %}
+        return None
+{% elif op.return_type.complex_type %}
+{% if op.return_type.list_type is none %}
+        return {{ op.return_type.type.converted_type }}.model_validate(body) if body is not None else {{ op.return_type.type.converted_type }}()
+{% else %}
+        return [{{ op.return_type.list_type }}.model_validate(item) for item in (body or [])]
+{% endif %}
+{% else %}
+        return body
+{% endif %}
+{% endif %}
+
+{% endfor %}

ab_openapi_python_generator-2.2.3/src/ab_openapi_python_generator/language_converters/python/templates/sync_client_httpx_pydantic_2.jinja2

@@ -0,0 +1,145 @@
+{% if env_token_name is not none %}import os{% endif %}
+
+from __future__ import annotations
+
+from collections.abc import Generator
+from typing import Any, Dict, Optional, Union
+import json
+
+import httpx
+from pydantic import BaseModel
+
+from ..models import *
+from ..exceptions import HTTPException
+
+{% set _base_url = servers[0].url if servers|length > 0 else "/" %}
+
+
+class SyncClient(BaseModel):
+    model_config = {"validate_assignment": True}
+
+    base_url: str = "{{ _base_url }}"
+    verify: Union[bool, str] = True
+{% if env_token_name is none %}
+    access_token: Optional[str] = None
+{% endif %}
+
+    def get_access_token(self) -> Optional[str]:
+{% if env_token_name is not none %}
+        try:
+            return os.environ["{{ env_token_name }}"]
+        except KeyError:
+            return None
+{% else %}
+        return self.access_token
+{% endif %}
+
+    def set_access_token(self, value: str) -> None:
+{% if env_token_name is not none %}
+        raise Exception(
+            "This client was generated with an environment variable for the access token. "
+            "Please set '{{ env_token_name }}'."
+        )
+{% else %}
+        self.access_token = value
+{% endif %}
+
+{% for op in operations %}
+    def {{ op.operation_id }}(self{% if op.params %}, {{ op.params }}{% endif %}) -> {%- if op.is_sse -%}
+Generator[str | dict[str, Any], None, None]
+{%- else -%}
+{%- if op.return_type.type is none or op.return_type.type.converted_type is none -%}None
+{%- elif op.return_type.list_type is not none -%}list[{{ op.return_type.list_type }}]
+{%- else -%}{{ op.return_type.type.converted_type }}
+{%- endif -%}
+{%- endif -%}:
+        base_url = self.base_url
+        path = f"{{ op.path_name }}"
+
+        headers = {
+            "Content-Type": "application/json",
+{% if op.is_sse %}
+            "Accept": "text/event-stream",
+{% else %}
+            "Accept": "application/json",
+{% endif %}
+            "Authorization": f"Bearer { self.get_access_token() }",
+        }
+
+        query_params: Dict[str, Any] = {
+{% for qp in op.query_params %}
+            {{ qp }},
+{% endfor %}
+        }
+        query_params = {k: v for (k, v) in query_params.items() if v is not None}
+
+{% if op.is_sse %}
+        with httpx.Client(base_url=base_url, verify=self.verify) as client:
+            with client.stream(
+                "{{ op.method }}",
+                httpx.URL(path),
+                headers=headers,
+                params=query_params,
+{% if op.body_param %}
+                json={{ op.body_param }},
+{% endif %}
+            ) as response:
+                if response.status_code != {{ op.return_type.status_code }}:
+                    raise HTTPException(
+                        response.status_code,
+                        f"{{ op.operation_id }} failed with status code: {response.status_code}",
+                    )
+
+                for line in response.iter_lines():
+                    if not line:
+                        continue
+                    if line.startswith("data:"):
+                        payload = line[len("data:"):].strip()
+                        if not payload:
+                            continue
+                        if payload == "[DONE]":
+                            break
+                        try:
+                            obj = json.loads(payload)
+                            if isinstance(obj, dict):
+                                yield obj
+                            else:
+                                yield payload
+                        except Exception:
+                            yield payload
+                    else:
+                        yield line
+{% else %}
+        with httpx.Client(base_url=base_url, verify=self.verify) as client:
+            response = client.request(
+                "{{ op.method }}",
+                httpx.URL(path),
+                headers=headers,
+                params=query_params,
+{% if op.body_param %}
+                json={{ op.body_param }},
+{% endif %}
+            )
+
+        if response.status_code != {{ op.return_type.status_code }}:
+            raise HTTPException(
+                response.status_code,
+                f"{{ op.operation_id }} failed with status code: {response.status_code}",
+            )
+
+        body = None if {{ op.return_type.status_code }} == 204 else response.json()
+
+{% if op.return_type.type is none or op.return_type.type.converted_type is none %}
+        return None
+{% elif op.return_type.complex_type %}
+{% if op.return_type.list_type is none %}
+        return {{ op.return_type.type.converted_type }}.model_validate(body) if body is not None else {{ op.return_type.type.converted_type }}()
+{% else %}
+        return [{{ op.return_type.list_type }}.model_validate(item) for item in (body or [])]
+{% endif %}
+{% else %}
+        return body
+{% endif %}
+{% endif %}
+
+{% endfor %}

{ab_openapi_python_generator-2.2.1 → ab_openapi_python_generator-2.2.3}/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.1 → ab_openapi_python_generator-2.2.3}/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.1/src/ab_openapi_python_generator/language_converters/python/templates/async_client_httpx_pydantic_2.jinja2

@@ -1,80 +0,0 @@
-{% if env_token_name is not none %}import os{% endif %}
-
-from typing import Any, Dict, Optional, Union
-
-import httpx
-from pydantic import BaseModel
-
-from ..models import *
-{% set _base_path = 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 }}"
-    verify: Union[bool, str] = True
-{% if env_token_name is none %}
-    access_token: Optional[str] = None
-{% endif %}
-
-    def get_access_token(self) -> Optional[str]:
-{% if env_token_name is not none %}
-        try:
-            return os.environ["{{ env_token_name }}"]
-        except KeyError:
-            return None
-{% else %}
-        return self.access_token
-{% endif %}
-
-    def set_access_token(self, value: str) -> None:
-{% if env_token_name is not none %}
-        raise Exception(
-            "This client was generated with an environment variable for the access token. "
-            "Please set '{{ env_token_name }}'."
-        )
-{% else %}
-        self.access_token = value
-{% endif %}
-
-{% for op in operations %}
-    async def {{ op.operation_id }}(self{% if op.params %}, {{ op.params }}{% endif %}) -> Any:
-        base_path = self.base_path
-        path = f"{{ op.path_name }}"
-
-        headers = {
-            "Content-Type": "application/json",
-            "Accept": "application/json",
-            "Authorization": f"Bearer { self.get_access_token() }",
-        }
-
-        query_params: Dict[str, Any] = {
-{% for qp in op.query_params %}
-            {{ qp }},
-{% endfor %}
-        }
-        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:
-            response = await client.request(
-                "{{ op.method }}",
-                httpx.URL(path),
-                headers=headers,
-                params=query_params,
-{% if op.body_param %}
-                json={{ op.body_param }},
-{% endif %}
-            )
-
-        if response.status_code != {{ op.return_type.status_code }}:
-            raise HTTPException(
-                response.status_code,
-                f"{{ op.operation_id }} failed with status code: {response.status_code}",
-            )
-
-        body = None if {{ op.return_type.status_code }} == 204 else response.json()
-        return body
-
-{% endfor %}

ab_openapi_python_generator-2.2.1/src/ab_openapi_python_generator/language_converters/python/templates/sync_client_httpx_pydantic_2.jinja2

@@ -1,80 +0,0 @@
-{% if env_token_name is not none %}import os{% endif %}
-
-from typing import Any, Dict, Optional, Union
-
-import httpx
-from pydantic import BaseModel
-
-from ..models import *
-{% set _base_path = 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 }}"
-    verify: Union[bool, str] = True
-{% if env_token_name is none %}
-    access_token: Optional[str] = None
-{% endif %}
-
-    def get_access_token(self) -> Optional[str]:
-{% if env_token_name is not none %}
-        try:
-            return os.environ["{{ env_token_name }}"]
-        except KeyError:
-            return None
-{% else %}
-        return self.access_token
-{% endif %}
-
-    def set_access_token(self, value: str) -> None:
-{% if env_token_name is not none %}
-        raise Exception(
-            "This client was generated with an environment variable for the access token. "
-            "Please set '{{ env_token_name }}'."
-        )
-{% else %}
-        self.access_token = value
-{% endif %}
-
-{% for op in operations %}
-    def {{ op.operation_id }}(self{% if op.params %}, {{ op.params }}{% endif %}) -> Any:
-        base_path = self.base_path
-        path = f"{{ op.path_name }}"
-
-        headers = {
-            "Content-Type": "application/json",
-            "Accept": "application/json",
-            "Authorization": f"Bearer { self.get_access_token() }",
-        }
-
-        query_params: Dict[str, Any] = {
-{% for qp in op.query_params %}
-            {{ qp }},
-{% endfor %}
-        }
-        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:
-            response = client.request(
-                "{{ op.method }}",
-                httpx.URL(path),
-                headers=headers,
-                params=query_params,
-{% if op.body_param %}
-                json={{ op.body_param }},
-{% endif %}
-            )
-
-        if response.status_code != {{ op.return_type.status_code }}:
-            raise HTTPException(
-                response.status_code,
-                f"{{ op.operation_id }} failed with status code: {response.status_code}",
-            )
-
-        body = None if {{ op.return_type.status_code }} == 204 else response.json()
-        return body
-
-{% endfor %}