From b916bbac59373c8d2b4b81ed85b7dc8b5bc7e588 Mon Sep 17 00:00:00 2001 From: JeshuaRen <270813223@qq.com> Date: Fri, 16 May 2025 17:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdks/scheduler/jobflow.go | 2 ++ sdks/scheduler/models.go | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sdks/scheduler/jobflow.go b/sdks/scheduler/jobflow.go index 1437598..8d78ddf 100644 --- a/sdks/scheduler/jobflow.go +++ b/sdks/scheduler/jobflow.go @@ -84,6 +84,7 @@ type JobFlowRunDAO struct { Description string `gorm:"column:description;size:255" json:"description"` Content string `gorm:"column:content;type:text" json:"content"` Status string `gorm:"column:status;type:enum('running','fail','success')" json:"status"` + Token string `gorm:"column:token;size:255" json:"token"` CreatedAt time.Time `gorm:"column:created_at;autoCreateTime" json:"createdAt"` FinishAt *time.Time `gorm:"column:finish_at" json:"finishedAt"` } @@ -95,6 +96,7 @@ type JobFlowRun struct { Description string `gorm:"column:description;size:255" json:"description"` Content FlowData `gorm:"column:content;type:text" json:"content"` Status string `gorm:"column:status;type:enum('running','fail','success')" json:"status"` + Token string `gorm:"column:token;size:255" json:"token"` CreatedAt time.Time `gorm:"column:created_at;autoCreateTime" json:"createdAt"` FinishAt *time.Time `gorm:"column:finish_at" json:"finishedAt"` } diff --git a/sdks/scheduler/models.go b/sdks/scheduler/models.go index 9dca84d..54f5261 100644 --- a/sdks/scheduler/models.go +++ b/sdks/scheduler/models.go @@ -630,7 +630,7 @@ type InferencePlatform struct { } type JobOutput interface { - Output() + Output2() } var JobOutputTypeUnion = types.NewTypeUnion[JobOutput]( @@ -642,7 +642,7 @@ var _ = serder.UseTypeUnionInternallyTagged(&JobOutputTypeUnion, "type") type JobOutputBase struct{} -func (d *JobOutputBase) Output() {} +func (d *JobOutputBase) Output2() {} type PublicOutput struct { serder.Metadata `union:"object"` @@ -650,10 +650,18 @@ type PublicOutput struct { Type string `json:"type"` } +type HPCOutput struct { + serder.Metadata `union:"HPCSlurm"` + JobOutputBase + Type string `json:"type"` + Output string `json:"output"` +} + type AIJobOutput struct { - serder.Metadata `union:"object"` + serder.Metadata `union:"AI"` JobOutputBase - Type string `json:"type"` + Type string `json:"type"` + Output string `json:"output"` } type BindingJobOutput struct { @@ -668,6 +676,7 @@ type DataReturnJobOutput struct { JobOutputBase Type string `json:"type"` ReportMessage TrainJobStatusReport `json:"report"` + PackageID cdssdk.PackageID `json:"packageID"` } type JobStatusReport interface {