diff --git a/packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py b/packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py index 5344d6478e4..78e0c005abc 100644 --- a/packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py +++ b/packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py @@ -6,6 +6,7 @@ from ..projects import ProjectID from ..projects_nodes_io import NodeID from ..resource_tracker import ( + CreditTransactionStatus, HardwareInfo, PricingPlanClassification, PricingPlanId, @@ -27,13 +28,15 @@ class ServiceRunGet( BaseModel -): # NOTE: this is already in use so I didnt modidy inheritance from OutputSchema +): # NOTE: this is already in use so I didnt modify inheritance from OutputSchema service_run_id: ServiceRunID wallet_id: WalletID | None wallet_name: str | None user_id: UserID + user_email: str project_id: ProjectID project_name: str + project_tags: list[str] node_id: NodeID node_name: str root_parent_project_id: ProjectID @@ -44,6 +47,9 @@ class ServiceRunGet( started_at: datetime stopped_at: datetime | None service_run_status: ServiceRunStatus + # Cost in credits + credit_cost: Decimal | None + transaction_status: CreditTransactionStatus | None class PricingUnitGet(OutputSchema): diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml index a64a214e1f0..cd57f9576b3 100644 --- a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml +++ b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml @@ -8523,6 +8523,15 @@ components: - usdPerCredit - minPaymentAmountUsd title: CreditPriceGet + CreditTransactionStatus: + type: string + enum: + - PENDING + - BILLED + - IN_DEBT + - NOT_BILLED + - REQUIRES_MANUAL_REVIEW + title: CreditTransactionStatus CursorPage___T_Customized_PathMetaDataGet_: properties: items: @@ -14626,6 +14635,9 @@ components: exclusiveMinimum: true title: User Id minimum: 0 + user_email: + type: string + title: User Email project_id: type: string format: uuid @@ -14633,6 +14645,11 @@ components: project_name: type: string title: Project Name + project_tags: + items: + type: string + type: array + title: Project Tags node_id: type: string format: uuid @@ -14670,14 +14687,25 @@ components: title: Stopped At service_run_status: $ref: '#/components/schemas/ServiceRunStatus' + credit_cost: + anyOf: + - type: string + - type: 'null' + title: Credit Cost + transaction_status: + anyOf: + - $ref: '#/components/schemas/CreditTransactionStatus' + - type: 'null' type: object required: - service_run_id - wallet_id - wallet_name - user_id + - user_email - project_id - project_name + - project_tags - node_id - node_name - root_parent_project_id @@ -14688,6 +14716,8 @@ components: - started_at - stopped_at - service_run_status + - credit_cost + - transaction_status title: ServiceRunGet ServiceRunStatus: type: string