@daocloud-proto/baize 0.124.0 → 0.126.0

package/common/k8s.pb.ts

@@ -57,6 +57,21 @@ export type ResourceAffinity = {
   value?: string
 }
 
+export type Port = {
+  name?: string
+  hostPort?: number
+  containerPort?: number
+  protocol?: string
+}
+
+export type ServicePort = {
+  name?: string
+  protocol?: string
+  port?: number
+  targetPort?: number
+  nodePort?: number
+}
+
 export type PodConfig = {
   kubeEnvs?: KubeEnv[]
   kubeVolumes?: KubeVolume[]
@@ -72,6 +87,7 @@ export type PodConfig = {
   readinessProbe?: Probe
   startupProbe?: Probe
   tolerations?: BaizeCommonCommon.Toleration[]
+  ports?: Port[]
 }
 
 

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

@@ -31,6 +31,7 @@ export enum DataSourceType {
   HUGGING_FACE = "HUGGING_FACE",
   MODEL_SCOPE = "MODEL_SCOPE",
   CONDA = "CONDA",
+  DATABASE = "DATABASE",
 }
 
 export enum DatasetStatusPhase {
@@ -71,6 +72,16 @@ export enum DataSourceOptionsS3Provider {
   MINIO = "MINIO",
 }
 
+export enum DataSourceOptionsDatabaseExportFormat {
+  Export_Format_UNSPECIFIED = "Export_Format_UNSPECIFIED",
+  CSV = "CSV",
+}
+
+export enum DataSourceOptionsDatabaseDBType {
+  DB_TYPE_UNSPECIFIED = "DB_TYPE_UNSPECIFIED",
+  MYSQL = "MYSQL",
+}
+
 export enum SecretOptionsAuthType {
   AUTH_TYPE_UNSPECIFIED = "AUTH_TYPE_UNSPECIFIED",
   BASIC = "BASIC",
@@ -120,6 +131,11 @@ export type Dataset = {
   resources?: BaizeCommonK8s.Resources
 }
 
+export type GetDatasetResponse = {
+  dataset?: Dataset
+  secretOptions?: SecretOptions
+}
+
 export type DataSourceOptionsConda = {
   pythonVersion?: string
   packageManager?: DataSourceOptionsCondaPackageManager
@@ -168,12 +184,23 @@ export type DataSourceOptionsReference = {
   sourceWorkspace?: BaizeManagement_apiWorkspaceV1alpha1Workspace.Workspace
 }
 
+export type DataSourceOptionsDatabase = {
+  type?: DataSourceOptionsDatabaseDBType
+  host?: string
+  port?: number
+  dbName?: string
+  tables?: string[]
+  charset?: string
+  exportFormat?: DataSourceOptionsDatabaseExportFormat
+  extraParams?: {[key: string]: string}
+}
+
 
 /* baize modified */ export type BaseDataSourceOptions = {
 }
 
 export type DataSourceOptions = BaseDataSourceOptions
-  & OneOf<{ git: DataSourceOptionsGit; s3: DataSourceOptionsS3; http: DataSourceOptionsHttp; conda: DataSourceOptionsConda; huggingFace: DataSourceOptionsHuggingFace; modelScope: DataSourceOptionsModelScope; reference: DataSourceOptionsReference }>
+  & OneOf<{ git: DataSourceOptionsGit; s3: DataSourceOptionsS3; http: DataSourceOptionsHttp; conda: DataSourceOptionsConda; huggingFace: DataSourceOptionsHuggingFace; modelScope: DataSourceOptionsModelScope; reference: DataSourceOptionsReference; database: DataSourceOptionsDatabase }>
 
 export type SecretOptionsBasicAuth = {
   username?: string
@@ -261,7 +288,7 @@ export type SingleDatasetRequest = {
 }
 
 export type UpdateDatasetRequest = BaseUpdateDatasetRequest
-  & OneOf<{ git: DataSourceOptionsGit; s3: DataSourceOptionsS3; http: DataSourceOptionsHttp; conda: DataSourceOptionsConda; huggingFace: DataSourceOptionsHuggingFace; modelScope: DataSourceOptionsModelScope; reference: DataSourceOptionsReference }>
+  & OneOf<{ git: DataSourceOptionsGit; s3: DataSourceOptionsS3; http: DataSourceOptionsHttp; conda: DataSourceOptionsConda; huggingFace: DataSourceOptionsHuggingFace; modelScope: DataSourceOptionsModelScope; reference: DataSourceOptionsReference; database: DataSourceOptionsDatabase }>
 
 export type DatasetActionRequest = {
   workspace?: number
@@ -312,6 +339,17 @@ export type ValidateDataSourceSecretsResponse = {
   message?: string
 }
 
+export type ValidateDatabaseRequest = {
+  source?: DataSource
+  secretOptions?: SecretOptions
+}
+
+export type ValidateDatabaseResponse = {
+  success?: boolean
+  message?: string
+  tables?: string[]
+}
+
 export type ListDatasetEventsRequest = {
   workspace?: number
   cluster?: string
@@ -320,6 +358,14 @@ export type ListDatasetEventsRequest = {
   page?: BaizeCommonCommon.Pagination
 }
 
+export type GetSecretOptionsRequest = {
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  secretName?: string
+  sourceType?: DataSourceType
+}
+
 export class DatasetManagement {
   static ListDatasets(req: ListDatasetRequest, initReq?: fm.InitReq): Promise<ListDatasetResponse> {
     return fm.fetchReq<ListDatasetRequest, ListDatasetResponse>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/datasets?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
@@ -327,6 +373,9 @@ export class DatasetManagement {
   static GetDataset(req: SingleDatasetRequest, initReq?: fm.InitReq): Promise<Dataset> {
     return fm.fetchReq<SingleDatasetRequest, Dataset>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/datasets/${req["name"]}?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
   }
+  static GetSecretOptions(req: GetSecretOptionsRequest, initReq?: fm.InitReq): Promise<SecretOptions> {
+    return fm.fetchReq<GetSecretOptionsRequest, SecretOptions>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/secret-options/${req["secretName"]}?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace", "secretName"])}`, {...initReq, method: "GET"})
+  }
   static ListDatasetEvents(req: ListDatasetEventsRequest, initReq?: fm.InitReq): Promise<BaizeManagement_apiEventV1alpha1Event.ListEventsResponse> {
     return fm.fetchReq<ListDatasetEventsRequest, BaizeManagement_apiEventV1alpha1Event.ListEventsResponse>(`/apis/baize.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/datasets/${req["name"]}/events?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
   }
@@ -354,4 +403,7 @@ export class DatasetManagement {
   static ValidateDataSourceSecrets(req: ValidateDataSourceSecretsRequest, initReq?: fm.InitReq): Promise<ValidateDataSourceSecretsResponse> {
     return fm.fetchReq<ValidateDataSourceSecretsRequest, ValidateDataSourceSecretsResponse>(`/apis/baize.io/v1alpha1/datasets/validate-secrets`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
+  static ValidateDatabase(req: ValidateDatabaseRequest, initReq?: fm.InitReq): Promise<ValidateDatabaseResponse> {
+    return fm.fetchReq<ValidateDatabaseRequest, ValidateDatabaseResponse>(`/apis/baize.io/v1alpha1/datasets/validate-database`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
 }

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

@@ -82,6 +82,12 @@ export type NotebookConfig = {
   imageConfig?: BaizeManagement_apiImageV1alpha1Image.ImageConfig
   shmSize?: number
   enableDind?: boolean
+  command?: Command
+}
+
+export type Command = {
+  commands?: string[]
+  args?: string[]
 }
 
 export type NotebookStatus = {

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

@@ -33,6 +33,7 @@ export enum FrameworkType {
   FRAMEWORK_TYPE_UNSPECIFIED = "FRAMEWORK_TYPE_UNSPECIFIED",
   FRAMEWORK_TYPE_TRITON = "FRAMEWORK_TYPE_TRITON",
   FRAMEWORK_TYPE_VLLM = "FRAMEWORK_TYPE_VLLM",
+  FRAMEWORK_TYPE_CUSTOM = "FRAMEWORK_TYPE_CUSTOM",
 }
 
 export enum FrameworkTritonBackend {
@@ -66,6 +67,9 @@ export type FrameworkTriton = {
 export type FrameworkVLLM = {
 }
 
+export type FrameworkCustom = {
+}
+
 
 /* baize modified */ export type BaseFramework = {
   type?: FrameworkType
@@ -74,7 +78,7 @@ export type FrameworkVLLM = {
 }
 
 export type Framework = BaseFramework
-  & OneOf<{ triton: FrameworkTriton; vllm: FrameworkVLLM }>
+  & OneOf<{ triton: FrameworkTriton; vllm: FrameworkVLLM; custom: FrameworkCustom }>
 
 export type Model = {
   name?: string
@@ -82,16 +86,6 @@ export type Model = {
   modelPath?: string
 }
 
-export type CustomArg = {
-  name?: string
-  values?: string[]
-}
-
-export type CustomCmd = {
-  command?: string
-  args?: CustomArg[]
-}
-
 export type ServingConfigVLLMLoraModel = {
   volume?: BaizeCommonK8s.KubeVolume
   relativePath?: string
@@ -109,6 +103,10 @@ export type ServingConfigVLLM = {
   shouldSkip?: boolean
 }
 
+export type ServingConfigCustomServing = {
+  cmdLine?: string
+}
+
 export type ServingConfigTritonModelConfig = {
   inputs?: BaizeManagement_apiServingTritonModel_config.ModelInput[]
   outputs?: BaizeManagement_apiServingTritonModel_config.ModelOutput[]
@@ -132,10 +130,11 @@ export type ServingConfigTritonServingConfig = BaseServingConfigTritonServingCon
 }
 
 export type ServingConfig = BaseServingConfig
-  & OneOf<{ triton: ServingConfigTritonServingConfig; vllm: ServingConfigVLLM }>
+  & OneOf<{ triton: ServingConfigTritonServingConfig; vllm: ServingConfigVLLM; custom: ServingConfigCustomServing }>
 
 export type ServiceConfig = {
   serviceType?: ServiceType
+  ports?: BaizeCommonK8s.ServicePort[]
 }
 
 export type InferenceServing = {
@@ -235,6 +234,7 @@ export type UpdateInferenceServingRequest = {
   image?: string
   imageConfig?: BaizeManagement_apiImageV1alpha1Image.ImageConfig
   targetGpus?: string[]
+  serviceConfig?: ServiceConfig
 }
 
 export type SingleInferenceServingRequest = {

package/package.json

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