@daocloud-proto/hydra 0.15.0 → 0.16.0-rc1

package/admin-api/core/v1alpha1/core.pb.ts

@@ -41,6 +41,7 @@ export type ListClusterResponse = {
 export type ConstantsResponse = {
   defaultFilesStorageCapacity?: string
   defaultMountPath?: string
+  defaultModelServingPort?: number
 }
 
 export type ListPlatformRolePermissionsForCurrentUserResponse = {

package/management-api/analysis_center/v1alpha1/cost_mock_config.pb.ts

@@ -0,0 +1,62 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as fm from "../../../fetch.pb"
+export type CostMockConfig = {
+  gpuCosts?: GPUCost[]
+  maasUsageCosts?: MaasUsageCost[]
+  maasTimeBoundPackageCosts?: MaaSTimeBoundPackageCost[]
+}
+
+export type GPUCost = {
+  productName?: string
+  sn?: string
+  cluster?: string
+  hourlyPrice?: number
+}
+
+export type MaasUsageCost = {
+  upstreamModelName?: string
+  inputPrice?: number
+  cachedInputPrice?: number
+  outputPrice?: number
+}
+
+export type MaaSTimeBoundPackageCost = {
+  upstreamModelName?: string
+  hourlyInputPrice?: number
+  hourlyCachedInputPrice?: number
+  hourlyOutputPrice?: number
+}
+
+export type CreateCostMockConfigRequest = {
+  config?: CostMockConfig
+}
+
+export type GetCostMockConfigRequest = {
+}
+
+export type UpdateCostMockConfigRequest = {
+  config?: CostMockConfig
+}
+
+export type DeleteCostMockConfigRequest = {
+}
+
+export class CostMockConfigManagement {
+  static CreateCostMockConfig(req: CreateCostMockConfigRequest, initReq?: fm.InitReq): Promise<CostMockConfig> {
+    return fm.fetchReq<CreateCostMockConfigRequest, CostMockConfig>(`/apis/hydra.io/v1alpha1/analysis-center/cost-mock-config`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
+  static GetCostMockConfig(req: GetCostMockConfigRequest, initReq?: fm.InitReq): Promise<CostMockConfig> {
+    return fm.fetchReq<GetCostMockConfigRequest, CostMockConfig>(`/apis/hydra.io/v1alpha1/analysis-center/cost-mock-config?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static UpdateCostMockConfig(req: UpdateCostMockConfigRequest, initReq?: fm.InitReq): Promise<CostMockConfig> {
+    return fm.fetchReq<UpdateCostMockConfigRequest, CostMockConfig>(`/apis/hydra.io/v1alpha1/analysis-center/cost-mock-config`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
+  static DeleteCostMockConfig(req: DeleteCostMockConfigRequest, initReq?: fm.InitReq): Promise<CostMockConfig> {
+    return fm.fetchReq<DeleteCostMockConfigRequest, CostMockConfig>(`/apis/hydra.io/v1alpha1/analysis-center/cost-mock-config`, {...initReq, method: "DELETE"})
+  }
+}

package/management-api/dashboard/v1alpha1/dashboard.pb.ts

@@ -0,0 +1,99 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as HydraCommonCommon from "../../../common/common.pb"
+import * as fm from "../../../fetch.pb"
+import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
+export type Period = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+}
+
+export type WSDashboardSummaryRequest = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+  compareStartTime?: GoogleProtobufTimestamp.Timestamp
+  compareEndTime?: GoogleProtobufTimestamp.Timestamp
+  timezone?: string
+  workspace?: number
+}
+
+export type DashboardSummaryResponse = {
+  activeUserCount?: string
+  totalUserCount?: string
+  activeUserChange?: string
+  activeUserChangeRate?: number
+  totalTokens?: string
+  todayTokens?: string
+  requestCount?: string
+  apiKeyCount?: string
+  apiKeyChange?: string
+  period?: Period
+  comparePeriod?: Period
+}
+
+export type ListWSUserTokenUsageRequest = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+  page?: HydraCommonCommon.Pagination
+  sortBy?: string
+  sortOrder?: string
+  workspace?: number
+}
+
+export type UserTokenUsage = {
+  userId?: string
+  username?: string
+  inputTokens?: string
+  outputTokens?: string
+  cachedTokens?: string
+  totalTokens?: string
+  requestCount?: string
+  lastUsedTime?: GoogleProtobufTimestamp.Timestamp
+}
+
+export type ListUserTokenUsageResponse = {
+  items?: UserTokenUsage[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListWSInstanceTokenUsageRequest = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+  page?: HydraCommonCommon.Pagination
+  sortBy?: string
+  sortOrder?: string
+  workspace?: number
+}
+
+export type InstanceTokenUsage = {
+  instanceId?: string
+  instanceName?: string
+  modelName?: string
+  inputTokens?: string
+  outputTokens?: string
+  cachedTokens?: string
+  totalTokens?: string
+  requestCount?: string
+  lastUsedTime?: GoogleProtobufTimestamp.Timestamp
+}
+
+export type ListInstanceTokenUsageResponse = {
+  items?: InstanceTokenUsage[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export class WSDashboardManagement {
+  static GetWSDashboardSummary(req: WSDashboardSummaryRequest, initReq?: fm.InitReq): Promise<DashboardSummaryResponse> {
+    return fm.fetchReq<WSDashboardSummaryRequest, DashboardSummaryResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/dashboard/summary?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
+  }
+  static ListWSUserTokenUsage(req: ListWSUserTokenUsageRequest, initReq?: fm.InitReq): Promise<ListUserTokenUsageResponse> {
+    return fm.fetchReq<ListWSUserTokenUsageRequest, ListUserTokenUsageResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/dashboard/users/token-usage?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
+  }
+  static ListWSInstanceTokenUsage(req: ListWSInstanceTokenUsageRequest, initReq?: fm.InitReq): Promise<ListInstanceTokenUsageResponse> {
+    return fm.fetchReq<ListWSInstanceTokenUsageRequest, ListInstanceTokenUsageResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/dashboard/instances/token-usage?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
+  }
+}

package/management-api/finetune/v1alpha1/common.pb.ts

@@ -11,4 +11,9 @@ export enum JobStatus {
   COMPLETED = "COMPLETED",
   FAILED = "FAILED",
   DELETING = "DELETING",
+}
+
+export type EnvVar = {
+  name?: string
+  value?: string
 }

package/management-api/finetune/v1alpha1/evaljob.pb.ts

@@ -44,6 +44,7 @@ export type EvalJob = {
   creationTimestamp?: GoogleProtobufTimestamp.Timestamp
   completionTimestamp?: GoogleProtobufTimestamp.Timestamp
   datasetName?: string
+  env?: HydraManagement_apiFinetuneV1alpha1Common.EnvVar[]
 }
 
 
@@ -57,6 +58,7 @@ export type EvalJob = {
   finetuneJobName?: string
   datasetId?: string
   datasetVolumeId?: string
+  env?: HydraManagement_apiFinetuneV1alpha1Common.EnvVar[]
 }
 
 export type CreateWSEvalJobRequest = BaseCreateWSEvalJobRequest

package/management-api/finetune/v1alpha1/finetunejob.pb.ts

@@ -52,6 +52,7 @@ export type FineTuneJob = {
   metrics?: MetricPoint[]
   trainingParams?: GoogleProtobufStruct.Struct
   metadata?: GoogleProtobufStruct.Struct
+  env?: HydraManagement_apiFinetuneV1alpha1Common.EnvVar[]
 }
 
 export type CreateWSFineTuneJobRequest = {
@@ -67,6 +68,7 @@ export type CreateWSFineTuneJobRequest = {
   training?: HydraManagement_apiFinetuneV1alpha1Finetuneconfig.TrainingConfig
   dpo?: HydraManagement_apiFinetuneV1alpha1Finetuneconfig.DpoConfig
   resources?: HydraManagement_apiFinetuneV1alpha1Finetuneconfig.ResourceConfig
+  env?: HydraManagement_apiFinetuneV1alpha1Common.EnvVar[]
 }
 
 export type GetWSFineTuneJobRequest = {

package/management-api/model_serving/v1alpha1/model_serving.pb.ts

@@ -30,6 +30,19 @@ export enum PlacementPolicy {
   GROUPED = "GROUPED",
 }
 
+export enum HealthProbeCheckType {
+  PROBE_CHECK_TYPE_UNSPECIFIED = "PROBE_CHECK_TYPE_UNSPECIFIED",
+  PROBE_CHECK_HTTP = "PROBE_CHECK_HTTP",
+  PROBE_CHECK_TCP = "PROBE_CHECK_TCP",
+  PROBE_CHECK_EXEC = "PROBE_CHECK_EXEC",
+}
+
+export enum HealthProbeScheme {
+  PROBE_SCHEME_UNSPECIFIED = "PROBE_SCHEME_UNSPECIFIED",
+  PROBE_SCHEME_HTTP = "PROBE_SCHEME_HTTP",
+  PROBE_SCHEME_HTTPS = "PROBE_SCHEME_HTTPS",
+}
+
 export enum ModelServingStatus {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
   DEPLOYING = "DEPLOYING",
@@ -75,6 +88,35 @@ export type PreflightConfig = {
   nodeCheckBusbwThresholdGbps?: string
 }
 
+export type HealthProbeHTTPHeader = {
+  name?: string
+  value?: string
+}
+
+export type HealthProbeConfig = {
+  checkType?: HealthProbeCheckType
+  path?: string
+  port?: number
+  host?: string
+  scheme?: HealthProbeScheme
+  httpHeaders?: HealthProbeHTTPHeader[]
+  command?: string[]
+  initialDelaySeconds?: number
+  timeoutSeconds?: number
+  periodSeconds?: number
+  successThreshold?: number
+  failureThreshold?: number
+}
+
+
+/* hydra modified */ export type BaseHealthCheckConfig = {
+}
+
+export type HealthCheckConfig = BaseHealthCheckConfig
+  & OneOf<{ livenessProbe: HealthProbeConfig }>
+  & OneOf<{ readinessProbe: HealthProbeConfig }>
+  & OneOf<{ startupProbe: HealthProbeConfig }>
+
 export type WeightVolumeConfig = {
   modelId?: string
   modelTag?: string
@@ -84,6 +126,12 @@ export type WeightVolumeConfig = {
   mountPath?: string
 }
 
+export type ConfigMapMountConfig = {
+  configMapName?: string
+  mountPath?: string
+  subPath?: string
+}
+
 
 /* hydra modified */ export type BaseResourceConfig = {
   cpu?: number
@@ -117,6 +165,7 @@ export type CreateModelServingRequest = {
   replicas?: number
   skuId?: string
   paymentMethods?: PaymentMethod
+  enableMetrics?: boolean
 }
 
 
@@ -132,12 +181,15 @@ export type CreateModelServingRequest = {
   resourceConfig?: ResourceConfig
   runtimeConfig?: RuntimeConfig
   tokenWeight?: string
+  enableMetrics?: boolean
+  configMapMounts?: ConfigMapMountConfig[]
 }
 
 export type CreateWSModelServingRequest = BaseCreateWSModelServingRequest
   & OneOf<{ weightVolumeConfig: WeightVolumeConfig }>
   & OneOf<{ schedulingConfig: SchedulingConfig }>
   & OneOf<{ preflight: PreflightConfig }>
+  & OneOf<{ healthCheck: HealthCheckConfig }>
 
 export type ModelServing = {
   id?: string
@@ -183,6 +235,8 @@ export type ModelServing = {
   modelVisible?: ModelVisible
   tokenWeight?: string
   preflight?: PreflightConfig
+  configMapMounts?: ConfigMapMountConfig[]
+  healthCheck?: HealthCheckConfig
 }
 
 export type WSModelServing = BaseWSModelServing

package/management-api/workspace/v1alpha1/workspace.pb.ts

@@ -69,6 +69,24 @@ export type ListClusterNamespaceResponse = {
   page?: HydraCommonCommon.Pagination
 }
 
+export type ListConfigMapsRequest = {
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  page?: HydraCommonCommon.Pagination
+  name?: string
+}
+
+export type ConfigMap = {
+  name?: string
+  namespace?: string
+}
+
+export type ListConfigMapsResponse = {
+  items?: ConfigMap[]
+  page?: HydraCommonCommon.Pagination
+}
+
 export class WorkspaceService {
   static ListWorkspaces(req: ListWorkspaceRequest, initReq?: fm.InitReq): Promise<ListWorkspacesResponse> {
     return fm.fetchReq<ListWorkspaceRequest, ListWorkspacesResponse>(`/apis/hydra.io/v1alpha1/workspaces?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
@@ -79,4 +97,7 @@ export class WorkspaceService {
   static ListClusterNamespaces(req: ListClusterNamespacesRequest, initReq?: fm.InitReq): Promise<ListClusterNamespaceResponse> {
     return fm.fetchReq<ListClusterNamespacesRequest, ListClusterNamespaceResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/cluster-namespaces?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
   }
+  static ListConfigMaps(req: ListConfigMapsRequest, initReq?: fm.InitReq): Promise<ListConfigMapsResponse> {
+    return fm.fetchReq<ListConfigMapsRequest, ListConfigMapsResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/configmaps?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/hydra",
-  "version": "v0.15.0",
+  "version": "v0.16.0-rc1",
   "description": "",
   "author": "",
   "license": "ISC"