fastapi-commons 0.6.6__tar.gz → 0.7.0__tar.gz

{fastapi_commons-0.6.6/src/fastapi_commons.egg-info → fastapi_commons-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-commons
-Version: 0.6.6
+Version: 0.7.0
 Summary: Re-usable FastAPI code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{fastapi_commons-0.6.6 → fastapi_commons-0.7.0}/src/fastapi_commons/middleware/prometheus.py

@@ -1,5 +1,7 @@
 import time
+from collections.abc import Sequence
 
+from fastapi.routing import APIRoute, _IncludedRouter
 from opentelemetry import trace
 from prometheus_client import REGISTRY, Counter, Gauge, Histogram
 from prometheus_client.openmetrics.exposition import (
@@ -9,9 +11,9 @@ from prometheus_client.openmetrics.exposition import (
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from starlette.requests import Request
 from starlette.responses import Response
-from starlette.routing import Match
+from starlette.routing import BaseRoute, Match, Mount
 from starlette.status import HTTP_500_INTERNAL_SERVER_ERROR
-from starlette.types import ASGIApp
+from starlette.types import ASGIApp, Scope
 
 INFO = Gauge('fastapi_app_info', 'FastAPI application information.', ['app_name'])
 REQUESTS = Counter(
@@ -41,6 +43,37 @@ REQUESTS_IN_PROGRESS = Gauge(
 )
 
 
+def _join_paths(prefix: str, path: str) -> str:
+    if not prefix:
+        return path
+    return f'{prefix.rstrip("/")}/{path.lstrip("/")}'
+
+
+def _resolve_route_path(routes: Sequence[BaseRoute], scope: Scope) -> str | None:
+    """Resolve the templated path of the route matching ``scope``."""
+    for route in routes:
+        match, _ = route.matches(scope)
+
+        if match is not Match.FULL:
+            continue
+
+        if isinstance(route, _IncludedRouter):
+            prefix = route.include_context.prefix or ''
+            stripped_path = scope['path'][len(prefix) :]
+            sub_scope = {**scope, 'path': stripped_path} if prefix else scope
+            sub_path = _resolve_route_path(route.original_router.routes, sub_scope)
+
+            if sub_path is not None:
+                return _join_paths(prefix, sub_path)
+
+            continue
+
+        if isinstance(route, (APIRoute, Mount)):
+            return route.path
+
+    return None
+
+
 class PrometheusMiddleware(BaseHTTPMiddleware):
     def __init__(self, app: ASGIApp, app_name: str = 'fastapi-app') -> None:
         super().__init__(app)
@@ -86,10 +119,8 @@ class PrometheusMiddleware(BaseHTTPMiddleware):
 
     @staticmethod
     def get_path(request: Request) -> tuple[str, bool]:
-        for route in request.app.routes:
-            match, _ = route.matches(request.scope)
-            if match == Match.FULL:
-                return route.path, True
+        if path := _resolve_route_path(request.app.routes, request.scope):
+            return path, True
 
         return request.url.path, False
 

{fastapi_commons-0.6.6 → fastapi_commons-0.7.0/src/fastapi_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-commons
-Version: 0.6.6
+Version: 0.7.0
 Summary: Re-usable FastAPI code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

fastapi_commons-0.7.0/src/fastapi_commons.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.7.0",
+  "distance": 0,
+  "node": "ge636e90f0e45473d573f81290b42ab0ed3dc2b5d",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-20"
+}

fastapi_commons-0.6.6/src/fastapi_commons.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.6.6",
-  "distance": 0,
-  "node": "g59406832b3c5d302e5a82928d843e7d978f9b58b",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-19"
-}