* 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
175 lines
5.5 KiB
Go
175 lines
5.5 KiB
Go
package geminichat
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert/convmeta"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert/internal/jsonutil"
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
)
|
|
|
|
func GeminiGenerateContentRequestToOpenAIChat(geminiRequest *dto.GeminiChatRequest, info convmeta.Meta) (*dto.GeneralOpenAIRequest, error) {
|
|
modelName := ""
|
|
isStream := false
|
|
if info != nil {
|
|
isStream = info.GetIsStream()
|
|
}
|
|
modelName = convmeta.UpstreamModelName(info)
|
|
openaiRequest := &dto.GeneralOpenAIRequest{
|
|
Model: modelName,
|
|
Stream: kitutil.GetPointer(isStream),
|
|
}
|
|
|
|
var messages []dto.Message
|
|
for _, content := range geminiRequest.Contents {
|
|
message := dto.Message{
|
|
Role: convertGeminiRoleToOpenAI(content.Role),
|
|
}
|
|
|
|
var mediaContents []dto.MediaContent
|
|
var toolCalls []dto.ToolCallRequest
|
|
for _, part := range content.Parts {
|
|
if part.Text != "" {
|
|
mediaContent := dto.MediaContent{
|
|
Type: "text",
|
|
Text: part.Text,
|
|
}
|
|
mediaContents = append(mediaContents, mediaContent)
|
|
} else if part.InlineData != nil {
|
|
mediaContent := dto.MediaContent{
|
|
Type: "image_url",
|
|
ImageUrl: &dto.MessageImageUrl{
|
|
Url: fmt.Sprintf("data:%s;base64,%s", part.InlineData.MimeType, part.InlineData.Data),
|
|
Detail: "auto",
|
|
MimeType: part.InlineData.MimeType,
|
|
},
|
|
}
|
|
mediaContents = append(mediaContents, mediaContent)
|
|
} else if part.FileData != nil {
|
|
mediaContent := dto.MediaContent{
|
|
Type: "image_url",
|
|
ImageUrl: &dto.MessageImageUrl{
|
|
Url: part.FileData.FileUri,
|
|
Detail: "auto",
|
|
MimeType: part.FileData.MimeType,
|
|
},
|
|
}
|
|
mediaContents = append(mediaContents, mediaContent)
|
|
} else if part.FunctionCall != nil {
|
|
toolCall := dto.ToolCallRequest{
|
|
ID: fmt.Sprintf("call_%d", len(toolCalls)+1),
|
|
Type: "function",
|
|
Function: dto.FunctionRequest{
|
|
Name: part.FunctionCall.FunctionName,
|
|
Arguments: jsonutil.ToJSONString(part.FunctionCall.Arguments),
|
|
},
|
|
}
|
|
toolCalls = append(toolCalls, toolCall)
|
|
} else if part.FunctionResponse != nil {
|
|
toolMessage := dto.Message{
|
|
Role: "tool",
|
|
ToolCallId: fmt.Sprintf("call_%d", len(toolCalls)),
|
|
}
|
|
toolMessage.SetStringContent(jsonutil.ToJSONString(part.FunctionResponse.Response))
|
|
messages = append(messages, toolMessage)
|
|
}
|
|
}
|
|
|
|
if len(toolCalls) > 0 {
|
|
message.SetToolCalls(toolCalls)
|
|
} else if len(mediaContents) == 1 && mediaContents[0].Type == "text" {
|
|
message.Content = mediaContents[0].Text
|
|
} else if len(mediaContents) > 0 {
|
|
message.SetMediaContent(mediaContents)
|
|
}
|
|
|
|
if len(message.ParseContent()) > 0 || len(message.ToolCalls) > 0 {
|
|
messages = append(messages, message)
|
|
}
|
|
}
|
|
|
|
openaiRequest.Messages = messages
|
|
|
|
if geminiRequest.GenerationConfig.Temperature != nil {
|
|
openaiRequest.Temperature = geminiRequest.GenerationConfig.Temperature
|
|
}
|
|
if geminiRequest.GenerationConfig.TopP != nil && *geminiRequest.GenerationConfig.TopP > 0 {
|
|
openaiRequest.TopP = kitutil.GetPointer(*geminiRequest.GenerationConfig.TopP)
|
|
}
|
|
if geminiRequest.GenerationConfig.TopK != nil && *geminiRequest.GenerationConfig.TopK > 0 {
|
|
openaiRequest.TopK = kitutil.GetPointer(int(*geminiRequest.GenerationConfig.TopK))
|
|
}
|
|
if geminiRequest.GenerationConfig.MaxOutputTokens != nil && *geminiRequest.GenerationConfig.MaxOutputTokens > 0 {
|
|
openaiRequest.MaxTokens = kitutil.GetPointer(*geminiRequest.GenerationConfig.MaxOutputTokens)
|
|
}
|
|
if len(geminiRequest.GenerationConfig.StopSequences) > 0 {
|
|
openaiRequest.Stop = geminiRequest.GenerationConfig.StopSequences[:min(len(geminiRequest.GenerationConfig.StopSequences), 4)]
|
|
}
|
|
if geminiRequest.GenerationConfig.CandidateCount != nil && *geminiRequest.GenerationConfig.CandidateCount > 0 {
|
|
openaiRequest.N = kitutil.GetPointer(*geminiRequest.GenerationConfig.CandidateCount)
|
|
}
|
|
|
|
if len(geminiRequest.GetTools()) > 0 {
|
|
var tools []dto.ToolCallRequest
|
|
for _, tool := range geminiRequest.GetTools() {
|
|
if tool.FunctionDeclarations == nil {
|
|
continue
|
|
}
|
|
functionDeclarations, err := kitutil.Any2Type[[]dto.FunctionRequest](tool.FunctionDeclarations)
|
|
if err != nil {
|
|
kitutil.LogSystemError(fmt.Sprintf("failed to parse gemini function declarations: %v (type=%T)", err, tool.FunctionDeclarations))
|
|
continue
|
|
}
|
|
for _, function := range functionDeclarations {
|
|
openAITool := dto.ToolCallRequest{
|
|
Type: "function",
|
|
Function: dto.FunctionRequest{
|
|
Name: function.Name,
|
|
Description: function.Description,
|
|
Parameters: function.Parameters,
|
|
},
|
|
}
|
|
tools = append(tools, openAITool)
|
|
}
|
|
}
|
|
if len(tools) > 0 {
|
|
openaiRequest.Tools = tools
|
|
}
|
|
}
|
|
|
|
if geminiRequest.SystemInstructions != nil {
|
|
systemMessage := dto.Message{
|
|
Role: "system",
|
|
Content: extractTextFromGeminiParts(geminiRequest.SystemInstructions.Parts),
|
|
}
|
|
openaiRequest.Messages = append([]dto.Message{systemMessage}, openaiRequest.Messages...)
|
|
}
|
|
|
|
return openaiRequest, nil
|
|
}
|
|
|
|
func convertGeminiRoleToOpenAI(geminiRole string) string {
|
|
switch geminiRole {
|
|
case "user":
|
|
return "user"
|
|
case "model":
|
|
return "assistant"
|
|
case "function":
|
|
return "function"
|
|
default:
|
|
return "user"
|
|
}
|
|
}
|
|
|
|
func extractTextFromGeminiParts(parts []dto.GeminiPart) string {
|
|
texts := make([]string, 0)
|
|
for _, part := range parts {
|
|
if part.Text != "" {
|
|
texts = append(texts, part.Text)
|
|
}
|
|
}
|
|
return strings.Join(texts, "\n")
|
|
}
|