forked from JointCloud/pcm-coordinator
parent
5757cd47a3
commit
424a53b342
|
@ -339,6 +339,29 @@ func infer(opt *option.InferOption, clusters []*strategy.AssignedCluster, ts []s
|
||||||
svcCtx.Scheduler.AiStorages.AddNoticeInfo(opt.AdapterId, adapterName, "", "", opt.TaskName, "completed", "任务完成")
|
svcCtx.Scheduler.AiStorages.AddNoticeInfo(opt.AdapterId, adapterName, "", "", opt.TaskName, "completed", "任务完成")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//save ai sub tasks
|
||||||
|
for _, r := range results {
|
||||||
|
for _, task := range aiTaskList {
|
||||||
|
if r.ClusterId == strconv.Itoa(int(task.ClusterId)) {
|
||||||
|
taskAiSub := models.TaskAiSub{
|
||||||
|
TaskId: id,
|
||||||
|
TaskName: task.Name,
|
||||||
|
TaskAiId: task.TaskId,
|
||||||
|
TaskAiName: task.Name,
|
||||||
|
ImageName: r.ImageName,
|
||||||
|
Result: r.ImageResult,
|
||||||
|
Card: r.Card,
|
||||||
|
ClusterId: task.ClusterId,
|
||||||
|
ClusterName: r.ClusterName,
|
||||||
|
}
|
||||||
|
tx := svcCtx.DbEngin.Table("task_ai_sub").Create(&taskAiSub)
|
||||||
|
if tx.Error != nil {
|
||||||
|
logx.Errorf(err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return results, nil
|
return results, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -414,7 +437,7 @@ func getInferResult(url string, file multipart.File, fileName string, clusterNam
|
||||||
return r, nil
|
return r, nil
|
||||||
}
|
}
|
||||||
var res Res
|
var res Res
|
||||||
req := GetRestyRequest(10)
|
req := GetRestyRequest(20)
|
||||||
_, err := req.
|
_, err := req.
|
||||||
SetFileReader("file", fileName, file).
|
SetFileReader("file", fileName, file).
|
||||||
SetResult(&res).
|
SetResult(&res).
|
||||||
|
|
|
@ -885,9 +885,10 @@ func (o *OctopusLink) GetImageInferUrl(ctx context.Context, option *option.Infer
|
||||||
var imageUrls []*collector.ImageInferUrl
|
var imageUrls []*collector.ImageInferUrl
|
||||||
for _, notebook := range list.Payload.GetNotebooks() {
|
for _, notebook := range list.Payload.GetNotebooks() {
|
||||||
if strings.Contains(notebook.AlgorithmName, option.ModelName) {
|
if strings.Contains(notebook.AlgorithmName, option.ModelName) {
|
||||||
|
url := strings.Replace(notebook.Tasks[0].Url, FORWARD_SLASH, "", -1)
|
||||||
names := strings.Split(notebook.AlgorithmName, UNDERSCORE)
|
names := strings.Split(notebook.AlgorithmName, UNDERSCORE)
|
||||||
imageUrl := &collector.ImageInferUrl{
|
imageUrl := &collector.ImageInferUrl{
|
||||||
Url: DOMAIN + notebook.Tasks[0].Url + FORWARD_SLASH + "image",
|
Url: DOMAIN + url + FORWARD_SLASH + "image",
|
||||||
Card: names[2],
|
Card: names[2],
|
||||||
}
|
}
|
||||||
imageUrls = append(imageUrls, imageUrl)
|
imageUrls = append(imageUrls, imageUrl)
|
||||||
|
|
|
@ -36,6 +36,10 @@ type (
|
||||||
|
|
||||||
TaskAiSub struct {
|
TaskAiSub struct {
|
||||||
Id int64 `db:"id"` // id
|
Id int64 `db:"id"` // id
|
||||||
|
TaskId int64 `db:"task_id"` // 主任务id
|
||||||
|
TaskName string `db:"task_name"` // 主任务名称
|
||||||
|
TaskAiId int64 `db:"task_ai_id"` // 子任务id
|
||||||
|
TaskAiName string `db:"task_ai_name"` // 子任务名称
|
||||||
ImageName string `db:"image_name"` // 图片名称
|
ImageName string `db:"image_name"` // 图片名称
|
||||||
Result string `db:"result"` // 识别结果
|
Result string `db:"result"` // 识别结果
|
||||||
Card string `db:"card"` // 加速卡
|
Card string `db:"card"` // 加速卡
|
||||||
|
|
Loading…
Reference in New Issue