From e2582fe335ea3a72db22847f023283fac4c17153 Mon Sep 17 00:00:00 2001 From: Evgeny Bokshitsky Date: Sun, 26 Oct 2025 21:28:49 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=94=A8=20remove=20unused=20variable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi/routing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fastapi/routing.py b/fastapi/routing.py index 0b59d250a..c994f83ad 100644 --- a/fastapi/routing.py +++ b/fastapi/routing.py @@ -372,7 +372,6 @@ def get_request_handler( raise http_error from e # Solve dependencies and run path operation function, auto-closing dependencies - errors: List[Any] = [] async_exit_stack = request.scope.get("fastapi_inner_astack") assert isinstance(async_exit_stack, AsyncExitStack), ( "fastapi_inner_astack not found in request scope" From 22a45cdffdf93f99b8efab3a9718dbb0848418d6 Mon Sep 17 00:00:00 2001 From: Evgeny Bokshitsky Date: Sun, 26 Oct 2025 21:34:23 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=A8=20simplify=20code,=20use=20les?= =?UTF-8?q?s=20nesting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi/routing.py | 82 +++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/fastapi/routing.py b/fastapi/routing.py index c994f83ad..ac0c19d12 100644 --- a/fastapi/routing.py +++ b/fastapi/routing.py @@ -385,52 +385,46 @@ def get_request_handler( embed_body_fields=embed_body_fields, ) errors = solved_result.errors - if not errors: - raw_response = await run_endpoint_function( - dependant=dependant, - values=solved_result.values, - is_coroutine=is_coroutine, - ) - if isinstance(raw_response, Response): - if raw_response.background is None: - raw_response.background = solved_result.background_tasks - response = raw_response - else: - response_args: Dict[str, Any] = { - "background": solved_result.background_tasks - } - # If status_code was set, use it, otherwise use the default from the - # response class, in the case of redirect it's 307 - current_status_code = ( - status_code if status_code else solved_result.response.status_code - ) - if current_status_code is not None: - response_args["status_code"] = current_status_code - if solved_result.response.status_code: - response_args["status_code"] = solved_result.response.status_code - content = await serialize_response( - field=response_field, - response_content=raw_response, - include=response_model_include, - exclude=response_model_exclude, - by_alias=response_model_by_alias, - exclude_unset=response_model_exclude_unset, - exclude_defaults=response_model_exclude_defaults, - exclude_none=response_model_exclude_none, - is_coroutine=is_coroutine, - ) - response = actual_response_class(content, **response_args) - if not is_body_allowed_for_status_code(response.status_code): - response.body = b"" - response.headers.raw.extend(solved_result.response.headers.raw) if errors: - validation_error = RequestValidationError( - _normalize_errors(errors), body=body - ) - raise validation_error + raise RequestValidationError(_normalize_errors(errors), body=body) - # Return response - assert response + raw_response = await run_endpoint_function( + dependant=dependant, + values=solved_result.values, + is_coroutine=is_coroutine, + ) + if isinstance(raw_response, Response): + if raw_response.background is None: + raw_response.background = solved_result.background_tasks + return raw_response + + response_args: Dict[str, Any] = { + "background": solved_result.background_tasks + } + # If status_code was set, use it, otherwise use the default from the + # response class, in the case of redirect it's 307 + current_status_code = ( + status_code if status_code else solved_result.response.status_code + ) + if current_status_code is not None: + response_args["status_code"] = current_status_code + if solved_result.response.status_code: + response_args["status_code"] = solved_result.response.status_code + content = await serialize_response( + field=response_field, + response_content=raw_response, + include=response_model_include, + exclude=response_model_exclude, + by_alias=response_model_by_alias, + exclude_unset=response_model_exclude_unset, + exclude_defaults=response_model_exclude_defaults, + exclude_none=response_model_exclude_none, + is_coroutine=is_coroutine, + ) + response = actual_response_class(content, **response_args) + if not is_body_allowed_for_status_code(response.status_code): + response.body = b"" + response.headers.raw.extend(solved_result.response.headers.raw) return response return app From 553faa0fb3926d8f2eb845b470a68564222e3b5a Mon Sep 17 00:00:00 2001 From: Evgeny Bokshitsky Date: Sun, 26 Oct 2025 21:49:39 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=A8=20rewrite=20status=5Fcode=20se?= =?UTF-8?q?lect=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi/routing.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fastapi/routing.py b/fastapi/routing.py index ac0c19d12..0d47c9b9a 100644 --- a/fastapi/routing.py +++ b/fastapi/routing.py @@ -403,13 +403,10 @@ def get_request_handler( } # If status_code was set, use it, otherwise use the default from the # response class, in the case of redirect it's 307 - current_status_code = ( - status_code if status_code else solved_result.response.status_code - ) - if current_status_code is not None: - response_args["status_code"] = current_status_code if solved_result.response.status_code: response_args["status_code"] = solved_result.response.status_code + elif status_code is not None: + response_args["status_code"] = status_code content = await serialize_response( field=response_field, response_content=raw_response, From 030f01473ae61438abaf026545a42b8968a30245 Mon Sep 17 00:00:00 2001 From: Evgeny Bokshitsky Date: Sun, 26 Oct 2025 22:22:32 +0400 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=94=A8=20remove=20unused=20"response"?= =?UTF-8?q?=20variable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi/routing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fastapi/routing.py b/fastapi/routing.py index 0d47c9b9a..4c1901b29 100644 --- a/fastapi/routing.py +++ b/fastapi/routing.py @@ -317,7 +317,6 @@ def get_request_handler( actual_response_class = response_class async def app(request: Request) -> Response: - response: Union[Response, None] = None file_stack = request.scope.get("fastapi_middleware_astack") assert isinstance(file_stack, AsyncExitStack), ( "fastapi_middleware_astack not found in request scope" From d4da10cbe7de709a947ff8bcb49d2114d207165d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 07:56:20 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20for?= =?UTF-8?q?mat=20from=20pre-commit.com=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi/routing.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fastapi/routing.py b/fastapi/routing.py index 4c1901b29..7080d044c 100644 --- a/fastapi/routing.py +++ b/fastapi/routing.py @@ -397,9 +397,7 @@ def get_request_handler( raw_response.background = solved_result.background_tasks return raw_response - response_args: Dict[str, Any] = { - "background": solved_result.background_tasks - } + response_args: Dict[str, Any] = {"background": solved_result.background_tasks} # If status_code was set, use it, otherwise use the default from the # response class, in the case of redirect it's 307 if solved_result.response.status_code: