Dalle supported image to image

api/core/types/task.go

@@ -70,17 +70,18 @@ type SdTaskParams struct {
 
 // DallTask DALL-E task
 type DallTask struct {
-	ModelId          uint   `json:"model_id"`
-	ModelName        string `json:"model_name"`
-	Id               uint   `json:"id"`
-	UserId           uint   `json:"user_id"`
-	Prompt           string `json:"prompt"`
-	N                int    `json:"n"`
-	Quality          string `json:"quality"`
-	Size             string `json:"size"`
-	Style            string `json:"style"`
-	Power            int    `json:"power"`
-	TranslateModelId int    `json:"translate_model_id"` // 提示词翻译模型ID
+	ModelId          uint     `json:"model_id"`
+	ModelName        string   `json:"model_name"`
+	Image            []string `json:"image,omitempty"`
+	Id               uint     `json:"id"`
+	UserId           uint     `json:"user_id"`
+	Prompt           string   `json:"prompt"`
+	N                int      `json:"n"`
+	Quality          string   `json:"quality"`
+	Size             string   `json:"size"`
+	Style            string   `json:"style"`
+	Power            int      `json:"power"`
+	TranslateModelId int      `json:"translate_model_id"` // 提示词翻译模型ID
 }
 
 type SunoTask struct {

api/handler/dalle_handler.go

@@ -118,6 +118,7 @@ func (h *DallJobHandler) Image(c *gin.Context) {
 		UserId:           uint(userId),
 		ModelId:          chatModel.Id,
 		ModelName:        chatModel.Value,
+		Image:            data.Image,
 		Prompt:           data.Prompt,
 		Quality:          data.Quality,
 		Size:             data.Size,

api/service/dalle/service.go

@@ -16,6 +16,7 @@ import (
 	"geekai/store"
 	"geekai/store/model"
 	"geekai/utils"
+	"strings"
 	"time"
 
 	"github.com/go-redis/redis/v8"
@@ -94,12 +95,14 @@ func (s *Service) Run() {
 }
 
 type imgReq struct {
-	Model   string `json:"model"`
-	Prompt  string `json:"prompt"`
-	N       int    `json:"n,omitempty"`
-	Size    string `json:"size,omitempty"`
-	Quality string `json:"quality,omitempty"`
-	Style   string `json:"style,omitempty"`
+	Model          string   `json:"model"`
+	Image          []string `json:"image,omitempty"`
+	Prompt         string   `json:"prompt"`
+	N              int      `json:"n,omitempty"`
+	Size           string   `json:"size,omitempty"`
+	Quality        string   `json:"quality,omitempty"`
+	Style          string   `json:"style,omitempty"`
+	ResponseFormat string   `json:"response_format,omitempty"`
 }
 
 type imgRes struct {
@@ -157,6 +160,11 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 		Style:   task.Style,
 		Quality: task.Quality,
 	}
+	// 图片编辑
+	if len(task.Image) > 0 {
+		reqBody.Prompt = fmt.Sprintf("%s, %s", strings.Join(task.Image, " "), task.Prompt)
+	}
+
 	logger.Infof("Channel:%s, API KEY:%s, BODY: %+v", apiURL, apiKey.Value, reqBody)
 	r, err := s.httpClient.R().SetHeader("Body-Type", "application/json").
 		SetHeader("Authorization", "Bearer "+apiKey.Value).

web/src/components/ChatPrompt.vue

@@ -232,6 +232,7 @@ const copyContent = (text) => {
             flex-flow: row;
             margin-right: 10px;
             position: relative;
+            justify-content: start;
 
             .el-image {
               border: 1px solid #e3e3e3;
@@ -365,6 +366,7 @@ const copyContent = (text) => {
             flex-flow: row;
             margin-right: 10px;
             position: relative;
+            justify-content: end;
 
             .el-image {
               border: 1px solid #e3e3e3;

web/src/components/ImageUpload.vue

@@ -85,7 +85,7 @@
           <el-icon :size="40" class="el-icon--upload"><UploadFilled /></el-icon>
           <div class="el-upload__text">拖拽图片到此处，或 <em>点击上传</em></div>
           <template #tip>
-            <div class="el-upload__tip text-center">
+            <div class="el-upload__tip text-gray-500 text-sm">
               支持 JPG、PNG 格式，最多上传 {{ maxCount }} 张，单张最大 5MB
             </div>
           </template>

web/src/views/Dalle.vue

@@ -101,6 +101,13 @@
                   <span v-else>生成中...</span>
                 </el-button>
               </div>
+
+              <div class="mt-2 mb-2">
+                <label class="text-gray-700 font-semibold">参考图(可选)</label>
+                <div class="py-2">
+                  <ImageUpload v-model="params.image" :max-count="5" :multiple="true" />
+                </div>
+              </div>
             </el-form>
           </div>
           <div class="py-4">
@@ -295,6 +302,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { onMounted, onUnmounted, ref } from 'vue'
 import { LazyImg, Waterfall } from 'vue-waterfall-plugin-next'
 import 'vue-waterfall-plugin-next/dist/style.css'
+import ImageUpload from '@/components/ImageUpload.vue'
 
 const listBoxHeight = ref(0)
 // const paramBoxHeight = ref(0)