feat: mj advance drawing page function is ready, use better task scheduling argorithm

api/service/function/func_mj.go

@@ -3,7 +3,6 @@ package function
 import (
 	"chatplus/service"
 	"chatplus/utils"
-	"fmt"
 )
 
 // AI 绘画函数
@@ -22,29 +21,6 @@ func NewMidJourneyFunc(mjService *service.MjService) FuncMidJourney {
 func (f FuncMidJourney) Invoke(params map[string]interface{}) (string, error) {
 	logger.Infof("MJ 绘画参数：%+v", params)
 	prompt := utils.InterfaceToString(params["prompt"])
-	if !utils.IsEmptyValue(params["ar"]) {
-		prompt = fmt.Sprintf("%s --ar %s", prompt, params["ar"])
-		delete(params, "ar")
-	}
-	if !utils.IsEmptyValue(params["s"]) {
-		prompt = fmt.Sprintf("%s --s %s", prompt, params["s"])
-		delete(params, "s")
-	}
-	if !utils.IsEmptyValue(params["seed"]) {
-		prompt = fmt.Sprintf("%s --seed %s", prompt, params["seed"])
-		delete(params, "seed")
-	}
-	if !utils.IsEmptyValue(params["no"]) {
-		prompt = fmt.Sprintf("%s --no %s", prompt, params["no"])
-		delete(params, "no")
-	}
-	if !utils.IsEmptyValue(params["niji"]) {
-		prompt = fmt.Sprintf("%s --niji %s", prompt, params["niji"])
-		delete(params, "niji")
-	} else {
-		prompt = prompt + " --v 5.2"
-	}
-
 	f.service.PushTask(service.MjTask{
 		Id:     utils.InterfaceToString(params["session_id"]),
 		Src:    service.TaskSrcChat,

api/service/mj_service.go

@@ -4,12 +4,14 @@ import (
 	"chatplus/core/types"
 	logger2 "chatplus/logger"
 	"chatplus/store"
+	"chatplus/store/model"
 	"chatplus/utils"
 	"context"
 	"errors"
 	"fmt"
 	"github.com/go-redis/redis/v8"
 	"github.com/imroc/req/v3"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -58,12 +60,14 @@ type MjService struct {
 	client    *req.Client
 	taskQueue *store.RedisQueue
 	redis     *redis.Client
+	db        *gorm.DB
 }
 
-func NewMjService(appConfig *types.AppConfig, client *redis.Client) *MjService {
+func NewMjService(appConfig *types.AppConfig, client *redis.Client, db *gorm.DB) *MjService {
 	return &MjService{
 		config:    appConfig.ExtConfig,
 		redis:     client,
+		db:        db,
 		taskQueue: store.NewRedisQueue("midjourney_task_queue", client),
 		client:    req.C().SetTimeout(30 * time.Second)}
 }
@@ -104,9 +108,11 @@ func (s *MjService) Run() {
 		}
 		if err != nil {
 			logger.Error("绘画任务执行失败：", err)
-			//if task.RetryCount > 5 {
-			//	continue
-			//}
+			if task.RetryCount > 5 {
+				// 取消并删除任务
+				s.db.Where("id = ?", task.Id).Delete(&model.MidJourneyJob{})
+				continue
+			}
 			task.RetryCount += 1
 			s.taskQueue.RPush(task)
 			// TODO: 执行失败通知聊天客户端