Fix make_partial_model (apache#63716)

pierrejeambrun · web-flow · commit 0e1832cd3cd5 · 2026-03-18T13:05:21.000+01:00
* Fix make_partial_model * Revert "Bump pydantic min version to 2.12.3 (apache#63570)" This reverts commit 9516a77. * Fix CI
diff --git a/airflow-core/pyproject.toml b/airflow-core/pyproject.toml
@@ -125,7 +125,7 @@ dependencies = [
     'pendulum>=3.1.0',
     "pluggy>=1.5.0",
     "psutil>=5.8.0",
-    "pydantic>=2.12.3",
+    "pydantic>=2.11.0",
     # Pygments 2.19.0 improperly renders .ini files with dictionaries as values
     # See https://github.com/pygments/pygments/issues/2834
     "pygments>=2.0.1,!=2.19.0",
diff --git a/airflow-core/src/airflow/api_fastapi/core_api/base.py b/airflow-core/src/airflow/api_fastapi/core_api/base.py
@@ -17,7 +17,6 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from copy import deepcopy
 from typing import TYPE_CHECKING, Generic, TypeVar, Union, get_args, get_origin
 
 from pydantic import BaseModel as PydanticBaseModel, ConfigDict, create_model
@@ -54,12 +53,13 @@ def make_partial_model(model: type[PydanticBaseModel]) -> type[PydanticBaseModel
     """Create a version of a Pydantic model where all fields are Optional with default=None."""
     field_overrides: dict = {}
     for field_name, field_info in model.model_fields.items():
-        new_info = deepcopy(field_info)
         ann = field_info.annotation
         origin = get_origin(ann)
         if not (origin is Union and type(None) in get_args(ann)):
             ann = ann | None  # type: ignore[operator, assignment]
+        new_info = field_info._copy()
         new_info.default = None
+        new_info._attributes_set["default"] = None
         field_overrides[field_name] = (ann, new_info)
 
     return create_model(
diff --git a/airflow-core/tests/unit/api_fastapi/core_api/test_base.py b/airflow-core/tests/unit/api_fastapi/core_api/test_base.py
@@ -41,6 +41,16 @@ def name_must_not_be_empty(cls, v: str) -> str:
 SampleModelPartial = make_partial_model(SampleModel)
 
 
+class ModelWithFieldAttributes(StrictBaseModel):
+    """Model with alias, title, and description to test full attribute preservation."""
+
+    name: str = Field(alias="user_name", title="User Name", description="The user's full name")
+    age: int = Field(ge=0, le=150, title="Age", description="Age in years")
+
+
+ModelWithFieldAttributesPartial = make_partial_model(ModelWithFieldAttributes)
+
+
 class TestMakePartialModel:
     def test_all_fields_become_optional(self):
         instance = SampleModelPartial()
@@ -76,3 +86,23 @@ def test_already_optional_fields_stay_optional(self):
 
     def test_partial_model_name(self):
         assert SampleModelPartial.__name__ == "SampleModelPartial"
+
+    def test_field_alias_preserved(self):
+        instance = ModelWithFieldAttributesPartial(user_name="Alice")
+        assert instance.name == "Alice"
+
+    def test_field_title_and_description_preserved(self):
+        name_field = ModelWithFieldAttributesPartial.model_fields["name"]
+        assert name_field.alias == "user_name"
+        assert name_field.title == "User Name"
+        assert name_field.description == "The user's full name"
+
+        age_field = ModelWithFieldAttributesPartial.model_fields["age"]
+        assert age_field.title == "Age"
+        assert age_field.description == "Age in years"
+
+    def test_field_ge_le_constraints_preserved(self):
+        with pytest.raises(ValidationError):
+            ModelWithFieldAttributesPartial(age=-1)
+        with pytest.raises(ValidationError):
+            ModelWithFieldAttributesPartial(age=200)
diff --git a/dev/registry/pyproject.toml b/dev/registry/pyproject.toml
@@ -33,7 +33,7 @@ version = "0.0.1"
 requires-python = ">=3.10"
 classifiers = ["Private :: Do Not Upload"]
 dependencies = [
-    "pydantic>=2.12.3",
+    "pydantic>=2.12.0",
     "pyyaml>=6.0.3",
 ]
 
diff --git a/providers/edge3/docs/index.rst b/providers/edge3/docs/index.rst
@@ -122,7 +122,7 @@ PIP package                                 Version required
 ==========================================  ===================
 ``apache-airflow``                          ``>=3.0.0,!=3.1.0``
 ``apache-airflow-providers-common-compat``  ``>=1.14.0``
-``pydantic``                                ``>=2.12.3``
+``pydantic``                                ``>=2.11.0``
 ``retryhttp``                               ``>=1.4.0``
 ``aiofiles``                                ``>=23.2.0``
 ``aiohttp``                                 ``>=3.9.2``
diff --git a/providers/edge3/pyproject.toml b/providers/edge3/pyproject.toml
@@ -67,7 +67,7 @@ requires-python = ">=3.10"
 dependencies = [
     "apache-airflow>=3.0.0,!=3.1.0",
     "apache-airflow-providers-common-compat>=1.14.0",
-    "pydantic>=2.12.3",
+    "pydantic>=2.11.0",
     "retryhttp>=1.4.0",
     "aiofiles>=23.2.0",
     "aiohttp>=3.9.2",
diff --git a/shared/secrets_masker/pyproject.toml b/shared/secrets_masker/pyproject.toml
@@ -27,7 +27,7 @@ dependencies = [
     'pendulum>=3.1.0',
     "methodtools>=0.4.7",
     "colorlog>=6.8.2",
-    "pydantic>2.12.3",
+    "pydantic>2.11.0",
 ]
 
 [dependency-groups]
diff --git a/task-sdk/pyproject.toml b/task-sdk/pyproject.toml
@@ -68,7 +68,7 @@ dependencies = [
     # End of shared timezones dependencies
     # Start of shared secrets_masker dependencies
     "colorlog>=6.8.2",
-    "pydantic>2.12.3",
+    "pydantic>2.11.0",
     # End of shared secrets_masker dependencies
     # Start of shared logging dependencies
     "pygtrie>=2.5.0",
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ version = "0.0.1"`
`33`	`33`	`requires-python = ">=3.10"`
`34`	`34`	`classifiers = ["Private :: Do Not Upload"]`
`35`	`35`	`dependencies = [`
`36`		`- "pydantic>=2.12.3",`
	`36`	`+ "pydantic>=2.12.0",`
`37`	`37`	`"pyyaml>=6.0.3",`
`38`	`38`	`]`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies = [`
`27`	`27`	`'pendulum>=3.1.0',`
`28`	`28`	`"methodtools>=0.4.7",`
`29`	`29`	`"colorlog>=6.8.2",`
`30`		`- "pydantic>2.12.3",`
	`30`	`+ "pydantic>2.11.0",`
`31`	`31`	`]`
`32`	`32`
`33`	`33`	`[dependency-groups]`