fastapi-deferred-init 0.3.0__tar.gz → 0.3.2__tar.gz

{fastapi_deferred_init-0.3.0 → fastapi_deferred_init-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-deferred-init
-Version: 0.3.0
+Version: 0.3.2
 Summary: Faster FastAPI start-up time for Projects with many nested routers
 Keywords: fastapi,speed,router,startup,optimization
 Author-Email: Jan Vollmer <jan@vllmr.dev>
@@ -18,7 +18,7 @@ Classifier: Typing :: Typed
 Project-URL: Source, https://github.com/jvllmr/fastapi-deferred-init
 Project-URL: Changelog, https://github.com/jvllmr/fastapi-deferred-init/releases
 Requires-Python: >=3.10
-Requires-Dist: fastapi>=0.137.2
+Requires-Dist: fastapi>=0.140.7
 Description-Content-Type: text/markdown
 
 # fastapi-deferred-init

{fastapi_deferred_init-0.3.0 → fastapi_deferred_init-0.3.2}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
     { name = "Jan Vollmer", email = "jan@vllmr.dev" },
 ]
 dependencies = [
-    "fastapi>=0.137.2",
+    "fastapi>=0.140.7",
 ]
 requires-python = ">=3.10"
 readme = "README.md"
@@ -29,7 +29,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dynamic = []
-version = "0.3.0"
+version = "0.3.2"
 
 [project.license]
 text = "MIT"
@@ -85,13 +85,13 @@ all = true
 
 [dependency-groups]
 dev = [
-    "pytest>=9.1.0",
-    "ruff>=0.15.17",
+    "pytest>=9.1.1",
+    "ruff>=0.15.20",
     "pre-commit>=4.3.0",
-    "mypy>=1.20.2",
+    "mypy>=2.1.0",
     "tuna>=0.5.15",
-    "httpx>=0.28.1",
     "pytest-benchmark>=5.2.3",
     "pip>=26.1.2",
-    "inline-snapshot>=0.34.1",
+    "inline-snapshot>=0.34.2",
+    "httpx2>=2.9.1",
 ]

{fastapi_deferred_init-0.3.0 → fastapi_deferred_init-0.3.2}/src/fastapi_deferred_init/patch.py

@@ -7,4 +7,8 @@ def apply_patch() -> None:
 
     routing._populate_api_route_state = _populate_api_route_state  # ty:ignore[invalid-assignment]
     routing.APIRoute = DeferringAPIRoute  # ty:ignore[invalid-assignment]
-    routing.APIRouter = DeferringAPIRouter
+    routing.APIRouter = DeferringAPIRouter  # ty:ignore[invalid-assignment]
+
+    import fastapi
+
+    fastapi.APIRouter = DeferringAPIRouter  # type:ignore[attr-defined]  # ty:ignore[invalid-assignment]

{fastapi_deferred_init-0.3.0 → fastapi_deferred_init-0.3.2}/src/fastapi_deferred_init/routing.py

@@ -10,17 +10,18 @@ from fastapi.sse import (
     EventSourceResponse,
     ServerSentEvent,
 )
+from fastapi.routing import _is_async_gen_callable, _is_gen_callable
 from fastapi import params, routing  # type: ignore[attr-defined]
 from fastapi._compat import ModelField, lenient_issubclass
 from fastapi.datastructures import Default, DefaultPlaceholder
 from fastapi.dependencies.utils import (
     _should_embed_body_fields,
-    get_body_field,
+    _get_body_field,
     get_dependant,
-    get_flat_dependant,
     get_parameterless_sub_dependant,
     get_typed_return_annotation,
     get_stream_item_type,
+    _get_flat_body_params,
 )
 from fastapi.responses import JSONResponse, Response
 from fastapi.types import IncEx
@@ -35,11 +36,13 @@ def _add_cache_attribute(
     instance: routing._APIRouteLike, name: str, func: Callable[[Any], Any]
 ) -> None:
     cls = type(instance)
-    if hasattr(instance, name) and (
-        (val := getattr(instance, name)) is None or val is False
+
+    if name in instance.__dict__ and (
+        (val := instance.__dict__[name]) is None or val is False
     ):
         delattr(instance, name)
 
+    # replace attribute with cached_property
     if not hasattr(cls, name) or not isinstance(getattr(cls, name), cached_property):
         prop = cached_property(func)
         setattr(cls, name, prop)
@@ -212,20 +215,20 @@ def _populate_api_route_state(
 
     _add_cache_attribute(route, "dependant", _get_dependant)
 
-    def _get_flat_dependant(self) -> Dependant:
-        return get_flat_dependant(self.dependant)
+    def _flat_body_params(self) -> list[ModelField]:
+        return _get_flat_body_params(self.dependant)
 
-    _add_cache_attribute(route, "_flat_dependant", _get_flat_dependant)
+    _add_cache_attribute(route, "_flat_body_params", _flat_body_params)
 
     def _embed_body_fields(self):
-        return _should_embed_body_fields(self._flat_dependant.body_params)
+        return _should_embed_body_fields(self._flat_body_params)
 
     _add_cache_attribute(route, "_embed_body_fields", _embed_body_fields)
 
     def _body_field(self):
-        return get_body_field(
-            flat_dependant=self._flat_dependant,
+        return _get_body_field(
             name=self.unique_id,
+            body_params=self._flat_body_params,
             embed_body_fields=self._embed_body_fields,
         )
 
@@ -233,7 +236,9 @@ def _populate_api_route_state(
 
     # Detect generator endpoints that should stream as JSONL or SSE
     def _is_generator(self) -> bool:
-        return self.dependant.is_async_gen_callable or self.dependant.is_gen_callable
+        return _is_async_gen_callable(self.dependant.call) or _is_gen_callable(
+            self.dependant.call
+        )
 
     _add_cache_attribute(route, "is_generator", _is_generator)
 

{fastapi_deferred_init-0.3.0 → fastapi_deferred_init-0.3.2}/tests/test_lib.py

@@ -3,7 +3,7 @@ import os
 import pytest
 from pydantic import BaseModel
 
-from fastapi import FastAPI
+from fastapi import FastAPI, APIRouter
 from fastapi import routing
 from fastapi.testclient import TestClient
 from fastapi_deferred_init.routing import (
@@ -27,9 +27,7 @@ def apply_monkeypatch(monkeypatch):
     )
     monkeypatch.setattr("fastapi.routing.APIRoute", DeferringAPIRoute)
     monkeypatch.setattr("fastapi.routing.APIRouter", DeferringAPIRouter)
-    # monkeypatch.setattr(
-    #        "fastapi.APIRouter", DeferringAPIRouter
-    #    )
+    monkeypatch.setattr("fastapi.APIRouter", DeferringAPIRouter)
 
 
 @pytest.mark.parametrize(["use_lib"], [(True,), (False,)])
@@ -42,7 +40,7 @@ def test_basic(use_lib: bool, benchmark, monkeypatch):
     )
 
     generated_code = benchmark(load_code)
-
+    assert generated_code.APIRouter is (DeferringAPIRouter if use_lib else APIRouter)
     app = FastAPI()
     router = generated_code.router