Skip to content

Commit

Permalink
Generic base middleware class (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
aleks-v-k authored Feb 12, 2025
1 parent fc8b9ef commit a495ead
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
9 changes: 6 additions & 3 deletions src/huntflow_base_metrics/web_frameworks/_middleware.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import abc
from dataclasses import dataclass
from typing import Any, Optional, Set
from typing import Generic, Optional, Set, TypeVar

from huntflow_base_metrics._context import METRIC_CONTEXT

Expand All @@ -11,13 +11,16 @@ class PathTemplate:
is_handled: bool


class PrometheusMiddleware(abc.ABC):
RequestType = TypeVar("RequestType")


class PrometheusMiddleware(abc.ABC, Generic[RequestType]):
include_routes: Optional[Set[str]] = None
exclude_routes: Optional[Set[str]] = None

@staticmethod
@abc.abstractmethod
def get_path_template(request: Any) -> PathTemplate:
def get_path_template(request: RequestType) -> PathTemplate:
pass

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion src/huntflow_base_metrics/web_frameworks/aiohttp.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
__all__ = ["add_middleware", "get_http_response_metrics"]


class _PrometheusMiddleware(PrometheusMiddleware):
class _PrometheusMiddleware(PrometheusMiddleware[Request]):
@classmethod
@middleware
async def dispatch(cls, request: Request, handler: Callable) -> Response:
Expand Down
2 changes: 1 addition & 1 deletion src/huntflow_base_metrics/web_frameworks/fastapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
__all__ = ["add_middleware", "get_http_response_metrics"]


class _PrometheusMiddleware(PrometheusMiddleware, BaseHTTPMiddleware):
class _PrometheusMiddleware(PrometheusMiddleware[Request], BaseHTTPMiddleware):
async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Response:
method = request.method
path_template = self.get_path_template(request)
Expand Down
2 changes: 1 addition & 1 deletion src/huntflow_base_metrics/web_frameworks/litestar.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class _RequestSpan:
status_code: int = 200


class _PrometheusMiddleware(PrometheusMiddleware, AbstractMiddleware):
class _PrometheusMiddleware(PrometheusMiddleware[Request], AbstractMiddleware):
scopes = {ScopeType.HTTP}

def __init__(self, app: ASGIApp, *args: Any, **kwargs: Any) -> None:
Expand Down

0 comments on commit a495ead

Please sign in to comment.