Skip to content

Commit

Permalink
cleanup after rename
Browse files Browse the repository at this point in the history
  • Loading branch information
zubenkoivan committed Jul 22, 2024
1 parent 565f94b commit 65d609b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
8 changes: 3 additions & 5 deletions src/platform_reports/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def _metrics_service(self) -> MetricsService:

@docs(
tags=["Metrics"],
summary="Evaluate credits consumption.",
summary="Evaluate credits usage.",
responses={
HTTPOk.status_code: {},
HTTPInternalServerError.status_code: {
Expand All @@ -331,7 +331,7 @@ async def handle_post_credits_usage(self, request: Request) -> Response:
request, [Permission(f"cluster://{self._config.cluster_name}", "read")]
)
request_data: PostCreditsUsageRequest = request["data"]
consumptions = await self._metrics_service.get_credits_usage(
usage = await self._metrics_service.get_credits_usage(
GetCreditsUsageRequest(
category_name=request_data.category_name,
org_name=request_data.org_name,
Expand All @@ -341,9 +341,7 @@ async def handle_post_credits_usage(self, request: Request) -> Response:
)
)
response_schema = PostCreditsUsageResponseSchema(many=True)
return json_response(
response_schema.dump(consumptions), status=HTTPOk.status_code
)
return json_response(response_schema.dump(usage), status=HTTPOk.status_code)


def _get_user_name(request: Request, access_token_cookie_names: Sequence[str]) -> str:
Expand Down
17 changes: 8 additions & 9 deletions src/platform_reports/metrics_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ def create_for_compute(cls, metric: Metric) -> CreditsUsage | None:
if app_id := metric.labels.get(PrometheusLabel.APOLO_APP_KEY):
return cls._create_for_app(metric, app_id=app_id)
LOGGER.warning(
"Failed to create compute consumption from metric labels: %s", metric.labels
"Failed to create compute credits usage from metric labels: %s",
metric.labels,
)
return None

Expand Down Expand Up @@ -149,24 +150,22 @@ async def get_credits_usage(
async with asyncio.TaskGroup() as tg:
tasks = []
if request.category_name in (None, CategoryName.JOBS, CategoryName.APPS):
tasks.append(
tg.create_task(self._get_compute_credits_usage(request))
)
tasks.append(tg.create_task(self._get_compute_credits_usage(request)))
return list(itertools.chain.from_iterable(t.result() for t in tasks))

async def _get_compute_credits_usage(
self, request: GetCreditsUsageRequest
) -> list[CreditsUsage]:
LOGGER.debug("Requesting compute credits consumption: %s", request)
LOGGER.debug("Requesting compute credits usage: %s", request)
query = self._prometheus_query_factory.create_compute_credits(
org_name=request.org_name, project_name=request.project_name
)
metrics = await self._prometheus_client.evaluate_range_query(
query=query, start_date=request.start_date, end_date=request.end_date
)
consumptions = []
usage = []
for metric in metrics:
if c := self._credits_usage_factory.create_for_compute(metric):
LOGGER.debug("Compute consumption: %s", c)
consumptions.append(c)
return consumptions
LOGGER.debug("Compute credits usage: %s", c)
usage.append(c)
return usage

0 comments on commit 65d609b

Please sign in to comment.