From e70d41938f664f8090c12cfedac2bd9749a16dd4 Mon Sep 17 00:00:00 2001 From: drobnikj Date: Sun, 7 May 2023 12:45:12 +0200 Subject: [PATCH 1/2] feat(runs, builds): add usage usd into actor run and build types --- src/resource_clients/actor.ts | 4 +++- src/resource_clients/build.ts | 9 ++++++++- src/resource_clients/build_collection.ts | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/resource_clients/actor.ts b/src/resource_clients/actor.ts index 46f75224..efbc2aeb 100644 --- a/src/resource_clients/actor.ts +++ b/src/resource_clients/actor.ts @@ -353,6 +353,7 @@ export interface ActorRunListItem { defaultKeyValueStoreId: string; defaultDatasetId: string; defaultRequestQueueId: string; + usageUsdTotal?: number; } export interface ActorRun extends ActorRunListItem { @@ -364,7 +365,8 @@ export interface ActorRun extends ActorRunListItem { containerUrl: string; isContainerServerReady?: boolean; gitBranchName?: string; - usage?: ActorRunUsage + usage?: ActorRunUsage; + usageUsd?: ActorRunUsage; } export interface ActorRunUsage { diff --git a/src/resource_clients/build.ts b/src/resource_clients/build.ts index 250f13b8..0d37a972 100644 --- a/src/resource_clients/build.ts +++ b/src/resource_clients/build.ts @@ -94,7 +94,14 @@ export interface Build { options?: BuildOptions; inputSchema?: string; readme?: string; - buildNumber: string + buildNumber: string; + usage?: BuildUsage; + usageUsdTotal?: number; + usageUsd?: BuildUsage; +} + +export interface BuildUsage { + ACTOR_COMPUTE_UNITS?: number; } export interface BuildStats { diff --git a/src/resource_clients/build_collection.ts b/src/resource_clients/build_collection.ts index 24adba3c..bed0be6b 100644 --- a/src/resource_clients/build_collection.ts +++ b/src/resource_clients/build_collection.ts @@ -35,6 +35,6 @@ export interface BuildCollectionClientListOptions { desc?: boolean; } -export type BuildCollectionClientListItem = Required> & Partial> +export type BuildCollectionClientListItem = Required> & Partial> export type BuildCollectionClientListResult = PaginatedList; From 54cbeb163ef63cdd7a6df20fe253f8a3bb0852eb Mon Sep 17 00:00:00 2001 From: drobnikj Date: Wed, 10 May 2023 10:22:25 +0200 Subject: [PATCH 2/2] feat(types): rename usageTotalUsd --- src/resource_clients/actor.ts | 2 +- src/resource_clients/build.ts | 2 +- src/resource_clients/build_collection.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/resource_clients/actor.ts b/src/resource_clients/actor.ts index efbc2aeb..1adcda86 100644 --- a/src/resource_clients/actor.ts +++ b/src/resource_clients/actor.ts @@ -353,7 +353,7 @@ export interface ActorRunListItem { defaultKeyValueStoreId: string; defaultDatasetId: string; defaultRequestQueueId: string; - usageUsdTotal?: number; + usageTotalUsd?: number; } export interface ActorRun extends ActorRunListItem { diff --git a/src/resource_clients/build.ts b/src/resource_clients/build.ts index 0d37a972..27a2307b 100644 --- a/src/resource_clients/build.ts +++ b/src/resource_clients/build.ts @@ -96,7 +96,7 @@ export interface Build { readme?: string; buildNumber: string; usage?: BuildUsage; - usageUsdTotal?: number; + usageTotalUsd?: number; usageUsd?: BuildUsage; } diff --git a/src/resource_clients/build_collection.ts b/src/resource_clients/build_collection.ts index bed0be6b..795dabef 100644 --- a/src/resource_clients/build_collection.ts +++ b/src/resource_clients/build_collection.ts @@ -35,6 +35,6 @@ export interface BuildCollectionClientListOptions { desc?: boolean; } -export type BuildCollectionClientListItem = Required> & Partial> +export type BuildCollectionClientListItem = Required> & Partial> export type BuildCollectionClientListResult = PaginatedList;