Merge pull request #1561 from vitalik/pydantic-2.12-fix

pydantic 2.12 compatibility

Author: vitalik

.github/workflows/test_full.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: 3.12
       - name: Install Flit
         run: pip install flit "django>=5.2"
       - name: Install Dependencies
@@ -64,7 +64,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies

ninja/params/models.py

@@ -65,6 +65,11 @@ def resolve(
             return cls()
 
         data = cls._map_data_paths(data)
+        # Convert defaultdict to dict for pydantic 2.12+ compatibility
+        # In pydantic 2.12+, accessing missing keys in defaultdict creates nested
+        # defaultdicts which then fail validation
+        if isinstance(data, defaultdict):
+            data = dict(data)
         return cls.model_validate(data, context={"request": request})
 
     @classmethod
@@ -197,7 +202,7 @@ def get_request_data(
         return results
 
 
-class Param(FieldInfo):
+class Param(FieldInfo):  # type: ignore[misc]
     def __init__(
         self,
         default: Any,
@@ -260,35 +265,35 @@ def _param_source(cls) -> str:
         return cls.__name__.lower()
 
 
-class Path(Param):
+class Path(Param):  # type: ignore[misc]
     _model = PathModel
 
 
-class Query(Param):
+class Query(Param):  # type: ignore[misc]
     _model = QueryModel
 
 
-class Header(Param):
+class Header(Param):  # type: ignore[misc]
     _model = HeaderModel
 
 
-class Cookie(Param):
+class Cookie(Param):  # type: ignore[misc]
     _model = CookieModel
 
 
-class Body(Param):
+class Body(Param):  # type: ignore[misc]
     _model = BodyModel
 
 
-class Form(Param):
+class Form(Param):  # type: ignore[misc]
     _model = FormModel
 
 
-class File(Param):
+class File(Param):  # type: ignore[misc]
     _model = FileModel
 
 
-class _MultiPartBody(Param):
+class _MultiPartBody(Param):  # type: ignore[misc]
     _model = _MultiPartBodyModel
 
     @classmethod

ninja/testing/client.py

@@ -206,7 +206,7 @@ def __init__(self, http_response: Union[HttpResponse, StreamingHttpResponse]):
         if self.streaming:
             self.content = b"".join(http_response.streaming_content)  # type: ignore
         else:
-            self.content = http_response.content  # type: ignore[union-attr]
+            self.content = http_response.content
         self._data = None
 
     def json(self) -> Any:

tests/test_orm_schemas.py

@@ -108,7 +108,10 @@ class Meta:
                 "format": "date-time",
             },
             "decimalfield": {
-                "anyOf": [{"type": "number"}, {"type": "string"}],
+                "anyOf": [
+                    {"type": "number"},
+                    {"type": "string"},
+                ],
                 "title": "Decimalfield",
             },
             "durationfield": {
@@ -199,6 +202,11 @@ class Meta:
     pydantic_version = tuple(map(int, pydantic.VERSION.split(".")[:2]))
     if pydantic_version >= (2, 11):
         expected_schema["properties"]["hstorefield"]["additionalProperties"] = True
+    if pydantic_version >= (2, 12):
+        # Pydantic 2.12 added pattern validation for decimal strings
+        expected_schema["properties"]["decimalfield"]["anyOf"][1]["pattern"] = (
+            r"^(?!^[-+.]*$)[+-]?0*\d*\.?\d*$"
+        )
     assert SchemaCls.json_schema() == expected_schema