openapi-python-client 0.21.0__tar.gz → 0.21.1__tar.gz

{openapi_python_client-0.21.0 → openapi_python_client-0.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openapi-python-client
-Version: 0.21.0
+Version: 0.21.1
 Summary: Generate modern Python clients from OpenAPI
 Project-URL: repository, https://github.com/openapi-generators/openapi-python-client
 Author-email: Dylan Anthony <contact@dylananthony.com>
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Code Generators
 Classifier: Typing :: Typed
-Requires-Python: <4.0,>=3.8
+Requires-Python: <4.0,>=3.8.1
 Requires-Dist: attrs>=21.3.0
 Requires-Dist: colorama>=0.4.3; sys_platform == 'win32'
 Requires-Dist: httpx<0.28.0,>=0.20.0

{openapi_python_client-0.21.0 → openapi_python_client-0.21.1}/openapi_python_client/parser/bodies.py

@@ -1,5 +1,5 @@
 import sys
-from typing import List, Tuple, Union
+from typing import Dict, List, Tuple, Union
 
 import attr
 
@@ -44,15 +44,19 @@ def body_from_data(
     *,
     data: oai.Operation,
     schemas: Schemas,
+    request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]],
     config: Config,
     endpoint_name: str,
 ) -> Tuple[List[Union[Body, ParseError]], Schemas]:
     """Adds form or JSON body to Endpoint if included in data"""
-    if data.request_body is None or isinstance(data.request_body, oai.Reference):
+    body = _resolve_reference(data.request_body, request_bodies)
+    if isinstance(body, ParseError):
+        return [body], schemas
+    if body is None:
         return [], schemas
 
     bodies: List[Union[Body, ParseError]] = []
-    body_content = data.request_body.content
+    body_content = body.content
     prefix_type_names = len(body_content) > 1
 
     for content_type, media_type in body_content.items():
@@ -61,7 +65,7 @@ def body_from_data(
             bodies.append(
                 ParseError(
                     detail="Invalid content type",
-                    data=data.request_body,
+                    data=body,
                     level=ErrorLevel.WARNING,
                 )
             )
@@ -71,7 +75,7 @@ def body_from_data(
             bodies.append(
                 ParseError(
                     detail="Missing schema",
-                    data=data.request_body,
+                    data=body,
                     level=ErrorLevel.WARNING,
                 )
             )
@@ -88,7 +92,7 @@ def body_from_data(
             bodies.append(
                 ParseError(
                     detail=f"Unsupported content type {simplified_content_type}",
-                    data=data.request_body,
+                    data=body,
                     level=ErrorLevel.WARNING,
                 )
             )
@@ -123,3 +127,19 @@ def body_from_data(
         )
 
     return bodies, schemas
+
+
+def _resolve_reference(
+    body: Union[oai.RequestBody, oai.Reference, None], request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]]
+) -> Union[oai.RequestBody, ParseError, None]:
+    if body is None:
+        return None
+    references_seen = []
+    while isinstance(body, oai.Reference) and body.ref not in references_seen:
+        references_seen.append(body.ref)
+        body = request_bodies.get(body.ref.split("/")[-1])
+    if isinstance(body, oai.Reference):
+        return ParseError(detail="Circular $ref in request body", data=body)
+    if body is None and references_seen:
+        return ParseError(detail=f"Could not resolve $ref {references_seen[-1]} in request body")
+    return body

{openapi_python_client-0.21.0 → openapi_python_client-0.21.1}/openapi_python_client/parser/openapi.py

@@ -48,6 +48,7 @@ class EndpointCollection:
         data: Dict[str, oai.PathItem],
         schemas: Schemas,
         parameters: Parameters,
+        request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]],
         config: Config,
     ) -> Tuple[Dict[utils.PythonIdentifier, "EndpointCollection"], Schemas, Parameters]:
         """Parse the openapi paths data to get EndpointCollections by tag"""
@@ -69,6 +70,7 @@ class EndpointCollection:
                     tag=tag,
                     schemas=schemas,
                     parameters=parameters,
+                    request_bodies=request_bodies,
                     config=config,
                 )
                 # Add `PathItem` parameters
@@ -392,6 +394,7 @@ class Endpoint:
         tag: str,
         schemas: Schemas,
         parameters: Parameters,
+        request_bodies: Dict[str, Union[oai.RequestBody, oai.Reference]],
         config: Config,
     ) -> Tuple[Union["Endpoint", ParseError], Schemas, Parameters]:
         """Construct an endpoint from the OpenAPI data"""
@@ -423,7 +426,9 @@ class Endpoint:
         result, schemas = Endpoint._add_responses(endpoint=result, data=data.responses, schemas=schemas, config=config)
         if isinstance(result, ParseError):
             return result, schemas, parameters
-        bodies, schemas = body_from_data(data=data, schemas=schemas, config=config, endpoint_name=result.name)
+        bodies, schemas = body_from_data(
+            data=data, schemas=schemas, config=config, endpoint_name=result.name, request_bodies=request_bodies
+        )
         body_errors = []
         for body in bodies:
             if isinstance(body, ParseError):
@@ -507,8 +512,9 @@ class GeneratorData:
                 parameters=parameters,
                 config=config,
             )
+        request_bodies = (openapi.components and openapi.components.requestBodies) or {}
         endpoint_collections_by_tag, schemas, parameters = EndpointCollection.from_data(
-            data=openapi.paths, schemas=schemas, parameters=parameters, config=config
+            data=openapi.paths, schemas=schemas, parameters=parameters, request_bodies=request_bodies, config=config
         )
 
         enums = (prop for prop in schemas.classes_by_name.values() if isinstance(prop, EnumProperty))

{openapi_python_client-0.21.0 → openapi_python_client-0.21.1}/openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -60,7 +60,7 @@ if not isinstance({{ source }}, Unset):
 {% else %}
 {{ destination }}: {{ type_string }} = UNSET
 if not isinstance({{ source }}, Unset):
-{{ _transform(property, source, destination, True, "to_dict") | indent(4)}}
+    {{ _transform(property, source, destination, True, "to_dict") | indent(4)}}
 {% endif %}
 {% endmacro %}
 

{openapi_python_client-0.21.0 → openapi_python_client-0.21.1}/pyproject.toml

@@ -3,7 +3,7 @@ authors = [
     { name = "Dylan Anthony", email = "contact@dylananthony.com" },
 ]
 license = { text = "MIT" }
-requires-python = ">=3.8,<4.0"
+requires-python = ">=3.8.1,<4.0"
 dependencies = [
     "jinja2>=3.0.0,<4.0.0",
     "typer>0.6,<0.13",
@@ -18,7 +18,7 @@ dependencies = [
     "typing-extensions>=4.8.0,<5.0.0",
 ]
 name = "openapi-python-client"
-version = "0.21.0"
+version = "0.21.1"
 description = "Generate modern Python clients from OpenAPI"
 keywords = [
     "OpenAPI",
@@ -84,8 +84,6 @@ ignore_missing_imports = true
 [tool.pytest.ini_options]
 junit_family = "xunit2"
 
-
-
 [tool.pdm.dev-dependencies]
 dev = [
     "pytest",
@@ -98,6 +96,7 @@ dev = [
     "types-certifi<2021.10.9,>=2020.0.0",
     "types-python-dateutil<3.0.0,>=2.0.0",
     "ruamel-yaml-string>=0.1.1",
+    "syrupy>=4",
 ]
 
 [tool.pdm.build]