update pcm.api

desc/inference/inference.api

@@ -141,6 +141,8 @@ type (
 
      DeployInstanceListReq{
           PageInfo
+          UserId int64 `form:"userId,optional"`
+          UserName string `form:"userName,optional"`
      }
 
      DeployInstanceListResp {

desc/pcm.api

@@ -411,7 +411,7 @@ service pcm {
 	@doc "文本识别"
 	@handler ChatHandler
 	post /ai/chat (ChatReq) returns (ChatResult)
-	/******chat end***********/
+/******chat end***********/
 }
 
 //screen接口
@@ -1100,4 +1100,5 @@ service pcm {
 
 	@handler scheduleSituationHandler
 	get /monitoring/schedule/situation returns (scheduleSituationResp)
-}
+}
+

internal/handler/inference/deployinstancelisthandler.go

@@ -1,10 +1,12 @@
 package inference
 
 import (
+	"encoding/json"
 	"github.com/zeromicro/go-zero/rest/httpx"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/internal/logic/inference"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/internal/types"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/models"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
 	"net/http"
 )
@@ -17,6 +19,12 @@ func DeployInstanceListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 
+		userStr := r.Header.Get("User")
+		user := &models.JccUserInfo{}
+		json.Unmarshal([]byte(userStr), user)
+		req.UserId = user.Id
+		req.UserName = user.UserName
+
 		l := inference.NewDeployInstanceListLogic(r.Context(), svcCtx)
 		resp, err := l.DeployInstanceList(&req)
 		result.HttpResult(r, w, resp, err)

internal/logic/inference/deployinstancelistlogic.go

@@ -32,6 +32,9 @@ func (l *DeployInstanceListLogic) DeployInstanceList(req *types.DeployInstanceLi
 
 	var tasklist []*models.AiDeployInstanceTask
 	tx := l.svcCtx.DbEngin.Raw("select * from ai_deploy_instance_task").Scan(&tasklist)
+	if req.UserName != "" && req.UserName != "admin" {
+		tx = tx.Where("user_id = ?", req.UserId)
+	}
 	if tx.Error != nil {
 		logx.Errorf(tx.Error.Error())
 		return nil, tx.Error

internal/logic/schedule/schedulecreatetasklogic.go

@@ -167,7 +167,7 @@ func (l *ScheduleCreateTaskLogic) ScheduleCreateTask(req *types.CreateTaskReq) (
 		// filter data distribution
 		clustersWithDataDistributes := generateFilteredDataDistributes(assignedClusters, req.DataDistributes)
 
-		taskId, err := l.createTask(taskName, req.Description, req.JobResources.ScheduleStrategy, clustersWithDataDistributes, req.Token, req.UserIp)
+		taskId, err := l.createTask(taskName, req.Description, req.UserId, req.JobResources.ScheduleStrategy, clustersWithDataDistributes, req.Token, req.UserIp)
 		if err != nil {
 			return nil, err
 		}
@@ -198,7 +198,7 @@ func (l *ScheduleCreateTaskLogic) ScheduleCreateTask(req *types.CreateTaskReq) (
 		// filter data distribution
 		clustersWithDataDistributes := generateFilteredDataDistributes(assignedClusters, req.DataDistributes)
 
-		taskId, err := l.createTask(taskName, req.Description, req.JobResources.ScheduleStrategy, clustersWithDataDistributes, req.Token, req.UserIp)
+		taskId, err := l.createTask(taskName, req.Description, req.UserId, req.JobResources.ScheduleStrategy, clustersWithDataDistributes, req.Token, req.UserIp)
 		if err != nil {
 			return nil, err
 		}
@@ -262,7 +262,7 @@ func (l *ScheduleCreateTaskLogic) getAssignedClustersByStrategy(resources *types
 	return assignedClusters, nil
 }
 
-func (l *ScheduleCreateTaskLogic) createTask(taskName string, desc string, strategyName string, clustersWithDataDistributes *ClustersWithDataDistributes, token string, userIp string) (int64, error) {
+func (l *ScheduleCreateTaskLogic) createTask(taskName string, desc string, userId int64, strategyName string, clustersWithDataDistributes *ClustersWithDataDistributes, token string, userIp string) (int64, error) {
 	var synergyStatus int64
 	if len(clustersWithDataDistributes.Clusters) > 1 {
 		synergyStatus = 1
@@ -273,7 +273,7 @@ func (l *ScheduleCreateTaskLogic) createTask(taskName string, desc string, strat
 		fmt.Printf("Error while Marshaling. %v", err)
 	}
 
-	taskId, err := l.svcCtx.Scheduler.CreateTask(taskName, desc, synergyStatus, strategyName, string(y), token, userIp, &l.svcCtx.Config)
+	taskId, err := l.svcCtx.Scheduler.CreateTask(taskName, desc, userId, synergyStatus, strategyName, string(y), token, userIp, &l.svcCtx.Config)
 	if err != nil {
 		return 0, err
 	}

internal/logic/schedule/schedulesubmitlogic.go

@@ -65,7 +65,7 @@ func (l *ScheduleSubmitLogic) ScheduleSubmit(req *types.ScheduleReq) (resp *type
 			synergystatus = 1
 		}
 
-		taskId, err := l.svcCtx.Scheduler.CreateTask(req.AiOption.TaskName, "", synergystatus, req.AiOption.Strategy, "", req.Token, "", &l.svcCtx.Config)
+		taskId, err := l.svcCtx.Scheduler.CreateTask(req.AiOption.TaskName, "", 0, synergystatus, req.AiOption.Strategy, "", req.Token, "", &l.svcCtx.Config)
 		if err != nil {
 			return nil, err
 		}

internal/scheduler/database/aiStorage.go

@@ -123,7 +123,7 @@ func (s *AiStorage) DoesTaskNameExist(name string, taskType string) (bool, error
 	return total > 0, nil
 }
 
-func (s *AiStorage) SaveTask(name string, desc string, strategyCode int64, synergyStatus int64, aiType string, yaml string, saveToChain func(task models.Task, id int64) error) (int64, error) {
+func (s *AiStorage) SaveTask(name string, desc string, userId int64, strategyCode int64, synergyStatus int64, aiType string, yaml string, saveToChain func(task models.Task, id int64) error) (int64, error) {
 	startTime := time.Now()
 
 	// 构建主任务结构体
@@ -131,6 +131,7 @@ func (s *AiStorage) SaveTask(name string, desc string, strategyCode int64, syner
 		Status:          constants.Saved,
 		Description:     desc,
 		Name:            name,
+		UserId:          userId,
 		SynergyStatus:   synergyStatus,
 		Strategy:        strategyCode,
 		AdapterTypeDict: "1",

internal/scheduler/scheduler.go

@@ -187,13 +187,13 @@ func (s *Scheduler) SaveToDb() error {
 	return nil
 }
 
-func (s *Scheduler) CreateTask(taskName string, desc string, synergyCode int64, strategyName string, yaml string, token string, userIp string, config *config.Config) (int64, error) {
+func (s *Scheduler) CreateTask(taskName string, desc string, userId int64, synergyCode int64, strategyName string, yaml string, token string, userIp string, config *config.Config) (int64, error) {
 	strategyCode, err := s.AiStorages.GetStrategyCode(strategyName)
 	if err != nil {
 		return 0, err
 	}
 
-	id, err := s.AiStorages.SaveTask(taskName, desc, strategyCode, synergyCode, "10", yaml, nil)
+	id, err := s.AiStorages.SaveTask(taskName, desc, userId, strategyCode, synergyCode, "10", yaml, nil)
 	if err != nil {
 		return 0, err
 	}

internal/scheduler/schedulers/aiScheduler.go

@@ -246,7 +246,7 @@ func (as *AiScheduler) handleErrors(errs []interface{}, clusters []*strategy.Ass
 		var taskId int64
 		switch mode {
 		case executor.SUBMIT_MODE_JOINT_CLOUD:
-			tid, err := as.CreateTask(as.option.TaskName, "", synergystatus, as.option.StrategyName, "", "", "", nil)
+			tid, err := as.CreateTask(as.option.TaskName, "", 0, synergystatus, as.option.StrategyName, "", "", "", nil)
 			if err != nil {
 				return err
 			}

internal/scheduler/service/inference/imageInference/imageInference.go

@@ -126,7 +126,7 @@ func (i *ImageInference) saveTask() (int64, error) {
 		return 0, err
 	}
 
-	id, err := i.storage.SaveTask(i.opt.TaskName, "", strategyCode, synergystatus, i.inference.GetAiType(), "", nil)
+	id, err := i.storage.SaveTask(i.opt.TaskName, "", 0, strategyCode, synergystatus, i.inference.GetAiType(), "", nil)
 	if err != nil {
 		return 0, err
 	}

internal/scheduler/service/inference/textInference/textInference.go

@@ -70,7 +70,7 @@ func (ti *TextInference) saveTask() (int64, error) {
 	var synergystatus int64
 	var strategyCode int64
 
-	id, err := ti.storage.SaveTask(ti.opt.TaskName, "", strategyCode, synergystatus, ti.inference.GetAiType(), "", nil)
+	id, err := ti.storage.SaveTask(ti.opt.TaskName, "", 0, strategyCode, synergystatus, ti.inference.GetAiType(), "", nil)
 	if err != nil {
 		return 0, err
 	}