Merge pull request #1321 from iszcz/main

支持Midjourney视频任务和图片编辑

relay/constant/relay_mode.go

@@ -29,6 +29,8 @@ const (
 	RelayModeMidjourneyShorten
 	RelayModeSwapFace
 	RelayModeMidjourneyUpload
+	RelayModeMidjourneyVideo
+	RelayModeMidjourneyEdits
 
 	RelayModeAudioSpeech        // tts
 	RelayModeAudioTranscription // whisper
@@ -108,6 +110,10 @@ func Path2RelayModeMidjourney(path string) int {
 		relayMode = RelayModeMidjourneyUpload
 	} else if strings.HasSuffix(path, "/mj/submit/imagine") {
 		relayMode = RelayModeMidjourneyImagine
+	} else if strings.HasSuffix(path, "/mj/submit/video") {
+		relayMode = RelayModeMidjourneyVideo
+	} else if strings.HasSuffix(path, "/mj/submit/edits") {
+		relayMode = RelayModeMidjourneyEdits
 	} else if strings.HasSuffix(path, "/mj/submit/blend") {
 		relayMode = RelayModeMidjourneyBlend
 	} else if strings.HasSuffix(path, "/mj/submit/describe") {

relay/relay-mj.go

@@ -106,6 +106,9 @@ func RelayMidjourneyNotify(c *gin.Context) *dto.MidjourneyResponse {
 	midjourneyTask.StartTime = midjRequest.StartTime
 	midjourneyTask.FinishTime = midjRequest.FinishTime
 	midjourneyTask.ImageUrl = midjRequest.ImageUrl
+	midjourneyTask.VideoUrl = midjRequest.VideoUrl
+	videoUrlsStr, _ := json.Marshal(midjRequest.VideoUrls)
+	midjourneyTask.VideoUrls = string(videoUrlsStr)
 	midjourneyTask.Status = midjRequest.Status
 	midjourneyTask.FailReason = midjRequest.FailReason
 	err = midjourneyTask.Update()
@@ -136,6 +139,9 @@ func coverMidjourneyTaskDto(c *gin.Context, originTask *model.Midjourney) (midjo
 	} else {
 		midjourneyTask.ImageUrl = originTask.ImageUrl
 	}
+	if originTask.VideoUrl != "" {
+		midjourneyTask.VideoUrl = originTask.VideoUrl
+	}
 	midjourneyTask.Status = originTask.Status
 	midjourneyTask.FailReason = originTask.FailReason
 	midjourneyTask.Action = originTask.Action
@@ -148,6 +154,13 @@ func coverMidjourneyTaskDto(c *gin.Context, originTask *model.Midjourney) (midjo
 			midjourneyTask.Buttons = buttons
 		}
 	}
+	if originTask.VideoUrls != "" {
+		var videoUrls []dto.ImgUrls
+		err := json.Unmarshal([]byte(originTask.VideoUrls), &videoUrls)
+		if err == nil {
+			midjourneyTask.VideoUrls = videoUrls
+		}
+	}
 	if originTask.Properties != "" {
 		var properties dto.Properties
 		err := json.Unmarshal([]byte(originTask.Properties), &properties)
@@ -370,6 +383,9 @@ func RelayMidjourneySubmit(c *gin.Context, relayMode int) *dto.MidjourneyRespons
 		}
 		relayMode = relayconstant.RelayModeMidjourneyChange
 	}
+	if relayMode == relayconstant.RelayModeMidjourneyVideo {
+		midjRequest.Action = constant.MjActionVideo
+	}
 
 	if relayMode == relayconstant.RelayModeMidjourneyImagine { //绘画任务，此类任务可重复
 		if midjRequest.Prompt == "" {
@@ -378,6 +394,8 @@ func RelayMidjourneySubmit(c *gin.Context, relayMode int) *dto.MidjourneyRespons
 		midjRequest.Action = constant.MjActionImagine
 	} else if relayMode == relayconstant.RelayModeMidjourneyDescribe { //按图生文任务，此类任务可重复
 		midjRequest.Action = constant.MjActionDescribe
+	} else if relayMode == relayconstant.RelayModeMidjourneyEdits { //编辑任务，此类任务可重复
+		midjRequest.Action = constant.MjActionEdits
 	} else if relayMode == relayconstant.RelayModeMidjourneyShorten { //缩短任务，此类任务可重复，plus only
 		midjRequest.Action = constant.MjActionShorten
 	} else if relayMode == relayconstant.RelayModeMidjourneyBlend { //绘画任务，此类任务可重复
@@ -412,6 +430,14 @@ func RelayMidjourneySubmit(c *gin.Context, relayMode int) *dto.MidjourneyRespons
 			//}
 			mjId = midjRequest.TaskId
 			midjRequest.Action = constant.MjActionModal
+		} else if relayMode == relayconstant.RelayModeMidjourneyVideo {
+			midjRequest.Action = constant.MjActionVideo
+			if midjRequest.TaskId == "" {
+				return service.MidjourneyErrorWrapper(constant.MjRequestError, "task_id_is_required")
+			} else if midjRequest.Action == "" {
+				return service.MidjourneyErrorWrapper(constant.MjRequestError, "action_is_required")
+			}
+			mjId = midjRequest.TaskId
 		}
 
 		originTask := model.GetByMJId(userId, mjId)