🎨 Increase unit test and improve compatibility

Author: KimigaiiWuyi

pyproject.toml

@@ -135,3 +135,9 @@ known-third-party = ["sqlmodel", "sqlalchemy", "pydantic", "fastapi"]
 [tool.ruff.lint.pyupgrade]
 # Preserve types, even if a file imports `from __future__ import annotations`.
 keep-runtime-typing = true
+
+[tool.pytest.ini_options]
+filterwarnings = [
+    "always::DeprecationWarning",
+    "ignore:.*:DeprecationWarning:typing_extensions"
+]

sqlmodel/main.py

@@ -1,5 +1,6 @@
 import ipaddress
 import uuid
+import inspect as inspect_module
 import weakref
 from datetime import date, datetime, time, timedelta
 from decimal import Decimal
@@ -26,6 +27,7 @@
 )
 
 from pydantic import BaseModel, EmailStr
+from pydantic import Field as PydanticField
 from pydantic.fields import FieldInfo as PydanticFieldInfo
 from sqlalchemy import (
     Boolean,
@@ -52,7 +54,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, TypeAlias, deprecated, get_origin
+from typing_extensions import Annotated, Literal, TypeAlias, deprecated, get_origin
 
 from ._compat import (  # type: ignore[attr-defined]
     IS_PYDANTIC_V2,
@@ -98,6 +100,9 @@
 ]
 OnDeleteType = Literal["CASCADE", "SET NULL", "RESTRICT"]
 
+FIELD_ACCEPTED_KWARGS = set(inspect_module.signature(PydanticField).parameters.keys())
+FIELD_ACCEPTED_KWARGS.remove('json_schema_extra')
+
 
 def __dataclass_transform__(
     *,
@@ -248,7 +253,19 @@ def Field(
     sa_type: Union[Type[Any], UndefinedType] = Undefined,
     sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined,
     sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined,
-    schema_extra: Optional[Dict[str, Any]] = None,
+    schema_extra: Annotated[
+        Optional[Dict[str, Any]],
+        deprecated(
+            """
+            This parameter is deprecated.
+            Use `json_schema_extra` to add extra information to the JSON schema.
+            Use `pydantic_kwargs` to pass additional parameters to `Field` that are not
+            part of this interface, but accepted by Pydantic's Field.
+            """
+        ),
+    ] = None,
+    json_schema_extra: Optional[Dict[str, Any]] = None,
+    pydantic_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Any: ...
 
 
@@ -294,8 +311,19 @@ def Field(
     sa_type: Union[Type[Any], UndefinedType] = Undefined,
     sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined,
     sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined,
-    schema_extra: Optional[Dict[str, Any]] = None,
+    schema_extra: Annotated[
+        Optional[Dict[str, Any]],
+        deprecated(
+            """
+            This parameter is deprecated.
+            Use `json_schema_extra` to add extra information to the JSON schema.
+            Use `pydantic_kwargs` to pass additional parameters to `Field` that are not
+            part of this interface, but accepted by Pydantic's Field.
+            """
+        ),
+    ] = None,
     json_schema_extra: Optional[Dict[str, Any]] = None,
+    pydantic_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Any: ...
 
 
@@ -341,8 +369,19 @@ def Field(
     discriminator: Optional[str] = None,
     repr: bool = True,
     sa_column: Union[Column[Any], UndefinedType] = Undefined,
-    schema_extra: Optional[Dict[str, Any]] = None,
+    schema_extra: Annotated[
+        Optional[Dict[str, Any]],
+        deprecated(
+            """
+            This parameter is deprecated.
+            Use `json_schema_extra` to add extra information to the JSON schema.
+            Use `pydantic_kwargs` to pass additional parameters to `Field` that are not
+            part of this interface, but accepted by Pydantic's Field.
+            """
+        ),
+    ] = None,
     json_schema_extra: Optional[Dict[str, Any]] = None,
+    pydantic_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Any: ...
 
 
@@ -386,12 +425,40 @@ def Field(
     sa_column: Union[Column, UndefinedType] = Undefined,  # type: ignore
     sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined,
     sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined,
-    schema_extra: Optional[Dict[str, Any]] = None,
+    schema_extra: Annotated[
+        Optional[Dict[str, Any]],
+        deprecated(
+            """
+            This parameter is deprecated.
+            Use `json_schema_extra` to add extra information to the JSON schema.
+            Use `pydantic_kwargs` to pass additional parameters to `Field` that are not
+            part of this interface, but accepted by Pydantic's Field.
+            """
+        ),
+    ] = None,
     json_schema_extra: Optional[Dict[str, Any]] = None,
+    pydantic_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Any:
+    if schema_extra and (json_schema_extra or pydantic_kwargs):
+        raise RuntimeError(
+            "Passing schema_extra is not supported when "
+            "also passing a json_schema_extra"
+        )
+
+    current_pydantic_kwargs = pydantic_kwargs or {}
+    current_json_schema_extra = json_schema_extra or {}
     current_schema_extra = schema_extra or {}
-    if json_schema_extra:
-        current_schema_extra["json_schema_extra"] = json_schema_extra
+
+    if current_schema_extra:
+        for key, value in current_schema_extra.items():
+            if key in FIELD_ACCEPTED_KWARGS:
+                current_pydantic_kwargs[key] = value
+            else:
+                current_json_schema_extra[key] = value
+
+    print(current_pydantic_kwargs)
+    print(current_json_schema_extra)
+
     field_info = FieldInfo(
         default,
         default_factory=default_factory,
@@ -427,7 +494,8 @@ def Field(
         sa_column=sa_column,
         sa_column_args=sa_column_args,
         sa_column_kwargs=sa_column_kwargs,
-        **current_schema_extra,
+        json_schema_extra=current_json_schema_extra,
+        **current_pydantic_kwargs,
     )
     post_init_field_info(field_info)
     return field_info

tests/test_field_pd_and_json_kwarrgs.py

@@ -0,0 +1,84 @@
+from sqlmodel import Field, SQLModel
+import pytest
+
+
+def test_json_schema_extra_applied():
+    '''test json_schema_extra is applied to the field'''
+
+    class Item(SQLModel):
+        name: str = Field(
+            json_schema_extra={
+                "example": "Sword of Power",
+                "x-custom-key": "Important Data",
+            }
+        )
+
+    schema = Item.model_json_schema()
+
+    name_schema = schema["properties"]["name"]
+
+    assert name_schema["example"] == "Sword of Power"
+    assert name_schema["x-custom-key"] == "Important Data"
+
+
+def test_pydantic_kwargs_applied():
+    '''test pydantic_kwargs is applied to the field'''
+
+    class User(SQLModel):
+        user_name: str = Field(pydantic_kwargs={"validation_alias": "UserNameInInput"})
+
+    field_info = User.model_fields["user_name"]
+
+    assert field_info.validation_alias == "UserNameInInput"
+
+    data = {"UserNameInInput": "KimigaiiWuyi"}
+    user = User.model_validate(data)
+    assert user.user_name == "KimigaiiWuyi"
+
+
+def test_schema_extra_and_new_param_conflict():
+    with pytest.raises(RuntimeError) as excinfo:
+
+        class ItemA(SQLModel):
+            name: str = Field(
+                schema_extra={"legacy": 1},
+                json_schema_extra={"new": 2},
+            )
+
+    assert "Passing schema_extra is not supported" in str(excinfo.value)
+
+    with pytest.raises(RuntimeError) as excinfo:
+
+        class ItemB(SQLModel):
+            name: str = Field(
+                schema_extra={"legacy": 1},
+                pydantic_kwargs={"alias": "Alias"},
+            )
+
+    assert "Passing schema_extra is not supported" in str(excinfo.value)
+
+
+def test_schema_extra_backward_compatibility():
+    """
+    test that schema_extra is backward compatible with json_schema_extra
+    """
+
+    # 1. 定义一个仅使用 schema_extra 的模型
+    class LegacyItem(SQLModel):
+        name: str = Field(
+            schema_extra={
+                "example": "Sword of Old",
+                "x-custom-key": "Important Data",
+                "serialization_alias": "id_test",
+            }
+        )
+
+    schema = LegacyItem.model_json_schema()
+
+    name_schema = schema["properties"]["name"]
+
+    assert name_schema["example"] == "Sword of Old"
+    assert name_schema["x-custom-key"] == "Important Data"
+
+    field_info = LegacyItem.model_fields["name"]
+    assert field_info.serialization_alias == "id_test"