diff --git a/constant/midjourney.go b/constant/midjourney.go index dbcc5c87..c1844350 100644 --- a/constant/midjourney.go +++ b/constant/midjourney.go @@ -13,4 +13,5 @@ const ( MjActionVariation = "VARIATION" MjActionInPaint = "INPAINT" MjActionInPaintPre = "INPAINT_PRE" + MjActionZoom = "ZOOM" ) diff --git a/relay/relay-mj.go b/relay/relay-mj.go index 5fafc89c..d5820557 100644 --- a/relay/relay-mj.go +++ b/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 diff --git a/web/src/components/MjLogsTable.js b/web/src/components/MjLogsTable.js index 4accf54c..a1ffeb62 100644 --- a/web/src/components/MjLogsTable.js +++ b/web/src/components/MjLogsTable.js @@ -39,6 +39,8 @@ function renderType(type) { return 重绘; case 'INPAINT': return 局部重绘; + case 'ZOOM': + return 变焦; case 'INPAINT_PRE': return 局部重绘-预处理; default: