🎨 Auto format

Author: pre-commit-ci-lite[bot]

sqlmodel/main.py

@@ -582,12 +582,12 @@ def __new__(
             # Also check model_config in class_dict
             config_dict = class_dict.get("model_config", {})
             if isinstance(config_dict, dict):
-                model_fields_optional = config_dict.get(
-                    "model_fields_optional", None
-                )
+                model_fields_optional = config_dict.get("model_fields_optional", None)
         if model_fields_optional == "all":
             for base in bases:
-                base_fields = get_model_fields(base) if hasattr(base, "model_fields") else {}
+                base_fields = (
+                    get_model_fields(base) if hasattr(base, "model_fields") else {}
+                )
                 for field_name, field_info in base_fields.items():
                     # Only modify fields not explicitly redefined in this class
                     if field_name not in pydantic_annotations:

tests/test_model_fields_optional.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import pytest
 from pydantic import ValidationError
 from sqlmodel import Field, SQLModel
@@ -13,7 +11,7 @@ def test_model_fields_optional_basic(clear_sqlmodel):
     class HeroBase(SQLModel):
         name: str
         secret_name: str
-        age: Optional[int] = None
+        age: int | None = None
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         pass
@@ -35,7 +33,7 @@ def test_model_fields_optional_partial_data(clear_sqlmodel):
     class HeroBase(SQLModel):
         name: str
         secret_name: str
-        age: Optional[int] = None
+        age: int | None = None
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         pass
@@ -53,7 +51,7 @@ def test_model_fields_optional_exclude_unset(clear_sqlmodel):
     class HeroBase(SQLModel):
         name: str
         secret_name: str
-        age: Optional[int] = None
+        age: int | None = None
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         pass
@@ -70,7 +68,7 @@ def test_model_fields_optional_override_field(clear_sqlmodel):
     class HeroBase(SQLModel):
         name: str
         secret_name: str
-        age: Optional[int] = None
+        age: int | None = None
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         name: str  # Keep name required
@@ -95,7 +93,7 @@ def test_model_fields_optional_preserves_constraints(clear_sqlmodel):
 
     class HeroBase(SQLModel):
         name: str = Field(min_length=1)
-        age: Optional[int] = Field(default=None, ge=0)
+        age: int | None = Field(default=None, ge=0)
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         pass
@@ -149,7 +147,7 @@ def test_model_fields_optional_via_model_config(clear_sqlmodel):
     class HeroBase(SQLModel):
         name: str
         secret_name: str
-        age: Optional[int] = None
+        age: int | None = None
 
     class HeroUpdate(HeroBase):
         model_config = SQLModelConfig(model_fields_optional="all")
@@ -170,10 +168,10 @@ def test_model_fields_optional_with_table_base(clear_sqlmodel):
     class HeroBase(SQLModel):
         name: str
         secret_name: str
-        age: Optional[int] = None
+        age: int | None = None
 
     class Hero(HeroBase, table=True):
-        id: Optional[int] = Field(default=None, primary_key=True)
+        id: int | None = Field(default=None, primary_key=True)
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         pass
@@ -194,8 +192,8 @@ def test_model_fields_optional_already_optional_fields(clear_sqlmodel):
 
     class HeroBase(SQLModel):
         name: str
-        nickname: Optional[str] = "Unknown"
-        age: Optional[int] = None
+        nickname: str | None = "Unknown"
+        age: int | None = None
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         pass
@@ -215,7 +213,7 @@ def test_model_fields_optional_model_validate(clear_sqlmodel):
     class HeroBase(SQLModel):
         name: str
         secret_name: str
-        age: Optional[int] = None
+        age: int | None = None
 
     class HeroUpdate(HeroBase, model_fields_optional="all"):
         pass