mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-13 07:40:56 +00:00
* feat(relaykit): preserve hosted tools across conversions - add protocol-neutral hosted-tool DTOs, conversion metadata, and loss policies - bridge citations, grounding metadata, and hosted-tool stream lifecycles - document the public conversion behavior and channel policy controls * refactor(relaykit): normalize reasoning and thinking intent - centralize provider-neutral reasoning intent, effort, and budget mappings - parse model suffixes at the host entry boundary while preserving provider-owned tails - keep adaptive Claude thinking and explicit zero-token compatibility consistent * fix(billing): preserve authoritative usage across relay hops - carry native BillingUsage sidecars through direct and streamed protocol bridges - merge partial and terminal usage monotonically with safe fallback settlement - retain cache metadata, penultimate usage, and per-call Gemini tool surcharges * feat(relay): bridge Responses with Claude and Gemini protocols - add direct request, response, and stream converters across supported relay formats - expose Claude count_tokens and Chat-to-Responses compatibility endpoints - carry conversion diagnostics through the host while retaining the curated public goldens * fix(relay): wire relaykit conversions into host channels - connect handlers, adaptors, and channel settings to the standalone conversion layer - keep model mapping, pricing identity, retries, and provider-specific suffix behavior aligned - ignore local audit artifacts and retain focused public regression coverage
270 lines
8.9 KiB
Go
270 lines
8.9 KiB
Go
package openai
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
relayconstant "github.com/QuantumNous/new-api/relay/constant"
|
|
"github.com/QuantumNous/new-api/relay/helper"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
|
|
"github.com/samber/lo"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
const chatToGeminiStreamStateKey = "relaykit.chat_to_gemini_stream_state"
|
|
|
|
// 辅助函数
|
|
func HandleStreamFormat(c *gin.Context, info *relaycommon.RelayInfo, data string, forceFormat bool, thinkToContent bool) error {
|
|
switch info.RelayFormat {
|
|
case types.RelayFormatOpenAI:
|
|
info.SendResponseCount++
|
|
return sendStreamData(c, info, data, forceFormat, thinkToContent)
|
|
case types.RelayFormatClaude:
|
|
info.SendResponseCount++
|
|
return handleClaudeFormat(c, data, info)
|
|
case types.RelayFormatGemini:
|
|
// The stateful relaykit path owns its chunk counter so multi-hop and
|
|
// direct conversions observe the same stream state semantics.
|
|
return handleGeminiFormat(c, data, info)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func handleClaudeFormat(c *gin.Context, data string, info *relaycommon.RelayInfo) error {
|
|
var streamResponse dto.ChatCompletionsStreamResponse
|
|
if err := common.Unmarshal(common.StringToByteSlice(data), &streamResponse); err != nil {
|
|
return err
|
|
}
|
|
|
|
if streamResponse.Usage != nil {
|
|
info.EnsureClaudeConvertInfo().Usage = streamResponse.Usage
|
|
}
|
|
result, err := service.ConvertStreamResponse(c, info, types.RelayFormatClaude, &streamResponse)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
claudeResponses, ok := result.Value.([]*dto.ClaudeResponse)
|
|
if !ok {
|
|
return fmt.Errorf("expected Claude stream responses, got %T", result.Value)
|
|
}
|
|
for _, resp := range claudeResponses {
|
|
helper.ClaudeData(c, *resp)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func handleGeminiFormat(c *gin.Context, data string, info *relaycommon.RelayInfo) error {
|
|
var streamResponse dto.ChatCompletionsStreamResponse
|
|
if err := common.Unmarshal(common.StringToByteSlice(data), &streamResponse); err != nil {
|
|
logger.LogError(c, "failed to unmarshal stream response: "+err.Error())
|
|
return err
|
|
}
|
|
|
|
state, err := chatToGeminiStreamState(c, &streamResponse)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
results, err := service.ConvertStreamResponseChunk(c, info, state, &streamResponse)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return sendGeminiStreamResults(c, results)
|
|
}
|
|
|
|
func chatToGeminiStreamState(c *gin.Context, streamResponse *dto.ChatCompletionsStreamResponse) (*relayconvert.ResponseStreamState, error) {
|
|
if value, ok := c.Get(chatToGeminiStreamStateKey); ok {
|
|
state, ok := value.(*relayconvert.ResponseStreamState)
|
|
if !ok || state == nil {
|
|
return nil, fmt.Errorf("invalid Chat-to-Gemini stream state %T", value)
|
|
}
|
|
return state, nil
|
|
}
|
|
|
|
state, err := relayconvert.NewResponseStreamState(types.RelayFormatOpenAI, types.RelayFormatGemini, relayconvert.ResponseStreamOptions{
|
|
ID: streamResponse.Id,
|
|
Model: streamResponse.Model,
|
|
Created: streamResponse.Created,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
c.Set(chatToGeminiStreamStateKey, state)
|
|
return state, nil
|
|
}
|
|
|
|
func sendGeminiStreamResults(c *gin.Context, results []relayconvert.ResponseResult) error {
|
|
for _, result := range results {
|
|
geminiResponse, ok := result.Value.(*dto.GeminiChatResponse)
|
|
if !ok {
|
|
return fmt.Errorf("expected Gemini stream response, got %T", result.Value)
|
|
}
|
|
if geminiResponse == nil {
|
|
continue
|
|
}
|
|
data, err := common.Marshal(geminiResponse)
|
|
if err != nil {
|
|
logger.LogError(c, "failed to marshal gemini response: "+err.Error())
|
|
return err
|
|
}
|
|
c.Render(-1, common.CustomEvent{Data: "data: " + string(data)})
|
|
_ = helper.FlushWriter(c)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func ProcessStreamResponse(streamResponse dto.ChatCompletionsStreamResponse, responseTextBuilder *strings.Builder, toolCount *int) error {
|
|
for _, choice := range streamResponse.Choices {
|
|
responseTextBuilder.WriteString(choice.Delta.GetContentString())
|
|
responseTextBuilder.WriteString(choice.Delta.GetReasoningContent())
|
|
if choice.Delta.ToolCalls != nil {
|
|
if len(choice.Delta.ToolCalls) > *toolCount {
|
|
*toolCount = len(choice.Delta.ToolCalls)
|
|
}
|
|
for _, tool := range choice.Delta.ToolCalls {
|
|
responseTextBuilder.WriteString(tool.Function.Name)
|
|
responseTextBuilder.WriteString(tool.Function.Arguments)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func processTokenData(relayMode int, data string, responseTextBuilder *strings.Builder, toolCount *int) error {
|
|
switch relayMode {
|
|
case relayconstant.RelayModeChatCompletions:
|
|
var streamResponse dto.ChatCompletionsStreamResponse
|
|
if err := common.UnmarshalJsonStr(data, &streamResponse); err != nil {
|
|
return err
|
|
}
|
|
return ProcessStreamResponse(streamResponse, responseTextBuilder, toolCount)
|
|
case relayconstant.RelayModeCompletions:
|
|
var streamResponse dto.CompletionsStreamResponse
|
|
if err := common.UnmarshalJsonStr(data, &streamResponse); err != nil {
|
|
return err
|
|
}
|
|
processCompletionsStreamResponse(streamResponse, responseTextBuilder)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func processCompletionsStreamResponse(streamResponse dto.CompletionsStreamResponse, responseTextBuilder *strings.Builder) {
|
|
for _, choice := range streamResponse.Choices {
|
|
responseTextBuilder.WriteString(choice.Text)
|
|
}
|
|
}
|
|
|
|
func handleLastResponse(lastStreamData string, responseId *string, createAt *int64,
|
|
systemFingerprint *string, model *string, usage **dto.Usage,
|
|
containStreamUsage *bool, info *relaycommon.RelayInfo,
|
|
shouldSendLastResp *bool) error {
|
|
|
|
var lastStreamResponse dto.ChatCompletionsStreamResponse
|
|
if err := common.Unmarshal(common.StringToByteSlice(lastStreamData), &lastStreamResponse); err != nil {
|
|
return err
|
|
}
|
|
|
|
*responseId = lastStreamResponse.Id
|
|
*createAt = lastStreamResponse.Created
|
|
*systemFingerprint = lastStreamResponse.GetSystemFingerprint()
|
|
*model = lastStreamResponse.Model
|
|
|
|
if service.ValidUsage(lastStreamResponse.Usage) {
|
|
*containStreamUsage = true
|
|
*usage = dto.MergeUsageNonZero(*usage, lastStreamResponse.Usage)
|
|
if !info.ShouldIncludeUsage {
|
|
*shouldSendLastResp = lo.SomeBy(lastStreamResponse.Choices, func(choice dto.ChatCompletionsStreamResponseChoice) bool {
|
|
return choice.Delta.GetContentString() != "" || choice.Delta.GetReasoningContent() != ""
|
|
})
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func HandleFinalResponse(c *gin.Context, info *relaycommon.RelayInfo, lastStreamData string,
|
|
responseId string, createAt int64, model string, systemFingerprint string,
|
|
usage *dto.Usage, containStreamUsage bool) {
|
|
|
|
switch info.RelayFormat {
|
|
case types.RelayFormatOpenAI:
|
|
if info.ShouldIncludeUsage && !containStreamUsage {
|
|
response := helper.GenerateFinalUsageResponse(responseId, createAt, model, *usage)
|
|
response.SetSystemFingerprint(systemFingerprint)
|
|
helper.ObjectData(c, response)
|
|
}
|
|
helper.Done(c)
|
|
|
|
case types.RelayFormatClaude:
|
|
var streamResponse dto.ChatCompletionsStreamResponse
|
|
if err := common.Unmarshal(common.StringToByteSlice(lastStreamData), &streamResponse); err != nil {
|
|
common.SysLog("error unmarshalling stream response: " + err.Error())
|
|
return
|
|
}
|
|
|
|
info.ClaudeConvertInfo.Usage = usage
|
|
|
|
result, err := service.ConvertStreamResponse(c, info, types.RelayFormatClaude, &streamResponse)
|
|
if err != nil {
|
|
common.SysLog("error converting Claude stream response: " + err.Error())
|
|
return
|
|
}
|
|
claudeResponses, ok := result.Value.([]*dto.ClaudeResponse)
|
|
if !ok {
|
|
common.SysLog(fmt.Sprintf("expected Claude stream responses, got %T", result.Value))
|
|
return
|
|
}
|
|
for _, resp := range claudeResponses {
|
|
_ = helper.ClaudeData(c, *resp)
|
|
}
|
|
info.ClaudeConvertInfo.Done = true
|
|
|
|
case types.RelayFormatGemini:
|
|
var streamResponse dto.ChatCompletionsStreamResponse
|
|
if err := common.Unmarshal(common.StringToByteSlice(lastStreamData), &streamResponse); err != nil {
|
|
common.SysLog("error unmarshalling stream response: " + err.Error())
|
|
return
|
|
}
|
|
|
|
state, err := chatToGeminiStreamState(c, &streamResponse)
|
|
if err != nil {
|
|
common.SysLog("error creating Gemini stream state: " + err.Error())
|
|
return
|
|
}
|
|
state.SetUsage(usage)
|
|
|
|
results, err := service.ConvertStreamResponseChunk(c, info, state, &streamResponse)
|
|
if err != nil {
|
|
common.SysLog("error converting final Gemini stream response: " + err.Error())
|
|
return
|
|
}
|
|
if err := sendGeminiStreamResults(c, results); err != nil {
|
|
common.SysLog("error sending final Gemini stream response: " + err.Error())
|
|
return
|
|
}
|
|
|
|
results, err = service.FinalizeStreamResponse(c, info, state)
|
|
if err != nil {
|
|
common.SysLog("error finalizing Gemini stream response: " + err.Error())
|
|
return
|
|
}
|
|
if err := sendGeminiStreamResults(c, results); err != nil {
|
|
common.SysLog("error sending finalized Gemini stream response: " + err.Error())
|
|
}
|
|
}
|
|
}
|
|
|
|
func sendResponsesStreamData(c *gin.Context, streamResponse dto.ResponsesStreamResponse, data string) {
|
|
if data == "" {
|
|
return
|
|
}
|
|
_ = helper.ResponseChunkData(c, streamResponse, data)
|
|
}
|