← pod_r5_v1h

fastapi_14301

resolved RESOLVED PASS · 7 tool calls · 40 s · fastapi/fastapi

Task input

🐛 Fix `Depends(func, scope='function')` for top level (parameterless) dependencies

**Summary**

This PR enables proper support for `scope="function"` on `APIRoute` dependencies by passing the dependency’s scope through to `get_dependant`. Previously, parameter-less dependencies created via `get_parameterless_sub_dependant` ignored `depends.scope`, which led to unexpected behavior for function-scoped dependencies.

**Motivation**

Users expect `scope="function"` to work as defined, even when registered at the route level. Because `depends.scope` wasn’t forwarded, function scope behaved like the default(request). This change aligns behavior with user expectations and documentation around dependency scopes.
(Related: #14296)

Tool calls (8)

#ToolArgumentsResult
1run_command
{
 "command": "grep -rn \"get_parameterless_sub_dependant\" . | head -20"
}
{"status": "ok", "stdout": "./fastapi/dependencies/utils.py:124:def get_parameterless_sub_dependant(*, depends: params.Depends, path: str) -> Dependant:\n./fast
full
{"status": "ok", "stdout": "./fastapi/dependencies/utils.py:124:def get_parameterless_sub_dependant(*, depends: params.Depends, path: str) -> Dependant:\n./fastapi/routing.py:44:    get_parameterless_sub_dependant,\n./fastapi/routing.py:489:                get_parameterless_sub_dependant(depends=depends, path=self.path_format),\n./fastapi/routing.py:642:                get_parameterless_sub_dependant(depends=depends, path=self.path_format),\n", "stderr": "", "exit_code": 0}
2run_command
{
 "command": "sed -n '120,140p' fastapi/dependencies/utils.py"
}
{"status": "ok", "stdout": " logger.error(multipart_not_installed_error)\n raise RuntimeError(multipart_not_installed_error) from None\n\n\ndef get_parameterles
full
{"status": "ok", "stdout": "            logger.error(multipart_not_installed_error)\n            raise RuntimeError(multipart_not_installed_error) from None\n\n\ndef get_parameterless_sub_dependant(*, depends: params.Depends, path: str) -> Dependant:\n    assert callable(depends.dependency), (\n        \"A parameter-less dependency must have a callable dependency\"\n    )\n    use_security_scopes: List[str] = []\n    if isinstance(depends, params.Security) and depends.scopes:\n        use_security_scopes.extend(depends.scopes)\n    return get_dependant(\n        path=path, call=depends.dependency, security_scopes=use_security_scopes\n    )\n\n\ndef get_flat_dependant(\n    dependant: Dependant,\n    *,\n    skip_repeats: bool = False,\n    visited: Optional[List[DependencyCacheKey]] = None,\n", "stderr": "", "exit_code": 0}
3run_command
{
 "command": "grep -n \"def get_dependant\" fastapi/dependencies/utils.py"
}
{"status": "ok", "stdout": "226:def get_dependant(\n", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "226:def get_dependant(\n", "stderr": "", "exit_code": 0}
4run_command
{
 "command": "sed -n '226,250p' fastapi/dependencies/utils.py"
}
{"status": "ok", "stdout": "def get_dependant(\n *,\n path: str,\n call: Callable[..., Any],\n name: Optional[str] = None,\n security_scopes: Optional[List[str]
full
{"status": "ok", "stdout": "def get_dependant(\n    *,\n    path: str,\n    call: Callable[..., Any],\n    name: Optional[str] = None,\n    security_scopes: Optional[List[str]] = None,\n    use_cache: bool = True,\n    scope: Union[Literal[\"function\", \"request\"], None] = None,\n) -> Dependant:\n    dependant = Dependant(\n        call=call,\n        name=name,\n        path=path,\n        security_scopes=security_scopes,\n        use_cache=use_cache,\n        scope=scope,\n    )\n    path_param_names = get_path_param_names(path)\n    endpoint_signature = get_typed_signature(call)\n    signature_params = endpoint_signature.parameters\n    if isinstance(call, SecurityBase):\n        use_scopes: List[str] = []\n        if isinstance(call, (OAuth2, OpenIdConnect)):\n            use_scopes = security_scopes or use_scopes\n        security_requirement = SecurityRequirement(\n", "stderr": "", "exit_code": 0}
5run_command
{
 "command": "python3 - <<'PY'\nfrom pathlib import Path\np = Path(\"fastapi/dependencies/utils.py\")\ns = p.read_text()\nold = \"\"\"def get_parameterless_sub_dependant(*, depends: params.Depends, path: str) -> Dependant:\n    assert callable(depends.dependency), (\n        \"A parameter-less dependency must have a callable dependency\"\n    )\n    use_security_scopes: List[str] = []\n    if isinstance(depends, params.Security) and depends.scopes:\n        use_security_scopes.extend(depends.scopes)\n    return get_dependant(\n        path=path, call=depends.dependency, security_scopes=use_security_scopes\n    )\"\"\"\nnew = \"\"\"def get_parameterless_sub_dependant(*, depends: params.Depends, path: str) -> Dependant:\n    assert callable(depends.dependency), (\n        \"A parameter-less dependency must have a callable dependency\"\n    )\n    use_security_scopes: List[str] = []\n    if isinstance(depends, params.Security) and depends.scopes:\n        use_security_scopes.extend(depends.scopes)\n    return get_dependant(\n        path=path, call=depends.dependency, security_scopes=use_security_scopes, scope=depends.scope\n    )\"\"\"\nassert s.count(old) == 1, (\"old text found this many times:\", s.count(old))\nt = s.replace(old, new)\n# Verify it compiles\ncompile(t, str(p), \"exec\")\np.write_text(t)\nPY\n"
}
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
6run_command
{
 "command": "python3 -m py_compile fastapi/dependencies/utils.py"
}
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
7run_command
{
 "command": "git diff"
}
{"status": "ok", "stdout": "diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py\nindex c5c6b69b..f71e84ee 100644\n--- a/fastapi/dependenc
full
{"status": "ok", "stdout": "diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py\nindex c5c6b69b..f71e84ee 100644\n--- a/fastapi/dependencies/utils.py\n+++ b/fastapi/dependencies/utils.py\n@@ -129,7 +129,7 @@ def get_parameterless_sub_dependant(*, depends: params.Depends, path: str) -> De\n     if isinstance(depends, params.Security) and depends.scopes:\n         use_security_scopes.extend(depends.scopes)\n     return get_dependant(\n-        path=path, call=depends.dependency, security_scopes=use_security_scopes\n+        path=path, call=depends.dependency, security_scopes=use_security_scopes, scope=depends.scope\n     )\n \n \n", "stderr": "", "exit_code": 0}
8submit_patch
{}
{"status": "ok", "patch_size": 618, "files_changed": 1}
full
{"status": "ok", "patch_size": 618, "files_changed": 1}

Patch

diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py
index c5c6b69b..f71e84ee 100644
--- a/fastapi/dependencies/utils.py
+++ b/fastapi/dependencies/utils.py
@@ -129,7 +129,7 @@ def get_parameterless_sub_dependant(*, depends: params.Depends, path: str) -> De
     if isinstance(depends, params.Security) and depends.scopes:
         use_security_scopes.extend(depends.scopes)
     return get_dependant(
-        path=path, call=depends.dependency, security_scopes=use_security_scopes
+        path=path, call=depends.dependency, security_scopes=use_security_scopes, scope=depends.scope
     )

Test output

show
...........                                                              [100%]
=============================== warnings summary ===============================
../../../../../../../Users/jp/repos/kaggle-gemini-coding-agent-post-training/.envs/overlays/starlette-0.49.3-py3-none-any/starlette/testclient.py:51
  /Users/jp/repos/kaggle-gemini-coding-agent-post-training/.envs/overlays/starlette-0.49.3-py3-none-any/starlette/testclient.py:51: DeprecationWarning: The anyio.abc.BlockingPortal alias is deprecated, use anyio.from_thread.BlockingPortal instead.
    _PortalFactoryType = Callable[[], AbstractContextManager[anyio.abc.BlockingPortal]]

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
11 passed, 1 warning in 0.59s