* 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
278 lines
9.3 KiB
Go
278 lines
9.3 KiB
Go
package ali
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/relay/channel"
|
|
"github.com/QuantumNous/new-api/relay/channel/claude"
|
|
"github.com/QuantumNous/new-api/relay/channel/openai"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relay/constant"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/QuantumNous/new-api/setting/model_setting"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type Adaptor struct {
|
|
IsSyncImageModel bool
|
|
}
|
|
|
|
const aliAnthropicMessagesModelsEnv = "ALI_ANTHROPIC_MESSAGES_MODELS"
|
|
const defaultAliAnthropicMessagesModels = "qwen,deepseek-v4,kimi,glm,minimax-m"
|
|
|
|
/*
|
|
var syncModels = []string{
|
|
"z-image",
|
|
"qwen-image",
|
|
"wan2.6",
|
|
}
|
|
*/
|
|
func supportsAliAnthropicMessages(modelName string) bool {
|
|
normalizedModelName := strings.ToLower(strings.TrimSpace(modelName))
|
|
if normalizedModelName == "" {
|
|
return false
|
|
}
|
|
|
|
return lo.SomeBy(aliAnthropicMessagesModelPatterns(), func(pattern string) bool {
|
|
return strings.Contains(normalizedModelName, pattern)
|
|
})
|
|
}
|
|
|
|
func aliAnthropicMessagesModelPatterns() []string {
|
|
configuredModels := common.GetEnvOrDefaultString(aliAnthropicMessagesModelsEnv, defaultAliAnthropicMessagesModels)
|
|
return lo.FilterMap(strings.Split(configuredModels, ","), func(item string, _ int) (string, bool) {
|
|
pattern := strings.ToLower(strings.TrimSpace(item))
|
|
return pattern, pattern != ""
|
|
})
|
|
}
|
|
|
|
var syncModels = []string{
|
|
"z-image",
|
|
"qwen-image",
|
|
"wan2.6",
|
|
}
|
|
|
|
func isSyncImageModel(modelName string) bool {
|
|
return model_setting.IsSyncImageModel(modelName)
|
|
}
|
|
|
|
func (a *Adaptor) ConvertGeminiRequest(*gin.Context, *relaycommon.RelayInfo, *dto.GeminiChatRequest) (any, error) {
|
|
//TODO implement me
|
|
return nil, errors.New("not implemented")
|
|
}
|
|
|
|
func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, req *dto.ClaudeRequest) (any, error) {
|
|
if supportsAliAnthropicMessages(info.UpstreamModelName) {
|
|
return req, nil
|
|
}
|
|
|
|
result, err := service.ConvertRequest(c, info, types.RelayFormatOpenAI, req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
oaiReq, ok := result.Value.(*dto.GeneralOpenAIRequest)
|
|
if !ok {
|
|
return nil, fmt.Errorf("expected OpenAI chat completions request, got %T", result.Value)
|
|
}
|
|
if info.SupportStreamOptions && info.IsStream {
|
|
oaiReq.StreamOptions = &dto.StreamOptions{IncludeUsage: true}
|
|
}
|
|
return a.ConvertOpenAIRequest(c, info, oaiReq)
|
|
}
|
|
|
|
func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
|
|
}
|
|
|
|
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
|
|
var fullRequestURL string
|
|
switch info.RelayFormat {
|
|
case types.RelayFormatClaude:
|
|
if supportsAliAnthropicMessages(info.UpstreamModelName) {
|
|
fullRequestURL = fmt.Sprintf("%s/apps/anthropic/v1/messages", info.ChannelBaseUrl)
|
|
} else {
|
|
fullRequestURL = fmt.Sprintf("%s/compatible-mode/v1/chat/completions", info.ChannelBaseUrl)
|
|
}
|
|
default:
|
|
switch info.RelayMode {
|
|
case constant.RelayModeEmbeddings:
|
|
fullRequestURL = fmt.Sprintf("%s/compatible-mode/v1/embeddings", info.ChannelBaseUrl)
|
|
case constant.RelayModeRerank:
|
|
fullRequestURL = fmt.Sprintf("%s/api/v1/services/rerank/text-rerank/text-rerank", info.ChannelBaseUrl)
|
|
case constant.RelayModeResponses:
|
|
fullRequestURL = fmt.Sprintf("%s/api/v2/apps/protocols/compatible-mode/v1/responses", info.ChannelBaseUrl)
|
|
case constant.RelayModeImagesGenerations:
|
|
if isSyncImageModel(info.OriginModelName) {
|
|
fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/multimodal-generation/generation", info.ChannelBaseUrl)
|
|
} else {
|
|
fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/text2image/image-synthesis", info.ChannelBaseUrl)
|
|
}
|
|
case constant.RelayModeImagesEdits:
|
|
if isOldWanModel(info.OriginModelName) {
|
|
fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/image2image/image-synthesis", info.ChannelBaseUrl)
|
|
} else if isWanModel(info.OriginModelName) {
|
|
fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/image-generation/generation", info.ChannelBaseUrl)
|
|
} else {
|
|
fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/multimodal-generation/generation", info.ChannelBaseUrl)
|
|
}
|
|
case constant.RelayModeCompletions:
|
|
fullRequestURL = fmt.Sprintf("%s/compatible-mode/v1/completions", info.ChannelBaseUrl)
|
|
default:
|
|
fullRequestURL = fmt.Sprintf("%s/compatible-mode/v1/chat/completions", info.ChannelBaseUrl)
|
|
}
|
|
}
|
|
|
|
return fullRequestURL, nil
|
|
}
|
|
|
|
func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Header, info *relaycommon.RelayInfo) error {
|
|
channel.SetupApiRequestHeader(info, c, req)
|
|
req.Set("Authorization", "Bearer "+info.ApiKey)
|
|
if info.IsStream {
|
|
req.Set("X-DashScope-SSE", "enable")
|
|
}
|
|
if c.GetString("plugin") != "" {
|
|
req.Set("X-DashScope-Plugin", c.GetString("plugin"))
|
|
}
|
|
if info.RelayMode == constant.RelayModeImagesGenerations {
|
|
if isSyncImageModel(info.OriginModelName) {
|
|
|
|
} else {
|
|
req.Set("X-DashScope-Async", "enable")
|
|
}
|
|
}
|
|
if info.RelayMode == constant.RelayModeImagesEdits {
|
|
if isWanModel(info.OriginModelName) {
|
|
req.Set("X-DashScope-Async", "enable")
|
|
}
|
|
req.Set("Content-Type", "application/json")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeneralOpenAIRequest) (any, error) {
|
|
if request == nil {
|
|
return nil, errors.New("request is nil")
|
|
}
|
|
// docs: https://bailian.console.aliyun.com/?tab=api#/api/?type=model&url=2712216
|
|
// fix: InternalError.Algo.InvalidParameter: The value of the enable_thinking parameter is restricted to True.
|
|
//if strings.Contains(request.Model, "thinking") {
|
|
// request.EnableThinking = true
|
|
// request.Stream = true
|
|
// info.IsStream = true
|
|
//}
|
|
//// fix: ali parameter.enable_thinking must be set to false for non-streaming calls
|
|
//if !info.IsStream {
|
|
// request.EnableThinking = false
|
|
//}
|
|
|
|
switch info.RelayMode {
|
|
default:
|
|
aliReq := requestOpenAI2Ali(*request)
|
|
return aliReq, nil
|
|
}
|
|
}
|
|
|
|
func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) {
|
|
if info.RelayMode == constant.RelayModeImagesGenerations {
|
|
if isSyncImageModel(info.OriginModelName) {
|
|
a.IsSyncImageModel = true
|
|
}
|
|
aliRequest, err := oaiImage2AliImageRequest(info, request, a.IsSyncImageModel)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("convert image request to async ali image request failed: %w", err)
|
|
}
|
|
return aliRequest, nil
|
|
} else if info.RelayMode == constant.RelayModeImagesEdits {
|
|
if isOldWanModel(info.OriginModelName) {
|
|
return oaiFormEdit2WanxImageEdit(c, info, request)
|
|
}
|
|
if isSyncImageModel(info.OriginModelName) {
|
|
if isWanModel(info.OriginModelName) {
|
|
a.IsSyncImageModel = false
|
|
} else {
|
|
a.IsSyncImageModel = true
|
|
}
|
|
}
|
|
// ali image edit https://bailian.console.aliyun.com/?tab=api#/api/?type=model&url=2976416
|
|
// 如果用户使用表单,则需要解析表单数据
|
|
if strings.Contains(c.Request.Header.Get("Content-Type"), "multipart/form-data") {
|
|
aliRequest, err := oaiFormEdit2AliImageEdit(c, info, request)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("convert image edit form request failed: %w", err)
|
|
}
|
|
return aliRequest, nil
|
|
} else {
|
|
aliRequest, err := oaiImage2AliImageRequest(info, request, a.IsSyncImageModel)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("convert image request to async ali image request failed: %w", err)
|
|
}
|
|
return aliRequest, nil
|
|
}
|
|
}
|
|
return nil, fmt.Errorf("unsupported image relay mode: %d", info.RelayMode)
|
|
}
|
|
|
|
func (a *Adaptor) ConvertRerankRequest(c *gin.Context, relayMode int, request dto.RerankRequest) (any, error) {
|
|
return ConvertRerankRequest(request), nil
|
|
}
|
|
|
|
func (a *Adaptor) ConvertEmbeddingRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.EmbeddingRequest) (any, error) {
|
|
return request, nil
|
|
}
|
|
|
|
func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) {
|
|
//TODO implement me
|
|
return nil, errors.New("not implemented")
|
|
}
|
|
|
|
func (a *Adaptor) ConvertOpenAIResponsesRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.OpenAIResponsesRequest) (any, error) {
|
|
return request, nil
|
|
}
|
|
|
|
func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (any, error) {
|
|
return channel.DoApiRequest(a, c, info, requestBody)
|
|
}
|
|
|
|
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
|
|
switch info.RelayFormat {
|
|
case types.RelayFormatClaude:
|
|
if supportsAliAnthropicMessages(info.UpstreamModelName) {
|
|
adaptor := claude.Adaptor{}
|
|
return adaptor.DoResponse(c, resp, info)
|
|
}
|
|
|
|
adaptor := openai.Adaptor{}
|
|
return adaptor.DoResponse(c, resp, info)
|
|
default:
|
|
switch info.RelayMode {
|
|
case constant.RelayModeImagesGenerations:
|
|
err, usage = aliImageHandler(a, c, resp, info)
|
|
case constant.RelayModeImagesEdits:
|
|
err, usage = aliImageHandler(a, c, resp, info)
|
|
case constant.RelayModeRerank:
|
|
err, usage = RerankHandler(c, resp, info)
|
|
default:
|
|
adaptor := openai.Adaptor{}
|
|
usage, err = adaptor.DoResponse(c, resp, info)
|
|
}
|
|
return usage, err
|
|
}
|
|
}
|
|
|
|
func (a *Adaptor) GetModelList() []string {
|
|
return ModelList
|
|
}
|
|
|
|
func (a *Adaptor) GetChannelName() string {
|
|
return ChannelName
|
|
}
|