From f3ce064dae88bba7f35416d6d61e186954dc3234 Mon Sep 17 00:00:00 2001
From: tzwang <wtz1003@sina.com>
Date: Thu, 25 Apr 2024 16:51:59 +0800
Subject: [PATCH] updated getJobLog api logic

Former-commit-id: ff312781e1ec873ab7a6637cead3f466809cd001
---
 api/desc/pcm.api                                       |  2 +-
 api/desc/schedule/pcm-schedule.api                     |  2 ++
 api/internal/handler/routes.go                         |  2 +-
 .../logic/schedule/schedulegetaijoblogloglogic.go      | 10 ++++++++--
 api/internal/types/types.go                            |  2 ++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/api/desc/pcm.api b/api/desc/pcm.api
index cf485b54..26baa9c8 100644
--- a/api/desc/pcm.api
+++ b/api/desc/pcm.api
@@ -923,7 +923,7 @@ service pcm {
 	get /schedule/ai/getAlgorithms/:adapterId/:resourceType/:taskType/:dataset (AiAlgorithmsReq) returns (AiAlgorithmsResp)
 
 	@handler ScheduleGetAiJobLogLogHandler
-	get /schedule/ai/getJobLog/:taskId/:instanceNum (AiJobLogReq) returns (AiJobLogResp)
+	get /schedule/ai/getJobLog/:adapterId/:taskId/:instanceNum (AiJobLogReq) returns (AiJobLogResp)
 
 	@handler ScheduleSubmitHandler
 	post /schedule/submit (ScheduleReq) returns (ScheduleResp)
diff --git a/api/desc/schedule/pcm-schedule.api b/api/desc/schedule/pcm-schedule.api
index d3d61990..02783746 100644
--- a/api/desc/schedule/pcm-schedule.api
+++ b/api/desc/schedule/pcm-schedule.api
@@ -72,6 +72,8 @@ type (
     }
 
     AiJobLogReq {
+        AdapterId string `path:"adapterId"`
+        ClusterId string `path:"clusterId"`
         TaskId string `path:"taskId"`
         instanceNum string `path:"instanceNum"`
     }
diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go
index 0138989a..a3ade3e1 100644
--- a/api/internal/handler/routes.go
+++ b/api/internal/handler/routes.go
@@ -1147,7 +1147,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodGet,
-				Path:    "/schedule/ai/getJobLog/:taskId/:instanceNum",
+				Path:    "/schedule/ai/getJobLog/:adapterId/:taskId/:instanceNum",
 				Handler: schedule.ScheduleGetAiJobLogLogHandler(serverCtx),
 			},
 			{
diff --git a/api/internal/logic/schedule/schedulegetaijoblogloglogic.go b/api/internal/logic/schedule/schedulegetaijoblogloglogic.go
index e2bb9e5c..da5a0c7a 100644
--- a/api/internal/logic/schedule/schedulegetaijoblogloglogic.go
+++ b/api/internal/logic/schedule/schedulegetaijoblogloglogic.go
@@ -24,7 +24,13 @@ func NewScheduleGetAiJobLogLogLogic(ctx context.Context, svcCtx *svc.ServiceCont
 }
 
 func (l *ScheduleGetAiJobLogLogLogic) ScheduleGetAiJobLogLog(req *types.AiJobLogReq) (resp *types.AiJobLogResp, err error) {
-	// todo: add your logic here and delete this line
+	resp = &types.AiJobLogResp{}
 
-	return
+	log, err := l.svcCtx.Scheduler.AiService.AiCollectorAdapterMap[req.AdapterId][req.ClusterId].GetTrainingTaskLog(l.ctx, req.TaskId, req.InstanceNum)
+	if err != nil {
+		return nil, err
+	}
+
+	resp.Log = log
+	return resp, nil
 }
diff --git a/api/internal/types/types.go b/api/internal/types/types.go
index 53285b9b..52164d6e 100644
--- a/api/internal/types/types.go
+++ b/api/internal/types/types.go
@@ -5536,6 +5536,8 @@ type AiAlgorithmsResp struct {
 }
 
 type AiJobLogReq struct {
+	AdapterId   string `path:"adapterId"`
+	ClusterId   string `path:"clusterId"`
 	TaskId      string `path:"taskId"`
 	InstanceNum string `path:"instanceNum"`
 }