@daocloud-proto/hydra 0.0.0-dev-23801a3d → 0.0.0-dev-e3f01965

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

@@ -99,6 +99,15 @@ export type ReportFineTuneMetricsResponse = {
   accepted?: boolean
 }
 
+export type ReportEvalMetricsRequest = {
+  jobId?: string
+  metric?: {[key: string]: number}
+}
+
+export type ReportEvalMetricsResponse = {
+  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)})
@@ -112,4 +121,7 @@ export class AgentCommunicationService {
   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)})
   }
+  static ReportEvalMetrics(req: ReportEvalMetricsRequest, initReq?: fm.InitReq): Promise<ReportEvalMetricsResponse> {
+    return fm.fetchReq<ReportEvalMetricsRequest, ReportEvalMetricsResponse>(`/apis/hydra.io/v1alpha1/agent/evaljob-metrics:report`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
 }

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

@@ -0,0 +1,124 @@
+/* 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);
+export type EvalJob = {
+  id?: string
+  name?: string
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  resources?: HydraManagement_apiFinetuneV1alpha1Finetuneconfig.ResourceConfig
+  finetuneConfigName?: string
+  finetuneJobName?: string
+  finetuneJobId?: string
+  datasetId?: string
+  datasetVolumeId?: string
+  cutoffLen?: number
+  maxSamples?: number
+  overwriteCache?: boolean
+  preprocessingNumWorkers?: number
+  perDeviceEvalBatchSize?: number
+  predictWithGenerate?: boolean
+  ddpTimeout?: string
+  phase?: HydraManagement_apiFinetuneV1alpha1Common.JobStatus
+  reason?: string
+  creationTimestamp?: GoogleProtobufTimestamp.Timestamp
+  completionTimestamp?: GoogleProtobufTimestamp.Timestamp
+}
+
+
+/* hydra modified */ export type BaseCreateWSEvalJobRequest = {
+  workspace?: number
+  name?: string
+  cluster?: string
+  namespace?: string
+  resources?: HydraManagement_apiFinetuneV1alpha1Finetuneconfig.ResourceConfig
+  finetuneConfigName?: string
+  finetuneJobName?: string
+  datasetId?: string
+  datasetVolumeId?: string
+}
+
+export type CreateWSEvalJobRequest = BaseCreateWSEvalJobRequest
+  & OneOf<{ cutoffLen: number }>
+  & OneOf<{ maxSamples: number }>
+  & OneOf<{ overwriteCache: boolean }>
+  & OneOf<{ preprocessingNumWorkers: number }>
+  & OneOf<{ perDeviceEvalBatchSize: number }>
+  & OneOf<{ predictWithGenerate: boolean }>
+  & OneOf<{ ddpTimeout: string }>
+
+export type GetWSEvalJobRequest = {
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+}
+
+export type ListWSEvalJobsRequest = {
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListWSEvalJobsResponse = {
+  items?: EvalJob[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export type DeleteWSEvalJobRequest = {
+  workspace?: number
+  cluster?: string
+  namespace?: string
+  id?: string
+}
+
+export type GetWSEvalMetricsRequest = {
+  workspace?: number
+  id?: string
+}
+
+export type GetWSEvalMetricsResponse = {
+  metrics?: GoogleProtobufStruct.Struct
+}
+
+export class WSEvalJobManagement {
+  static CreateWSEvalJob(req: CreateWSEvalJobRequest, initReq?: fm.InitReq): Promise<EvalJob> {
+    return fm.fetchReq<CreateWSEvalJobRequest, EvalJob>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/finetune-evaljobs`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
+  static GetWSEvalJob(req: GetWSEvalJobRequest, initReq?: fm.InitReq): Promise<EvalJob> {
+    return fm.fetchReq<GetWSEvalJobRequest, EvalJob>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/finetune-evaljobs/${req["name"]}?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
+  }
+  static ListWSEvalJobs(req: ListWSEvalJobsRequest, initReq?: fm.InitReq): Promise<ListWSEvalJobsResponse> {
+    return fm.fetchReq<ListWSEvalJobsRequest, ListWSEvalJobsResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/finetune-evaljobs?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace"])}`, {...initReq, method: "GET"})
+  }
+  static DeleteWSEvalJob(req: DeleteWSEvalJobRequest, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<DeleteWSEvalJobRequest, GoogleProtobufEmpty.Empty>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/finetune-evaljobs/${req["id"]}`, {...initReq, method: "DELETE"})
+  }
+  static DefaultEvalJob(req: GoogleProtobufEmpty.Empty, initReq?: fm.InitReq): Promise<EvalJob> {
+    return fm.fetchReq<GoogleProtobufEmpty.Empty, EvalJob>(`/apis/hydra.io/v1alpha1/finetune-evaljobs:default?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static GetWSEvalMetrics(req: GetWSEvalMetricsRequest, initReq?: fm.InitReq): Promise<GetWSEvalMetricsResponse> {
+    return fm.fetchReq<GetWSEvalMetricsRequest, GetWSEvalMetricsResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/finetune-evaljobs/${req["id"]}/metrics?${fm.renderURLSearchParams(req, ["workspace", "id"])}`, {...initReq, method: "GET"})
+  }
+}

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

@@ -8,6 +8,15 @@ import * as HydraCommonCommon from "../../../common/common.pb"
 import * as fm from "../../../fetch.pb"
 import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.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 TrainingStage {
   TRAINING_STAGE_UNSPECIFIED = "TRAINING_STAGE_UNSPECIFIED",
   SFT = "SFT",
@@ -86,19 +95,18 @@ export type DpoConfig = {
   refModel?: string
 }
 
-export type ResourceQuota = {
-  request?: string
-  limit?: string
-}
 
-export type ResourceConfig = {
-  replicas?: number
+/* hydra modified */ export type BaseResourceConfig = {
   gpuType?: string
   gpuCount?: number
-  cpu?: ResourceQuota
-  memory?: ResourceQuota
+  cpu?: number
+  memory?: number
+  perGpuMemory?: number
 }
 
+export type ResourceConfig = BaseResourceConfig
+  & OneOf<{ gpuCores: number }>
+
 export type FineTuneConfig = {
   name?: string
   cluster?: string

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

@@ -51,6 +51,7 @@ export type FineTuneJob = {
   creationTimestamp?: GoogleProtobufTimestamp.Timestamp
   completionTimestamp?: GoogleProtobufTimestamp.Timestamp
   metrics?: MetricPoint[]
+  trainingParams?: GoogleProtobufStruct.Struct
 }
 
 export type CreateWSFineTuneJobRequest = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/hydra",
-  "version": "v0.0.0-dev-23801a3d",
+  "version": "v0.0.0-dev-e3f01965",
   "description": "",
   "author": "",
   "license": "ISC"