🚨 Fix types for new Pydantic (#1131)

fastapi · Oct 7, 2024 · aa814e2 · aa814e2
1 parent 79ef8d0
commit aa814e2
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/sqlmodel/main.py b/sqlmodel/main.py
@@ -52,7 +52,7 @@
 from sqlalchemy.orm.instrumentation import is_instrumented
 from sqlalchemy.sql.schema import MetaData
 from sqlalchemy.sql.sqltypes import LargeBinary, Time, Uuid
-from typing_extensions import Literal, deprecated, get_origin
+from typing_extensions import Literal, TypeAlias, deprecated, get_origin
 
 from ._compat import (  # type: ignore[attr-defined]
     IS_PYDANTIC_V2,
@@ -90,7 +90,12 @@
 
 _T = TypeVar("_T")
 NoArgAnyCallable = Callable[[], Any]
-IncEx = Union[Set[int], Set[str], Dict[int, Any], Dict[str, Any], None]
+IncEx: TypeAlias = Union[
+    Set[int],
+    Set[str],
+    Mapping[int, Union["IncEx", Literal[True]]],
+    Mapping[str, Union["IncEx", Literal[True]]],
+]
 OnDeleteType = Literal["CASCADE", "SET NULL", "RESTRICT"]
 
 
@@ -858,8 +863,8 @@ def model_dump(
         self,
         *,
         mode: Union[Literal["json", "python"], str] = "python",
-        include: IncEx = None,
-        exclude: IncEx = None,
+        include: Union[IncEx, None] = None,
+        exclude: Union[IncEx, None] = None,
         context: Union[Dict[str, Any], None] = None,
         by_alias: bool = False,
         exclude_unset: bool = False,
@@ -908,8 +913,8 @@ def model_dump(
     def dict(
         self,
         *,
-        include: IncEx = None,
-        exclude: IncEx = None,
+        include: Union[IncEx, None] = None,
+        exclude: Union[IncEx, None] = None,
         by_alias: bool = False,
         exclude_unset: bool = False,
         exclude_defaults: bool = False,