Merge c1f1585dce into 8032e21418

fastapi/dependencies/utils.py

@@ -230,7 +230,8 @@ def get_flat_params(dependant: Dependant) -> List[ModelField]:
 
 def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature:
     signature = inspect.signature(call)
-    globalns = getattr(call, "__globals__", {})
+    nsobj = inspect.unwrap(call)
+    globalns = getattr(nsobj, "__globals__", {})
     typed_params = [
         inspect.Parameter(
             name=param.name,

tests/forward_reference_type.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+
+
+def forwardref_method(input: "ForwardRef") -> "ForwardRef":
+    return ForwardRef(x=input.x + 1)
+
+
+class ForwardRef(BaseModel):
+    x: int = 0

tests/test_wrapped_method_forward_reference.py

@@ -0,0 +1,31 @@
+import functools
+
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+
+from .forward_reference_type import forwardref_method
+
+
+def passthrough(f):
+    @functools.wraps(f)
+    def method(*args, **kwargs):
+        return f(*args, **kwargs)
+
+    return method
+
+
+def test_wrapped_method_type_inference():
+    """
+    Regression test ensuring that when a method imported from another module
+    is decorated with something that sets the __wrapped__ attribute, then
+    the types are still processed correctly, including dereferencing of forward
+    references.
+    """
+    app = FastAPI()
+    client = TestClient(app)
+    app.post("/endpoint")(passthrough(forwardref_method))
+    app.post("/endpoint2")(passthrough(passthrough(forwardref_method)))
+    with client:
+        response = client.post("/endpoint", json={"input": {"x": 0}})
+        response2 = client.post("/endpoint2", json={"input": {"x": 0}})
+    assert response.json() == response2.json() == {"x": 1}