Skip to content

Commit 6bc3d32

Browse files
fix wrong model
1 parent 9e857e0 commit 6bc3d32

File tree

1 file changed

+28
-29
lines changed

1 file changed

+28
-29
lines changed

services/web/server/src/simcore_service_webserver/resource_usage/_service_runs_rest.py

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
OsparcCreditsAggregatedUsagesPage,
77
ServiceRunPage,
88
)
9-
from models_library.api_schemas_webserver.resource_usage import ServiceRunGet
109
from models_library.basic_types import IDStr
1110
from models_library.resource_tracker import (
1211
ServiceResourceUsagesFilters,
@@ -52,33 +51,33 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
5251
return wrapper
5352

5453

55-
_ResorceUsagesListOrderQueryParams: type[
56-
RequestParameters
57-
] = create_ordering_query_model_class(
58-
ordering_fields={
59-
"wallet_id",
60-
"wallet_name",
61-
"user_id",
62-
"user_email",
63-
"project_id",
64-
"project_name",
65-
"node_id",
66-
"node_name",
67-
"root_parent_project_id",
68-
"root_parent_project_name",
69-
"service_key",
70-
"service_version",
71-
"service_type",
72-
"started_at",
73-
"stopped_at",
74-
"service_run_status",
75-
"credit_cost",
76-
"transaction_status",
77-
},
78-
default=OrderBy(field=IDStr("started_at"), direction=OrderDirection.DESC),
79-
ordering_fields_api_to_column_map={
80-
"credit_cost": "osparc_credits",
81-
},
54+
_ResorceUsagesListOrderQueryParams: type[RequestParameters] = (
55+
create_ordering_query_model_class(
56+
ordering_fields={
57+
"wallet_id",
58+
"wallet_name",
59+
"user_id",
60+
"user_email",
61+
"project_id",
62+
"project_name",
63+
"node_id",
64+
"node_name",
65+
"root_parent_project_id",
66+
"root_parent_project_name",
67+
"service_key",
68+
"service_version",
69+
"service_type",
70+
"started_at",
71+
"stopped_at",
72+
"service_run_status",
73+
"credit_cost",
74+
"transaction_status",
75+
},
76+
default=OrderBy(field=IDStr("started_at"), direction=OrderDirection.DESC),
77+
ordering_fields_api_to_column_map={
78+
"credit_cost": "osparc_credits",
79+
},
80+
)
8281
)
8382

8483

@@ -143,7 +142,7 @@ async def list_resource_usage_services(request: web.Request):
143142
),
144143
)
145144

146-
page = Page[ServiceRunGet].model_validate(
145+
page = Page[dict[str, Any]].model_validate(
147146
paginate_data(
148147
chunk=services.items,
149148
request_url=request.url,

0 commit comments

Comments
 (0)