From 8e76b76b582915939c792e41795e351c67ed0430 Mon Sep 17 00:00:00 2001
From: JeshuaRen <270813223@qq.com>
Date: Mon, 30 Sep 2024 15:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AE=E8=B0=83=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A2=84=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdks/scheduler/modeljob.go |  2 ++
 sdks/scheduler/models.go   | 57 ++++++++++++++++++++++++++------------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/sdks/scheduler/modeljob.go b/sdks/scheduler/modeljob.go
index 673c431..d896760 100644
--- a/sdks/scheduler/modeljob.go
+++ b/sdks/scheduler/modeljob.go
@@ -88,11 +88,13 @@ const (
 	PauseECS      = "pause"
 	DestroyECS    = "destroy"
 	OperateServer = "operate"
+	RestartServer = "restartServer"
 
 	GPUMonitor = "GPUMonitor"
 
 	RcloneMount = "rclone"
 	Mounted     = "mounted"
+	MountDir    = "/mnt/oss"
 
 	Deploying = "Deploying"
 	Waiting   = "Waiting"
diff --git a/sdks/scheduler/models.go b/sdks/scheduler/models.go
index e169717..d3e606a 100644
--- a/sdks/scheduler/models.go
+++ b/sdks/scheduler/models.go
@@ -7,9 +7,11 @@ import (
 )
 
 const (
-	JobTypeNormal   = "Normal"
-	JobTypeResource = "Resource"
-	JobTypeInstance = "Instance"
+	JobTypeNormal         = "Normal"
+	JobTypeResource       = "Resource"
+	JobTypeInstance       = "Instance"
+	JobTypeFinetuning     = "Finetuning"
+	JobTypeDataPreprocess = "DataPreprocess"
 
 	FileInfoTypePackage   = "Package"
 	FileInfoTypeLocalFile = "LocalFile"
@@ -28,6 +30,7 @@ type CCID int64
 
 type ModelID string
 type ModelName string
+type ECSInstanceID string
 type NodeID int64
 type Address string
 
@@ -46,6 +49,7 @@ var JobInfoTypeUnion = types.NewTypeUnion[JobInfo](
 	(*InstanceJobInfo)(nil),
 	(*UpdateMultiInstanceJobInfo)(nil),
 	(*FinetuningJobInfo)(nil),
+	(*DataPreprocessJobInfo)(nil),
 )
 var _ = serder.UseTypeUnionInternallyTagged(&JobInfoTypeUnion, "type")
 
@@ -60,16 +64,30 @@ func (i *JobInfoBase) GetLocalJobID() string {
 type NormalJobInfo struct {
 	serder.Metadata `union:"Normal"`
 	JobInfoBase
-	Type      string           `json:"type"`
-	Files     JobFilesInfo     `json:"files"`
-	Runtime   JobRuntimeInfo   `json:"runtime"`
-	Resources JobResourcesInfo `json:"resources"`
-	Services  JobServicesInfo  `json:"services"`
+	Type         string           `json:"type"`
+	Files        JobFilesInfo     `json:"files"`
+	Runtime      JobRuntimeInfo   `json:"runtime"`
+	Resources    JobResourcesInfo `json:"resources"`
+	Services     JobServicesInfo  `json:"services"`
+	ModelJobInfo ModelJobInfo     `json:"modelJobInfo"`
 }
 
+// FinetuningJobInfo 模型微调
 type FinetuningJobInfo struct {
 	serder.Metadata `union:"Finetuning"`
 	JobInfoBase
+	Type         string           `json:"type"`
+	Files        JobFilesInfo     `json:"files"`
+	Runtime      JobRuntimeInfo   `json:"runtime"`
+	Resources    JobResourcesInfo `json:"resources"`
+	Services     JobServicesInfo  `json:"services"`
+	ModelJobInfo ModelJobInfo     `json:"modelJobInfo"`
+}
+
+// DataPreprocessJobInfo 数据预处理
+type DataPreprocessJobInfo struct {
+	serder.Metadata `union:"DataPreprocess"`
+	JobInfoBase
 	Type      string           `json:"type"`
 	Files     JobFilesInfo     `json:"files"`
 	Runtime   JobRuntimeInfo   `json:"runtime"`
@@ -85,6 +103,7 @@ type DataReturnJobInfo struct {
 	TargetLocalJobID string          `json:"targetLocalJobID"`
 }
 
+// MultiInstanceJobInfo 多实例(推理任务)
 type MultiInstanceJobInfo struct {
 	serder.Metadata `union:"MultiInstance"`
 	JobInfoBase
@@ -95,6 +114,7 @@ type MultiInstanceJobInfo struct {
 	ModelJobInfo ModelJobInfo     `json:"modelJobInfo"`
 }
 
+// UpdateMultiInstanceJobInfo 更新模型
 type UpdateMultiInstanceJobInfo struct {
 	serder.Metadata `union:"UpdateModel"`
 	JobInfoBase
@@ -114,6 +134,7 @@ type ModelJobInfo struct {
 	Command         string    `json:"command"`
 }
 
+// InstanceJobInfo 单实例(推理任务)
 type InstanceJobInfo struct {
 	serder.Metadata `union:"Instance"`
 	JobInfoBase
@@ -269,14 +290,14 @@ type Rclone struct {
 }
 
 type InferencePlatform struct {
-	PlatformName        string  `json:"platformName"`
-	ApiBaseUrl          string  `json:"apiBaseUrl"`
-	ApiKey              string  `json:"apiKey"`
-	ApiProxy            string  `json:"apiProxy"`
-	LlmModel            string  `json:"llmModel"`
-	EmbedModel          string  `json:"embedModel"`
-	ChunkMaxLength      int64   `json:"chunkMaxLength"`
-	StartChunkThreshold int64   `json:"startChunkThreshold"`
-	SimilarityThreshold float64 `json:"similarityThreshold"`
-	EntriesPerFile      int64   `json:"entriesPerFile"`
+	PlatformName        string `json:"platformName"`
+	ApiBaseUrl          string `json:"apiBaseUrl"`
+	ApiKey              string `json:"apiKey"`
+	ApiProxy            string `json:"apiProxy"`
+	LlmModel            string `json:"llmModel"`
+	EmbedModel          string `json:"embedModel"`
+	ChunkMaxLength      string `json:"chunkMaxLength"`
+	StartChunkThreshold string `json:"startChunkThreshold"`
+	SimilarityThreshold string `json:"similarityThreshold"`
+	EntriesPerFile      string `json:"entriesPerFile"`
 }