Selaa lähdekoodia

feat: 兼容变焦功能

CaIon 2 vuotta sitten
vanhempi
commit
728dbed28d
3 muutettua tiedostoa jossa 7 lisäystä ja 1 poistoa
  1. 1 0
      constant/midjourney.go
  2. 4 1
      relay/relay-mj.go
  3. 2 0
      web/src/components/MjLogsTable.js

+ 1 - 0
constant/midjourney.go

@@ -13,4 +13,5 @@ const (
 	MjActionVariation  = "VARIATION"
 	MjActionInPaint    = "INPAINT"
 	MjActionInPaintPre = "INPAINT_PRE"
+	MjActionZoom       = "ZOOM"
 )

+ 4 - 1
relay/relay-mj.go

@@ -27,6 +27,7 @@ var DefaultModelPrice = map[string]float64{
 	"mj_reroll":      0.1,
 	"mj_blend":       0.1,
 	"mj_inpaint":     0.1,
+	"mj_zoom":        0.1,
 	"mj_inpaint_pre": 0,
 	"mj_describe":    0.05,
 	"mj_upscale":     0.05,
@@ -646,11 +647,13 @@ func coverPlusActionToNormalAction(midjRequest *dto.MidjourneyRequest) *dto.Midj
 		midjRequest.Action = constant.MjActionUpscale
 	} else if strings.Contains(action, "variation") {
 		midjRequest.Action = constant.MjActionVariation
+		midjRequest.Index = 1
 	} else if strings.Contains(action, "pan") {
 		midjRequest.Action = constant.MjActionVariation
 		midjRequest.Index = 1
 	} else if action == "Outpaint" || strings.Contains(action, "CustomZoom") {
-		midjRequest.Action = constant.MjActionInPaintPre
+		midjRequest.Action = constant.MjActionZoom
+		midjRequest.Index = 1
 	} else if action == "Inpaint" {
 		midjRequest.Action = constant.MjActionInPaintPre
 		midjRequest.Index = 1

+ 2 - 0
web/src/components/MjLogsTable.js

@@ -39,6 +39,8 @@ function renderType(type) {
             return <Tag color="indigo" size='large'>重绘</Tag>;
         case 'INPAINT':
             return <Tag color="violet" size='large'>局部重绘</Tag>;
+        case 'ZOOM':
+            return <Tag color="teal" size='large'>变焦</Tag>;
         case 'INPAINT_PRE':
             return <Tag color="violet" size='large'>局部重绘-预处理</Tag>;
         default: