Merge branch 'main' into dependabot/uv/python-packages-fa30b79da8

Author: svlandeg

sqlmodel/main.py

@@ -903,6 +903,7 @@ def model_dump(
         warnings: bool | Literal["none", "warn", "error"] = True,
         fallback: Callable[[Any], Any] | None = None,  # v2.11
         serialize_as_any: bool = False,  # v2.7
+        polymorphic_serialization: bool | None = None,  # v2.13
     ) -> builtins.dict[str, Any]:
         if PYDANTIC_MINOR_VERSION < (2, 11):
             by_alias = by_alias or False
@@ -913,6 +914,8 @@ def model_dump(
             extra_kwargs["fallback"] = fallback
         if PYDANTIC_MINOR_VERSION >= (2, 12):
             extra_kwargs["exclude_computed_fields"] = exclude_computed_fields
+        if PYDANTIC_MINOR_VERSION >= (2, 13):
+            extra_kwargs["polymorphic_serialization"] = polymorphic_serialization
         return super().model_dump(
             mode=mode,
             include=include,

tests/test_pydantic/test_model_dump.py

@@ -0,0 +1,47 @@
+from typing import Any
+
+import pytest
+from sqlmodel import SQLModel
+from sqlmodel._compat import PYDANTIC_MINOR_VERSION
+
+
+@pytest.mark.parametrize(
+    ("polymorphic_serialization", "expected_result"),
+    [
+        (None, {"user": {"name": "pydantic"}}),
+        (False, {"user": {"name": "pydantic"}}),
+        pytest.param(
+            True,
+            {"user": {"name": "pydantic", "password": "password"}},
+            marks=pytest.mark.skipif(
+                PYDANTIC_MINOR_VERSION < (2, 13),
+                reason="polymorphic_serialization is only available in Pydantic v2.13+",
+            ),
+        ),
+    ],
+)
+def test_polymorphic_serialization(
+    polymorphic_serialization: bool | None, expected_result: dict[str, Any]
+):
+
+    class User(SQLModel):
+        name: str
+
+    class UserLogin(User):
+        password: str
+
+    class OuterModel(SQLModel):
+        user: User
+
+    outer_model = OuterModel(
+        user=UserLogin(name="pydantic", password="password"),
+    )
+
+    assert (
+        outer_model.model_dump(polymorphic_serialization=polymorphic_serialization)
+        == expected_result
+    )
+
+    assert outer_model.model_dump(polymorphic_serialization=False) == {
+        "user": {"name": "pydantic"}
+    }