fastapi 0.143.0__tar.gz → 0.143.2__tar.gz

{fastapi-0.143.0 → fastapi-0.143.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi
-Version: 0.143.0
+Version: 0.143.2
 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.143.0 → fastapi-0.143.2}/fastapi/__init__.py

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

{fastapi-0.143.0 → fastapi-0.143.2}/fastapi/routing.py

@@ -1592,6 +1592,8 @@ class RouteContext:
     @property
     def _effective_route(self) -> BaseRoute | _EffectiveRouteContext:
         if self._route_context is not None:
+            if self._route_context.starlette_route is not None:
+                return self._route_context.starlette_route
             return self._route_context
         return self.route
 
@@ -2002,13 +2004,16 @@ class _FrontendStaticFiles(StaticFiles):
             return self.file_response(full_path, stat_result, scope)
 
         if self.fallback == "404.html" or (
-            self.fallback == "auto" and self._fallback_file_exists("404.html")
+            self.fallback == "auto" and await self._fallback_file_exists("404.html")
         ):
             return await self._fallback_response("404.html", scope, status_code=404)
 
         if (
             self.fallback == "index.html"
-            or (self.fallback == "auto" and self._fallback_file_exists("index.html"))
+            or (
+                self.fallback == "auto"
+                and await self._fallback_file_exists("index.html")
+            )
         ) and _is_frontend_navigation_request(scope):
             return await self._fallback_response("index.html", scope, status_code=200)
 
@@ -2041,8 +2046,8 @@ class _FrontendStaticFiles(StaticFiles):
                 return full_path, stat_result, True
         return None
 
-    def _fallback_file_exists(self, fallback: str) -> bool:
-        _, stat_result = self.lookup_path(fallback)
+    async def _fallback_file_exists(self, fallback: str) -> bool:
+        _, stat_result = await run_in_threadpool(self.lookup_path, fallback)
         return stat_result is not None and stat.S_ISREG(stat_result.st_mode)
 
     async def _fallback_response(

{fastapi-0.143.0 → fastapi-0.143.2}/pyproject.toml

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

{fastapi-0.143.0 → fastapi-0.143.2}/tests/test_frontend.py

@@ -1,3 +1,4 @@
+import asyncio
 import errno
 import os
 import runpy
@@ -775,11 +776,22 @@ def test_auto_fallback_prefers_404_over_index(tmp_path: Path):
     assert response.text == "missing"
 
 
-def test_auto_fallback_uses_index_when_404_is_missing(tmp_path: Path):
+def test_auto_fallback_uses_index_when_404_is_missing(monkeypatch, tmp_path: Path):
     dist = tmp_path / "dist"
     write_file(dist / "index.html", "app shell")
     app = FastAPI()
     app.frontend("/", directory=dist)
+    frontend_routes = app.router._frontend_routes
+    assert frontend_routes is not None
+    static_files = frontend_routes.routes[0].app
+    original_lookup_path = static_files.lookup_path
+
+    def lookup_path(path: str):
+        with pytest.raises(RuntimeError, match="no running event loop"):
+            asyncio.get_running_loop()
+        return original_lookup_path(path)
+
+    monkeypatch.setattr(static_files, "lookup_path", lookup_path)
 
     response = TestClient(app).get("/dashboard", headers={"accept": "text/html"})
 

{fastapi-0.143.0 → fastapi-0.143.2}/tests/test_router_include_context.py

@@ -9,6 +9,7 @@ from fastapi.openapi.utils import get_openapi
 from fastapi.responses import HTMLResponse, JSONResponse, PlainTextResponse
 from fastapi.routing import (
     APIRoute,
+    APIWebSocketRoute,
     RouteContext,
     _IncludedRouter,
     _iter_included_route_candidates,
@@ -18,7 +19,16 @@ from fastapi.routing import (
 from fastapi.security import HTTPBearer
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
-from starlette.routing import BaseRoute, Host, Match, Mount, NoMatchFound, Route, Router
+from starlette.routing import (
+    BaseRoute,
+    Host,
+    Match,
+    Mount,
+    NoMatchFound,
+    Route,
+    Router,
+    WebSocketRoute,
+)
 
 
 def dependency_a():
@@ -55,6 +65,65 @@ def test_iter_route_contexts_returns_direct_route_context():
     assert contexts[0].endpoint is read_item
 
 
+@pytest.mark.parametrize(
+    ("route_class", "methods"),
+    [
+        (APIWebSocketRoute, None),
+        (Route, {"GET", "HEAD"}),
+        (WebSocketRoute, None),
+    ],
+)
+def test_iter_route_contexts_returns_included_route_metadata(route_class, methods):
+    async def endpoint():  # pragma: no cover
+        pass
+
+    route = route_class("/items/{item_id:int}", endpoint=endpoint, name="items")
+    router = APIRouter(routes=[route])
+    app = FastAPI(openapi_url=None)
+    app.include_router(router, prefix="/api")
+
+    [context] = iter_route_contexts(app.routes)
+
+    assert context.route is route
+    assert context.original_route is route
+    assert context.path == "/api/items/{item_id:int}"
+    assert context.path_format == "/api/items/{item_id}"
+    assert context.name == "items"
+    assert context.methods == methods
+    assert context.endpoint is endpoint
+    assert context.param_convertors["item_id"].convert("42") == 42
+    assert route.path == "/items/{item_id:int}"
+
+
+def test_iter_route_contexts_supports_nested_repeated_live_websocket_routes():
+    router = APIRouter(prefix="/stream", dependencies=[Depends(dependency_b)])
+    parent = APIRouter(prefix="/parent")
+    parent.include_router(router, prefix="/child")
+    app = FastAPI(openapi_url=None)
+    for prefix in ["/v1", "/v2"]:
+        app.include_router(parent, prefix=prefix, dependencies=[Depends(dependency_a)])
+
+    # Populate the inclusion caches before adding the endpoint.
+    assert list(iter_route_contexts(app.routes)) == []
+
+    @router.websocket("/{job_id}")
+    async def stream():  # pragma: no cover
+        pass
+
+    contexts = list(iter_route_contexts(app.routes))
+
+    assert [context.path for context in contexts] == [
+        "/v1/parent/child/stream/{job_id}",
+        "/v2/parent/child/stream/{job_id}",
+    ]
+    for context in contexts:
+        assert context.original_route is router.routes[0]
+        assert [dependency.dependency for dependency in context.dependencies] == [
+            dependency_a,
+            dependency_b,
+        ]
+
+
 def test_iter_route_contexts_supports_nested_conflict_detection():
     existing_router = APIRouter()
     nested_router = APIRouter()
@@ -713,6 +782,15 @@ def test_included_starlette_mount_keeps_prefix_runtime_and_url_path_for():
     client = TestClient(app)
     response = client.get("/api/mounted/items/abc")
 
+    context = list(iter_route_contexts(app.routes))[-1]
+    assert context.original_route is router.routes[0]
+    assert context.path == "/api/mounted"
+    assert context.path_format == "/api/mounted/{path}"
+    assert context.name == "mounted"
+    assert context.methods is None
+    assert context.endpoint is None
+    assert context.routes == cast(Mount, router.routes[0]).routes
+
     assert response.status_code == 200
     assert response.text == "mounted"
     assert (
@@ -736,6 +814,15 @@ def test_included_starlette_host_keeps_prefix_runtime_and_url_path_for():
     client = TestClient(app, base_url="http://api.example.com")
     response = client.get("/api/items/abc")
 
+    context = list(iter_route_contexts(app.routes))[-1]
+    assert context.original_route is router.routes[0]
+    assert context.path is None
+    assert context.path_format is None
+    assert context.name == "hosted"
+    assert context.methods is None
+    assert context.endpoint is None
+    assert context.host == "{subdomain}.example.com"
+
     assert response.status_code == 200
     assert response.text == "hosted"
     url = app.url_path_for("hosted:read_item", subdomain="api", item_id="abc")