* 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
220 lines
6.6 KiB
Go
220 lines
6.6 KiB
Go
package claudemessages
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert/convmeta"
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
)
|
|
|
|
const (
|
|
webSearchMaxUsesLow = 1
|
|
webSearchMaxUsesMedium = 5
|
|
webSearchMaxUsesHigh = 10
|
|
)
|
|
|
|
type openRouterRequestReasoning struct {
|
|
Enabled bool `json:"enabled"`
|
|
Effort string `json:"effort,omitempty"`
|
|
MaxTokens int `json:"max_tokens,omitempty"`
|
|
Exclude bool `json:"exclude,omitempty"`
|
|
}
|
|
|
|
func ClaudeMessagesRequestToOpenAIChat(claudeRequest dto.ClaudeRequest, info convmeta.Meta) (*dto.GeneralOpenAIRequest, error) {
|
|
openAIRequest := dto.GeneralOpenAIRequest{
|
|
Model: claudeRequest.Model,
|
|
Temperature: claudeRequest.Temperature,
|
|
}
|
|
if claudeRequest.MaxTokens != nil {
|
|
openAIRequest.MaxTokens = kitutil.GetPointer(*claudeRequest.MaxTokens)
|
|
}
|
|
if claudeRequest.TopP != nil {
|
|
openAIRequest.TopP = kitutil.GetPointer(*claudeRequest.TopP)
|
|
}
|
|
if claudeRequest.TopK != nil {
|
|
openAIRequest.TopK = kitutil.GetPointer(*claudeRequest.TopK)
|
|
}
|
|
if claudeRequest.Stream != nil {
|
|
openAIRequest.Stream = kitutil.GetPointer(*claudeRequest.Stream)
|
|
}
|
|
|
|
isOpenRouter := convmeta.OptionsOf(info).OpenRouterDialect
|
|
if isOpenRouter {
|
|
if effort := claudeRequest.GetEfforts(); effort != "" {
|
|
effortBytes, _ := kitutil.Marshal(effort)
|
|
openAIRequest.Verbosity = effortBytes
|
|
}
|
|
if claudeRequest.Thinking != nil {
|
|
var reasoningConfig openRouterRequestReasoning
|
|
if claudeRequest.Thinking.Type == "enabled" {
|
|
reasoningConfig = openRouterRequestReasoning{
|
|
Enabled: true,
|
|
MaxTokens: claudeRequest.Thinking.GetBudgetTokens(),
|
|
}
|
|
} else if claudeRequest.Thinking.Type == "adaptive" {
|
|
reasoningConfig = openRouterRequestReasoning{
|
|
Enabled: true,
|
|
}
|
|
}
|
|
reasoningJSON, err := kitutil.Marshal(reasoningConfig)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to marshal reasoning: %w", err)
|
|
}
|
|
openAIRequest.Reasoning = reasoningJSON
|
|
}
|
|
} else if info != nil {
|
|
thinkingSuffix := "-thinking"
|
|
if strings.HasSuffix(info.GetOriginModelName(), thinkingSuffix) &&
|
|
!strings.HasSuffix(openAIRequest.Model, thinkingSuffix) {
|
|
openAIRequest.Model = openAIRequest.Model + thinkingSuffix
|
|
}
|
|
}
|
|
|
|
if len(claudeRequest.StopSequences) == 1 {
|
|
openAIRequest.Stop = claudeRequest.StopSequences[0]
|
|
} else if len(claudeRequest.StopSequences) > 1 {
|
|
openAIRequest.Stop = claudeRequest.StopSequences
|
|
}
|
|
|
|
tools, _ := kitutil.Any2Type[[]dto.Tool](claudeRequest.Tools)
|
|
openAITools := make([]dto.ToolCallRequest, 0)
|
|
for _, claudeTool := range tools {
|
|
openAITool := dto.ToolCallRequest{
|
|
Type: "function",
|
|
Function: dto.FunctionRequest{
|
|
Name: claudeTool.Name,
|
|
Description: claudeTool.Description,
|
|
Parameters: claudeTool.InputSchema,
|
|
},
|
|
}
|
|
openAITools = append(openAITools, openAITool)
|
|
}
|
|
openAIRequest.Tools = openAITools
|
|
|
|
openAIMessages := make([]dto.Message, 0)
|
|
if claudeRequest.System != nil {
|
|
if claudeRequest.IsStringSystem() && claudeRequest.GetStringSystem() != "" {
|
|
openAIMessage := dto.Message{
|
|
Role: "system",
|
|
}
|
|
openAIMessage.SetStringContent(claudeRequest.GetStringSystem())
|
|
openAIMessages = append(openAIMessages, openAIMessage)
|
|
} else {
|
|
systems := claudeRequest.ParseSystem()
|
|
if len(systems) > 0 {
|
|
openAIMessage := dto.Message{
|
|
Role: "system",
|
|
}
|
|
isOpenRouterClaude := isOpenRouter && strings.HasPrefix(convmeta.UpstreamModelName(info), "anthropic/claude")
|
|
if isOpenRouterClaude {
|
|
systemMediaMessages := make([]dto.MediaContent, 0, len(systems))
|
|
for _, system := range systems {
|
|
message := dto.MediaContent{
|
|
Type: "text",
|
|
Text: system.GetText(),
|
|
CacheControl: system.CacheControl,
|
|
}
|
|
systemMediaMessages = append(systemMediaMessages, message)
|
|
}
|
|
openAIMessage.SetMediaContent(systemMediaMessages)
|
|
} else {
|
|
systemStr := ""
|
|
for _, system := range systems {
|
|
if system.Text != nil {
|
|
systemStr += *system.Text
|
|
}
|
|
}
|
|
openAIMessage.SetStringContent(systemStr)
|
|
}
|
|
openAIMessages = append(openAIMessages, openAIMessage)
|
|
}
|
|
}
|
|
}
|
|
|
|
for _, claudeMessage := range claudeRequest.Messages {
|
|
openAIMessage := dto.Message{
|
|
Role: claudeMessage.Role,
|
|
}
|
|
if claudeMessage.IsStringContent() {
|
|
openAIMessage.SetStringContent(claudeMessage.GetStringContent())
|
|
} else {
|
|
content, err := claudeMessage.ParseContent()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var toolCalls []dto.ToolCallRequest
|
|
mediaMessages := make([]dto.MediaContent, 0, len(content))
|
|
|
|
for _, mediaMsg := range content {
|
|
switch mediaMsg.Type {
|
|
case "text", "input_text":
|
|
message := dto.MediaContent{
|
|
Type: "text",
|
|
Text: mediaMsg.GetText(),
|
|
CacheControl: mediaMsg.CacheControl,
|
|
}
|
|
mediaMessages = append(mediaMessages, message)
|
|
case "image":
|
|
imageData := fmt.Sprintf("data:%s;base64,%s", mediaMsg.Source.MediaType, mediaMsg.Source.Data)
|
|
mediaMessage := dto.MediaContent{
|
|
Type: "image_url",
|
|
ImageUrl: &dto.MessageImageUrl{Url: imageData},
|
|
}
|
|
mediaMessages = append(mediaMessages, mediaMessage)
|
|
case "tool_use":
|
|
toolCall := dto.ToolCallRequest{
|
|
ID: mediaMsg.Id,
|
|
Type: "function",
|
|
Function: dto.FunctionRequest{
|
|
Name: mediaMsg.Name,
|
|
Arguments: requestToJSONString(mediaMsg.Input),
|
|
},
|
|
}
|
|
toolCalls = append(toolCalls, toolCall)
|
|
case "tool_result":
|
|
toolName := mediaMsg.Name
|
|
if toolName == "" {
|
|
toolName = claudeRequest.SearchToolNameByToolCallId(mediaMsg.ToolUseId)
|
|
}
|
|
oaiToolMessage := dto.Message{
|
|
Role: "tool",
|
|
Name: &toolName,
|
|
ToolCallId: mediaMsg.ToolUseId,
|
|
}
|
|
if mediaMsg.IsStringContent() {
|
|
oaiToolMessage.SetStringContent(mediaMsg.GetStringContent())
|
|
} else {
|
|
mediaContents := mediaMsg.ParseMediaContent()
|
|
encodedJSON, _ := kitutil.Marshal(mediaContents)
|
|
oaiToolMessage.SetStringContent(string(encodedJSON))
|
|
}
|
|
openAIMessages = append(openAIMessages, oaiToolMessage)
|
|
}
|
|
}
|
|
|
|
if len(toolCalls) > 0 {
|
|
openAIMessage.SetToolCalls(toolCalls)
|
|
}
|
|
if len(mediaMessages) > 0 && len(toolCalls) == 0 {
|
|
openAIMessage.SetMediaContent(mediaMessages)
|
|
}
|
|
}
|
|
if len(openAIMessage.ParseContent()) > 0 || len(openAIMessage.ToolCalls) > 0 {
|
|
openAIMessages = append(openAIMessages, openAIMessage)
|
|
}
|
|
}
|
|
|
|
openAIRequest.Messages = openAIMessages
|
|
return &openAIRequest, nil
|
|
}
|
|
|
|
func requestToJSONString(v interface{}) string {
|
|
b, err := kitutil.Marshal(v)
|
|
if err != nil {
|
|
return "{}"
|
|
}
|
|
return string(b)
|
|
}
|