* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
349 lines
9.8 KiB
Go
349 lines
9.8 KiB
Go
package ali
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"mime/multipart"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
func oaiImage2AliImageRequest(info *relaycommon.RelayInfo, request dto.ImageRequest, isSync bool) (*AliImageRequest, error) {
|
|
var imageRequest AliImageRequest
|
|
imageRequest.Model = request.Model
|
|
imageRequest.ResponseFormat = request.ResponseFormat
|
|
if request.Extra != nil {
|
|
if val, ok := request.Extra["parameters"]; ok {
|
|
err := common.Unmarshal(val, &imageRequest.Parameters)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid parameters field: %w", err)
|
|
}
|
|
} else {
|
|
// 兼容没有parameters字段的情况,从openai标准字段中提取参数
|
|
imageRequest.Parameters = AliImageParameters{
|
|
Size: strings.Replace(request.Size, "x", "*", -1),
|
|
N: int(lo.FromPtrOr(request.N, uint(1))),
|
|
Watermark: request.Watermark,
|
|
}
|
|
}
|
|
if val, ok := request.Extra["input"]; ok {
|
|
err := common.Unmarshal(val, &imageRequest.Input)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid input field: %w", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
if strings.Contains(request.Model, "z-image") {
|
|
// z-image 开启prompt_extend后,按2倍计费
|
|
if imageRequest.Parameters.PromptExtendValue() {
|
|
info.PriceData.AddOtherRatio("prompt_extend", 2)
|
|
}
|
|
}
|
|
|
|
// Parameters may come from Extra["parameters"], bypassing the standard
|
|
// top-level n validation; enforce the same bound before it becomes a
|
|
// billing multiplier.
|
|
if imageRequest.Parameters.N < 0 || imageRequest.Parameters.N > dto.MaxImageN {
|
|
return nil, fmt.Errorf("parameters.n must be an integer between 1 and %d", dto.MaxImageN)
|
|
}
|
|
if imageRequest.Parameters.N != 0 {
|
|
info.PriceData.AddOtherRatio("n", float64(imageRequest.Parameters.N))
|
|
}
|
|
|
|
// 同步图片模型和异步图片模型请求格式不一样
|
|
if isSync {
|
|
if imageRequest.Input == nil {
|
|
imageRequest.Input = AliImageInput{
|
|
Messages: []AliMessage{
|
|
{
|
|
Role: "user",
|
|
Content: []AliMediaContent{
|
|
{
|
|
Text: request.Prompt,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
} else {
|
|
if imageRequest.Input == nil {
|
|
imageRequest.Input = AliImageInput{
|
|
Prompt: request.Prompt,
|
|
}
|
|
}
|
|
}
|
|
|
|
return &imageRequest, nil
|
|
}
|
|
func getImageBase64sFromForm(c *gin.Context, fieldName string) ([]string, error) {
|
|
mf := c.Request.MultipartForm
|
|
if mf == nil {
|
|
if _, err := c.MultipartForm(); err != nil {
|
|
return nil, fmt.Errorf("failed to parse image edit form request: %w", err)
|
|
}
|
|
mf = c.Request.MultipartForm
|
|
}
|
|
|
|
var imageFiles []*multipart.FileHeader
|
|
var exists bool
|
|
|
|
// First check for standard "image" field
|
|
if imageFiles, exists = mf.File["image"]; !exists || len(imageFiles) == 0 {
|
|
// If not found, check for "image[]" field
|
|
if imageFiles, exists = mf.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 mf.File {
|
|
if strings.HasPrefix(fieldName, "image[") && len(files) > 0 {
|
|
foundArrayImages = true
|
|
imageFiles = append(imageFiles, files...)
|
|
}
|
|
}
|
|
|
|
// If no image fields found at all
|
|
if !foundArrayImages && (len(imageFiles) == 0) {
|
|
return nil, errors.New("image is required")
|
|
}
|
|
}
|
|
}
|
|
|
|
if len(imageFiles) == 0 {
|
|
return nil, errors.New("image is required")
|
|
}
|
|
|
|
//if len(imageFiles) > 1 {
|
|
// return nil, errors.New("only one image is supported for qwen edit")
|
|
//}
|
|
|
|
// 获取base64编码的图片
|
|
var imageBase64s []string
|
|
for _, file := range imageFiles {
|
|
image, err := file.Open()
|
|
if err != nil {
|
|
return nil, errors.New("failed to open image file")
|
|
}
|
|
|
|
// 读取文件内容
|
|
imageData, err := io.ReadAll(image)
|
|
if err != nil {
|
|
return nil, errors.New("failed to read image file")
|
|
}
|
|
|
|
// 获取MIME类型
|
|
mimeType := http.DetectContentType(imageData)
|
|
|
|
// 编码为base64
|
|
base64Data := base64.StdEncoding.EncodeToString(imageData)
|
|
|
|
// 构造data URL格式
|
|
dataURL := fmt.Sprintf("data:%s;base64,%s", mimeType, base64Data)
|
|
imageBase64s = append(imageBase64s, dataURL)
|
|
image.Close()
|
|
}
|
|
return imageBase64s, nil
|
|
}
|
|
|
|
func oaiFormEdit2AliImageEdit(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (*AliImageRequest, error) {
|
|
var imageRequest AliImageRequest
|
|
imageRequest.Model = request.Model
|
|
imageRequest.ResponseFormat = request.ResponseFormat
|
|
|
|
imageBase64s, err := getImageBase64sFromForm(c, "image")
|
|
if err != nil {
|
|
return nil, fmt.Errorf("get image base64s from form failed: %w", err)
|
|
}
|
|
//dto.MediaContent{}
|
|
mediaContents := make([]AliMediaContent, len(imageBase64s))
|
|
for i, b64 := range imageBase64s {
|
|
mediaContents[i] = AliMediaContent{
|
|
Image: b64,
|
|
}
|
|
}
|
|
mediaContents = append(mediaContents, AliMediaContent{
|
|
Text: request.Prompt,
|
|
})
|
|
imageRequest.Input = AliImageInput{
|
|
Messages: []AliMessage{
|
|
{
|
|
Role: "user",
|
|
Content: mediaContents,
|
|
},
|
|
},
|
|
}
|
|
imageRequest.Parameters = AliImageParameters{
|
|
N: int(lo.FromPtrOr(request.N, uint(1))),
|
|
Watermark: request.Watermark,
|
|
}
|
|
return &imageRequest, nil
|
|
}
|
|
|
|
func updateTask(info *relaycommon.RelayInfo, taskID string) (*AliResponse, error, []byte) {
|
|
url := fmt.Sprintf("%s/api/v1/tasks/%s", info.ChannelBaseUrl, taskID)
|
|
|
|
var aliResponse AliResponse
|
|
|
|
req, err := http.NewRequest("GET", url, nil)
|
|
if err != nil {
|
|
return &aliResponse, err, nil
|
|
}
|
|
|
|
req.Header.Set("Authorization", "Bearer "+info.ApiKey)
|
|
|
|
client := &http.Client{}
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
common.SysLog("updateTask client.Do err: " + err.Error())
|
|
return &aliResponse, err, nil
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
|
|
var response AliResponse
|
|
err = common.Unmarshal(responseBody, &response)
|
|
if err != nil {
|
|
common.SysLog("updateTask NewDecoder err: " + err.Error())
|
|
return &aliResponse, err, nil
|
|
}
|
|
|
|
return &response, nil, responseBody
|
|
}
|
|
|
|
func asyncTaskWait(c *gin.Context, info *relaycommon.RelayInfo, taskID string) (*AliResponse, []byte, error) {
|
|
waitSeconds := 10
|
|
step := 0
|
|
maxStep := 20
|
|
|
|
var taskResponse AliResponse
|
|
var responseBody []byte
|
|
|
|
time.Sleep(time.Duration(5) * time.Second)
|
|
|
|
for {
|
|
logger.LogDebug(c, "asyncTaskWait step %d/%d, wait %d seconds", step, maxStep, waitSeconds)
|
|
step++
|
|
rsp, err, body := updateTask(info, taskID)
|
|
responseBody = body
|
|
if err != nil {
|
|
logger.LogWarn(c, "asyncTaskWait UpdateTask err: "+err.Error())
|
|
time.Sleep(time.Duration(waitSeconds) * time.Second)
|
|
continue
|
|
}
|
|
|
|
if rsp.Output.TaskStatus == "" {
|
|
return &taskResponse, responseBody, nil
|
|
}
|
|
|
|
switch rsp.Output.TaskStatus {
|
|
case "FAILED":
|
|
fallthrough
|
|
case "CANCELED":
|
|
fallthrough
|
|
case "SUCCEEDED":
|
|
fallthrough
|
|
case "UNKNOWN":
|
|
return rsp, responseBody, nil
|
|
}
|
|
if step >= maxStep {
|
|
break
|
|
}
|
|
time.Sleep(time.Duration(waitSeconds) * time.Second)
|
|
}
|
|
|
|
return nil, nil, fmt.Errorf("aliAsyncTaskWait timeout")
|
|
}
|
|
|
|
func responseAli2OpenAIImage(c *gin.Context, response *AliResponse, originBody []byte, info *relaycommon.RelayInfo, responseFormat string) *dto.ImageResponse {
|
|
imageResponse := dto.ImageResponse{
|
|
Created: info.StartTime.Unix(),
|
|
}
|
|
|
|
if len(response.Output.Results) > 0 {
|
|
imageResponse.Data = response.Output.ResultToOpenAIImageDate(c, responseFormat)
|
|
} else if len(response.Output.Choices) > 0 {
|
|
imageResponse.Data = response.Output.ChoicesToOpenAIImageDate(c, responseFormat)
|
|
}
|
|
|
|
imageResponse.Metadata = originBody
|
|
return &imageResponse
|
|
}
|
|
|
|
func aliImageHandler(a *Adaptor, c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*types.NewAPIError, *dto.Usage) {
|
|
responseFormat := c.GetString("response_format")
|
|
|
|
var aliTaskResponse AliResponse
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError), nil
|
|
}
|
|
service.CloseResponseBodyGracefully(resp)
|
|
err = common.Unmarshal(responseBody, &aliTaskResponse)
|
|
if err != nil {
|
|
return types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError), nil
|
|
}
|
|
|
|
if aliTaskResponse.Message != "" {
|
|
logger.LogError(c, "ali_async_task_failed: "+aliTaskResponse.Message)
|
|
return types.NewError(errors.New(aliTaskResponse.Message), types.ErrorCodeBadResponse), nil
|
|
}
|
|
|
|
var (
|
|
aliResponse *AliResponse
|
|
originRespBody []byte
|
|
)
|
|
|
|
if a.IsSyncImageModel {
|
|
aliResponse = &aliTaskResponse
|
|
originRespBody = responseBody
|
|
} else {
|
|
// 异步图片模型需要轮询任务结果
|
|
aliResponse, originRespBody, err = asyncTaskWait(c, info, aliTaskResponse.Output.TaskId)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponse), nil
|
|
}
|
|
if aliResponse.Output.TaskStatus != "SUCCEEDED" {
|
|
return types.WithOpenAIError(types.OpenAIError{
|
|
Message: aliResponse.Output.Message,
|
|
Type: "ali_error",
|
|
Param: "",
|
|
Code: aliResponse.Output.Code,
|
|
}, resp.StatusCode), nil
|
|
}
|
|
}
|
|
|
|
if a.IsSyncImageModel {
|
|
logger.LogDebug(c, "ali_sync_image_result: %s", originRespBody)
|
|
} else {
|
|
logger.LogDebug(c, "ali_async_image_result: %s", originRespBody)
|
|
}
|
|
|
|
imageResponses := responseAli2OpenAIImage(c, aliResponse, originRespBody, info, responseFormat)
|
|
if aliResponse.Usage.ImageCount != 0 {
|
|
info.PriceData.AddOtherRatio("n", float64(aliResponse.Usage.ImageCount))
|
|
} else if len(imageResponses.Data) != 0 {
|
|
info.PriceData.AddOtherRatio("n", float64(len(imageResponses.Data)))
|
|
}
|
|
jsonResponse, err := common.Marshal(imageResponses)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
service.IOCopyBytesGracefully(c, resp, jsonResponse)
|
|
|
|
return nil, &dto.Usage{}
|
|
}
|