fastapi 0.147.0__tar.gz → 0.148.0__tar.gz

{fastapi-0.147.0 → fastapi-0.148.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi
-Version: 0.147.0
+Version: 0.148.0
 Summary: FastAPI framework, high performance, easy to learn, fast to code, ready for production
 Author-Email: Sebastián Ramírez <tiangolo@gmail.com>
 License-Expression: MIT

{fastapi-0.147.0 → fastapi-0.148.0}/fastapi/__init__.py

@@ -1,6 +1,6 @@
 """FastAPI framework, high performance, easy to learn, fast to code, ready for production"""
 
-__version__ = "0.147.0"
+__version__ = "0.148.0"
 
 from starlette import status as status
 

{fastapi-0.147.0 → fastapi-0.148.0}/fastapi/dependencies/utils.py

@@ -737,8 +737,9 @@ def _validate_value_with_model_field(
     if value is None:
         if field.field_info.is_required():
             return None, [get_missing_field_error(loc=loc)]
-        else:
-            return deepcopy(field.default), []
+        value = deepcopy(field.default)
+        if not field.field_info.validate_default:
+            return value, []
     return field.validate(value, values, loc=loc)
 
 
@@ -770,10 +771,8 @@ def _get_multidict_value(
             and len(value) == 0
         )
     ):
-        if field.field_info.is_required():
-            return
-        else:
-            return deepcopy(field.default)
+        # Apply defaults during validation, not while extracting request data.
+        return None
     return value
 
 

{fastapi-0.147.0 → fastapi-0.148.0}/pyproject.toml

@@ -53,7 +53,7 @@ dependencies = [
     "annotated-doc>=0.0.2",
     "opentelemetry-api>=1.44.0",
 ]
-version = "0.147.0"
+version = "0.148.0"
 
 [project.urls]
 Homepage = "https://github.com/fastapi/fastapi"

{fastapi-0.147.0 → fastapi-0.148.0}/tests/test_forms_single_model.py

@@ -99,13 +99,13 @@ def test_no_data():
                 "type": "missing",
                 "loc": ["body", "username"],
                 "msg": "Field required",
-                "input": {"tags": ["foo", "bar"], "with": "nothing"},
+                "input": {},
             },
             {
                 "type": "missing",
                 "loc": ["body", "lastname"],
                 "msg": "Field required",
-                "input": {"tags": ["foo", "bar"], "with": "nothing"},
+                "input": {},
             },
         ]
     }

{fastapi-0.147.0 → fastapi-0.148.0}/tests/test_request_params/test_default_validation.py

@@ -1,4 +1,5 @@
 from typing import Annotated
+from unittest.mock import Mock
 
 import pytest
 from fastapi import Body, Cookie, FastAPI, Form, Header, Query
@@ -13,20 +14,7 @@ def double(value):
 ValidatedInt = Annotated[int | None, BeforeValidator(double)]
 
 
-@pytest.mark.parametrize(
-    "parameter",
-    [
-        pytest.param(
-            parameter,
-            marks=pytest.mark.xfail(
-                reason="Missing values are validated as explicitly supplied defaults",
-                raises=AssertionError,
-            ),
-        )
-        for parameter in (Query, Header, Cookie, Form)
-    ]
-    + [Body],
-)
+@pytest.mark.parametrize("parameter", [Query, Header, Cookie, Form, Body])
 @pytest.mark.parametrize("path", ["/parameter", "/model"])
 def test_missing_value_uses_default_without_validation(parameter, path):
     app = FastAPI()
@@ -183,3 +171,78 @@ def test_model_can_validate_default(parameter, default, expected):
         response = client.post("/")
     assert response.status_code == 200
     assert response.json() == expected
+
+
+@pytest.mark.parametrize("parameter", [Query, Header, Cookie, Form, Body])
+@pytest.mark.parametrize("default,expected", [(None, 0), (10, 20)])
+def test_parameter_can_validate_default(parameter, default, expected):
+    app = FastAPI()
+    field = (
+        Body(embed=True, validate_default=True)
+        if parameter is Body
+        else parameter(validate_default=True)
+    )
+
+    @app.post("/")
+    def read_parameter(value: Annotated[ValidatedInt, field] = default):
+        return value
+
+    client = TestClient(app)
+    if parameter is Body:
+        response = client.post("/", json={})
+    else:
+        response = client.post("/")
+    assert response.status_code == 200
+    assert response.json() == expected
+
+
+@pytest.mark.parametrize("parameter", [Query, Header, Cookie, Form, Body])
+@pytest.mark.parametrize("default,expected", [(None, 0), (10, 20)])
+def test_parameter_validates_default_factory_once(parameter, default, expected):
+    app = FastAPI()
+    default_factory = Mock(return_value=default)
+    field = (
+        Body(embed=True, default_factory=default_factory, validate_default=True)
+        if parameter is Body
+        else parameter(default_factory=default_factory, validate_default=True)
+    )
+
+    @app.post("/")
+    def read_parameter(value: Annotated[ValidatedInt, field]):
+        return value
+
+    default_factory.assert_not_called()
+    client = TestClient(app)
+    if parameter is Body:
+        response = client.post("/", json={})
+    else:
+        response = client.post("/")
+    assert response.status_code == 200
+    assert response.json() == expected
+    default_factory.assert_called_once_with()
+
+
+def test_parameter_rejects_invalid_default():
+    app = FastAPI()
+
+    @app.get("/")
+    def read_parameter(value: Annotated[int, Query(gt=0, validate_default=True)] = -1):
+        return value
+
+    client = TestClient(app)
+    response = client.get("/")
+    assert response.status_code == 422
+    assert response.json() == {
+        "detail": [
+            {
+                "type": "greater_than",
+                "loc": ["query", "value"],
+                "msg": "Input should be greater than 0",
+                "input": -1,
+                "ctx": {"gt": 0},
+            }
+        ]
+    }
+    response = client.get("/", params={"value": "1"})
+    assert response.status_code == 200
+    assert response.json() == 1

{fastapi-0.147.0 → fastapi-0.148.0}/tests/test_request_params/test_nullable_and_defaults.py

@@ -3,6 +3,7 @@ from unittest.mock import Mock
 
 import pytest
 from fastapi import Body, Cookie, FastAPI, Form, Header, Query
+from fastapi._compat import PYDANTIC_VERSION_MINOR_TUPLE
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field
 
@@ -331,27 +332,15 @@ def test_missing_none_default_is_unset(parameter):
 @pytest.mark.parametrize(
     "parameter,annotation,default",
     [
-        pytest.param(
-            source,
-            annotation,
-            default,
-            marks=pytest.mark.xfail(
-                source is not Body,
-                reason="Missing model fields are populated with defaults before validation",
-                raises=AssertionError,
-            ),
-        )
-        for source, annotation, default in [
-            (Query, int | None, 10),
-            (Header, int | None, 10),
-            (Cookie, int | None, 10),
-            (Form, int | None, 10),
-            (Body, int | None, 10),
-            (Query, list[int] | None, [10]),
-            (Header, list[int] | None, [10]),
-            (Form, list[int] | None, [10]),
-            (Body, list[int] | None, [10]),
-        ]
+        (Query, int | None, 10),
+        (Header, int | None, 10),
+        (Cookie, int | None, 10),
+        (Form, int | None, 10),
+        (Body, int | None, 10),
+        (Query, list[int] | None, [10]),
+        (Header, list[int] | None, [10]),
+        (Form, list[int] | None, [10]),
+        (Body, list[int] | None, [10]),
     ],
 )
 def test_missing_non_null_default_is_unset(parameter, annotation, default):
@@ -376,27 +365,15 @@ def test_missing_non_null_default_is_unset(parameter, annotation, default):
 @pytest.mark.parametrize(
     "parameter,annotation,default",
     [
-        pytest.param(
-            source,
-            annotation,
-            default,
-            marks=pytest.mark.xfail(
-                source is not Body,
-                reason="Missing model fields are populated with defaults before validation",
-                raises=AssertionError,
-            ),
-        )
-        for source, annotation, default in [
-            (Query, int | None, 10),
-            (Header, int | None, 10),
-            (Cookie, int | None, 10),
-            (Form, int | None, 10),
-            (Body, int | None, 10),
-            (Query, list[int] | None, [10]),
-            (Header, list[int] | None, [10]),
-            (Form, list[int] | None, [10]),
-            (Body, list[int] | None, [10]),
-        ]
+        (Query, int | None, 10),
+        (Header, int | None, 10),
+        (Cookie, int | None, 10),
+        (Form, int | None, 10),
+        (Body, int | None, 10),
+        (Query, list[int] | None, [10]),
+        (Header, list[int] | None, [10]),
+        (Form, list[int] | None, [10]),
+        (Body, list[int] | None, [10]),
     ],
 )
 def test_missing_factory_default_is_unset(parameter, annotation, default):
@@ -418,25 +395,9 @@ def test_missing_factory_default_is_unset(parameter, annotation, default):
     assert response.json() == {"value": default, "fields_set": []}
 
 
-@pytest.mark.parametrize(
-    "parameter,path,default",
-    [
-        pytest.param(
-            source,
-            path,
-            default,
-            marks=pytest.mark.xfail(
-                source is not Body
-                and (default is None or (path == "/parameter" and source is not Form)),
-                reason="The default factory is called more than once for an omitted value",
-                raises=AssertionError,
-            ),
-        )
-        for source in (Query, Header, Cookie, Form, Body)
-        for path in ("/parameter", "/model")
-        for default in (None, 10)
-    ],
-)
+@pytest.mark.parametrize("parameter", [Query, Header, Cookie, Form, Body])
+@pytest.mark.parametrize("path", ["/parameter", "/model"])
+@pytest.mark.parametrize("default", [None, 10])
 def test_missing_value_calls_default_factory_once(parameter, path, default):
     app = FastAPI()
     default_factory = Mock(return_value=default)
@@ -468,6 +429,43 @@ def test_missing_value_calls_default_factory_once(parameter, path, default):
     default_factory.assert_called_once_with()
 
 
+@pytest.mark.parametrize("parameter", [Query, Header, Cookie, Form, Body])
+@pytest.mark.skipif(
+    PYDANTIC_VERSION_MINOR_TUPLE < (2, 10),
+    reason="Default factories receiving validated data require Pydantic 2.10",
+)
+def test_model_default_factory_receives_validated_data(parameter):
+    app = FastAPI()
+
+    class Model(BaseModel):
+        value: int
+        doubled: Annotated[int, Field(default_factory=lambda data: data["value"] * 2)]
+
+    @app.post("/")
+    def read_model(params: Annotated[Model, parameter()]):
+        return {
+            "values": params.model_dump(),
+            "supplied": params.model_dump(exclude_unset=True),
+        }
+
+    client = TestClient(app)
+    if parameter is Query:
+        response = client.post("/", params={"value": "5"})
+    elif parameter is Header:
+        response = client.post("/", headers={"value": "5"})
+    elif parameter is Cookie:
+        response = client.post("/", headers={"cookie": "value=5"})
+    elif parameter is Form:
+        response = client.post("/", data={"value": "5"})
+    else:
+        response = client.post("/", json={"value": 5})
+    assert response.status_code == 200
+    assert response.json() == {
+        "values": {"value": 5, "doubled": 10},
+        "supplied": {"value": 5},
+    }
+
+
 @pytest.mark.parametrize("parameter", [Query, Header, Cookie, Form, Body])
 @pytest.mark.parametrize("path", ["/parameter", "/model"])
 def test_supplied_value_does_not_call_default_factory(parameter, path):
@@ -532,20 +530,7 @@ def test_value_equal_to_default_is_explicitly_set(parameter):
     assert response.json() == {"value": 0, "fields_set": ["value"]}
 
 
-@pytest.mark.parametrize(
-    "parameter",
-    [
-        pytest.param(
-            parameter,
-            marks=pytest.mark.xfail(
-                reason="Omitted model fields are marked as explicitly set",
-                raises=AssertionError,
-            ),
-        )
-        for parameter in (Query, Header, Cookie, Form)
-    ]
-    + [Body],
-)
+@pytest.mark.parametrize("parameter", [Query, Header, Cookie, Form, Body])
 def test_partial_model_submission(parameter):
     app = FastAPI()
 

{fastapi-0.147.0 → fastapi-0.148.0}/tests/test_tutorial/test_header_param_models/test_tutorial001.py

@@ -66,7 +66,6 @@ def test_header_param_model_invalid(client: TestClient):
                     "loc": ["header", "save_data"],
                     "msg": "Field required",
                     "input": {
-                        "x_tag": [],
                         "host": "testserver",
                         "accept": "*/*",
                         "accept-encoding": IsOneOf(

{fastapi-0.147.0 → fastapi-0.148.0}/tests/test_tutorial/test_header_param_models/test_tutorial002.py

@@ -65,7 +65,7 @@ def test_header_param_model_invalid(client: TestClient):
                     "type": "missing",
                     "loc": ["header", "save_data"],
                     "msg": "Field required",
-                    "input": {"x_tag": [], "host": "testserver"},
+                    "input": {"host": "testserver"},
                 }
             ]
         }

{fastapi-0.147.0 → fastapi-0.148.0}/tests/test_tutorial/test_header_param_models/test_tutorial003.py

@@ -65,7 +65,6 @@ def test_header_param_model_no_underscore(client: TestClient):
                     "input": {
                         "host": "testserver",
                         "traceparent": "123",
-                        "x_tag": [],
                         "accept": "*/*",
                         "accept-encoding": IsOneOf(
                             "gzip, deflate", "gzip, deflate, zstd"
@@ -105,7 +104,6 @@ def test_header_param_model_invalid(client: TestClient):
                     "loc": ["header", "save_data"],
                     "msg": "Field required",
                     "input": {
-                        "x_tag": [],
                         "host": "testserver",
                         "accept": "*/*",
                         "accept-encoding": IsOneOf(