fastapi-injected 0.3.2__tar.gz → 0.3.3__tar.gz

{fastapi_injected-0.3.2 → fastapi_injected-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: fastapi-injected
-Version: 0.3.2
+Version: 0.3.3
 Summary: Yet another library to reuse fastapi dependency injection
 Project-URL: Repository, https://github.com/uriyyo/fastapi-injected
 Author-email: Yurii Karabas <1998uriyyo@gmail.com>

{fastapi_injected-0.3.2 → fastapi_injected-0.3.3}/fastapi_injected/_bind.py

@@ -1,12 +1,12 @@
 import inspect
 from collections.abc import Callable, Sequence
 from functools import wraps
-from typing import Annotated, Any, Concatenate, overload
+from typing import Annotated, Any, Concatenate, get_origin, overload
 
 from fastapi.dependencies.utils import get_typed_signature
 from fastapi.params import Depends
 
-from ._deps_tp import is_dep
+from ._deps_tp import unwrap_tp
 from .sign import update_func_sign
 from .types import AsyncFunc, DepOf, Func
 
@@ -33,13 +33,15 @@ def _dep_arg_index(name: str, /) -> int | None:
     return int(index) if index.isdigit() else None
 
 
+def _is_annotation(tp: Any, /) -> bool:
+    return get_origin(unwrap_tp(tp)) is Annotated
+
+
 def _dep_annotation(dep: DepOf[Any] | Callable[..., Any], /) -> Any:
     if isinstance(dep, Depends):
         return Annotated[Any, dep]
 
-    # a marker is an annotation already, while a callable is a dependency the same way
-    # `resolve` takes one - anything else is left as it was written
-    if is_dep(dep) or not callable(dep):
+    if _is_annotation(dep) or not callable(dep):
         return dep
 
     return Annotated[Any, Depends(dep)]

{fastapi_injected-0.3.2 → fastapi_injected-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-injected"
-version = "0.3.2"
+version = "0.3.3"
 description = "Yet another library to reuse fastapi dependency injection"
 authors = [
     { name = "Yurii Karabas", email = "1998uriyyo@gmail.com" },

{fastapi_injected-0.3.2 → fastapi_injected-0.3.3}/tests/test_bind.py

@@ -2,9 +2,19 @@ from dataclasses import dataclass
 from typing import Annotated, Any
 
 import pytest
-from fastapi import Depends
-
-from fastapi_injected import Given, bind_deps, inject, push_inject_scope, push_overrides, resolve, signature_with_deps
+from fastapi import Depends, FastAPI, Header
+from fastapi.testclient import TestClient
+
+from fastapi_injected import (
+    Given,
+    bind_deps,
+    init_inject_scope,
+    inject,
+    push_inject_scope,
+    push_overrides,
+    resolve,
+    signature_with_deps,
+)
 from fastapi_injected._bind import UnboundDepArgsError, dep_arg_name, remap_dep_args, take_dep_args
 
 pytestmark = pytest.mark.asyncio
@@ -87,6 +97,30 @@ async def test_a_dependency_can_be_bound_however_it_is_written(dep):
     assert await resolve(bind_deps(describe, Given(Doc()), dep)) == "readme:admin"
 
 
+TitleHeader = Annotated[str, Header(alias="x-title")]
+
+
+async def titled(title: str, role: Role) -> str:
+    return f"{title}:{role.name}"
+
+
+async def test_a_request_marker_is_bound_as_written() -> None:
+    sign = signature_with_deps(titled, TitleHeader, RoleDep)
+
+    assert next(iter(sign.parameters.values())).annotation == TitleHeader
+
+
+async def test_a_request_marker_resolves_from_the_request() -> None:
+    app = FastAPI(dependencies=[Depends(init_inject_scope)])
+
+    @app.get("/marker")
+    async def _route(described: Annotated[str, Depends(bind_deps(titled, TitleHeader, RoleDep))]) -> str:
+        return described
+
+    with TestClient(app) as client:
+        assert client.get("/marker", headers={"x-title": "readme"}).json() == "readme:admin"
+
+
 async def test_signature_with_deps_names_the_bound_parameters() -> None:
     sign = signature_with_deps(describe, Given(Doc()), RoleDep)
 

{fastapi_injected-0.3.2 → fastapi_injected-0.3.3}/uv.lock

@@ -186,7 +186,7 @@ wheels = [
 
 [[package]]
 name = "fastapi-injected"
-version = "0.3.2"
+version = "0.3.3"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },