← eval3_submission

fastapi_14301

resolved RESOLVED PASS · 6 tool calls · 16 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 (7)

#ToolArgumentsResult
1run_command
{
 "command": "grep -rn \"get_parameterless_sub_dependant\" ."
}
{"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", "exit_code": 0}
2read_file
{
 "filepath": "fastapi/dependencies/utils.py",
 "start_line": 120,
 "end_line": 140
}
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "content": " logger.error(multipart_not_installed_error)\n raise RuntimeError(multipart_not_instal
full
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "content": "            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", "start_line": 120, "end_line": 140, "total_lines": 1020, "is_truncated": false}
3read_file
{
 "end_line": 100,
 "filepath": "fastapi/dependencies/utils.py",
 "start_line": 50
}
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "content": "from fastapi._compat.shared import annotation_is_pydantic_v1\nfrom fastapi.background
full
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "content": "from fastapi._compat.shared import annotation_is_pydantic_v1\nfrom fastapi.background import BackgroundTasks\nfrom fastapi.concurrency import (\n    asynccontextmanager,\n    contextmanager_in_threadpool,\n)\nfrom fastapi.dependencies.models import Dependant, SecurityRequirement\nfrom fastapi.exceptions import DependencyScopeError\nfrom fastapi.logger import logger\nfrom fastapi.security.base import SecurityBase\nfrom fastapi.security.oauth2 import OAuth2, SecurityScopes\nfrom fastapi.security.open_id_connect_url import OpenIdConnect\nfrom fastapi.types import DependencyCacheKey\nfrom fastapi.utils import create_model_field, get_path_param_names\nfrom pydantic import BaseModel\nfrom pydantic.fields import FieldInfo\nfrom starlette.background import BackgroundTasks as StarletteBackgroundTasks\nfrom starlette.concurrency import run_in_threadpool\nfrom starlette.datastructures import (\n    FormData,\n    Headers,\n    ImmutableMultiDict,\n    QueryParams,\n    UploadFile,\n)\nfrom starlette.requests import HTTPConnection, Request\nfrom starlette.responses import Response\nfrom starlette.websockets import WebSocket\nfrom typing_extensions import Annotated, Literal, get_args, get_origin\n\nfrom .. import temp_pydantic_v1_params\n\nmultipart_not_installed_error = (\n    'Form data requires \"python-multipart\" to be installed. \\n'\n    'You can install \"python-multipart\" with: \\n\\n'\n    \"pip install python-multipart\\n\"\n)\nmultipart_incorrect_install_error = (\n    'Form data requires \"python-multipart\" to be installed. '\n    'It seems you installed \"multipart\" instead. \\n'\n    'You can remove \"multipart\" with: \\n\\n'\n    \"pip uninstall multipart\\n\\n\"\n    'And then install \"python-multipart\" with: \\n\\n'\n    \"pip install python-multipart\\n\"\n)\n\n\ndef ensure_multipart_is_installed() -> None:\n    try:\n        from python_multipart import __version__\n\n", "start_li
4run_command
{
 "command": "grep -rn \"def get_dependant\" fastapi/dependencies/utils.py"
}
{"status": "ok", "stdout": "226:def get_dependant(\n", "exit_code": 0}
full
{"status": "ok", "stdout": "226:def get_dependant(\n", "exit_code": 0}
5read_file
{
 "end_line": 260,
 "filepath": "fastapi/dependencies/utils.py",
 "start_line": 226
}
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "content": "def get_dependant(\n *,\n path: str,\n call: Callable[..., Any],\n name: Optional[str]
full
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "content": "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            security_scheme=call, scopes=use_scopes\n        )\n        dependant.security_requirements.append(security_requirement)\n    for param_name, param in signature_params.items():\n        is_path_param = param_name in path_param_names\n        param_details = analyze_param(\n            param_name=param_name,\n            annotation=param.annotation,\n            value=param.default,\n            is_path_param=is_path_param,\n", "start_line": 226, "end_line": 260, "total_lines": 1020, "is_truncated": false}
6edit_file
{
 "filepath": "fastapi/dependencies/utils.py",
 "new_string": "    return get_dependant(\n        path=path, call=depends.dependency, security_scopes=use_security_scopes, scope=depends.scope\n    )",
 "old_string": "    return get_dependant(\n        path=path, call=depends.dependency, security_scopes=use_security_scopes\n    )"
}
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/fastapi/dependencies/utils.py\n+++ b/fastapi
full
{"status": "ok", "filepath": "fastapi/dependencies/utils.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/fastapi/dependencies/utils.py\n+++ b/fastapi/dependencies/utils.py\n@@ -129,7 +129,7 @@\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", "is_truncated": false}
7submit_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 ===============================
../../../../../../kaggle/tmp/envs/overlays/starlette-0.49.3-py3-none-any/starlette/testclient.py:51
  /kaggle/tmp/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.76s