From 19f11072f7c4ef8c4f8252f7e2f54f7bcdcc98ec Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Fri, 22 Nov 2024 08:36:24 -0500
Subject: [PATCH 1/2] Bump mypy, enable pydantic plugin

---
 fastapi/security/api_key.py | 6 +++---
 pyproject.toml              | 1 +
 requirements-tests.txt      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fastapi/security/api_key.py b/fastapi/security/api_key.py
index 70c2dca8a..6d6dd01d9 100644
--- a/fastapi/security/api_key.py
+++ b/fastapi/security/api_key.py
@@ -100,7 +100,7 @@ class APIKeyQuery(APIKeyBase):
         ] = True,
     ):
         self.model: APIKey = APIKey(
-            **{"in": APIKeyIn.query},  # type: ignore[arg-type]
+            **{"in": APIKeyIn.query},
             name=name,
             description=description,
         )
@@ -188,7 +188,7 @@ class APIKeyHeader(APIKeyBase):
         ] = True,
     ):
         self.model: APIKey = APIKey(
-            **{"in": APIKeyIn.header},  # type: ignore[arg-type]
+            **{"in": APIKeyIn.header},
             name=name,
             description=description,
         )
@@ -276,7 +276,7 @@ class APIKeyCookie(APIKeyBase):
         ] = True,
     ):
         self.model: APIKey = APIKey(
-            **{"in": APIKeyIn.cookie},  # type: ignore[arg-type]
+            **{"in": APIKeyIn.cookie},
             name=name,
             description=description,
         )
diff --git a/pyproject.toml b/pyproject.toml
index 51d63fd44..4b1824d03 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -123,6 +123,7 @@ source-includes = [
 name = "fastapi-slim"
 
 [tool.mypy]
+plugins = ["pydantic.mypy"]
 strict = true
 
 [[tool.mypy.overrides]]
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 4a15844e4..c825bdc88 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -2,7 +2,7 @@
 -r requirements-docs-tests.txt
 pytest >=7.1.3,<9.0.0
 coverage[toml] >= 6.5.0,< 8.0
-mypy ==1.8.0
+mypy ==1.13.0
 dirty-equals ==0.8.0
 sqlmodel==0.0.22
 flask >=1.1.2,<4.0.0

From cfdb9476d4e863f722f5c23f792caf7566eccafd Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Sat, 30 Nov 2024 09:06:18 -0500
Subject: [PATCH 2/2] Refine dataclass check

Change the `dataclasses.is_dataclass` overload used from
```
@overload
def is_dataclass(obj: object) -> TypeIs[DataclassInstance | type[DataclassInstance]]: ...
```
to
```
@overload
def is_dataclass(obj: type) -> TypeIs[type[DataclassInstance]]: ...
```

This fixes the following mypy errors:
```
fastapi/encoders.py:244: error: Argument 1 to "asdict" has incompatible type "DataclassInstance | type[DataclassInstance]"; expected "DataclassInstance"  [arg-type]
fastapi/routing.py:122: error: Argument 1 to "asdict" has incompatible type "DataclassInstance | type[DataclassInstance]"; expected "DataclassInstance"  [arg-type]
Found 2 errors in 2 files (checked 44 source files)
```
---
 fastapi/encoders.py | 2 +-
 fastapi/routing.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastapi/encoders.py b/fastapi/encoders.py
index 451ea0760..c416abbcb 100644
--- a/fastapi/encoders.py
+++ b/fastapi/encoders.py
@@ -240,7 +240,7 @@ def jsonable_encoder(
             custom_encoder=encoders,
             sqlalchemy_safe=sqlalchemy_safe,
         )
-    if dataclasses.is_dataclass(obj):
+    if dataclasses.is_dataclass(type(obj)):
         obj_dict = dataclasses.asdict(obj)
         return jsonable_encoder(
             obj_dict,
diff --git a/fastapi/routing.py b/fastapi/routing.py
index 8ea4bb219..c0d9c821a 100644
--- a/fastapi/routing.py
+++ b/fastapi/routing.py
@@ -118,7 +118,7 @@ def _prepare_response_content(
             )
             for k, v in res.items()
         }
-    elif dataclasses.is_dataclass(res):
+    elif dataclasses.is_dataclass(type(res)):
         return dataclasses.asdict(res)
     return res