feat: 初步兼容midjourney-proxy-plus

common/constants.go

@@ -189,7 +189,7 @@ const (
 	ChannelTypeMidjourney     = 2
 	ChannelTypeMidjourney     = 2
 	ChannelTypeAzure          = 3
 	ChannelTypeAzure          = 3
 	ChannelTypeOllama         = 4
 	ChannelTypeOllama         = 4
-	ChannelTypeOpenAISB       = 5
+	ChannelTypeMidjourneyPlus = 5
 	ChannelTypeOpenAIMax      = 6
 	ChannelTypeOpenAIMax      = 6
 	ChannelTypeOhMyGPT        = 7
 	ChannelTypeOhMyGPT        = 7
 	ChannelTypeCustom         = 8
 	ChannelTypeCustom         = 8

constant/midjourney.go

+package constant
+
+const (
+	MjErrorUnknown = 5
+	MjRequestError = 4
+)
+
+const (
+	MjActionImagine    = "IMAGINE"
+	MjActionDescribe   = "DESCRIBE"
+	MjActionBlend      = "BLEND"
+	MjActionUpscale    = "UPSCALE"
+	MjActionVariation  = "VARIATION"
+	MjActionInPaint    = "INPAINT"
+	MjActionInPaintPre = "INPAINT_PRE"
+)

controller/channel-billing.go

@@ -214,8 +214,8 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
 		return 0, errors.New("尚未实现")
 		return 0, errors.New("尚未实现")
 	case common.ChannelTypeCustom:
 	case common.ChannelTypeCustom:
 		baseURL = channel.GetBaseURL()
 		baseURL = channel.GetBaseURL()
-	case common.ChannelTypeOpenAISB:
-		return updateChannelOpenAISBBalance(channel)
+	//case common.ChannelTypeOpenAISB:
+	//	return updateChannelOpenAISBBalance(channel)
 	case common.ChannelTypeAIProxy:
 	case common.ChannelTypeAIProxy:
 		return updateChannelAIProxyBalance(channel)
 		return updateChannelAIProxyBalance(channel)
 	case common.ChannelTypeAPI2GPT:
 	case common.ChannelTypeAPI2GPT:

controller/midjourney.go

@@ -10,8 +10,8 @@ import (
 	"log"
 	"log"
 	"net/http"
 	"net/http"
 	"one-api/common"
 	"one-api/common"
+	"one-api/dto"
 	"one-api/model"
 	"one-api/model"
-	relay2 "one-api/relay"
 	"one-api/service"
 	"one-api/service"
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
@@ -75,11 +75,11 @@ import (
 				responseBody, err := io.ReadAll(resp.Body)
 				responseBody, err := io.ReadAll(resp.Body)
 				resp.Body.Close()
 				resp.Body.Close()
 				log.Printf("responseBody: %s", string(responseBody))
 				log.Printf("responseBody: %s", string(responseBody))
-				var responseItem Midjourney
+				var responseItem MidjourneyDto
 				// err = json.NewDecoder(resp.Body).Decode(&responseItem)
 				// err = json.NewDecoder(resp.Body).Decode(&responseItem)
 				err = json.Unmarshal(responseBody, &responseItem)
 				err = json.Unmarshal(responseBody, &responseItem)
 				if err != nil {
 				if err != nil {
-					if strings.Contains(err.Error(), "cannot unmarshal number into Go struct field Midjourney.status of type string") {
+					if strings.Contains(err.Error(), "cannot unmarshal number into Go struct field MidjourneyDto.status of type string") {
 						var responseWithoutStatus MidjourneyWithoutStatus
 						var responseWithoutStatus MidjourneyWithoutStatus
 						var responseStatus MidjourneyStatus
 						var responseStatus MidjourneyStatus
 						err1 := json.Unmarshal(responseBody, &responseWithoutStatus)
 						err1 := json.Unmarshal(responseBody, &responseWithoutStatus)
@@ -228,12 +228,16 @@ func UpdateMidjourneyTaskBulk() {
 				common.LogError(ctx, fmt.Sprintf("Get Task Do req error: %v", err))
 				common.LogError(ctx, fmt.Sprintf("Get Task Do req error: %v", err))
 				continue
 				continue
 			}
 			}
+			if resp.StatusCode != http.StatusOK {
+				common.LogError(ctx, fmt.Sprintf("Get Task status code: %d", resp.StatusCode))
+				continue
+			}
 			responseBody, err := io.ReadAll(resp.Body)
 			responseBody, err := io.ReadAll(resp.Body)
 			if err != nil {
 			if err != nil {
 				common.LogError(ctx, fmt.Sprintf("Get Task parse body error: %v", err))
 				common.LogError(ctx, fmt.Sprintf("Get Task parse body error: %v", err))
 				continue
 				continue
 			}
 			}
-			var responseItems []relay2.Midjourney
+			var responseItems []dto.MidjourneyDto
 			err = json.Unmarshal(responseBody, &responseItems)
 			err = json.Unmarshal(responseBody, &responseItems)
 			if err != nil {
 			if err != nil {
 				common.LogError(ctx, fmt.Sprintf("Get Task parse body error2: %v, body: %s", err, string(responseBody)))
 				common.LogError(ctx, fmt.Sprintf("Get Task parse body error2: %v, body: %s", err, string(responseBody)))
@@ -259,6 +263,10 @@ func UpdateMidjourneyTaskBulk() {
 				task.ImageUrl = responseItem.ImageUrl
 				task.ImageUrl = responseItem.ImageUrl
 				task.Status = responseItem.Status
 				task.Status = responseItem.Status
 				task.FailReason = responseItem.FailReason
 				task.FailReason = responseItem.FailReason
+				if responseItem.Buttons != nil {
+					buttonStr, _ := json.Marshal(responseItem.Buttons)
+					task.Buttons = string(buttonStr)
+				}
 				if task.Progress != "100%" && responseItem.FailReason != "" {
 				if task.Progress != "100%" && responseItem.FailReason != "" {
 					common.LogInfo(ctx, task.MjId+" 构建失败，"+task.FailReason)
 					common.LogInfo(ctx, task.MjId+" 构建失败，"+task.FailReason)
 					task.Progress = "100%"
 					task.Progress = "100%"
@@ -286,7 +294,7 @@ func UpdateMidjourneyTaskBulk() {
 	}
 	}
 }
 }
 
 
-func checkMjTaskNeedUpdate(oldTask *model.Midjourney, newTask relay2.Midjourney) bool {
+func checkMjTaskNeedUpdate(oldTask *model.Midjourney, newTask dto.MidjourneyDto) bool {
 	if oldTask.Code != 1 {
 	if oldTask.Code != 1 {
 		return true
 		return true
 	}
 	}

controller/relay.go

@@ -62,7 +62,13 @@ func Relay(c *gin.Context) {
 
 
 func RelayMidjourney(c *gin.Context) {
 func RelayMidjourney(c *gin.Context) {
 	relayMode := relayconstant.RelayModeUnknown
 	relayMode := relayconstant.RelayModeUnknown
-	if strings.HasPrefix(c.Request.URL.Path, "/mj/submit/imagine") {
+	if strings.HasPrefix(c.Request.URL.Path, "/mj/submit/action") {
+		// midjourney plus
+		relayMode = relayconstant.RelayModeMidjourneyAction
+	} else if strings.HasPrefix(c.Request.URL.Path, "/mj/submit/modal") {
+		// midjourney plus
+		relayMode = relayconstant.RelayModeMidjourneyModal
+	} else if strings.HasPrefix(c.Request.URL.Path, "/mj/submit/imagine") {
 		relayMode = relayconstant.RelayModeMidjourneyImagine
 		relayMode = relayconstant.RelayModeMidjourneyImagine
 	} else if strings.HasPrefix(c.Request.URL.Path, "/mj/submit/blend") {
 	} else if strings.HasPrefix(c.Request.URL.Path, "/mj/submit/blend") {
 		relayMode = relayconstant.RelayModeMidjourneyBlend
 		relayMode = relayconstant.RelayModeMidjourneyBlend
@@ -86,35 +92,24 @@ func RelayMidjourney(c *gin.Context) {
 		err = relay.RelayMidjourneyNotify(c)
 		err = relay.RelayMidjourneyNotify(c)
 	case relayconstant.RelayModeMidjourneyTaskFetch, relayconstant.RelayModeMidjourneyTaskFetchByCondition:
 	case relayconstant.RelayModeMidjourneyTaskFetch, relayconstant.RelayModeMidjourneyTaskFetchByCondition:
 		err = relay.RelayMidjourneyTask(c, relayMode)
 		err = relay.RelayMidjourneyTask(c, relayMode)
+	//case relayconstant.RelayModeMidjourneyModal:
+	//	err = relay.RelayMidjournneyModal(c)
 	default:
 	default:
 		err = relay.RelayMidjourneySubmit(c, relayMode)
 		err = relay.RelayMidjourneySubmit(c, relayMode)
 	}
 	}
 	//err = relayMidjourneySubmit(c, relayMode)
 	//err = relayMidjourneySubmit(c, relayMode)
 	log.Println(err)
 	log.Println(err)
 	if err != nil {
 	if err != nil {
-		retryTimesStr := c.Query("retry")
-		retryTimes, _ := strconv.Atoi(retryTimesStr)
-		if retryTimesStr == "" {
-			retryTimes = common.RetryTimes
-		}
-		if retryTimes > 0 {
-			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s?retry=%d", c.Request.URL.Path, retryTimes-1))
-		} else {
-			if err.Code == 30 {
-				err.Result = "当前分组负载已饱和，请稍后再试，或升级账户以提升服务质量。"
-			}
-			c.JSON(429, gin.H{
-				"error": fmt.Sprintf("%s %s", err.Description, err.Result),
-				"type":  "upstream_error",
-			})
+		if err.Code == 30 {
+			err.Result = "当前分组负载已饱和，请稍后再试，或升级账户以提升服务质量。"
 		}
 		}
+		c.JSON(429, gin.H{
+			"error": fmt.Sprintf("%s %s", err.Description, err.Result),
+			"type":  "upstream_error",
+			"code":  err.Code,
+		})
 		channelId := c.GetInt("channel_id")
 		channelId := c.GetInt("channel_id")
 		common.SysError(fmt.Sprintf("relay error (channel #%d): %s", channelId, fmt.Sprintf("%s %s", err.Description, err.Result)))
 		common.SysError(fmt.Sprintf("relay error (channel #%d): %s", channelId, fmt.Sprintf("%s %s", err.Description, err.Result)))
-		//if shouldDisableChannel(&err.Error) {
-		//	channelId := c.GetInt("channel_id")
-		//	channelName := c.GetString("channel_name")
-		//	disableChannel(channelId, channelName, err.Result)
-		//};''''''''''''''''''''''''''''''''
 	}
 	}
 }
 }
 
 

dto/midjourney.go

@@ -2,6 +2,8 @@ package dto
 
 
 type MidjourneyRequest struct {
 type MidjourneyRequest struct {
 	Prompt      string   `json:"prompt"`
 	Prompt      string   `json:"prompt"`
+	CustomId    string   `json:"customId"`
+	BotType     string   `json:"botType"`
 	NotifyHook  string   `json:"notifyHook"`
 	NotifyHook  string   `json:"notifyHook"`
 	Action      string   `json:"action"`
 	Action      string   `json:"action"`
 	Index       int      `json:"index"`
 	Index       int      `json:"index"`
@@ -9,6 +11,7 @@ type MidjourneyRequest struct {
 	TaskId      string   `json:"taskId"`
 	TaskId      string   `json:"taskId"`
 	Base64Array []string `json:"base64Array"`
 	Base64Array []string `json:"base64Array"`
 	Content     string   `json:"content"`
 	Content     string   `json:"content"`
+	MaskBase64  string   `json:"maskBase64"`
 }
 }
 
 
 type MidjourneyResponse struct {
 type MidjourneyResponse struct {
@@ -17,3 +20,52 @@ type MidjourneyResponse struct {
 	Properties  interface{} `json:"properties"`
 	Properties  interface{} `json:"properties"`
 	Result      string      `json:"result"`
 	Result      string      `json:"result"`
 }
 }
+
+type MidjourneyDto struct {
+	MjId        string `json:"id"`
+	Action      string `json:"action"`
+	CustomId    string `json:"customId"`
+	Prompt      string `json:"prompt"`
+	PromptEn    string `json:"promptEn"`
+	Description string `json:"description"`
+	State       string `json:"state"`
+	SubmitTime  int64  `json:"submitTime"`
+	StartTime   int64  `json:"startTime"`
+	FinishTime  int64  `json:"finishTime"`
+	ImageUrl    string `json:"imageUrl"`
+	Status      string `json:"status"`
+	Progress    string `json:"progress"`
+	FailReason  string `json:"failReason"`
+	Buttons     any    `json:"buttons"`
+	MaskBase64  string `json:"maskBase64"`
+}
+
+type MidjourneyStatus struct {
+	Status int `json:"status"`
+}
+type MidjourneyWithoutStatus struct {
+	Id          int    `json:"id"`
+	Code        int    `json:"code"`
+	UserId      int    `json:"user_id" gorm:"index"`
+	Action      string `json:"action"`
+	MjId        string `json:"mj_id" gorm:"index"`
+	Prompt      string `json:"prompt"`
+	PromptEn    string `json:"prompt_en"`
+	Description string `json:"description"`
+	State       string `json:"state"`
+	SubmitTime  int64  `json:"submit_time"`
+	StartTime   int64  `json:"start_time"`
+	FinishTime  int64  `json:"finish_time"`
+	ImageUrl    string `json:"image_url"`
+	Progress    string `json:"progress"`
+	FailReason  string `json:"fail_reason"`
+	ChannelId   int    `json:"channel_id"`
+}
+
+type ActionButton struct {
+	CustomId any `json:"customId"`
+	Emoji    any `json:"emoji"`
+	Label    any `json:"label"`
+	Type     any `json:"type"`
+	Style    any `json:"style"`
+}

middleware/auth.go

@@ -125,12 +125,6 @@ func TokenAuth() func(c *gin.Context) {
 		} else {
 		} else {
 			c.Set("token_model_limit_enabled", false)
 			c.Set("token_model_limit_enabled", false)
 		}
 		}
-		requestURL := c.Request.URL.String()
-		consumeQuota := true
-		if strings.HasPrefix(requestURL, "/v1/models") {
-			consumeQuota = false
-		}
-		c.Set("consume_quota", consumeQuota)
 		if len(parts) > 1 {
 		if len(parts) > 1 {
 			if model.IsAdmin(token.UserId) {
 			if model.IsAdmin(token.UserId) {
 				c.Set("channelId", parts[1])
 				c.Set("channelId", parts[1])

model/midjourney.go

@@ -19,6 +19,7 @@ type Midjourney struct {
 	FailReason  string `json:"fail_reason"`
 	FailReason  string `json:"fail_reason"`
 	ChannelId   int    `json:"channel_id"`
 	ChannelId   int    `json:"channel_id"`
 	Quota       int    `json:"quota"`
 	Quota       int    `json:"quota"`
+	Buttons     string `json:"buttons"`
 }
 }
 
 
 // TaskQueryParams 用于包含所有搜索条件的结构体，可以根据需求添加更多字段
 // TaskQueryParams 用于包含所有搜索条件的结构体，可以根据需求添加更多字段

relay/constant/relay_mode.go

@@ -21,6 +21,8 @@ const (
 	RelayModeAudioSpeech
 	RelayModeAudioSpeech
 	RelayModeAudioTranscription
 	RelayModeAudioTranscription
 	RelayModeAudioTranslation
 	RelayModeAudioTranslation
+	RelayModeMidjourneyAction
+	RelayModeMidjourneyModal
 )
 )
 
 
 func Path2RelayMode(path string) int {
 func Path2RelayMode(path string) int {

router/relay-router.go

@@ -47,6 +47,8 @@ func SetRelayRouter(router *gin.Engine) {
 	relayMjRouter.GET("/image/:id", relay.RelayMidjourneyImage)
 	relayMjRouter.GET("/image/:id", relay.RelayMidjourneyImage)
 	relayMjRouter.Use(middleware.TokenAuth(), middleware.Distribute())
 	relayMjRouter.Use(middleware.TokenAuth(), middleware.Distribute())
 	{
 	{
+		relayMjRouter.POST("/submit/action", controller.RelayMidjourney)
+		relayMjRouter.POST("/submit/modal", controller.RelayMidjourney)
 		relayMjRouter.POST("/submit/imagine", controller.RelayMidjourney)
 		relayMjRouter.POST("/submit/imagine", controller.RelayMidjourney)
 		relayMjRouter.POST("/submit/change", controller.RelayMidjourney)
 		relayMjRouter.POST("/submit/change", controller.RelayMidjourney)
 		relayMjRouter.POST("/submit/simple-change", controller.RelayMidjourney)
 		relayMjRouter.POST("/submit/simple-change", controller.RelayMidjourney)

service/error.go

@@ -11,6 +11,13 @@ import (
 	"strings"
 	"strings"
 )
 )
 
 
+func MidjourneyErrorWrapper(code int, desc string) *dto.MidjourneyResponse {
+	return &dto.MidjourneyResponse{
+		Code:        code,
+		Description: desc,
+	}
+}
+
 // OpenAIErrorWrapper wraps an error into an OpenAIErrorWithStatusCode
 // OpenAIErrorWrapper wraps an error into an OpenAIErrorWithStatusCode
 func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
 func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
 	text := err.Error()
 	text := err.Error()

web/src/components/MjLogsTable.js

@@ -35,6 +35,10 @@ function renderType(type) {
             return <Tag color="yellow" size='large'>图生文</Tag>;
             return <Tag color="yellow" size='large'>图生文</Tag>;
         case 'BLEAND':
         case 'BLEAND':
             return <Tag color="lime" size='large'>图混合</Tag>;
             return <Tag color="lime" size='large'>图混合</Tag>;
+        case 'INPAINT':
+            return <Tag color="violet" size='large'>局部重绘</Tag>;
+        case 'INPAINT_PRE':
+            return <Tag color="violet" size='large'>局部重绘-预处理</Tag>;
         default:
         default:
             return <Tag color="white" size='large'>未知</Tag>;
             return <Tag color="white" size='large'>未知</Tag>;
     }
     }
@@ -68,6 +72,8 @@ function renderStatus(type) {
             return <Tag color="blue" size='large'>执行中</Tag>;
             return <Tag color="blue" size='large'>执行中</Tag>;
         case 'FAILURE':
         case 'FAILURE':
             return <Tag color="red" size='large'>失败</Tag>;
             return <Tag color="red" size='large'>失败</Tag>;
+        case 'MODAL':
+            return <Tag color="yellow" size='large'>窗口等待</Tag>;
         default:
         default:
             return <Tag color="white" size='large'>未知</Tag>;
             return <Tag color="white" size='large'>未知</Tag>;
     }
     }

web/src/constants/channel.constants.js

 export const CHANNEL_OPTIONS = [
 export const CHANNEL_OPTIONS = [
     {key: 1, text: 'OpenAI', value: 1, color: 'green', label: 'OpenAI'},
     {key: 1, text: 'OpenAI', value: 1, color: 'green', label: 'OpenAI'},
     {key: 2, text: 'Midjourney Proxy', value: 2, color: 'light-blue', label: 'Midjourney Proxy'},
     {key: 2, text: 'Midjourney Proxy', value: 2, color: 'light-blue', label: 'Midjourney Proxy'},
+    {key: 5, text: 'Midjourney Proxy Plus', value: 5, color: 'blue', label: 'Midjourney Proxy Plus'},
     {key: 4, text: 'Ollama', value: 4, color: 'grey', label: 'Ollama'},
     {key: 4, text: 'Ollama', value: 4, color: 'grey', label: 'Ollama'},
     {key: 14, text: 'Anthropic Claude', value: 14, color: 'indigo', label: 'Anthropic Claude'},
     {key: 14, text: 'Anthropic Claude', value: 14, color: 'indigo', label: 'Anthropic Claude'},
     {key: 3, text: 'Azure OpenAI', value: 3, color: 'teal', label: 'Azure OpenAI'},
     {key: 3, text: 'Azure OpenAI', value: 3, color: 'teal', label: 'Azure OpenAI'},