fastapi-rtk 2.4.0__tar.gz → 2.4.2__tar.gz

{fastapi_rtk-2.4.0 → fastapi_rtk-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 2.4.0
+Version: 2.4.2
 Summary: A package that provides a set of tools to build a FastAPI application with a Class-Based CRUD API.
 Project-URL: Homepage, https://codeberg.org/datatactics/fastapi-rtk
 Project-URL: Issues, https://codeberg.org/datatactics/fastapi-rtk/issues

fastapi_rtk-2.4.2/fastapi_rtk/_version.py

@@ -0,0 +1 @@
+__version__ = "2.4.2"

{fastapi_rtk-2.4.0 → fastapi_rtk-2.4.2}/fastapi_rtk/api/model_rest_api/_columns_mixin.py

@@ -247,8 +247,8 @@ class ColumnsMixin(_TypedModelRestApi):
             name or new_schema_name,
             **rel_schema,
             __base__=schema,
+            __config__=pydantic.ConfigDict(extra="forbid"),
         )
-        new_schema.model_config["extra"] = "forbid"
         return new_schema
 
     async def _process_body(

{fastapi_rtk-2.4.0 → fastapi_rtk-2.4.2}/tests/unit/api/model_rest_api/test_columns.py

@@ -10,7 +10,6 @@ import typing
 
 import pydantic
 import pytest
-
 from fastapi_rtk.api.model_rest_api import ModelRestApi
 from fastapi_rtk.backends.sqla.interface import SQLAInterface
 
@@ -120,7 +119,6 @@ class TestGetDatamodelAndColumn:
 @pytest.fixture
 def Country_cls():
     import sqlalchemy
-
     from fastapi_rtk.backends.sqla.model import Model
 
     if "tier12_country" in Model.metadata.tables:
@@ -139,7 +137,6 @@ def Country_cls():
 @pytest.fixture
 def WidgetWithCountry_cls(Country_cls):
     import sqlalchemy.orm
-
     from fastapi_rtk.backends.sqla.model import Model
 
     if "tier12_widget_country" in Model.metadata.tables:
@@ -227,6 +224,40 @@ class TestSchemaExtraFieldsColumnCollision:
             Api()
 
 
+class TestCreateRequestSchemaForbidsExtra:
+    """``_create_request_schema`` must bake ``extra="forbid"`` into the model's
+    validation core (not merely set ``model_config["extra"]``, a no-op on an
+    already-built model until a rebuild) while preserving the base schema's
+    own config.
+    """
+
+    def test_standalone_schema_rejects_unknown_field(self, Widget_cls):
+        class Api(ModelRestApi):
+            datamodel = SQLAInterface(Widget_cls)
+
+        api = Api()
+        request_schema = api._create_request_schema(api.add_obj_schema)
+        with pytest.raises(pydantic.ValidationError):
+            request_schema.model_validate({"name": "ok", "totally_unknown": "x"})
+
+    def test_carries_base_config_plus_forbid(self, Widget_cls):
+        class Api(ModelRestApi):
+            datamodel = SQLAInterface(Widget_cls)
+
+        class CustomBase(pydantic.BaseModel):
+            model_config = pydantic.ConfigDict(str_strip_whitespace=True)
+            name: str
+
+        request_schema = Api()._create_request_schema(CustomBase, name="CustomReq")
+        # Base config carried through AND `extra=forbid` added, both baked into
+        # the validation core: whitespace stripped (base) + extras rejected.
+        assert request_schema.model_config.get("str_strip_whitespace") is True
+        assert request_schema.model_config.get("extra") == "forbid"
+        assert request_schema.model_validate({"name": "  x  "}).name == "x"
+        with pytest.raises(pydantic.ValidationError):
+            request_schema.model_validate({"name": "x", "nope": 1})
+
+
 class TestJsonformsListItemsSchema:
     @pytest.mark.parametrize(
         "col_type,expected",
@@ -251,7 +282,6 @@ class TestGenerateJsonformsSchemaListBranch:
     @pytest.fixture(scope="class")
     def list_api(self):
         import sqlalchemy
-
         from fastapi_rtk import (
             JSONBListColumn,
             ListColumn,

fastapi_rtk-2.4.0/fastapi_rtk/_version.py

@@ -1 +0,0 @@
-__version__ = "2.4.0"