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

{ab_openapi_python_generator-2.2.1 → 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.1
+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.1 → 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.1 → ab_openapi_python_generator-2.2.2}/pyproject.toml

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

{ab_openapi_python_generator-2.2.1 → 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.1 → 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.1 → 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.1 → 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