Skip to content

Commit dfb4149

Browse files
🐛 fix wrong ServiceRunGet model (#7349)
1 parent 5539d0a commit dfb4149

File tree

2 files changed

+37
-1
lines changed
  • packages/models-library/src/models_library/api_schemas_webserver
  • services/web/server/src/simcore_service_webserver/api/v0

2 files changed

+37
-1
lines changed

packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from ..projects import ProjectID
77
from ..projects_nodes_io import NodeID
88
from ..resource_tracker import (
9+
CreditTransactionStatus,
910
HardwareInfo,
1011
PricingPlanClassification,
1112
PricingPlanId,
@@ -27,13 +28,15 @@
2728

2829
class ServiceRunGet(
2930
BaseModel
30-
): # NOTE: this is already in use so I didnt modidy inheritance from OutputSchema
31+
): # NOTE: this is already in use so I didnt modify inheritance from OutputSchema
3132
service_run_id: ServiceRunID
3233
wallet_id: WalletID | None
3334
wallet_name: str | None
3435
user_id: UserID
36+
user_email: str
3537
project_id: ProjectID
3638
project_name: str
39+
project_tags: list[str]
3740
node_id: NodeID
3841
node_name: str
3942
root_parent_project_id: ProjectID
@@ -44,6 +47,9 @@ class ServiceRunGet(
4447
started_at: datetime
4548
stopped_at: datetime | None
4649
service_run_status: ServiceRunStatus
50+
# Cost in credits
51+
credit_cost: Decimal | None
52+
transaction_status: CreditTransactionStatus | None
4753

4854

4955
class PricingUnitGet(OutputSchema):

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8523,6 +8523,15 @@ components:
85238523
- usdPerCredit
85248524
- minPaymentAmountUsd
85258525
title: CreditPriceGet
8526+
CreditTransactionStatus:
8527+
type: string
8528+
enum:
8529+
- PENDING
8530+
- BILLED
8531+
- IN_DEBT
8532+
- NOT_BILLED
8533+
- REQUIRES_MANUAL_REVIEW
8534+
title: CreditTransactionStatus
85268535
CursorPage___T_Customized_PathMetaDataGet_:
85278536
properties:
85288537
items:
@@ -14626,13 +14635,21 @@ components:
1462614635
exclusiveMinimum: true
1462714636
title: User Id
1462814637
minimum: 0
14638+
user_email:
14639+
type: string
14640+
title: User Email
1462914641
project_id:
1463014642
type: string
1463114643
format: uuid
1463214644
title: Project Id
1463314645
project_name:
1463414646
type: string
1463514647
title: Project Name
14648+
project_tags:
14649+
items:
14650+
type: string
14651+
type: array
14652+
title: Project Tags
1463614653
node_id:
1463714654
type: string
1463814655
format: uuid
@@ -14670,14 +14687,25 @@ components:
1467014687
title: Stopped At
1467114688
service_run_status:
1467214689
$ref: '#/components/schemas/ServiceRunStatus'
14690+
credit_cost:
14691+
anyOf:
14692+
- type: string
14693+
- type: 'null'
14694+
title: Credit Cost
14695+
transaction_status:
14696+
anyOf:
14697+
- $ref: '#/components/schemas/CreditTransactionStatus'
14698+
- type: 'null'
1467314699
type: object
1467414700
required:
1467514701
- service_run_id
1467614702
- wallet_id
1467714703
- wallet_name
1467814704
- user_id
14705+
- user_email
1467914706
- project_id
1468014707
- project_name
14708+
- project_tags
1468114709
- node_id
1468214710
- node_name
1468314711
- root_parent_project_id
@@ -14688,6 +14716,8 @@ components:
1468814716
- started_at
1468914717
- stopped_at
1469014718
- service_run_status
14719+
- credit_cost
14720+
- transaction_status
1469114721
title: ServiceRunGet
1469214722
ServiceRunStatus:
1469314723
type: string

0 commit comments

Comments
 (0)