fastapi-rtk 2.1.2__tar.gz → 2.1.3__tar.gz

{fastapi_rtk-2.1.2 → fastapi_rtk-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 2.1.2
+Version: 2.1.3
 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.1.3/fastapi_rtk/_version.py

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

{fastapi_rtk-2.1.2 → fastapi_rtk-2.1.3}/fastapi_rtk/api/base_api.py

@@ -201,24 +201,27 @@ class BaseApi:
                             self, metadata["response_model_str"]
                         )
 
-                    extra_dependencies = []
-                    if metadata.get("dependencies"):
-                        extra_dependencies = metadata["dependencies"]
-                    if extra_dependencies and not data.get("dependencies"):
-                        data["dependencies"] = []
-                    for dep in extra_dependencies:
+                    resolved_dependencies = []
+                    for dep in metadata.get("dependencies") or []:
                         func, kwargs = dep
                         if kwargs:
+                            # Resolve into a fresh dict; the source kwargs live in
+                            # the shared registry and must stay un-mutated so other
+                            # instances of the same Api class can resolve them too.
+                            resolved_kwargs = {}
                             for key, val in kwargs.items():
                                 if val == ":self":
-                                    kwargs[key] = self
-                                elif val.startswith(":f"):
+                                    resolved_kwargs[key] = self
+                                elif isinstance(val, str) and val.startswith(":f"):
                                     prop = val.split(".")[1]
-                                    kwargs[key] = metadata[prop]
-                            func = Depends(func(**kwargs))
+                                    resolved_kwargs[key] = metadata[prop]
+                                else:
+                                    resolved_kwargs[key] = val
+                            resolved_dependencies.append(
+                                Depends(func(**resolved_kwargs))
+                            )
                         else:
-                            func = Depends(func)
-                        data["dependencies"].append(func)
+                            resolved_dependencies.append(Depends(func))
 
                     path, methods, rest_data = (
                         data["path"],
@@ -226,6 +229,11 @@ class BaseApi:
                         {k: v for k, v in data.items() if k != "methods"},
                     )
 
+                    if resolved_dependencies:
+                        rest_data["dependencies"] = (
+                            list(data.get("dependencies") or []) + resolved_dependencies
+                        )
+
                     self.messages.append(
                         f"Registering route {self.router.prefix}{path} {methods}"
                     )

{fastapi_rtk-2.1.2 → fastapi_rtk-2.1.3}/tests/unit/api/test_base_api.py

@@ -130,6 +130,29 @@ class TestExposedRoutes:
         api = TierMsgApi()
         assert any("Registering route" in m for m in api.messages)
 
+    def test_protect_dependency_resolved_per_instance(self):
+        # Regression: resolving @protect's ":self" / ":f" placeholders must not
+        # mutate the shared registry metadata. Otherwise a second instance of
+        # the same class crashes ("... object has no attribute 'startswith'")
+        # and dependencies accumulate across registrations.
+        class TierSharedApi(BaseApi):
+            base_permissions = [f"{PERMISSION_PREFIX}read"]
+
+            @expose("/shared", methods=["GET"])
+            @protect()
+            @permission_name("read")
+            async def shared(self):
+                return {}
+
+        for _ in range(2):
+            api = TierSharedApi()
+            deps = [
+                rest_data.get("dependencies")
+                for _, rest_data, _, _ in api.routes_to_register
+                if rest_data["path"] == "/shared"
+            ]
+            assert deps and len(deps[0]) == 1
+
 
 class TestPriorityRoutes:
     def test_priority_routes_reordered(self):

fastapi_rtk-2.1.2/fastapi_rtk/_version.py

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