Execute all BG tasks after exit stack

fastapi/routing.py

@@ -22,6 +22,7 @@ from typing import (
     Tuple,
     Type,
     Union,
+    cast,
 )
 
 from annotated_doc import Doc
@@ -106,30 +107,24 @@ def request_response(
             # Starts customization
             response_awaited = False
             background_tasks: BackgroundTasks | None = None
-            initial_task_count = 0
 
             async with AsyncExitStack() as request_stack:
                 scope["fastapi_inner_astack"] = request_stack
                 async with AsyncExitStack() as function_stack:
                     scope["fastapi_function_astack"] = function_stack
                     response = await f(request)
-
+                # Extract background tasks from Request to process them after
-                # Check how many tasks were in the background before awaiting
+                # AsyncExitStack cleanup
-                if background_tasks := scope.get("fastapi_background_tasks"):
+                background_tasks = cast(
-                    initial_task_count = len(background_tasks.tasks)
+                    Union[BackgroundTasks, None], response.background
-
+                )
+                response.background = None
                 await response(scope, receive, send)
                 # Continues customization
                 response_awaited = True
 
-            # After AsyncExitStack cleanup (which includes dependency cleanup),
+            if background_tasks:
-            # check if new background tasks were added and execute them
+                await background_tasks()
-            if background_tasks and len(background_tasks.tasks) > initial_task_count:
-                for task in background_tasks.tasks[initial_task_count:]:
-                    if task.is_async:
-                        await task.func(*task.args, **task.kwargs)
-                    else:
-                        await run_in_threadpool(task.func, *task.args, **task.kwargs)
 
             if not response_awaited:
                 raise FastAPIError(
@@ -405,8 +400,6 @@ def get_request_handler(
             async_exit_stack=async_exit_stack,
             embed_body_fields=embed_body_fields,
         )
-        # Store background tasks in request scope for cleanup monitoring
-        request.scope["fastapi_background_tasks"] = solved_result.background_tasks
         errors = solved_result.errors
         if not errors:
             raw_response = await run_endpoint_function(

tests/test_dependency_contextmanager.py

@@ -363,7 +363,7 @@ def test_background_tasks():
     assert middleware_state["bg"] == "not set"
     assert state["context_b"] == "finished b with a: started a"
     assert state["context_a"] == "finished a"
-    assert state["bg"] == "bg set - b: started b - a: started a"
+    assert state["bg"] == "bg set - b: finished b with a: started a - a: finished a"
 
 
 def test_sync_raise_raises():
@@ -469,7 +469,10 @@ def test_sync_background_tasks():
     assert data["sync_bg"] == "not set"
     assert state["context_b"] == "finished b with a: started a"
     assert state["context_a"] == "finished a"
-    assert state["sync_bg"] == "sync_bg set - b: started b - a: started a"
+    assert (
+        state["sync_bg"]
+        == "sync_bg set - b: finished b with a: started a - a: finished a"
+    )
 
 
 def test_sync_dependency_background_tasks_after_yield():