From 009cce84e29e568c00506f463979f2ee7c13d4c8 Mon Sep 17 00:00:00 2001
From: Christophe Haen <christophe.haen@cern.ch>
Date: Wed, 27 Mar 2024 05:08:34 +0100
Subject: [PATCH 1/4] Fix evaluating stringified annotations in Python 3.10
 (also from __future__ import annotations)

---
 fastapi/dependencies/utils.py         | 11 +++++++--
 tests/test_future/__init__.py         |  0
 tests/test_future/loging_tool.py      | 10 ++++++++
 tests/test_future/test_future_6465.py | 34 +++++++++++++++++++++++++++
 tests/test_future/test_future_9095.py | 28 ++++++++++++++++++++++
 5 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_future/__init__.py
 create mode 100644 tests/test_future/loging_tool.py
 create mode 100644 tests/test_future/test_future_6465.py
 create mode 100644 tests/test_future/test_future_9095.py

diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py
index 02284b4ed..b316aab7e 100644
--- a/fastapi/dependencies/utils.py
+++ b/fastapi/dependencies/utils.py
@@ -1,4 +1,5 @@
 import inspect
+import sys
 from contextlib import AsyncExitStack, contextmanager
 from copy import deepcopy
 from typing import (
@@ -205,7 +206,10 @@ def get_flat_params(dependant: Dependant) -> List[ModelField]:
 
 
 def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature:
-    signature = inspect.signature(call)
+    if sys.version_info >= (3, 10):
+        signature = inspect.signature(call, eval_str=True)
+    else:
+        signature = inspect.signature(call)
     globalns = getattr(call, "__globals__", {})
     typed_params = [
         inspect.Parameter(
@@ -228,7 +232,10 @@ def get_typed_annotation(annotation: Any, globalns: Dict[str, Any]) -> Any:
 
 
 def get_typed_return_annotation(call: Callable[..., Any]) -> Any:
-    signature = inspect.signature(call)
+    if sys.version_info >= (3, 10):
+        signature = inspect.signature(call, eval_str=True)
+    else:
+        signature = inspect.signature(call)
     annotation = signature.return_annotation
 
     if annotation is inspect.Signature.empty:
diff --git a/tests/test_future/__init__.py b/tests/test_future/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_future/loging_tool.py b/tests/test_future/loging_tool.py
new file mode 100644
index 000000000..bc11fe2f7
--- /dev/null
+++ b/tests/test_future/loging_tool.py
@@ -0,0 +1,10 @@
+from functools import wraps
+
+
+def login_required(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        print("login")
+        return func(*args, **kwargs)
+
+    return wrapper
diff --git a/tests/test_future/test_future_6465.py b/tests/test_future/test_future_6465.py
new file mode 100644
index 000000000..57362c5c7
--- /dev/null
+++ b/tests/test_future/test_future_6465.py
@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+import sys
+
+from ..utils import needs_py310
+
+if sys.version_info > (3, 10):
+    from typing import Optional
+
+    from fastapi import FastAPI
+    from fastapi.testclient import TestClient
+    from pydantic import BaseModel
+
+    from .loging_tool import login_required
+
+    app = FastAPI()
+    client = TestClient(app)
+
+    class Item(BaseModel):
+        name: str
+        description: Optional[str] = None
+        price: float
+        tax: Optional[float] = None
+
+    @app.get("/items/")
+    @login_required
+    def get_item(id: int) -> Item:
+        return Item(name="name", price=42.42)
+
+
+@needs_py310
+def test_future_6465():
+    res = client.get("/items?id=3")
+    assert res.status_code == 200
diff --git a/tests/test_future/test_future_9095.py b/tests/test_future/test_future_9095.py
new file mode 100644
index 000000000..44224f71b
--- /dev/null
+++ b/tests/test_future/test_future_9095.py
@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+import sys
+
+from ..utils import needs_py310
+
+if sys.version_info > (3, 10):
+    from fastapi import Depends, FastAPI
+    from fastapi.testclient import TestClient
+    from starlette.requests import Request
+
+    app = FastAPI()
+
+    client = TestClient(app)
+
+    class Test:
+        def __call__(self, request: Request):
+            return "test"
+
+    @app.get("/test/")
+    def call(test: str = Depends(Test())):
+        return {"test": test}
+
+
+@needs_py310
+def test_call():
+    response = client.get("/test")
+    assert response.status_code == 200

From 9b1cbc5b282553e851a4206af3f72f45ad13e4e9 Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Fri, 23 Aug 2024 16:35:37 +0200
Subject: [PATCH 2/4] refactor unit test to avoid Python check twice

---
 .../{loging_tool.py => login_tool.py}         |  0
 tests/test_future/test_future_6465.py         | 38 +++++++++----------
 tests/test_future/test_future_9095.py         | 25 ++++++------
 3 files changed, 30 insertions(+), 33 deletions(-)
 rename tests/test_future/{loging_tool.py => login_tool.py} (100%)

diff --git a/tests/test_future/loging_tool.py b/tests/test_future/login_tool.py
similarity index 100%
rename from tests/test_future/loging_tool.py
rename to tests/test_future/login_tool.py
diff --git a/tests/test_future/test_future_6465.py b/tests/test_future/test_future_6465.py
index 57362c5c7..3277d9809 100644
--- a/tests/test_future/test_future_6465.py
+++ b/tests/test_future/test_future_6465.py
@@ -1,34 +1,32 @@
 from __future__ import annotations
 
-import sys
+from typing import Optional
 
-from ..utils import needs_py310
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from pydantic import BaseModel
 
-if sys.version_info > (3, 10):
-    from typing import Optional
+from ..utils import needs_py310
+from .login_tool import login_required
 
-    from fastapi import FastAPI
-    from fastapi.testclient import TestClient
-    from pydantic import BaseModel
+app = FastAPI()
+client = TestClient(app)
 
-    from .loging_tool import login_required
 
-    app = FastAPI()
-    client = TestClient(app)
+class Item(BaseModel):
+    name: str
+    description: Optional[str] = None
+    price: float
+    tax: Optional[float] = None
 
-    class Item(BaseModel):
-        name: str
-        description: Optional[str] = None
-        price: float
-        tax: Optional[float] = None
 
-    @app.get("/items/")
-    @login_required
-    def get_item(id: int) -> Item:
-        return Item(name="name", price=42.42)
+@app.get("/items/")
+@login_required
+def get_item(item_id: int) -> Item:
+    return Item(name="name", price=42.42)
 
 
 @needs_py310
 def test_future_6465():
-    res = client.get("/items?id=3")
+    res = client.get("/items?item_id=3")
     assert res.status_code == 200
diff --git a/tests/test_future/test_future_9095.py b/tests/test_future/test_future_9095.py
index 44224f71b..c86cdead0 100644
--- a/tests/test_future/test_future_9095.py
+++ b/tests/test_future/test_future_9095.py
@@ -1,25 +1,24 @@
 from __future__ import annotations
 
-import sys
+from fastapi import Depends, FastAPI
+from fastapi.testclient import TestClient
+from starlette.requests import Request
 
 from ..utils import needs_py310
 
-if sys.version_info > (3, 10):
-    from fastapi import Depends, FastAPI
-    from fastapi.testclient import TestClient
-    from starlette.requests import Request
+app = FastAPI()
 
-    app = FastAPI()
+client = TestClient(app)
 
-    client = TestClient(app)
 
-    class Test:
-        def __call__(self, request: Request):
-            return "test"
+class Test:
+    def __call__(self, request: Request):
+        return "test"
 
-    @app.get("/test/")
-    def call(test: str = Depends(Test())):
-        return {"test": test}
+
+@app.get("/test/")
+def call(test: str = Depends(Test())):
+    return {"test": test}
 
 
 @needs_py310

From 91576992dd7ac280d2321d36754392a668c345ec Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Fri, 23 Aug 2024 16:54:26 +0200
Subject: [PATCH 3/4] expand needs_py310 scope

---
 tests/test_future/test_future_6465.py | 11 +++++------
 tests/test_future/test_future_9095.py |  9 ++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tests/test_future/test_future_6465.py b/tests/test_future/test_future_6465.py
index 3277d9809..f300d6dc6 100644
--- a/tests/test_future/test_future_6465.py
+++ b/tests/test_future/test_future_6465.py
@@ -20,13 +20,12 @@ class Item(BaseModel):
     tax: Optional[float] = None
 
 
-@app.get("/items/")
-@login_required
-def get_item(item_id: int) -> Item:
-    return Item(name="name", price=42.42)
-
-
 @needs_py310
 def test_future_6465():
+    @app.get("/items/")
+    @login_required
+    def get_item(item_id: int) -> Item:
+        return Item(name="name", price=42.42)
+
     res = client.get("/items?item_id=3")
     assert res.status_code == 200
diff --git a/tests/test_future/test_future_9095.py b/tests/test_future/test_future_9095.py
index c86cdead0..0f59fc7cf 100644
--- a/tests/test_future/test_future_9095.py
+++ b/tests/test_future/test_future_9095.py
@@ -16,12 +16,11 @@ class Test:
         return "test"
 
 
-@app.get("/test/")
-def call(test: str = Depends(Test())):
-    return {"test": test}
-
-
 @needs_py310
 def test_call():
+    @app.get("/test/")
+    def call(test: str = Depends(Test())):
+        return {"test": test}
+
     response = client.get("/test")
     assert response.status_code == 200

From 9413db6bd9a69f0829334ea93e38f564b8b82ad6 Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Fri, 23 Aug 2024 17:00:35 +0200
Subject: [PATCH 4/4] remove unnecessary login print

---
 tests/test_future/login_tool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_future/login_tool.py b/tests/test_future/login_tool.py
index bc11fe2f7..e522c7ec8 100644
--- a/tests/test_future/login_tool.py
+++ b/tests/test_future/login_tool.py
@@ -4,7 +4,7 @@ from functools import wraps
 def login_required(func):
     @wraps(func)
     def wrapper(*args, **kwargs):
-        print("login")
+        # login functionality could come here
         return func(*args, **kwargs)
 
     return wrapper