Merge main into formatter coverage

koxudaxi · koxudaxi · commit b35b00f33cb5 · 2026-05-31T15:23:59.000Z
diff --git a/docs/llms-full.txt b/docs/llms-full.txt
@@ -553,7 +553,7 @@ Run `tox run -e schema-docs` after changing supported inputs or model backends.
 
 | Format | Status | Evidence | Notes |
 |--------|--------|----------|-------|
-| OpenAPI YAML | tested | `tests/data/openapi/**/*.yaml` (34 fixtures) | Primary fixture format exercised under `tests/data/openapi/**/*.yaml`. |
+| OpenAPI YAML | tested | `tests/data/openapi/**/*.yaml` (39 fixtures) | Primary fixture format exercised under `tests/data/openapi/**/*.yaml`. |
 | OpenAPI JSON | tested | `tests/main/test_main.py::test_generate_from_json_input` | Covered by the JSON conversion CLI test in `tests/main/test_main.py`. |
 | Remote HTTP `$ref` targets | tested | `tests/main/test_main.py::test_generate_remote_ref` | Covered by the remote `$ref` generation test against a live HTTP server. |
 
@@ -562,7 +562,7 @@ Run `tox run -e schema-docs` after changing supported inputs or model backends.
 | Suite | Fixtures | Example files | Notes |
 |-------|----------|---------------|-------|
 | Default template | 20 | `body_and_parameters.yaml`, `content_in_parameters.yaml`, `content_in_parameters_inline.yaml` | Core single-file generation scenarios exercised by the main CLI tests. |
-| Coverage fixtures | 9 | `callbacks.yaml`, `callbacks_with_operation_id.yaml`, `faux_immutability.yaml` | Focused fixtures for callbacks, non-200 responses, and other regression edges. |
+| Coverage fixtures | 14 | `callbacks.yaml`, `callbacks_with_operation_id.yaml`, `faux_immutability.yaml` | Focused fixtures for callbacks, non-200 responses, and other regression edges. |
 | Custom template overrides | 1 | `custom_security.yaml` | Template override coverage for `--template-dir`. |
 | Timestamp suppression | 1 | `simple.yaml` | Fixtures that exercise `--disable-timestamp`. |
 | Remote references | 1 | `body_and_parameters.yaml` | Fixtures whose `$ref` targets are resolved over HTTP at test time. |
diff --git a/docs/supported_formats.md b/docs/supported_formats.md
@@ -7,7 +7,7 @@ Run `tox run -e schema-docs` after changing supported inputs or model backends.
 
 | Format | Status | Evidence | Notes |
 |--------|--------|----------|-------|
-| OpenAPI YAML | tested | `tests/data/openapi/**/*.yaml` (34 fixtures) | Primary fixture format exercised under `tests/data/openapi/**/*.yaml`. |
+| OpenAPI YAML | tested | `tests/data/openapi/**/*.yaml` (39 fixtures) | Primary fixture format exercised under `tests/data/openapi/**/*.yaml`. |
 | OpenAPI JSON | tested | `tests/main/test_main.py::test_generate_from_json_input` | Covered by the JSON conversion CLI test in `tests/main/test_main.py`. |
 | Remote HTTP `$ref` targets | tested | `tests/main/test_main.py::test_generate_remote_ref` | Covered by the remote `$ref` generation test against a live HTTP server. |
 
@@ -16,7 +16,7 @@ Run `tox run -e schema-docs` after changing supported inputs or model backends.
 | Suite | Fixtures | Example files | Notes |
 |-------|----------|---------------|-------|
 | Default template | 20 | `body_and_parameters.yaml`, `content_in_parameters.yaml`, `content_in_parameters_inline.yaml` | Core single-file generation scenarios exercised by the main CLI tests. |
-| Coverage fixtures | 9 | `callbacks.yaml`, `callbacks_with_operation_id.yaml`, `faux_immutability.yaml` | Focused fixtures for callbacks, non-200 responses, and other regression edges. |
+| Coverage fixtures | 14 | `callbacks.yaml`, `callbacks_with_operation_id.yaml`, `faux_immutability.yaml` | Focused fixtures for callbacks, non-200 responses, and other regression edges. |
 | Custom template overrides | 1 | `custom_security.yaml` | Template override coverage for `--template-dir`. |
 | Timestamp suppression | 1 | `simple.yaml` | Fixtures that exercise `--disable-timestamp`. |
 | Remote references | 1 | `body_and_parameters.yaml` | Fixtures whose `$ref` targets are resolved over HTTP at test time. |
diff --git a/fastapi_code_generator/cli.py b/fastapi_code_generator/cli.py
@@ -334,6 +334,8 @@ def generate_code(
 
     for target in template_dir.rglob("*"):
         relative_path = target.relative_to(template_dir)
+        if generate_routers and relative_path.name.startswith("routers."):
+            continue
         template = environment.get_template(str(relative_path))
         result = template.render(template_vars)
         results[relative_path] = _normalize_pydantic_v2_code(
diff --git a/fastapi_code_generator/modular_template/routers.jinja2 b/fastapi_code_generator/modular_template/routers.jinja2
@@ -11,6 +11,9 @@ router = APIRouter(
 {% for operation in operations %}
 {% if operation.tags[0] == tag %}
 @router.{{operation.type}}('{{operation.path}}', response_model={{operation.response}}
+    {% if operation.status_code %}
+    , status_code={{operation.status_code}}
+    {% endif %}
     {% if operation.additional_responses %}
         , responses={
             {% for status_code, models in operation.additional_responses.items() %}
diff --git a/fastapi_code_generator/parser.py b/fastapi_code_generator/parser.py
@@ -199,6 +199,7 @@ class Operation(CachedPropertyModel):
     tags: Optional[List[str]] = []
     request: Optional[Argument] = None
     response: str = ''
+    status_code: Optional[int] = None
     additional_responses: Dict[Union[str, int], Dict[str, str]] = {}
     return_type: str = ''
     callbacks: Dict[UsefulStr, List["Operation"]] = {}
@@ -396,7 +397,7 @@ def parse_info(self) -> Optional[Dict[str, Any]]:
         info = self.raw_obj.get('info')
         if not isinstance(info, dict):  # pragma: no cover
             return None
-        result = info.copy()
+        result = {key: value for key, value in info.items() if not key.startswith('x-')}
         servers = self.raw_obj.get('servers')
         if servers:
             result['servers'] = servers
@@ -727,6 +728,17 @@ def parse_responses(  # type: ignore[override]
             data_type = DataType(type='None')
         type_hint = data_type.type_hint  # TODO: change to lazy loading
         self._temporary_operation['response'] = type_hint
+        success_status_codes = [
+            int(status_code)
+            for status_code in responses
+            if str(status_code).isdigit() and 200 <= int(status_code) < 300
+        ]
+        if '200' not in responses and success_status_codes:
+            selected_status_code = min(success_status_codes)
+            if selected_status_code == 204 and not data_types.get(
+                str(selected_status_code)
+            ):
+                self._temporary_operation['status_code'] = selected_status_code
         return_types = {type_hint: data_type}
         for status_code, additional_responses in data_types.items():
             if status_code != '200' and additional_responses:  # 200 is processed above
diff --git a/fastapi_code_generator/prompt_data.py b/fastapi_code_generator/prompt_data.py
@@ -532,7 +532,7 @@
     '\n'
     '| Format | Status | Evidence | Notes |\n'
     '|--------|--------|----------|-------|\n'
-    '| OpenAPI YAML | tested | `tests/data/openapi/**/*.yaml` (34 '
+    '| OpenAPI YAML | tested | `tests/data/openapi/**/*.yaml` (39 '
     'fixtures) | Primary fixture format exercised under '
     '`tests/data/openapi/**/*.yaml`. |\n'
     '| OpenAPI JSON | tested | '
@@ -552,7 +552,7 @@
     '`content_in_parameters.yaml`, '
     '`content_in_parameters_inline.yaml` | Core single-file '
     'generation scenarios exercised by the main CLI tests. |\n'
-    '| Coverage fixtures | 9 | `callbacks.yaml`, '
+    '| Coverage fixtures | 14 | `callbacks.yaml`, '
     '`callbacks_with_operation_id.yaml`, `faux_immutability.yaml` '
     '| Focused fixtures for callbacks, non-200 responses, and '
     'other regression edges. |\n'
diff --git a/fastapi_code_generator/template/main.jinja2 b/fastapi_code_generator/template/main.jinja2
@@ -16,6 +16,9 @@ app = FastAPI(
 
 {% for operation in operations %}
 @app.{{operation.type}}('{{operation.path}}', response_model={{operation.response}}
+    {% if operation.status_code %}
+    , status_code={{operation.status_code}}
+    {% endif %}
     {% if operation.additional_responses %}
         , responses={
             {% for status_code, models in operation.additional_responses.items() %}
diff --git a/tests/data/custom_template/router_tag_import/main.jinja2 b/tests/data/custom_template/router_tag_import/main.jinja2
@@ -0,0 +1,9 @@
+from fastapi import FastAPI
+{% if routers %}
+from .routers import {{ routers|join(", ") }}
+{% endif %}
+
+app = FastAPI()
+{% for router in routers %}
+app.include_router({{ router }}.router)
+{% endfor %}
diff --git a/tests/data/custom_template/router_tag_import/routers.jinja2 b/tests/data/custom_template/router_tag_import/routers.jinja2
@@ -0,0 +1,9 @@
+from anymodule import {{ tag.strip() }}
+from fastapi import APIRouter
+
+router = APIRouter(tags=[{{ tag.strip() }}.__name__])
+
+
+@router.get('/items', tags=[{{ tag.strip() }}.__name__])
+def get_items() -> None:
+    pass
diff --git a/tests/data/expected/openapi/coverage/field_examples/main.py b/tests/data/expected/openapi/coverage/field_examples/main.py
@@ -0,0 +1,18 @@
+# generated by fastapi-codegen:
+#   filename:  field_examples.yaml
+
+from __future__ import annotations
+
+from fastapi import FastAPI
+
+from .models import StatusResponse
+
+app = FastAPI(
+    title='Example',
+    version='1.0.0',
+)
+
+
+@app.get('/status', response_model=StatusResponse)
+def get_status() -> StatusResponse:
+    pass
diff --git a/tests/data/expected/openapi/coverage/field_examples/models.py b/tests/data/expected/openapi/coverage/field_examples/models.py
@@ -0,0 +1,17 @@
+# generated by fastapi-codegen:
+#   filename:  field_examples.yaml
+
+from __future__ import annotations
+
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+class StatusResponse(BaseModel):
+    status: str
+    api_version: Optional[str] = Field(
+        None,
+        description='Indication of the API version implemented at this URL.',
+        examples=['v0.4.2'],
+    )
diff --git a/tests/data/expected/openapi/coverage/non_200_status_code/main.py b/tests/data/expected/openapi/coverage/non_200_status_code/main.py
@@ -0,0 +1,17 @@
+# generated by fastapi-codegen:
+#   filename:  non_200_status_code.yaml
+#   timestamp: 2020-06-19T00:00:00+00:00
+
+from __future__ import annotations
+
+from fastapi import FastAPI
+
+app = FastAPI(
+    title='Delete API',
+    version='1.0.0',
+)
+
+
+@app.delete('/items/{item_id}', response_model=None, status_code=204)
+def delete_item(item_id: int) -> None:
+    pass
diff --git a/tests/data/expected/openapi/coverage/non_200_status_code/models.py b/tests/data/expected/openapi/coverage/non_200_status_code/models.py
@@ -0,0 +1,3 @@
+# generated by fastapi-codegen:
+#   filename:  non_200_status_code.yaml
+#   timestamp: 2020-06-19T00:00:00+00:00
diff --git a/tests/data/expected/openapi/coverage/request_body_without_schema/main.py b/tests/data/expected/openapi/coverage/request_body_without_schema/main.py
@@ -0,0 +1,16 @@
+# generated by fastapi-codegen:
+#   filename:  request_body_without_schema.yaml
+
+from __future__ import annotations
+
+from fastapi import FastAPI
+
+app = FastAPI(
+    title='Request Without Schema API',
+    version='1.0.0',
+)
+
+
+@app.post('/upload', response_model=None, status_code=204)
+def create_upload() -> None:
+    pass
diff --git a/tests/data/expected/openapi/coverage/request_body_without_schema/models.py b/tests/data/expected/openapi/coverage/request_body_without_schema/models.py
@@ -0,0 +1,2 @@
+# generated by fastapi-codegen:
+#   filename:  request_body_without_schema.yaml
diff --git a/tests/data/expected/openapi/coverage/router_tag_import/main.py b/tests/data/expected/openapi/coverage/router_tag_import/main.py
@@ -0,0 +1,10 @@
+# generated by fastapi-codegen:
+#   filename:  router_tag_import.yaml
+
+from fastapi import FastAPI
+
+from .routers import items
+
+app = FastAPI()
+
+app.include_router(items.router)
diff --git a/tests/data/expected/openapi/coverage/router_tag_import/models.py b/tests/data/expected/openapi/coverage/router_tag_import/models.py
@@ -0,0 +1,2 @@
+# generated by fastapi-codegen:
+#   filename:  router_tag_import.yaml
diff --git a/tests/data/expected/openapi/coverage/router_tag_import/routers/items.py b/tests/data/expected/openapi/coverage/router_tag_import/routers/items.py
@@ -0,0 +1,12 @@
+# generated by fastapi-codegen:
+#   filename:  router_tag_import.yaml
+
+from anymodule import Items
+from fastapi import APIRouter
+
+router = APIRouter(tags=[Items.__name__])
+
+
+@router.get('/items', tags=[Items.__name__])
+def get_items() -> None:
+    pass
diff --git a/tests/data/expected/openapi/coverage/union_request_body/main.py b/tests/data/expected/openapi/coverage/union_request_body/main.py
@@ -15,6 +15,6 @@
 )
 
 
-@app.post('/payload', response_model=None)
+@app.post('/payload', response_model=None, status_code=204)
 def create_payload(body: Union[TypeA, TypeB]) -> None:
     pass
diff --git a/tests/data/expected/openapi/coverage/vendor_extensions/main.py b/tests/data/expected/openapi/coverage/vendor_extensions/main.py
@@ -0,0 +1,11 @@
+# generated by fastapi-codegen:
+#   filename:  vendor_extensions.yaml
+
+from __future__ import annotations
+
+from fastapi import FastAPI
+
+app = FastAPI(
+    title='Example',
+    version='1.0.0',
+)
diff --git a/tests/data/expected/openapi/coverage/vendor_extensions/models.py b/tests/data/expected/openapi/coverage/vendor_extensions/models.py
@@ -0,0 +1,2 @@
+# generated by fastapi-codegen:
+#   filename:  vendor_extensions.yaml
diff --git a/tests/data/modular_template/routers.jinja2 b/tests/data/modular_template/routers.jinja2
@@ -11,6 +11,9 @@ router = APIRouter(
 {% for operation in operations %}
 {% if operation.tags[0] == tag %}
 @router.{{operation.type}}('{{operation.path}}', response_model={{operation.response}}
+    {% if operation.status_code %}
+    , status_code={{operation.status_code}}
+    {% endif %}
     {% if operation.additional_responses %}
         , responses={
             {% for status_code, models in operation.additional_responses.items() %}
diff --git a/tests/data/openapi/coverage/field_examples.yaml b/tests/data/openapi/coverage/field_examples.yaml
@@ -0,0 +1,28 @@
+openapi: 3.0.2
+info:
+  title: Example
+  version: 1.0.0
+paths:
+  /status:
+    get:
+      operationId: getStatus
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/StatusResponse'
+components:
+  schemas:
+    StatusResponse:
+      type: object
+      required:
+        - status
+      properties:
+        status:
+          type: string
+        api_version:
+          description: Indication of the API version implemented at this URL.
+          type: string
+          example: v0.4.2
diff --git a/tests/data/openapi/coverage/non_200_status_code.yaml b/tests/data/openapi/coverage/non_200_status_code.yaml
@@ -0,0 +1,17 @@
+openapi: 3.0.0
+info:
+  title: Delete API
+  version: 1.0.0
+paths:
+  /items/{item_id}:
+    delete:
+      operationId: deleteItem
+      parameters:
+        - name: item_id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        "204":
+          description: Successful Response
diff --git a/tests/data/openapi/coverage/request_body_without_schema.yaml b/tests/data/openapi/coverage/request_body_without_schema.yaml
@@ -0,0 +1,15 @@
+openapi: 3.0.0
+info:
+  title: Request Without Schema API
+  version: 1.0.0
+paths:
+  /upload:
+    post:
+      operationId: createUpload
+      requestBody:
+        required: false
+        content:
+          application/json: {}
+      responses:
+        '204':
+          description: No content
diff --git a/tests/data/openapi/coverage/router_tag_import.yaml b/tests/data/openapi/coverage/router_tag_import.yaml
@@ -0,0 +1,13 @@
+openapi: 3.0.0
+info:
+  title: Router Tag Import
+  version: 1.0.0
+paths:
+  /items:
+    get:
+      operationId: getItems
+      tags:
+        - Items
+      responses:
+        '200':
+          description: OK
diff --git a/tests/data/openapi/coverage/vendor_extensions.yaml b/tests/data/openapi/coverage/vendor_extensions.yaml
@@ -0,0 +1,8 @@
+openapi: 3.0.0
+info:
+  title: Example
+  version: 1.0.0
+  x-audience: company-internal
+  x-logo:
+    url: https://www.example.com/company-logo.png
+paths: {}
diff --git a/tests/main/test_main.py b/tests/main/test_main.py
