|
|
@@ -22,9 +22,11 @@ import (
|
|
|
"one-api/relay/common_handler"
|
|
|
"one-api/relay/constant"
|
|
|
"one-api/service"
|
|
|
+ "path/filepath"
|
|
|
"strings"
|
|
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
+ "net/textproto"
|
|
|
)
|
|
|
|
|
|
type Adaptor struct {
|
|
|
@@ -238,13 +240,8 @@ func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInf
|
|
|
func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) {
|
|
|
switch info.RelayMode {
|
|
|
case constant.RelayModeImagesEdits:
|
|
|
- body, err := common.GetRequestBody(c)
|
|
|
- if err != nil {
|
|
|
- return nil, errors.New("get request body fail")
|
|
|
- }
|
|
|
- return bytes.NewReader(body), nil
|
|
|
|
|
|
- /*var requestBody bytes.Buffer
|
|
|
+ var requestBody bytes.Buffer
|
|
|
writer := multipart.NewWriter(&requestBody)
|
|
|
|
|
|
writer.WriteField("model", request.Model)
|
|
|
@@ -260,36 +257,129 @@ func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInf
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 添加文件字段
|
|
|
- imageFiles := c.Request.MultipartForm.File["image[]"]
|
|
|
- for _, file := range imageFiles {
|
|
|
- part, err := writer.CreateFormFile("image[]", file.Filename)
|
|
|
- if err != nil {
|
|
|
- return nil, errors.New("create form file failed")
|
|
|
+ // Parse the multipart form to handle both single image and multiple images
|
|
|
+ if err := c.Request.ParseMultipartForm(32 << 20); err != nil { // 32MB max memory
|
|
|
+ return nil, errors.New("failed to parse multipart form")
|
|
|
+ }
|
|
|
+
|
|
|
+ if c.Request.MultipartForm != nil && c.Request.MultipartForm.File != nil {
|
|
|
+ // Check if "image" field exists in any form, including array notation
|
|
|
+ var imageFiles []*multipart.FileHeader
|
|
|
+ var exists bool
|
|
|
+
|
|
|
+ // First check for standard "image" field
|
|
|
+ if imageFiles, exists = c.Request.MultipartForm.File["image"]; !exists || len(imageFiles) == 0 {
|
|
|
+ // If not found, check for "image[]" field
|
|
|
+ if imageFiles, exists = c.Request.MultipartForm.File["image[]"]; !exists || len(imageFiles) == 0 {
|
|
|
+ // If still not found, iterate through all fields to find any that start with "image["
|
|
|
+ foundArrayImages := false
|
|
|
+ for fieldName, files := range c.Request.MultipartForm.File {
|
|
|
+ if strings.HasPrefix(fieldName, "image[") && len(files) > 0 {
|
|
|
+ foundArrayImages = true
|
|
|
+ for _, file := range files {
|
|
|
+ imageFiles = append(imageFiles, file)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // If no image fields found at all
|
|
|
+ if !foundArrayImages && (len(imageFiles) == 0) {
|
|
|
+ return nil, errors.New("image is required")
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- // 打开文件
|
|
|
- src, err := file.Open()
|
|
|
- if err != nil {
|
|
|
- return nil, errors.New("open file failed")
|
|
|
+
|
|
|
+ // Process all image files
|
|
|
+ for i, fileHeader := range imageFiles {
|
|
|
+ file, err := fileHeader.Open()
|
|
|
+ if err != nil {
|
|
|
+ return nil, fmt.Errorf("failed to open image file %d: %w", i, err)
|
|
|
+ }
|
|
|
+ defer file.Close()
|
|
|
+
|
|
|
+ // If multiple images, use image[] as the field name
|
|
|
+ fieldName := "image"
|
|
|
+ if len(imageFiles) > 1 {
|
|
|
+ fieldName = "image[]"
|
|
|
+ }
|
|
|
+
|
|
|
+ // Determine MIME type based on file extension
|
|
|
+ mimeType := detectImageMimeType(fileHeader.Filename)
|
|
|
+
|
|
|
+ // Create a form file with the appropriate content type
|
|
|
+ h := make(textproto.MIMEHeader)
|
|
|
+ h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="%s"; filename="%s"`, fieldName, fileHeader.Filename))
|
|
|
+ h.Set("Content-Type", mimeType)
|
|
|
+
|
|
|
+ part, err := writer.CreatePart(h)
|
|
|
+ if err != nil {
|
|
|
+ return nil, fmt.Errorf("create form part failed for image %d: %w", i, err)
|
|
|
+ }
|
|
|
+
|
|
|
+ if _, err := io.Copy(part, file); err != nil {
|
|
|
+ return nil, fmt.Errorf("copy file failed for image %d: %w", i, err)
|
|
|
+ }
|
|
|
}
|
|
|
- // 将文件数据写入 form part
|
|
|
- _, err = io.Copy(part, src)
|
|
|
- if err != nil {
|
|
|
- return nil, errors.New("copy file failed")
|
|
|
+
|
|
|
+ // Handle mask file if present
|
|
|
+ if maskFiles, exists := c.Request.MultipartForm.File["mask"]; exists && len(maskFiles) > 0 {
|
|
|
+ maskFile, err := maskFiles[0].Open()
|
|
|
+ if err != nil {
|
|
|
+ return nil, errors.New("failed to open mask file")
|
|
|
+ }
|
|
|
+ defer maskFile.Close()
|
|
|
+
|
|
|
+ // Determine MIME type for mask file
|
|
|
+ mimeType := detectImageMimeType(maskFiles[0].Filename)
|
|
|
+
|
|
|
+ // Create a form file with the appropriate content type
|
|
|
+ h := make(textproto.MIMEHeader)
|
|
|
+ h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="mask"; filename="%s"`, maskFiles[0].Filename))
|
|
|
+ h.Set("Content-Type", mimeType)
|
|
|
+
|
|
|
+ maskPart, err := writer.CreatePart(h)
|
|
|
+ if err != nil {
|
|
|
+ return nil, errors.New("create form file failed for mask")
|
|
|
+ }
|
|
|
+
|
|
|
+ if _, err := io.Copy(maskPart, maskFile); err != nil {
|
|
|
+ return nil, errors.New("copy mask file failed")
|
|
|
+ }
|
|
|
}
|
|
|
- src.Close()
|
|
|
+ } else {
|
|
|
+ return nil, errors.New("no multipart form data found")
|
|
|
}
|
|
|
|
|
|
// 关闭 multipart 编写器以设置分界线
|
|
|
writer.Close()
|
|
|
c.Request.Header.Set("Content-Type", writer.FormDataContentType())
|
|
|
- return bytes.NewReader(requestBody.Bytes()), nil*/
|
|
|
+ return bytes.NewReader(requestBody.Bytes()), nil
|
|
|
|
|
|
default:
|
|
|
return request, nil
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+// detectImageMimeType determines the MIME type based on the file extension
|
|
|
+func detectImageMimeType(filename string) string {
|
|
|
+ ext := strings.ToLower(filepath.Ext(filename))
|
|
|
+ switch ext {
|
|
|
+ case ".jpg", ".jpeg":
|
|
|
+ return "image/jpeg"
|
|
|
+ case ".png":
|
|
|
+ return "image/png"
|
|
|
+ case ".webp":
|
|
|
+ return "image/webp"
|
|
|
+ default:
|
|
|
+ // Try to detect from extension if possible
|
|
|
+ if strings.HasPrefix(ext, ".jp") {
|
|
|
+ return "image/jpeg"
|
|
|
+ }
|
|
|
+ // Default to png as a fallback
|
|
|
+ return "image/png"
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (any, error) {
|
|
|
if info.RelayMode == constant.RelayModeAudioTranscription ||
|
|
|
info.RelayMode == constant.RelayModeAudioTranslation ||
|
CaIon