openapi-python-generator 2.1.1__py3-none-any.whl → 2.1.2__py3-none-any.whl

openapi_python_generator/language_converters/python/service_generator.py

@@ -4,7 +4,6 @@ from typing import Any, Dict, List, Literal, Optional, Tuple, Union
 import click
 from openapi_pydantic.v3 import (
     Operation,
-    Parameter,
     PathItem,
     Reference,
     Response,
@@ -24,6 +23,7 @@ from openapi_pydantic.v3.v3_0 import (
 from openapi_pydantic.v3.v3_0 import (
     Schema as Schema30,
 )
+from openapi_pydantic.v3.v3_0.parameter import Parameter as Parameter30
 from openapi_pydantic.v3.v3_1 import (
     MediaType as MediaType31,
 )
@@ -36,6 +36,7 @@ from openapi_pydantic.v3.v3_1 import (
 from openapi_pydantic.v3.v3_1 import (
     Schema as Schema31,
 )
+from openapi_pydantic.v3.v3_1.parameter import Parameter as Parameter31
 
 from openapi_python_generator.language_converters.python import common
 from openapi_python_generator.language_converters.python.common import normalize_symbol
@@ -152,7 +153,7 @@ def generate_params(operation: Operation) -> str:
     default_params = ""
     if operation.parameters is not None:
         for param in operation.parameters:
-            if not isinstance(param, Parameter):
+            if not isinstance(param, (Parameter30, Parameter31)):
                 continue  # pragma: no cover
             converted_result = ""
             required = False
@@ -245,7 +246,7 @@ def _generate_params(
 
     params = []
     for param in operation.parameters:
-        if isinstance(param, Parameter) and param.param_in == param_in:
+        if isinstance(param, (Parameter30, Parameter31)) and param.param_in == param_in:
             param_name_cleaned = common.normalize_symbol(param.name)
             params.append(f"{param.name!r} : {param_name_cleaned}")
 
@@ -358,10 +359,13 @@ def generate_services(
                 existing_names = set()
                 if op.parameters is not None:
                     for p in op.parameters:  # type: ignore
-                        if isinstance(p, Parameter):
+                        if isinstance(p, (Parameter30, Parameter31)):
                             existing_names.add(p.name)
                 for p in path_level_params:
-                    if isinstance(p, Parameter) and p.name not in existing_names:
+                    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

{openapi_python_generator-2.1.1.dist-info → openapi_python_generator-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openapi-python-generator
-Version: 2.1.1
+Version: 2.1.2
 Summary: Openapi Python Generator
 Home-page: https://github.com/MarcoMuellner/openapi-python-generator
 License: MIT

{openapi_python_generator-2.1.1.dist-info → openapi_python_generator-2.1.2.dist-info}/RECORD

@@ -9,7 +9,7 @@ openapi_python_generator/language_converters/python/common.py,sha256=gZHNhVC4OwG
 openapi_python_generator/language_converters/python/generator.py,sha256=BpgALeKsNgqSvQNQPoM8x1LYG9BmvA687eNdtvPO6UM,1681
 openapi_python_generator/language_converters/python/jinja_config.py,sha256=FuNhGkJqBNaal_jkkirZqgzZOkiMImi-863mnG55n08,1042
 openapi_python_generator/language_converters/python/model_generator.py,sha256=8PURrVr7h5OvCYjxCHNPc4qFh1vGE1uEVRK6DGsDPrY,19428
-openapi_python_generator/language_converters/python/service_generator.py,sha256=38pyA53vOjd173WwCF5Bp3OhCkmOSKaBjCC2WhGiG4A,18547
+openapi_python_generator/language_converters/python/service_generator.py,sha256=J0tJ0MyrbUKXho2qGvJXYa6NN9Jw3tVhg5mBNeE0nDw,18816
 openapi_python_generator/language_converters/python/templates/aiohttp.jinja2,sha256=Ym3-KX8JH9-V75GqkfcXVgh7rnqlkOQU5DLaNd1Wma0,2135
 openapi_python_generator/language_converters/python/templates/apiconfig.jinja2,sha256=bvYMJV6YB2NZLLcqwozISdS86XLH8J6D8o3ZpfgJCjc,1256
 openapi_python_generator/language_converters/python/templates/apiconfig_pydantic_2.jinja2,sha256=_MzcHYEq9aoqSUEhZ-5SLbO80zgBeJnx5d7q3Q_usSo,1319
@@ -25,8 +25,8 @@ openapi_python_generator/parsers/openapi_30.py,sha256=YLA5_rIv_wkV2dyQp7M1_87170
 openapi_python_generator/parsers/openapi_31.py,sha256=c3YpAp6wg6PijM1YScHJgivFk6DLhAP_N6pnTLyRUck,1912
 openapi_python_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openapi_python_generator/version_detector.py,sha256=Cn7iG6_EnBdmjGmefJQ1cIBzbT28F0BeCEpoqksBGyQ,2142
-openapi_python_generator-2.1.1.dist-info/METADATA,sha256=p1wJm0cmd0eeIE8Qqhw0aUdutWpJxuUU08to9i7Udus,5427
-openapi_python_generator-2.1.1.dist-info/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
-openapi_python_generator-2.1.1.dist-info/entry_points.txt,sha256=hqE8T8yX5Pkeb2g__7yQrEazkBPwNgTbEHmoOkaYh80,83
-openapi_python_generator-2.1.1.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-openapi_python_generator-2.1.1.dist-info/RECORD,,
+openapi_python_generator-2.1.2.dist-info/LICENSE,sha256=0myanGwJ2vUOZN12aN95o0My6XEysnnVlbKikYw3pHg,1070
+openapi_python_generator-2.1.2.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+openapi_python_generator-2.1.2.dist-info/entry_points.txt,sha256=hqE8T8yX5Pkeb2g__7yQrEazkBPwNgTbEHmoOkaYh80,83
+openapi_python_generator-2.1.2.dist-info/METADATA,sha256=T5BRrBVShC9tLjppEDRFBAJ5q0X5HrMfSnR8fRUQCbA,5427
+openapi_python_generator-2.1.2.dist-info/RECORD,,