- Hotfix for param ordering in call

Author: MarcoMuellner

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-python-generator"
-version = "0.3.1"
+version = "0.3.2"
 description = "Openapi Python Generator"
 authors = ["Marco Müllner <[email protected]>"]
 license = "MIT"

src/openapi_python_generator/language_converters/python/service_generator.py

@@ -34,36 +34,46 @@ def generate_body_param(operation: Operation) -> Union[str, None]:
         return "data"
 
 
-def generate_params(operation: Operation) -> List[str]:
+def generate_params(operation: Operation) -> str:
     def _generate_params_from_content(content: Union[Reference, Schema]):
         if isinstance(content, Reference):
             return f"data : {content.ref.split('/')[-1]}"
         else:
             return f"data : {type_converter(content, True).converted_type}"
 
     if operation.parameters is None and operation.requestBody is None:
-        return []
+        return ""
 
-    params = []
+    params = ""
+    default_params = ""
     if operation.parameters is not None:
         for param in operation.parameters:
             if not isinstance(param, Parameter):
                 continue
+            converted_result = ""
+            required = False
 
             if isinstance(param.param_schema, Schema):
-                params.append(
+                converted_result = (
                     f"{param.name} : {type_converter(param.param_schema, param.required).converted_type}"
                     + ("" if param.required else " = None")
                 )
+                required = param.required
             elif isinstance(param.param_schema, Reference):
-                params.append(
+                converted_result = (
                     f"{param.name} : {param.param_schema.ref.split('/')[-1] }"
                     + (
                         ""
                         if isinstance(param, Reference) or param.required
                         else " = None"
                     )
                 )
+                required = isinstance(param, Reference) or param.required
+
+            if required:
+                params += f"{converted_result}, "
+            else:
+                default_params += f"{converted_result}, "
 
     if operation.requestBody is not None:
         if (
@@ -76,15 +86,17 @@ def _generate_params_from_content(content: Union[Reference, Schema]):
                 isinstance(content.media_type_schema, Schema)
                 or isinstance(content.media_type_schema, Reference)
             ):
-                params.append(_generate_params_from_content(content.media_type_schema))
+                params += (
+                    f"{_generate_params_from_content(content.media_type_schema)}, "
+                )
             else:
                 raise Exception(f"Unsupported media type schema for {str(operation)}")
         else:
             raise Exception(
                 f"Unsupported request body type: {type(operation.requestBody)}"
             )
 
-    return params
+    return params + default_params
 
 
 def generate_operation_id(operation: Operation, http_op: str) -> str:

src/openapi_python_generator/language_converters/python/templates/httpx.jinja2

@@ -1,4 +1,4 @@
-{%  if async_client %}async {% endif %}def {{ operation_id }}({{ params | join(',') }}) -> {% if return_type.type is none or return_type.type.converted_type is none %}None{% else %}{{ return_type.type.converted_type}}{% endif %}:
+{%  if async_client %}async {% endif %}def {{ operation_id }}({{ params }}) -> {% if return_type.type is none or return_type.type.converted_type is none %}None{% else %}{{ return_type.type.converted_type}}{% endif %}:
     base_path = APIConfig.base_path
     path = f'{{ path_name }}'
     headers = {

src/openapi_python_generator/language_converters/python/templates/requests.jinja2

@@ -1,4 +1,4 @@
-def {{ operation_id }}({{ params | join(',') }}) -> {% if return_type.type is none or return_type.type.converted_type is none %}None{% else %}{{ return_type.type.converted_type}}{% endif %}:
+def {{ operation_id }}({{ params }}) -> {% if return_type.type is none or return_type.type.converted_type is none %}None{% else %}{{ return_type.type.converted_type}}{% endif %}:
     base_path = APIConfig.base_path
     path = f'{{ path_name }}'
     headers = {

src/openapi_python_generator/models.py

@@ -29,7 +29,7 @@ class OpReturnType(BaseModel):
 
 
 class ServiceOperation(BaseModel):
-    params: List[str]
+    params: str
     operation_id: str
     query_params: List[str]
     return_type: OpReturnType

tests/test_service_generator.py

@@ -58,7 +58,7 @@ def test_generate_body_param(test_openapi_operation, expected_result):
 @pytest.mark.parametrize(
     "test_openapi_operation, expected_result",
     [
-        (Operation(parameters=None, requestBody=None), []),
+        (Operation(parameters=None, requestBody=None), ""),
         (
             Operation(
                 parameters=[
@@ -71,7 +71,7 @@ def test_generate_body_param(test_openapi_operation, expected_result):
                 ],
                 requestBody=None,
             ),
-            ["test : TestModel"],
+            "test : TestModel, ",
         ),
         (
             Operation(
@@ -84,7 +84,7 @@ def test_generate_body_param(test_openapi_operation, expected_result):
                     )
                 ],
             ),
-            ["test2 : Optional[str] = None"],
+            "test2 : Optional[str] = None, ",
         ),
         (
             Operation(
@@ -103,7 +103,7 @@ def test_generate_body_param(test_openapi_operation, expected_result):
                     ),
                 ],
             ),
-            ["test : TestModel", "test2 : Optional[str] = None"],
+            "test : TestModel, test2 : Optional[str] = None, ",
         ),
         (
             Operation(
@@ -131,7 +131,7 @@ def test_generate_body_param(test_openapi_operation, expected_result):
                     }
                 ),
             ),
-            ["test : TestModel", "test2 : str", "data : TestModel"],
+            "test : TestModel, test2 : str, data : TestModel, ",
         ),
         (
             Operation(
@@ -159,7 +159,7 @@ def test_generate_body_param(test_openapi_operation, expected_result):
                     }
                 ),
             ),
-            ["test : TestModel", "test2 : str", "data : TestModel"],
+            "test : TestModel, test2 : str, data : TestModel, ",
         ),
         (
             Operation(
@@ -185,7 +185,7 @@ def test_generate_body_param(test_openapi_operation, expected_result):
                     }
                 ),
             ),
-            ["test : TestModel", "test2 : str", "data : str"],
+            "test : TestModel, test2 : str, data : str, ",
         ),
         (
             Operation(