@daocloud-proto/hydra 0.11.0-dev-40 → 0.11.0-dev-41

package/common/common.pb.ts

@@ -18,6 +18,13 @@ export enum Mode {
   Any = "Any",
 }
 
+export enum NodePhase {
+  NODE_PHASE_UNSPECIFIED = "NODE_PHASE_UNSPECIFIED",
+  Ready = "Ready",
+  Not_Ready = "Not_Ready",
+  Unknown = "Unknown",
+}
+
 export enum SearchIndexFieldBuilderType {
   FIELD_TYPE_UNSPECIFIED = "FIELD_TYPE_UNSPECIFIED",
   FILED = "FILED",
@@ -101,4 +108,52 @@ export type AuditObject = {
   kind?: string
   group?: string
   version?: string
+}
+
+export type Node = {
+  name?: string
+  arch?: string
+  labels?: {[key: string]: string}
+  gpuModels?: string[]
+  status?: NodeStatus
+}
+
+export type NodeStatus = {
+  phase?: NodePhase
+  addresses?: NodeAddress[]
+  cpuCapacity?: string
+  cpuAllocated?: number
+  cpuUsage?: number
+  memoryCapacity?: string
+  memoryAllocated?: number
+  memoryUsage?: number
+  systemInfo?: NodeSystemInfo
+  allowedPodNumber?: number
+  podAllocated?: number
+  readyPodNumber?: number
+  storageCapacity?: string
+  storageAllocated?: string
+  storageUsage?: number
+  storageDriver?: string
+  gpuTotal?: string
+  gpuAllocated?: string
+  gpuMemoryTotal?: string
+  gpuMemoryAllocated?: string
+  gpuCoreUsage?: number
+  gpuMemoryUsage?: number
+}
+
+export type NodeAddress = {
+  type?: string
+  address?: string
+}
+
+export type NodeSystemInfo = {
+  kernelVersion?: string
+  osImage?: string
+  containerRuntimeVersion?: string
+  kubeletVersion?: string
+  kubeProxyVersion?: string
+  operatingSystem?: string
+  architecture?: string
 }

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

@@ -24,6 +24,12 @@ export enum PaymentMethod {
   PAY_AS_YOU_GO = "PAY_AS_YOU_GO",
 }
 
+export enum PlacementPolicy {
+  PLACEMENT_POLICY_UNSPECIFIED = "PLACEMENT_POLICY_UNSPECIFIED",
+  BALANCED = "BALANCED",
+  GROUPED = "GROUPED",
+}
+
 export enum ModelServingStatus {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
   DEPLOYING = "DEPLOYING",
@@ -34,6 +40,12 @@ export enum ModelServingStatus {
   STOPPED = "STOPPED",
 }
 
+export enum ModelVisible {
+  MODEL_VISIBLE_UNSPECIFIED = "MODEL_VISIBLE_UNSPECIFIED",
+  MODEL_VISIBLE_PUBLIC = "MODEL_VISIBLE_PUBLIC",
+  MODEL_VISIBLE_PRIVATE = "MODEL_VISIBLE_PRIVATE",
+}
+
 export enum DeployDetectConditionType {
   DEPLOY_DETECT_CONDITION_TYPE_UNSPECIFIED = "DEPLOY_DETECT_CONDITION_TYPE_UNSPECIFIED",
   CLUSTER_RESOURCE_AVAILABLE = "CLUSTER_RESOURCE_AVAILABLE",
@@ -51,6 +63,12 @@ export enum WSModelServingActionRequestAction {
   STOP = "STOP",
 }
 
+export type SchedulingConfig = {
+  queueName?: string
+  priorityClass?: string
+  placementPolicy?: PlacementPolicy
+}
+
 export type WeightVolumeConfig = {
   modelId?: string
   modelTag?: string
@@ -111,6 +129,7 @@ export type CreateModelServingRequest = {
 
 export type CreateWSModelServingRequest = BaseCreateWSModelServingRequest
   & OneOf<{ weightVolumeConfig: WeightVolumeConfig }>
+  & OneOf<{ schedulingConfig: SchedulingConfig }>
 
 export type ModelServing = {
   id?: string
@@ -134,7 +153,8 @@ export type ModelServing = {
   modelSupportFeature?: HydraManagement_apiModelV1alpha1Model.ModelSupportFeature[]
 }
 
-export type WSModelServing = {
+
+/* hydra modified */ export type BaseWSModelServing = {
   id?: string
   name?: string
   modelId?: string
@@ -152,8 +172,12 @@ export type WSModelServing = {
   resourceConfig?: ResourceConfig
   runtimeConfig?: RuntimeConfig
   weightVolumeConfig?: WeightVolumeConfig
+  modelVisible?: ModelVisible
 }
 
+export type WSModelServing = BaseWSModelServing
+  & OneOf<{ schedulingConfig: SchedulingConfig }>
+
 export type ListModelServingRequest = {
   page?: HydraCommonCommon.Pagination
 }
@@ -237,6 +261,7 @@ export type WSModelServingActionRequest = {
 
 export type WSModelServingDeployDetectionRequest = BaseWSModelServingDeployDetectionRequest
   & OneOf<{ weightVolumeConfig: WeightVolumeConfig }>
+  & OneOf<{ schedulingConfig: SchedulingConfig }>
 
 export type ModelServingDeployDetectionResponse = {
   ready?: boolean

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

@@ -0,0 +1,121 @@
+/* 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"
+
+export enum QueueType {
+  QUEUE_TYPE_UNSPECIFIED = "QUEUE_TYPE_UNSPECIFIED",
+  KUEUE = "KUEUE",
+}
+
+export enum QueuePhase {
+  QUEUE_PHASE_UNSPECIFIED = "QUEUE_PHASE_UNSPECIFIED",
+  READY = "READY",
+}
+
+export enum QueueStrategy {
+  QUEUE_STRATEGY_UNSPECIFIED = "QUEUE_STRATEGY_UNSPECIFIED",
+  STRICT_FIFO = "STRICT_FIFO",
+  BEST_EFFORT_FIFO = "BEST_EFFORT_FIFO",
+}
+
+export enum QueuePreemptionWithinClusterQueuePolicy {
+  QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_UNSPECIFIED = "QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_UNSPECIFIED",
+  QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_NEVER = "QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_NEVER",
+  QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_LOWER_PRIORITY = "QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_LOWER_PRIORITY",
+  QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_LOWER_OR_NEWER_EQUALPRIORITY = "QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_LOWER_OR_NEWER_EQUALPRIORITY",
+  QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_ANY = "QUEUE_PREEMPTION_WITHIN_CLUSTER_QUEUE_POLICY_ANY",
+}
+
+export type CheckQueueRequest = {
+  type?: QueueType
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+}
+
+export type CheckQueueResponse = {
+  type?: QueueType
+  exist?: boolean
+}
+
+export type CreateLocalQueueRequest = {
+  type?: QueueType
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+}
+
+export type QueueStatus = {
+  phase?: QueuePhase
+}
+
+export type CreateLocalQueueResponse = {
+  type?: QueueType
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+  status?: QueueStatus
+}
+
+export type ListQueueRequest = {
+  workspace?: number
+  cluster?: string
+  type?: QueueType
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListQueueResponse = {
+  items?: Queue[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export type QueueResource = {
+  name?: string
+  value?: string
+  borrowingLimit?: string
+}
+
+export type QueueFlavor = {
+  name?: string
+  resources?: QueueResource[]
+  resourcesAvailable?: QueueResource[]
+  nodes?: HydraCommonCommon.Node[]
+}
+
+export type Queue = {
+  type?: QueueType
+  cluster?: string
+  name?: string
+  workspace?: number
+  description?: string
+  resources?: QueueResource[]
+  resourcesAvailable?: QueueResource[]
+  labels?: {[key: string]: string}
+  annotations?: {[key: string]: string}
+  status?: QueueStatus
+  strategy?: QueueStrategy
+  workspaceAlias?: string
+  preemptionWithinClusterQueue?: QueuePreemptionWithinClusterQueuePolicy
+  flavors?: QueueFlavor[]
+  tasEnabled?: boolean
+}
+
+export class QueueManagement {
+  static CheckQueue(req: CheckQueueRequest, initReq?: fm.InitReq): Promise<CheckQueueResponse> {
+    return fm.fetchReq<CheckQueueRequest, CheckQueueResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/queues/${req["name"]}/capacites?${fm.renderURLSearchParams(req, ["workspace", "cluster", "name"])}`, {...initReq, method: "GET"})
+  }
+  static CreateLocalQueue(req: CreateLocalQueueRequest, initReq?: fm.InitReq): Promise<CreateLocalQueueResponse> {
+    return fm.fetchReq<CreateLocalQueueRequest, CreateLocalQueueResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/localqueues`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
+  static ListQueues(req: ListQueueRequest, initReq?: fm.InitReq): Promise<ListQueueResponse> {
+    return fm.fetchReq<ListQueueRequest, ListQueueResponse>(`/apis/hydra.io/v1alpha1/queues?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/hydra",
-  "version": "v0.11.0-dev-40",
+  "version": "v0.11.0-dev-41",
   "description": "",
   "author": "",
   "license": "ISC"