Merge pull request #382 from yyamano/issue-322

Generate valid python code if query param exists and requeststBody is required

Author: koxudaxi

fastapi_code_generator/parser.py

@@ -330,7 +330,11 @@ def get_argument_list(self, snake_case: bool, path: List[str]) -> List[Argument]
         for argument in arguments:
             if positional_argument and argument.required and argument.default is None:
                 argument.default = UsefulStr('...')
-            positional_argument = argument.required or argument.default is not None
+            positional_argument = (
+                argument.required
+                or (argument.default is not None)
+                or argument.type_hint.startswith('Optional[')
+            )
 
         return arguments
 

tests/data/expected/openapi/default_template/body_and_parameters/main.py

@@ -37,7 +37,12 @@ def post_bar(request: Request) -> None:
 
 
 @app.post('/convert', response_model=bytes)
-def convert(format: Optional[str] = 'pdf', request: Request = ...) -> bytes:
+def convert1(format: Optional[str] = 'pdf', request: Request = ...) -> bytes:
+    pass
+
+
+@app.put('/convert', response_model=bytes)
+def convert2(format: Optional[str] = None, request: Request = ...) -> bytes:
     pass
 
 

tests/data/openapi/default_template/body_and_parameters.yaml

@@ -339,7 +339,8 @@ paths:
         required: true
   /convert:
     post:
-      operationId: convert
+      description: https://github.com/koxudaxi/fastapi-code-generator/issues/376
+      operationId: convert1
       parameters:
         - in: query
           name: format
@@ -360,6 +361,28 @@ paths:
               schema:
                 type: string
                 format: binary
+    put:
+      description: https://github.com/koxudaxi/fastapi-code-generator/issues/322
+      operationId: convert2
+      parameters:
+        - in: query
+          name: format
+          schema:
+            type: string
+      requestBody:
+        required: true
+        content:
+          application/octet-stream:
+            schema:
+              type: string
+              format: binary
+      responses:
+        "200":
+          content:
+            application/octet-stream:
+              schema:
+                type: string
+                format: binary
 components:
   parameters:
     MyParam: