Skip to content

Improve metrics route team tags #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saiatmakuri merged 3 commits into from
Nov 13, 2023
Merged

Improve metrics route team tags #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e93343
add team email to user
saiatmakuri Nov 10, 2023
0644b54
format request route with path params
saiatmakuri Nov 10, 2023
62b25f6
Merge branch 'main' into saiatmakuri/improve-metrics-route-team-tags
saiatmakuri Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion model-engine/model_engine_server/api/llms_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,19 @@
from sse_starlette.sse import EventSourceResponse


def format_request_route(request: Request) -> str:
url_path = request.url.path
for path_param in request.path_params:
url_path = url_path.replace(request.path_params[path_param], f":{path_param}")
return f"{request.method}_{url_path}".lower()


async def record_route_call(
request: Request,
auth: User = Depends(verify_authentication),
external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only),
):
route = f"{request.method}_{request.url.path}".lower()
route = format_request_route(request)
model_name = request.query_params.get("model_endpoint_name", None)

external_interfaces.monitoring_metrics_gateway.emit_route_call_metric(
Expand Down
5 changes: 3 additions & 2 deletions model-engine/model_engine_server/core/auth/authentication_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
from abc import ABC, abstractmethod
from dataclasses import dataclass
from dataclasses import dataclass, field
from typing import Optional


@dataclass
class User:
user_id: str
team_id: str
email: Optional[str] = None
email: Optional[str] = field(repr=False, default=None)
team_email: Optional[str] = field(repr=False, default=None)
is_privileged_user: bool = False


Expand Down