@daocloud-proto/baize 0.104.0 → 0.104.2

package/common/k8s.pb.ts

@@ -27,6 +27,16 @@ export type KubeVolume = {
   readOnly?: boolean
 }
 
+export type PodConfig = {
+  kubeEnvs?: KubeEnv[]
+  kubeVolumes?: KubeVolume[]
+  resources?: Resources
+  affinity?: Affinity
+  schedulerName?: string
+  priorityClass?: string
+  queue?: string
+}
+
 export type Affinity = {
   nodeAffinity?: NodeAffinity
   podAffinity?: PodAffinity

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

@@ -0,0 +1,19 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as BaizeCommonK8s from "../../../common/k8s.pb"
+
+export enum AnalysisConfigType {
+  TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
+  TENSORBOARD = "TENSORBOARD",
+}
+
+export type AnalysisConfig = {
+  enabled?: boolean
+  type?: AnalysisConfigType
+  kubeVolumes?: BaizeCommonK8s.KubeVolume[]
+  logPath?: string
+}

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

@@ -6,6 +6,15 @@
 
 import * as BaizeCommonK8s from "../../../common/k8s.pb"
 
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
+
 export enum QueueType {
   QUEUE_TYPE_UNSPECIFIED = "QUEUE_TYPE_UNSPECIFIED",
   KUEUE = "KUEUE",
@@ -32,7 +41,8 @@ export type CommonConfig = {
   description?: string
 }
 
-export type JobCreationBaseConfig = {
+
+/* baize modified */ export type BaseJobCreationBaseConfig = {
   image?: string
   imagePullSecret?: string
   command?: string[]
@@ -41,10 +51,12 @@ export type JobCreationBaseConfig = {
   annotations?: {[key: string]: string}
   kubeEnvs?: BaizeCommonK8s.KubeEnv[]
   kubeVolumes?: BaizeCommonK8s.KubeVolume[]
-  tolerationSeconds?: string
-  podAntiAffinity?: BaizeCommonK8s.Affinity
+  affinity?: BaizeCommonK8s.Affinity
 }
 
+export type JobCreationBaseConfig = BaseJobCreationBaseConfig
+  & OneOf<{ tolerationSeconds: string }>
+
 export type JobRoleDifferenceConfig = {
   replicas?: number
   resources?: BaizeCommonK8s.Resources

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

@@ -7,6 +7,7 @@
 import * as BaizeCommonCommon from "../../../common/common.pb"
 import * as BaizeCommonK8s from "../../../common/k8s.pb"
 import * as fm from "../../../fetch.pb"
+import * as BaizeManagement_apiAnalysisV1alpha1Analysis from "../../analysis/v1alpha1/analysis.pb"
 import * as BaizeManagement_apiJobV1alpha1Paddle from "./paddle.pb"
 import * as BaizeManagement_apiJobV1alpha1Pytorch from "./pytorch.pb"
 import * as BaizeManagement_apiJobV1alpha1Tfjob from "./tfjob.pb"
@@ -39,12 +40,13 @@ export enum JobActionRequestAction {
   priorityClass?: string
   runningDuration?: number
   totalResources?: BaizeCommonK8s.Resources
-  tolerationSeconds?: string
-  podAntiAffinity?: BaizeCommonK8s.Affinity
+  affinity?: BaizeCommonK8s.Affinity
+  analysis?: BaizeManagement_apiAnalysisV1alpha1Analysis.AnalysisConfig
 }
 
 export type Job = BaseJob
   & OneOf<{ pytorch: BaizeManagement_apiJobV1alpha1Pytorch.PyTorchJob; tensorflow: BaizeManagement_apiJobV1alpha1Tfjob.TFJob; paddle: BaizeManagement_apiJobV1alpha1Paddle.PaddleJob }>
+  & OneOf<{ tolerationSeconds: string }>
 
 export type ListJobsRequest = {
   workspace?: number
@@ -77,6 +79,7 @@ export type SingleJobRequest = {
   description?: string
   queueName?: string
   priorityClass?: string
+  analysis?: BaizeManagement_apiAnalysisV1alpha1Analysis.AnalysisConfig
 }
 
 export type CreateJobRequest = BaseCreateJobRequest

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

@@ -8,6 +8,7 @@ import * as BaizeCommonCommon from "../../../common/common.pb"
 import * as BaizeCommonK8s from "../../../common/k8s.pb"
 import * as fm from "../../../fetch.pb"
 import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
+import * as BaizeManagement_apiAnalysisV1alpha1Analysis from "../../analysis/v1alpha1/analysis.pb"
 
 export enum NotebookType {
   TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
@@ -75,6 +76,7 @@ export type Notebook = {
   creationTimestamp?: GoogleProtobufTimestamp.Timestamp
   status?: NotebookStatus
   priorityClass?: string
+  analysis?: BaizeManagement_apiAnalysisV1alpha1Analysis.AnalysisConfig
 }
 
 export type ListNotebooksResponse = {
@@ -98,6 +100,7 @@ export type CreateNotebookRequest = {
   type?: NotebookType
   config?: NotebookConfig
   priorityClass?: string
+  analysis?: BaizeManagement_apiAnalysisV1alpha1Analysis.AnalysisConfig
 }
 
 export type UpdateNotebookRequest = {
@@ -107,6 +110,7 @@ export type UpdateNotebookRequest = {
   name?: string
   config?: NotebookConfig
   priorityClass?: string
+  analysis?: BaizeManagement_apiAnalysisV1alpha1Analysis.AnalysisConfig
 }
 
 export type NotebookActionRequest = {

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

@@ -60,6 +60,10 @@ export type ListQueueResponse = {
   page?: BaizeCommonCommon.Pagination
 }
 
+export type QueueJSON = {
+  data?: string
+}
+
 export type CreateQueueRequest = {
   type?: QueueType
   cluster?: string
@@ -139,6 +143,9 @@ export class QueueManagement {
   static GetQueue(req: GetQueueRequest, initReq?: fm.InitReq): Promise<Queue> {
     return fm.fetchReq<GetQueueRequest, Queue>(`/apis/baize.io/v1alpha1/clusters/${req["cluster"]}/queues/${req["name"]}?${fm.renderURLSearchParams(req, ["cluster", "name"])}`, {...initReq, method: "GET"})
   }
+  static GetQueueByJSON(req: GetQueueRequest, initReq?: fm.InitReq): Promise<QueueJSON> {
+    return fm.fetchReq<GetQueueRequest, QueueJSON>(`/apis/baize.io/v1alpha1/clusters/${req["cluster"]}/queues/${req["name"]}/json?${fm.renderURLSearchParams(req, ["cluster", "name"])}`, {...initReq, method: "GET"})
+  }
   static DeleteQueue(req: DeleteQueueRequest, initReq?: fm.InitReq): Promise<Queue> {
     return fm.fetchReq<DeleteQueueRequest, Queue>(`/apis/baize.io/v1alpha1/clusters/${req["cluster"]}/queues/${req["name"]}`, {...initReq, method: "DELETE", body: JSON.stringify(req, fm.replacer)})
   }

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

@@ -7,6 +7,7 @@
 import * as BaizeCommonCommon from "../../../common/common.pb"
 import * as BaizeCommonK8s from "../../../common/k8s.pb"
 import * as fm from "../../../fetch.pb"
+import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
 import * as BaizeManagement_apiServingTritonModel_config from "../triton/model_config.pb"
 
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
@@ -18,6 +19,13 @@ type OneOf<T> =
         : never)
     : never);
 
+export enum ServiceType {
+  SERVICE_TYPE_UNSPECIFIED = "SERVICE_TYPE_UNSPECIFIED",
+  NODE_PORT = "NODE_PORT",
+  LOAD_BALANCER = "LOAD_BALANCER",
+  CLUSTER_IP = "CLUSTER_IP",
+}
+
 export enum FrameworkType {
   FRAMEWORK_TYPE_UNSPECIFIED = "FRAMEWORK_TYPE_UNSPECIFIED",
   FRAMEWORK_TYPE_TRITON = "FRAMEWORK_TYPE_TRITON",
@@ -31,30 +39,22 @@ export enum FrameworkTritonBackend {
   TRITON_BACKEND_ONNX = "TRITON_BACKEND_ONNX",
 }
 
-export enum InferenceServingServiceType {
-  SERVICE_TYPE_UNSPECIFIED = "SERVICE_TYPE_UNSPECIFIED",
-  NODE_PORT = "NODE_PORT",
-  LOAD_BALANCER = "LOAD_BALANCER",
-  CLUSTER_IP = "CLUSTER_IP",
-}
-
 export enum InferenceServingStatusPhase {
   PHASE_UNSPECIFIED = "PHASE_UNSPECIFIED",
   PENDING = "PENDING",
   UPDATING_OR_CREATING = "UPDATING_OR_CREATING",
   RUNNING = "RUNNING",
   FAILED = "FAILED",
+  DELETING = "DELETING",
+  STOPPED = "STOPPED",
 }
 
-export enum CreateInferenceServingRequestServiceType {
-  SERVICE_TYPE_UNSPECIFIED = "SERVICE_TYPE_UNSPECIFIED",
-  NODE_PORT = "NODE_PORT",
-  LOAD_BALANCER = "LOAD_BALANCER",
-  CLUSTER_IP = "CLUSTER_IP",
+export enum ServingAuthAuthType {
+  AUTH_TYPE_UNSPECIFIED = "AUTH_TYPE_UNSPECIFIED",
+  TRITON_RESTRICTED_KEY = "TRITON_RESTRICTED_KEY",
 }
 
 export type FrameworkTriton = {
-  secretRef?: string
   backend?: FrameworkTritonBackend
 }
 
@@ -94,13 +94,16 @@ export type ServingConfigTritonServingConfig = BaseServingConfigTritonServingCon
 
 
 /* baize modified */ export type BaseServingConfig = {
+  name?: string
+  version?: string
+  modelPath?: string
 }
 
 export type ServingConfig = BaseServingConfig
   & OneOf<{ triton: ServingConfigTritonServingConfig }>
 
-export type InferenceServingServiceConfig = {
-  serviceType?: InferenceServingServiceType
+export type ServiceConfig = {
+  serviceType?: ServiceType
 }
 
 export type InferenceServing = {
@@ -108,11 +111,14 @@ export type InferenceServing = {
   cluster?: string
   namespace?: string
   models?: ServingConfig[]
-  kubeEnvs?: BaizeCommonK8s.KubeEnv[]
-  kubeVolumes?: BaizeCommonK8s.KubeVolume[]
-  serviceConfig?: InferenceServingServiceConfig
+  serviceConfig?: ServiceConfig
   replicas?: number
+  labels?: {[key: string]: string}
+  annotations?: {[key: string]: string}
+  framework?: Framework
+  podConfig?: BaizeCommonK8s.PodConfig
   status?: InferenceServingStatus
+  lastUpdated?: GoogleProtobufTimestamp.Timestamp
 }
 
 export type InferenceServingStatusModelStatus = {
@@ -127,20 +133,45 @@ export type InferenceServingStatus = {
   accessBaseUrl?: string
 }
 
-export type CreateInferenceServingRequestServiceConfig = {
-  serviceType?: CreateInferenceServingRequestServiceType
+export type ServingAuthTritonRestrictedKeyValue = {
+  key?: string
+  value?: string
+}
+
+
+/* baize modified */ export type BaseServingAuth = {
+  authType?: ServingAuthAuthType
 }
 
+export type ServingAuth = BaseServingAuth
+  & OneOf<{ tritonRestrictedKeyValue: ServingAuthTritonRestrictedKeyValue }>
+
 export type CreateInferenceServingRequest = {
   workspace?: number
   name?: string
   cluster?: string
   namespace?: string
   models?: ServingConfig[]
-  kubeEnvs?: BaizeCommonK8s.KubeEnv[]
-  kubeVolumes?: BaizeCommonK8s.KubeVolume[]
-  serviceConfig?: CreateInferenceServingRequestServiceConfig
+  serviceConfig?: ServiceConfig
+  replicas?: number
+  labels?: {[key: string]: string}
+  annotations?: {[key: string]: string}
+  podConfig?: BaizeCommonK8s.PodConfig
+  framework?: Framework
+  auth?: ServingAuth
+}
+
+export type UpdateInferenceServingRequest = {
+  workspace?: number
+  name?: string
+  cluster?: string
+  namespace?: string
+  models?: ServingConfig[]
   replicas?: number
+  labels?: {[key: string]: string}
+  annotations?: {[key: string]: string}
+  podConfig?: BaizeCommonK8s.PodConfig
+  auth?: ServingAuth
 }
 
 export type SingleInferenceServingRequest = {
@@ -151,7 +182,6 @@ export type SingleInferenceServingRequest = {
 }
 
 export type ListInferenceServingsRequest = {
-  name?: string
   cluster?: string
   namespace?: string
   workspace?: number
@@ -173,6 +203,9 @@ export class InferenceServingManagement {
   static ListInferenceServings(req: ListInferenceServingsRequest, initReq?: fm.InitReq): Promise<ListInferenceServingsResponse> {
     return fm.fetchReq<ListInferenceServingsRequest, ListInferenceServingsResponse>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/inference-serving?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace"])}`, {...initReq, method: "GET"})
   }
+  static UpdateInferenceServing(req: UpdateInferenceServingRequest, initReq?: fm.InitReq): Promise<InferenceServing> {
+    return fm.fetchReq<UpdateInferenceServingRequest, InferenceServing>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/inference-serving/${req["name"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
   static DeleteInferenceServing(req: SingleInferenceServingRequest, initReq?: fm.InitReq): Promise<InferenceServing> {
     return fm.fetchReq<SingleInferenceServingRequest, InferenceServing>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/inference-serving/${req["name"]}`, {...initReq, method: "DELETE", body: JSON.stringify(req, fm.replacer)})
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/baize",
-  "version": "v0.104.0",
+  "version": "v0.104.2",
   "description": "",
   "author": "",
   "license": "ISC"