* 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
231 lines
7.1 KiB
Go
231 lines
7.1 KiB
Go
package oaichat
|
|
|
|
import (
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert/convmeta"
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
)
|
|
|
|
// ResponseOpenAI2Gemini 将 OpenAI 响应转换为 Gemini 格式
|
|
func ResponseOpenAI2Gemini(openAIResponse *dto.OpenAITextResponse, info convmeta.Meta) *dto.GeminiChatResponse {
|
|
totalTokens := openAIResponse.TotalTokens
|
|
if totalTokens == 0 {
|
|
totalTokens = openAIResponse.PromptTokens + openAIResponse.CompletionTokens
|
|
}
|
|
geminiResponse := &dto.GeminiChatResponse{
|
|
Candidates: make([]dto.GeminiChatCandidate, 0, len(openAIResponse.Choices)),
|
|
HasUsageMetadata: true,
|
|
UsageMetadata: dto.GeminiUsageMetadata{
|
|
PromptTokenCount: openAIResponse.PromptTokens,
|
|
CandidatesTokenCount: openAIResponse.CompletionTokens,
|
|
TotalTokenCount: totalTokens,
|
|
BillingUsage: openAIBillingUsageFromUsage(&openAIResponse.Usage),
|
|
},
|
|
}
|
|
if metadata, ok := geminiBillingMetadataFromOpenAIUsage(&openAIResponse.Usage); ok {
|
|
geminiResponse.UsageMetadata = metadata
|
|
}
|
|
|
|
for _, choice := range openAIResponse.Choices {
|
|
candidate := dto.GeminiChatCandidate{
|
|
Index: int64(choice.Index),
|
|
SafetyRatings: []dto.GeminiChatSafetyRating{},
|
|
}
|
|
|
|
// 设置结束原因
|
|
var finishReason string
|
|
switch choice.FinishReason {
|
|
case "stop":
|
|
finishReason = "STOP"
|
|
case "length":
|
|
finishReason = "MAX_TOKENS"
|
|
case "content_filter":
|
|
finishReason = "SAFETY"
|
|
case "tool_calls":
|
|
finishReason = "STOP"
|
|
default:
|
|
finishReason = "STOP"
|
|
}
|
|
candidate.FinishReason = &finishReason
|
|
|
|
// 转换消息内容
|
|
content := dto.GeminiChatContent{
|
|
Role: "model",
|
|
Parts: make([]dto.GeminiPart, 0),
|
|
}
|
|
|
|
textContent := choice.Message.StringContent()
|
|
if textContent != "" {
|
|
part := dto.GeminiPart{
|
|
Text: textContent,
|
|
}
|
|
content.Parts = append(content.Parts, part)
|
|
}
|
|
|
|
toolCalls := choice.Message.ParseToolCalls()
|
|
for _, toolCall := range toolCalls {
|
|
var args map[string]interface{}
|
|
if toolCall.Function.Arguments != "" {
|
|
if err := kitutil.Unmarshal([]byte(toolCall.Function.Arguments), &args); err != nil {
|
|
args = map[string]interface{}{"arguments": toolCall.Function.Arguments}
|
|
}
|
|
} else {
|
|
args = make(map[string]interface{})
|
|
}
|
|
|
|
part := dto.GeminiPart{
|
|
FunctionCall: &dto.FunctionCall{
|
|
FunctionName: toolCall.Function.Name,
|
|
Arguments: args,
|
|
},
|
|
}
|
|
content.Parts = append(content.Parts, part)
|
|
}
|
|
|
|
candidate.Content = content
|
|
geminiResponse.Candidates = append(geminiResponse.Candidates, candidate)
|
|
}
|
|
|
|
return geminiResponse
|
|
}
|
|
|
|
// StreamResponseOpenAI2Gemini 将 OpenAI 流式响应转换为 Gemini 格式
|
|
func StreamResponseOpenAI2Gemini(openAIResponse *dto.ChatCompletionsStreamResponse, info convmeta.Meta) *dto.GeminiChatResponse {
|
|
// 检查是否有实际内容或结束标志
|
|
hasContent := false
|
|
hasFinishReason := false
|
|
for _, choice := range openAIResponse.Choices {
|
|
if len(choice.Delta.GetContentString()) > 0 || (choice.Delta.ToolCalls != nil && len(choice.Delta.ToolCalls) > 0) {
|
|
hasContent = true
|
|
}
|
|
if choice.FinishReason != nil {
|
|
hasFinishReason = true
|
|
}
|
|
}
|
|
|
|
// 如果没有实际内容且没有结束标志,跳过。主要针对 openai 流响应开头的空数据
|
|
if !hasContent && !hasFinishReason {
|
|
return nil
|
|
}
|
|
|
|
estimatePromptTokens := 0
|
|
if info != nil {
|
|
estimatePromptTokens = info.GetEstimatePromptTokens()
|
|
}
|
|
geminiResponse := &dto.GeminiChatResponse{
|
|
Candidates: make([]dto.GeminiChatCandidate, 0, len(openAIResponse.Choices)),
|
|
HasUsageMetadata: true,
|
|
UsageMetadata: dto.GeminiUsageMetadata{
|
|
PromptTokenCount: estimatePromptTokens,
|
|
CandidatesTokenCount: 0, // 流式响应中可能没有完整的 usage 信息
|
|
TotalTokenCount: estimatePromptTokens,
|
|
},
|
|
}
|
|
|
|
if openAIResponse.Usage != nil {
|
|
geminiResponse.UsageMetadata.PromptTokenCount = openAIResponse.Usage.PromptTokens
|
|
geminiResponse.UsageMetadata.CandidatesTokenCount = openAIResponse.Usage.CompletionTokens
|
|
geminiResponse.UsageMetadata.TotalTokenCount = openAIResponse.Usage.TotalTokens
|
|
geminiResponse.UsageMetadata.BillingUsage = openAIBillingUsageFromUsage(openAIResponse.Usage)
|
|
if metadata, ok := geminiBillingMetadataFromOpenAIUsage(openAIResponse.Usage); ok {
|
|
geminiResponse.UsageMetadata = metadata
|
|
}
|
|
}
|
|
|
|
for _, choice := range openAIResponse.Choices {
|
|
candidate := dto.GeminiChatCandidate{
|
|
Index: int64(choice.Index),
|
|
SafetyRatings: []dto.GeminiChatSafetyRating{},
|
|
}
|
|
|
|
// 设置结束原因
|
|
if choice.FinishReason != nil {
|
|
var finishReason string
|
|
switch *choice.FinishReason {
|
|
case "stop":
|
|
finishReason = "STOP"
|
|
case "length":
|
|
finishReason = "MAX_TOKENS"
|
|
case "content_filter":
|
|
finishReason = "SAFETY"
|
|
case "tool_calls":
|
|
finishReason = "STOP"
|
|
default:
|
|
finishReason = "STOP"
|
|
}
|
|
candidate.FinishReason = &finishReason
|
|
}
|
|
|
|
// 转换消息内容
|
|
content := dto.GeminiChatContent{
|
|
Role: "model",
|
|
Parts: make([]dto.GeminiPart, 0),
|
|
}
|
|
|
|
// 处理工具调用
|
|
if choice.Delta.ToolCalls != nil {
|
|
for _, toolCall := range choice.Delta.ToolCalls {
|
|
// 解析参数
|
|
var args map[string]interface{}
|
|
if toolCall.Function.Arguments != "" {
|
|
if err := kitutil.Unmarshal([]byte(toolCall.Function.Arguments), &args); err != nil {
|
|
args = map[string]interface{}{"arguments": toolCall.Function.Arguments}
|
|
}
|
|
} else {
|
|
args = make(map[string]interface{})
|
|
}
|
|
|
|
part := dto.GeminiPart{
|
|
FunctionCall: &dto.FunctionCall{
|
|
FunctionName: toolCall.Function.Name,
|
|
Arguments: args,
|
|
},
|
|
}
|
|
content.Parts = append(content.Parts, part)
|
|
}
|
|
} else {
|
|
// 处理文本内容
|
|
textContent := choice.Delta.GetContentString()
|
|
if textContent != "" {
|
|
part := dto.GeminiPart{
|
|
Text: textContent,
|
|
}
|
|
content.Parts = append(content.Parts, part)
|
|
}
|
|
}
|
|
|
|
candidate.Content = content
|
|
geminiResponse.Candidates = append(geminiResponse.Candidates, candidate)
|
|
}
|
|
|
|
return geminiResponse
|
|
}
|
|
|
|
func geminiBillingMetadataFromOpenAIUsage(usage *dto.Usage) (dto.GeminiUsageMetadata, bool) {
|
|
if usage == nil || usage.BillingUsage == nil || usage.BillingUsage.GeminiUsageMetadata == nil {
|
|
return dto.GeminiUsageMetadata{}, false
|
|
}
|
|
if usage.BillingUsage.Source != dto.BillingUsageSourceGeminiChat && usage.BillingUsage.Semantic != dto.BillingUsageSemanticGemini {
|
|
return dto.GeminiUsageMetadata{}, false
|
|
}
|
|
billingUsage := dto.CloneBillingUsage(usage.BillingUsage)
|
|
if billingUsage == nil || billingUsage.GeminiUsageMetadata == nil {
|
|
return dto.GeminiUsageMetadata{}, false
|
|
}
|
|
return *billingUsage.GeminiUsageMetadata, true
|
|
}
|
|
|
|
func openAIBillingUsageFromUsage(usage *dto.Usage) *dto.BillingUsage {
|
|
if usage == nil {
|
|
return nil
|
|
}
|
|
if existingBillingUsage := dto.CloneBillingUsage(usage.BillingUsage); existingBillingUsage != nil && existingBillingUsage.OpenAIUsage != nil {
|
|
if existingBillingUsage.Source == dto.BillingUsageSourceOAIChat ||
|
|
existingBillingUsage.Source == dto.BillingUsageSourceOAIResponses ||
|
|
existingBillingUsage.Semantic == dto.BillingUsageSemanticOpenAI {
|
|
return existingBillingUsage
|
|
}
|
|
}
|
|
return dto.NewOpenAIChatBillingUsage(usage)
|
|
}
|