ab-openapi-python-generator 2.2.5__py3-none-any.whl → 2.2.7__py3-none-any.whl

ab_openapi_python_generator/language_converters/python/client_generator.py

@@ -144,38 +144,46 @@ HTTP_OPERATIONS = ["get", "post", "put", "delete", "options", "head", "patch", "
 def generate_body_param(operation: Operation) -> Union[str, None]:
     if operation.requestBody is None:
         return None
-    else:
-        if isinstance(operation.requestBody, Reference30) or isinstance(operation.requestBody, Reference31):
-            return "data.dict()"
-
-        if operation.requestBody.content is None:
-            return None  # pragma: no cover
-
-        if operation.requestBody.content.get("application/json") is None:
-            return None  # pragma: no cover
-
-        media_type = operation.requestBody.content.get("application/json")
-
-        if media_type is None:
-            return None  # pragma: no cover
-
-        if isinstance(media_type.media_type_schema, (Reference, Reference30, Reference31)):
-            return "data.dict()"
-        elif hasattr(media_type.media_type_schema, "ref"):
-            # Handle Reference objects from different OpenAPI versions
-            return "data.dict()"
-        elif isinstance(media_type.media_type_schema, (Schema, Schema30, Schema31)):
-            schema = media_type.media_type_schema
-            if schema.type == "array":
-                return "[i.dict() for i in data]"
-            elif schema.type == "object":
-                return "data"
-            else:
-                raise Exception(f"Unsupported schema type for request body: {schema.type}")  # pragma: no cover
-        else:
-            raise Exception(
-                f"Unsupported schema type for request body: {type(media_type.media_type_schema)}"
-            )  # pragma: no cover
+
+    # If requestBody is a $ref, it will be a Pydantic model instance in the client.
+    if isinstance(operation.requestBody, (Reference30, Reference31)):
+        return "data.model_dump(by_alias=True, exclude_none=True)"
+
+    rb_content = getattr(operation.requestBody, "content", None)
+    if rb_content is None:
+        return None  # pragma: no cover
+
+    if rb_content.get("application/json") is None:
+        return None  # pragma: no cover
+
+    media_type = rb_content.get("application/json")
+    if media_type is None:
+        return None  # pragma: no cover
+
+    mts = getattr(media_type, "media_type_schema", None)
+    if mts is None:
+        return None  # pragma: no cover
+
+    # $ref schema -> model
+    if isinstance(mts, (Reference, Reference30, Reference31)) or hasattr(mts, "ref"):
+        return "data.model_dump(by_alias=True, exclude_none=True)"
+
+    # Concrete schema
+    if isinstance(mts, (Schema, Schema30, Schema31)):
+        schema = mts
+
+        if schema.type == "array":
+            # List of models or primitives
+            return "[i.model_dump(by_alias=True, exclude_none=True) if hasattr(i, 'model_dump') else i for i in data]"
+
+        if schema.type == "object":
+            # Model or dict-like
+            return "data.model_dump(by_alias=True, exclude_none=True) if hasattr(data, 'model_dump') else data"
+
+        # Primitive (string/int/etc.)
+        return "data"
+
+    raise Exception(f"Unsupported schema type for request body: {type(mts)}")  # pragma: no cover
 
 
 def generate_params(operation: Operation) -> str:

ab_openapi_python_generator/language_converters/python/generator.py

@@ -13,6 +13,7 @@ from ab_openapi_python_generator.language_converters.python.exception_generator
 )
 from ab_openapi_python_generator.language_converters.python.model_generator import (
     generate_models,
+    generate_response_union_alias_models,
 )
 from ab_openapi_python_generator.models import ConversionResult, LibraryConfig
 
@@ -40,6 +41,14 @@ def generator(
     else:
         models = []
 
+    # Generate response union alias models (e.g. AuthorizeResponse) from paths
+    # so client return types that reference those aliases have corresponding
+    # model modules available in the output.
+    if data.paths is not None:
+        resp_alias_models = generate_response_union_alias_models(data.paths, pydantic_version)
+        if resp_alias_models:
+            models.extend(resp_alias_models)
+
     if data.paths is not None:
         clients = generate_clients(data, data.paths, library_config, env_token_name, pydantic_version)
     else:

ab_openapi_python_generator/language_converters/python/model_generator.py

@@ -757,16 +757,21 @@ def _generate_property_from_schema(
     """
     required = parent_schema is not None and parent_schema.required is not None and name in parent_schema.required
 
-    import_type = None
+    # Pick up OpenAPI default (if present)
+    default_val = getattr(schema, "default", None)
+
     if required:
-        import_type = [] if name == model_name else [name]
+        rendered_default = None
+    else:
+        # If OpenAPI provides a default, use it. Otherwise fall back to None.
+        rendered_default = repr(default_val) if default_val is not None else "None"
 
     return Property(
         name=name,
         type=type_converter(schema, required, model_name),
         required=required,
-        default=None if required else "None",
-        import_type=import_type,
+        default=rendered_default,
+        import_type=None if not required else ([] if name == model_name else [name]),
     )
 
 

ab_openapi_python_generator/language_converters/python/templates/async_client_httpx_pydantic_2.jinja2

@@ -57,15 +57,20 @@ AsyncGenerator[str | dict[str, Any], None]
         path = f"{{ op.path_name }}"
 
         headers = {
+{% if op.body_param %}
             "Content-Type": "application/json",
+{% endif %}
 {% if op.is_sse %}
             "Accept": "text/event-stream",
 {% else %}
             "Accept": "application/json",
 {% endif %}
-            "Authorization": f"Bearer { await self.get_access_token() }",
         }
 
+        _token = await self.get_access_token()
+        if _token:
+            headers["Authorization"] = f"Bearer {_token}"
+
         query_params: Dict[str, Any] = {
 {% for qp in op.query_params %}
             {{ qp }},

ab_openapi_python_generator/language_converters/python/templates/sync_client_httpx_pydantic_2.jinja2

@@ -57,15 +57,20 @@ Generator[str | dict[str, Any], None, None]
         path = f"{{ op.path_name }}"
 
         headers = {
+{% if op.body_param %}
             "Content-Type": "application/json",
+{% endif %}
 {% if op.is_sse %}
             "Accept": "text/event-stream",
 {% else %}
             "Accept": "application/json",
 {% endif %}
-            "Authorization": f"Bearer { self.get_access_token() }",
         }
 
+        _token = self.get_access_token()
+        if _token:
+            headers["Authorization"] = f"Bearer {_token}"
+
         query_params: Dict[str, Any] = {
 {% for qp in op.query_params %}
             {{ qp }},

{ab_openapi_python_generator-2.2.5.dist-info → ab_openapi_python_generator-2.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ab-openapi-python-generator
-Version: 2.2.5
+Version: 2.2.7
 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.5.dist-info → ab_openapi_python_generator-2.2.7.dist-info}/RECORD

@@ -7,25 +7,25 @@ ab_openapi_python_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 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=7KB1PLRnbqh623RcvwVMoK1mhdwXmZGn6K2Sm3-nSBE,19306
+ab_openapi_python_generator/language_converters/python/client_generator.py,sha256=j_2AIR9YZmXH8si23Jety5vrsuq--afwHT9pQATN_Qw,19402
 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/generator.py,sha256=AnIiTZm0ZHd07-XSvLrqBnS-gn2vaO8AD1QywW1VlmM,2109
 ab_openapi_python_generator/language_converters/python/jinja_config.py,sha256=B-qSmxfrplroItvHLS7fp-FC_PkroJLT9fsB5-9J0oI,1267
-ab_openapi_python_generator/language_converters/python/model_generator.py,sha256=lx-SFNgYGGNAPS6yzZFaK21_qxWJ_XC4VzEETvrxFFY,42292
+ab_openapi_python_generator/language_converters/python/model_generator.py,sha256=rzOVF80iK3ekB9FbFNnTjBFgber6B5C96u-Uai_VHDw,42550
 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=6loXkLatHYrqMWxWyUr9_PWb73jJbUetS-67-YoOK9Q,4931
+ab_openapi_python_generator/language_converters/python/templates/async_client_httpx_pydantic_2.jinja2,sha256=GOJWwbALdHwTnj3UUB6O5kPBqCHJNiG_WzukJtXpcsI,5017
 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=Cv1XUM99atLNlj0rWyEqi5jWTKhDPJRVp5-xfuEn4Ko,4776
+ab_openapi_python_generator/language_converters/python/templates/sync_client_httpx_pydantic_2.jinja2,sha256=MaFsVuKq5K0rEldlc_HZEU98MdFCXSEKFznxJHKMl3U,4862
 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.5.dist-info/METADATA,sha256=x2g50ud0ktO1p0bPiqIt_J0jqZBZQzAP3kzQpbbOEHw,5186
-ab_openapi_python_generator-2.2.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ab_openapi_python_generator-2.2.5.dist-info/entry_points.txt,sha256=zezbCs2qP8lSUbcjL6cN5XHoHxf9JTe15CZYH8Yuzo0,90
-ab_openapi_python_generator-2.2.5.dist-info/licenses/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
-ab_openapi_python_generator-2.2.5.dist-info/RECORD,,
+ab_openapi_python_generator-2.2.7.dist-info/METADATA,sha256=g9Wn_Yob0tnCOs5KMiutnQziyqyWUcB5LY3eigSAWJQ,5186
+ab_openapi_python_generator-2.2.7.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+ab_openapi_python_generator-2.2.7.dist-info/entry_points.txt,sha256=zezbCs2qP8lSUbcjL6cN5XHoHxf9JTe15CZYH8Yuzo0,90
+ab_openapi_python_generator-2.2.7.dist-info/licenses/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
+ab_openapi_python_generator-2.2.7.dist-info/RECORD,,

{ab_openapi_python_generator-2.2.5.dist-info → ab_openapi_python_generator-2.2.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.28.0
+Generator: hatchling 1.29.0
 Root-Is-Purelib: true
 Tag: py3-none-any