@daocloud-proto/baize 0.104.3 → 0.105.0

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

@@ -6,15 +6,6 @@
 
 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",
@@ -35,28 +26,34 @@ export enum JobPhase {
   SUSPENDED = "SUSPENDED",
 }
 
+export enum JobRole {
+  JOB_ROLE_UNSPECIFIED = "JOB_ROLE_UNSPECIFIED",
+  MASTER = "MASTER",
+  WORKER = "WORKER",
+  TF_CHIEF = "TF_CHIEF",
+  TF_PS = "TF_PS",
+  TF_WORKER = "TF_WORKER",
+  TF_EVALUATOR = "TF_EVALUATOR",
+  PD_MASTER = "PD_MASTER",
+  PD_WORKER = "PD_WORKER",
+}
+
 export type CommonConfig = {
   queueType?: QueueType
   taskQueue?: string
   description?: string
 }
 
-
-/* baize modified */ export type BaseJobCreationBaseConfig = {
+export type JobCreationBaseConfig = {
   image?: string
   imagePullSecret?: string
   command?: string[]
   args?: string[]
+  podConfig?: BaizeCommonK8s.PodConfig
   labels?: {[key: string]: string}
   annotations?: {[key: string]: string}
-  kubeEnvs?: BaizeCommonK8s.KubeEnv[]
-  kubeVolumes?: BaizeCommonK8s.KubeVolume[]
-  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,19 +7,10 @@
 import * as BaizeCommonCommon from "../../../common/common.pb"
 import * as BaizeCommonK8s from "../../../common/k8s.pb"
 import * as fm from "../../../fetch.pb"
+import * as GoogleProtobufStruct from "../../../google/protobuf/struct.pb"
+import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.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"
-
-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);
+import * as BaizeManagement_apiJobV1alpha1Common from "./common.pb"
 
 export enum JobType {
   JOB_TYPE_UNSPECIFIED = "JOB_TYPE_UNSPECIFIED",
@@ -33,21 +24,30 @@ export enum JobActionRequestAction {
   STOP = "STOP",
 }
 
+export enum JobSchedulersResponseSchedulerFeature {
+  FEATURE_UNSPECIFIED = "FEATURE_UNSPECIFIED",
+  BINPACK = "BINPACK",
+  GANG = "GANG",
+  FAIR = "FAIR",
+}
 
-/* baize modified */ export type BaseJob = {
+export type Job = {
   type?: JobType
-  queueName?: string
-  priorityClass?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
+  creationTimestamp?: GoogleProtobufTimestamp.Timestamp
+  jobSpec?: GoogleProtobufStruct.Struct
+  description?: string
+  baseConfig?: BaizeManagement_apiJobV1alpha1Common.JobCreationBaseConfig
+  roleConfig?: {[key: string]: BaizeManagement_apiJobV1alpha1Common.JobRoleDifferenceConfig}
+  phase?: BaizeManagement_apiJobV1alpha1Common.JobPhase
   runningDuration?: number
   totalResources?: BaizeCommonK8s.Resources
-  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
   type?: JobType
@@ -69,22 +69,19 @@ export type SingleJobRequest = {
   name?: string
 }
 
-
-/* baize modified */ export type BaseCreateJobRequest = {
+export type CreateJobRequest = {
   workspace?: number
   type?: JobType
   cluster?: string
   namespace?: string
   name?: string
   description?: string
-  queueName?: string
-  priorityClass?: string
+  baseConfig?: BaizeManagement_apiJobV1alpha1Common.JobCreationBaseConfig
+  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
+  roleConfig?: {[key: string]: BaizeManagement_apiJobV1alpha1Common.JobRoleDifferenceConfig}
   analysis?: BaizeManagement_apiAnalysisV1alpha1Analysis.AnalysisConfig
 }
 
-export type CreateJobRequest = BaseCreateJobRequest
-  & OneOf<{ pytorch: BaizeManagement_apiJobV1alpha1Pytorch.PytorchJobCreationConfig; tensorflow: BaizeManagement_apiJobV1alpha1Tfjob.TFJobCreationConfig; paddle: BaizeManagement_apiJobV1alpha1Paddle.PaddleJobCreationConfig }>
-
 export type JobActionRequest = {
   workspace?: number
   type?: JobType
@@ -94,6 +91,17 @@ export type JobActionRequest = {
   action?: JobActionRequestAction
 }
 
+export type JobSchedulersResponseScheduler = {
+  default?: boolean
+  name?: string
+  alias?: string
+  enabledFeatures?: JobSchedulersResponseSchedulerFeature[]
+}
+
+export type JobSchedulersResponse = {
+  items?: JobSchedulersResponseScheduler[]
+}
+
 export class JobsManagement {
   static ListJobs(req: ListJobsRequest, initReq?: fm.InitReq): Promise<ListJobsResponse> {
     return fm.fetchReq<ListJobsRequest, ListJobsResponse>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/jobs?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
@@ -110,4 +118,7 @@ export class JobsManagement {
   static DoJobAction(req: JobActionRequest, initReq?: fm.InitReq): Promise<Job> {
     return fm.fetchReq<JobActionRequest, Job>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/jobs/${req["name"]}/actions`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
+  static ListSchedulers(req: CreateJobRequest, initReq?: fm.InitReq): Promise<JobSchedulersResponse> {
+    return fm.fetchReq<CreateJobRequest, JobSchedulersResponse>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/jobs/${req["name"]}/schedulers?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
+  }
 }

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

@@ -57,6 +57,7 @@ export type NotebookConfig = {
   kubeVolumes?: BaizeCommonK8s.KubeVolume[]
   runAsRoot?: boolean
   serviceType?: NotebookConfigServiceType
+  enableSSH?: boolean
 }
 
 export type NotebookStatus = {

package/package.json

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

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

@@ -1,34 +0,0 @@
-/* eslint-disable */
-// @ts-nocheck
-/*
-* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
-*/
-
-import * as GoogleProtobufStruct from "../../../google/protobuf/struct.pb"
-import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
-import * as BaizeManagement_apiJobV1alpha1Common from "./common.pb"
-
-export enum PaddleRole {
-  PADDLE_ROLE_UNSPECIFIED = "PADDLE_ROLE_UNSPECIFIED",
-  PD_MASTER = "PD_MASTER",
-  PD_WORKER = "PD_WORKER",
-}
-
-export type PaddleJob = {
-  cluster?: string
-  namespace?: string
-  name?: string
-  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
-  creationTimestamp?: GoogleProtobufTimestamp.Timestamp
-  phase?: BaizeManagement_apiJobV1alpha1Common.JobPhase
-  labels?: {[key: string]: string}
-  annotations?: {[key: string]: string}
-  jobSpec?: GoogleProtobufStruct.Struct
-  description?: string
-}
-
-export type PaddleJobCreationConfig = {
-  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
-  baseConfig?: BaizeManagement_apiJobV1alpha1Common.JobCreationBaseConfig
-  roleConfig?: {[key: string]: BaizeManagement_apiJobV1alpha1Common.JobRoleDifferenceConfig}
-}

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

@@ -1,34 +0,0 @@
-/* eslint-disable */
-// @ts-nocheck
-/*
-* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
-*/
-
-import * as GoogleProtobufStruct from "../../../google/protobuf/struct.pb"
-import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
-import * as BaizeManagement_apiJobV1alpha1Common from "./common.pb"
-
-export enum PyTorchRole {
-  PYTORCH_ROLE_UNSPECIFIED = "PYTORCH_ROLE_UNSPECIFIED",
-  MASTER = "MASTER",
-  WORKER = "WORKER",
-}
-
-export type PyTorchJob = {
-  cluster?: string
-  namespace?: string
-  name?: string
-  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
-  creationTimestamp?: GoogleProtobufTimestamp.Timestamp
-  phase?: BaizeManagement_apiJobV1alpha1Common.JobPhase
-  labels?: {[key: string]: string}
-  annotations?: {[key: string]: string}
-  jobSpec?: GoogleProtobufStruct.Struct
-  description?: string
-}
-
-export type PytorchJobCreationConfig = {
-  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
-  baseConfig?: BaizeManagement_apiJobV1alpha1Common.JobCreationBaseConfig
-  roleConfig?: {[key: string]: BaizeManagement_apiJobV1alpha1Common.JobRoleDifferenceConfig}
-}

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

@@ -1,36 +0,0 @@
-/* eslint-disable */
-// @ts-nocheck
-/*
-* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
-*/
-
-import * as GoogleProtobufStruct from "../../../google/protobuf/struct.pb"
-import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
-import * as BaizeManagement_apiJobV1alpha1Common from "./common.pb"
-
-export enum TFRole {
-  TF_ROLE_UNSPECIFIED = "TF_ROLE_UNSPECIFIED",
-  TF_CHIEF = "TF_CHIEF",
-  TF_PS = "TF_PS",
-  TF_WORKER = "TF_WORKER",
-  TF_EVALUATOR = "TF_EVALUATOR",
-}
-
-export type TFJob = {
-  cluster?: string
-  namespace?: string
-  name?: string
-  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
-  creationTimestamp?: GoogleProtobufTimestamp.Timestamp
-  phase?: BaizeManagement_apiJobV1alpha1Common.JobPhase
-  labels?: {[key: string]: string}
-  annotations?: {[key: string]: string}
-  jobSpec?: GoogleProtobufStruct.Struct
-  description?: string
-}
-
-export type TFJobCreationConfig = {
-  trainingMode?: BaizeManagement_apiJobV1alpha1Common.TrainingMode
-  baseConfig?: BaizeManagement_apiJobV1alpha1Common.JobCreationBaseConfig
-  roleConfig?: {[key: string]: BaizeManagement_apiJobV1alpha1Common.JobRoleDifferenceConfig}
-}