@daocloud-proto/hydra 0.0.0-dev-88ed8f0b → 0.0.0-dev-1afd0f75

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

@@ -7,8 +7,23 @@
 import * as HydraCommonCommon from "../../../common/common.pb"
 import * as fm from "../../../fetch.pb"
 import * as GoogleProtobufEmpty from "../../../google/protobuf/empty.pb"
-import * as HydraManagement_apiCoreV1alpha1Permissions from "../../../management-api/core/v1alpha1/permissions.pb"
 import * as HydraManagement_apiWorkspaceV1alpha1Workspace from "../../../management-api/workspace/v1alpha1/workspace.pb"
+
+export enum AdminPermission {
+  MODEL_GET = "MODEL_GET",
+  MODEL_CREATE = "MODEL_CREATE",
+  MODEL_UPDATE = "MODEL_UPDATE",
+  MODEL_DELETE = "MODEL_DELETE",
+  MAAS_MODEL_GET = "MAAS_MODEL_GET",
+  MAAS_MODEL_CREATE = "MAAS_MODEL_CREATE",
+  MAAS_MODEL_UPDATE = "MAAS_MODEL_UPDATE",
+  CLUSTER_GET = "CLUSTER_GET",
+  FILES_STORAGE_GET = "FILES_STORAGE_GET",
+  FILES_STORAGE_CREATE = "FILES_STORAGE_CREATE",
+  FILES_STORAGE_UPDATE = "FILES_STORAGE_UPDATE",
+  FILES_STORAGE_DELETE = "FILES_STORAGE_DELETE",
+}
+
 export type ListClusterRequest = {
   page?: HydraCommonCommon.Pagination
 }
@@ -24,7 +39,7 @@ export type ConstantsResponse = {
 }
 
 export type ListPlatformRolePermissionsForCurrentUserResponse = {
-  permissions?: HydraManagement_apiCoreV1alpha1Permissions.Permission[]
+  permissions?: AdminPermission[]
 }
 
 export class CoreService {

package/management-api/agent/v1alpha1/event.pb.ts

@@ -9,6 +9,15 @@ import * as GoogleProtobufEmpty from "../../../google/protobuf/empty.pb"
 import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
 import * as HydraManagement_apiApikeyV1alpha1Apikey from "../../apikey/v1alpha1/apikey.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 APIKeyEventType {
   UNKNOWN = "UNKNOWN",
   DELETE = "DELETE",
@@ -63,6 +72,33 @@ export type UsageReportResponse = {
   accepted?: boolean
 }
 
+
+/* hydra modified */ export type BaseMetricPoint = {
+  currentSteps?: number
+  totalSteps?: number
+}
+
+export type MetricPoint = BaseMetricPoint
+  & OneOf<{ loss: number }>
+  & OneOf<{ evalLoss: number }>
+  & OneOf<{ predictLoss: number }>
+  & OneOf<{ reward: number }>
+  & OneOf<{ accuracy: number }>
+  & OneOf<{ lr: number }>
+  & OneOf<{ epoch: number }>
+  & OneOf<{ percentage: number }>
+  & OneOf<{ elapsedTime: string }>
+  & OneOf<{ remainingTime: string }>
+
+export type ReportFineTuneMetricsRequest = {
+  jobId?: string
+  metric?: MetricPoint
+}
+
+export type ReportFineTuneMetricsResponse = {
+  accepted?: boolean
+}
+
 export class AgentCommunicationService {
   static FetchAPIKeyByKey(req: FetchAPIKeyRequest, initReq?: fm.InitReq): Promise<HydraManagement_apiApikeyV1alpha1Apikey.APIKey> {
     return fm.fetchReq<FetchAPIKeyRequest, HydraManagement_apiApikeyV1alpha1Apikey.APIKey>(`/hydra.management_api.agent.v1alpha1.AgentCommunicationService/FetchAPIKeyByKey`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
@@ -73,4 +109,7 @@ export class AgentCommunicationService {
   static UsageReport(req: UsageReportRequest, initReq?: fm.InitReq): Promise<UsageReportResponse> {
     return fm.fetchReq<UsageReportRequest, UsageReportResponse>(`/hydra.management_api.agent.v1alpha1.AgentCommunicationService/UsageReport`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
+  static ReportFineTuneMetrics(req: ReportFineTuneMetricsRequest, initReq?: fm.InitReq): Promise<ReportFineTuneMetricsResponse> {
+    return fm.fetchReq<ReportFineTuneMetricsRequest, ReportFineTuneMetricsResponse>(`/apis/hydra.io/v1alpha1/agent/fine-tune-metrics:report`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
 }

package/management-api/core/v1alpha1/permissions.pb.ts

@@ -6,14 +6,11 @@
 
 import * as fm from "../../../fetch.pb"
 
-export enum Permission {
+export enum UserPermission {
   MODEL_GET = "MODEL_GET",
   MODEL_CREATE = "MODEL_CREATE",
   MODEL_UPDATE = "MODEL_UPDATE",
   MODEL_DELETE = "MODEL_DELETE",
-  MAAS_MODEL_GET = "MAAS_MODEL_GET",
-  MAAS_MODEL_CREATE = "MAAS_MODEL_CREATE",
-  MAAS_MODEL_UPDATE = "MAAS_MODEL_UPDATE",
   MODEL_SERVING_GET = "MODEL_SERVING_GET",
   MODEL_SERVING_CREATE = "MODEL_SERVING_CREATE",
   MODEL_SERVING_UPDATE = "MODEL_SERVING_UPDATE",
@@ -30,7 +27,14 @@ export enum Permission {
   QUEUE_CREATE = "QUEUE_CREATE",
   QUEUE_UPDATE = "QUEUE_UPDATE",
   QUEUE_DELETE = "QUEUE_DELETE",
-  ALL = "ALL",
+  DATASET_GET = "DATASET_GET",
+  DATASET_CREATE = "DATASET_CREATE",
+  DATASET_UPDATE = "DATASET_UPDATE",
+  DATASET_DELETE = "DATASET_DELETE",
+  FINETUNE_GET = "FINETUNE_GET",
+  FINETUNE_CREATE = "FINETUNE_CREATE",
+  FINETUNE_UPDATE = "FINETUNE_UPDATE",
+  FINETUNE_DELETE = "FINETUNE_DELETE",
 }
 
 export type ListRolePermissionsByWorkspaceForCurrentUserRequest = {
@@ -38,7 +42,7 @@ export type ListRolePermissionsByWorkspaceForCurrentUserRequest = {
 }
 
 export type ListRolePermissionsByWorkspaceForCurrentUserResponse = {
-  permissions?: Permission[]
+  permissions?: UserPermission[]
 }
 
 export class Core {

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

@@ -0,0 +1,14 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+export enum JobStatus {
+  UNKNOWN = "UNKNOWN",
+  PENDING = "PENDING",
+  RUNNING = "RUNNING",
+  COMPLETED = "COMPLETED",
+  FAILED = "FAILED",
+  DELETING = "DELETING",
+}

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

@@ -0,0 +1,100 @@
+/* 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 GoogleProtobufEmpty from "../../../google/protobuf/empty.pb"
+import * as GoogleProtobufStruct from "../../../google/protobuf/struct.pb"
+import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
+import * as HydraManagement_apiFinetuneV1alpha1Common from "./common.pb"
+import * as HydraManagement_apiFinetuneV1alpha1Finetuneconfig from "./finetuneconfig.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);
+
+/* hydra modified */ export type BaseMetricPoint = {
+  currentSteps?: number
+  totalSteps?: number
+}
+
+export type MetricPoint = BaseMetricPoint
+  & OneOf<{ loss: number }>
+  & OneOf<{ evalLoss: number }>
+  & OneOf<{ predictLoss: number }>
+  & OneOf<{ reward: number }>
+  & OneOf<{ accuracy: number }>
+  & OneOf<{ lr: number }>
+  & OneOf<{ epoch: number }>
+  & OneOf<{ percentage: number }>
+  & OneOf<{ elapsedTime: string }>
+  & OneOf<{ remainingTime: string }>
+
+export type FineTuneJob = {
+  id?: string
+  name?: string
+  configName?: string
+  status?: HydraManagement_apiFinetuneV1alpha1Common.JobStatus
+  cluster?: string
+  namespace?: string
+  storageSpec?: GoogleProtobufStruct.Struct
+  runtimeType?: string
+  resourceConfig?: HydraManagement_apiFinetuneV1alpha1Finetuneconfig.ResourceConfig
+  creationTimestamp?: GoogleProtobufTimestamp.Timestamp
+  completionTimestamp?: GoogleProtobufTimestamp.Timestamp
+  metrics?: MetricPoint[]
+}
+
+export type CreateWSFineTuneJobRequest = {
+  workspace?: number
+  namespace?: string
+  name?: string
+  configName?: string
+  runtimeType?: string
+  resourceConfig?: HydraManagement_apiFinetuneV1alpha1Finetuneconfig.ResourceConfig
+}
+
+export type GetWSFineTuneJobRequest = {
+  workspace?: number
+  id?: string
+}
+
+export type ListWSFineTuneJobsRequest = {
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListWSFineTuneJobsResponse = {
+  items?: FineTuneJob[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export type DeleteWSFineTuneJobRequest = {
+  workspace?: number
+  id?: string
+}
+
+export class WSFineTuneJobManagement {
+  static CreateWSFineTuneJob(req: CreateWSFineTuneJobRequest, initReq?: fm.InitReq): Promise<FineTuneJob> {
+    return fm.fetchReq<CreateWSFineTuneJobRequest, FineTuneJob>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/finetune/jobs`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
+  static GetWSFineTuneJob(req: GetWSFineTuneJobRequest, initReq?: fm.InitReq): Promise<FineTuneJob> {
+    return fm.fetchReq<GetWSFineTuneJobRequest, FineTuneJob>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/finetune/jobs/${req["id"]}?${fm.renderURLSearchParams(req, ["workspace", "id"])}`, {...initReq, method: "GET"})
+  }
+  static ListWSFineTuneJobs(req: ListWSFineTuneJobsRequest, initReq?: fm.InitReq): Promise<ListWSFineTuneJobsResponse> {
+    return fm.fetchReq<ListWSFineTuneJobsRequest, ListWSFineTuneJobsResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/finetune/jobs?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
+  }
+  static DeleteWSFineTuneJob(req: DeleteWSFineTuneJobRequest, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<DeleteWSFineTuneJobRequest, GoogleProtobufEmpty.Empty>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/finetune/jobs/${req["id"]}`, {...initReq, method: "DELETE"})
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/hydra",
-  "version": "v0.0.0-dev-88ed8f0b",
+  "version": "v0.0.0-dev-1afd0f75",
   "description": "",
   "author": "",
   "license": "ISC"