mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-12 07:00:42 +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
320 lines
11 KiB
Go
320 lines
11 KiB
Go
package openai
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"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/gin-gonic/gin"
|
|
)
|
|
|
|
func OaiResponsesToChatHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
|
|
if resp == nil || resp.Body == nil {
|
|
return nil, types.NewOpenAIError(fmt.Errorf("invalid response"), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
|
|
defer service.CloseResponseBodyGracefully(resp)
|
|
|
|
var responsesResp dto.OpenAIResponsesResponse
|
|
body, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
if err := common.Unmarshal(body, &responsesResp); err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
|
|
if oaiError := responsesResp.GetOpenAIError(); oaiError != nil && oaiError.Type != "" {
|
|
return nil, types.WithOpenAIError(*oaiError, resp.StatusCode)
|
|
}
|
|
|
|
responseValue, usage, err := convertResponsesResponseForClient(c, info, &responsesResp)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
responseBody, err := common.Marshal(responseValue)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeJsonMarshalFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
service.IOCopyBytesGracefully(c, resp, responseBody)
|
|
return usage, nil
|
|
}
|
|
|
|
func OaiResponsesToChatBufferedStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
|
|
if resp == nil || resp.Body == nil {
|
|
return nil, types.NewOpenAIError(fmt.Errorf("invalid response"), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
defer service.CloseResponseBodyGracefully(resp)
|
|
|
|
accumulator := relayconvert.NewResponsesBufferedAccumulator()
|
|
var finalResponse *dto.OpenAIResponsesResponse
|
|
var streamErr *types.NewAPIError
|
|
|
|
scanner := helper.NewStreamScanner(resp.Body)
|
|
scanner.Split(bufio.ScanLines)
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
if len(line) < 6 || line[:5] != "data:" {
|
|
continue
|
|
}
|
|
data := line[5:]
|
|
data = strings.TrimSpace(data)
|
|
if data == "" || data == "[DONE]" {
|
|
if data == "[DONE]" {
|
|
break
|
|
}
|
|
continue
|
|
}
|
|
|
|
var streamResp dto.ResponsesStreamResponse
|
|
if err := common.UnmarshalJsonStr(data, &streamResp); err != nil {
|
|
logger.LogError(c, "failed to unmarshal buffered responses stream event: "+err.Error())
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
break
|
|
}
|
|
accumulator.ProcessEvent(&streamResp)
|
|
switch streamResp.Type {
|
|
case "response.completed", "response.done", "response.incomplete":
|
|
finalResponse = streamResp.Response
|
|
if streamResp.Type == "response.incomplete" {
|
|
if finalResponse == nil {
|
|
finalResponse = &dto.OpenAIResponsesResponse{}
|
|
}
|
|
if len(finalResponse.Status) == 0 {
|
|
finalResponse.Status = []byte(`"incomplete"`)
|
|
}
|
|
}
|
|
case "response.failed", "response.error":
|
|
if streamResp.Response != nil {
|
|
if oaiErr := streamResp.Response.GetOpenAIError(); oaiErr != nil && oaiErr.Type != "" {
|
|
streamErr = types.WithOpenAIError(*oaiErr, http.StatusInternalServerError)
|
|
break
|
|
}
|
|
}
|
|
streamErr = types.NewOpenAIError(fmt.Errorf("responses stream error: %s", streamResp.Type), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
if streamErr != nil || finalResponse != nil {
|
|
break
|
|
}
|
|
}
|
|
if streamErr != nil {
|
|
return nil, streamErr
|
|
}
|
|
if err := scanner.Err(); err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
if finalResponse == nil {
|
|
finalResponse = &dto.OpenAIResponsesResponse{
|
|
ID: helper.GetResponseID(c),
|
|
CreatedAt: int(time.Now().Unix()),
|
|
Model: info.UpstreamModelName,
|
|
Status: []byte(`"completed"`),
|
|
}
|
|
}
|
|
accumulator.SupplementResponseOutput(finalResponse)
|
|
|
|
responseValue, usage, err := convertResponsesResponseForClient(c, info, finalResponse)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
responseBody, err := common.Marshal(responseValue)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeJsonMarshalFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
service.IOCopyBytesGracefully(c, resp, responseBody)
|
|
return usage, nil
|
|
}
|
|
|
|
func convertResponsesResponseForClient(c *gin.Context, info *relaycommon.RelayInfo, response *dto.OpenAIResponsesResponse) (any, *dto.Usage, error) {
|
|
if responseID := helper.GetResponseID(c); responseID != "" {
|
|
response.ID = responseID
|
|
}
|
|
|
|
usage := relayconvert.UsageFromResponsesUsage(response.Usage)
|
|
if usage == nil || usage.TotalTokens == 0 {
|
|
text := service.ExtractOutputTextFromResponses(response)
|
|
usage = service.ResponseText2Usage(c, text, info.UpstreamModelName, info.GetEstimatePromptTokens())
|
|
response.Usage = relayconvert.UsageFromChatUsage(usage)
|
|
}
|
|
|
|
result, err := service.ConvertResponse(c, info, info.RelayFormat, response)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if result.Usage != nil && result.Usage.TotalTokens != 0 {
|
|
usage = result.Usage
|
|
}
|
|
return result.Value, usage, nil
|
|
}
|
|
|
|
func OaiResponsesToChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
|
|
if resp == nil || resp.Body == nil {
|
|
return nil, types.NewOpenAIError(fmt.Errorf("invalid response"), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
|
|
defer service.CloseResponseBodyGracefully(resp)
|
|
|
|
responseId := helper.GetResponseID(c)
|
|
createAt := time.Now().Unix()
|
|
state, err := relayconvert.NewResponseStreamState(types.RelayFormatOpenAIResponses, info.RelayFormat, relayconvert.ResponseStreamOptions{
|
|
ID: responseId,
|
|
Model: info.UpstreamModelName,
|
|
Created: createAt,
|
|
})
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
streamErr := (*types.NewAPIError)(nil)
|
|
|
|
if info.RelayFormat == types.RelayFormatClaude && info.ClaudeConvertInfo == nil {
|
|
info.ClaudeConvertInfo = &relaycommon.ClaudeConvertInfo{LastMessagesType: relaycommon.LastMessageTypeNone}
|
|
}
|
|
|
|
sendGeminiResponse := func(geminiResponse *dto.GeminiChatResponse) bool {
|
|
if geminiResponse == nil {
|
|
return true
|
|
}
|
|
geminiResponseStr, err := common.Marshal(geminiResponse)
|
|
if err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeJsonMarshalFailed, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
c.Render(-1, common.CustomEvent{Data: "data: " + string(geminiResponseStr)})
|
|
_ = helper.FlushWriter(c)
|
|
return true
|
|
}
|
|
|
|
sendStreamResult := func(result relayconvert.ResponseResult) bool {
|
|
switch value := result.Value.(type) {
|
|
case dto.ChatCompletionsStreamResponse:
|
|
if len(value.Choices) == 0 && value.Usage == nil {
|
|
return true
|
|
}
|
|
if err := helper.ObjectData(c, &value); err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
return true
|
|
case *dto.ChatCompletionsStreamResponse:
|
|
if value == nil || (len(value.Choices) == 0 && value.Usage == nil) {
|
|
return true
|
|
}
|
|
if err := helper.ObjectData(c, value); err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
return true
|
|
case dto.ClaudeResponse:
|
|
if err := helper.ClaudeData(c, value); err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
return true
|
|
case *dto.ClaudeResponse:
|
|
if value == nil {
|
|
return true
|
|
}
|
|
if err := helper.ClaudeData(c, *value); err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
return true
|
|
case dto.GeminiChatResponse:
|
|
return sendGeminiResponse(&value)
|
|
case *dto.GeminiChatResponse:
|
|
return sendGeminiResponse(value)
|
|
default:
|
|
streamErr = types.NewOpenAIError(fmt.Errorf("unsupported converted stream response type %T", result.Value), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
}
|
|
|
|
helper.StreamScannerHandler(c, resp, info, func(data string, sr *helper.StreamResult) {
|
|
if streamErr != nil {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
|
|
var streamResp dto.ResponsesStreamResponse
|
|
if err := common.UnmarshalJsonStr(data, &streamResp); err != nil {
|
|
logger.LogError(c, "failed to unmarshal responses stream event: "+err.Error())
|
|
sr.Error(err)
|
|
return
|
|
}
|
|
|
|
if streamResp.Type == "response.error" || streamResp.Type == "response.failed" {
|
|
if streamResp.Response != nil {
|
|
if oaiErr := streamResp.Response.GetOpenAIError(); oaiErr != nil && oaiErr.Type != "" {
|
|
streamErr = types.WithOpenAIError(*oaiErr, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
}
|
|
streamErr = types.NewOpenAIError(fmt.Errorf("responses stream error: %s", streamResp.Type), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
|
|
results, err := service.ConvertStreamResponseChunk(c, info, state, &streamResp)
|
|
if err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
for _, result := range results {
|
|
if !sendStreamResult(result) {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
}
|
|
})
|
|
|
|
if streamErr != nil {
|
|
return nil, streamErr
|
|
}
|
|
|
|
usage := state.Usage()
|
|
if usage == nil || usage.TotalTokens == 0 {
|
|
usage = service.ResponseText2Usage(c, state.UsageText(), info.UpstreamModelName, info.GetEstimatePromptTokens())
|
|
state.SetUsage(usage)
|
|
}
|
|
|
|
if info.RelayFormat == types.RelayFormatClaude && info.ClaudeConvertInfo != nil {
|
|
info.ClaudeConvertInfo.Usage = usage
|
|
}
|
|
finalResults, err := service.FinalizeStreamResponse(c, info, state)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
for _, result := range finalResults {
|
|
if !sendStreamResult(result) {
|
|
return nil, streamErr
|
|
}
|
|
}
|
|
if info.RelayFormat == types.RelayFormatOpenAI && info.ShouldIncludeUsage && usage != nil {
|
|
if err := helper.ObjectData(c, helper.GenerateFinalUsageResponse(responseId, createAt, info.UpstreamModelName, *usage)); err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
}
|
|
|
|
if info.RelayFormat == types.RelayFormatOpenAI {
|
|
helper.Done(c)
|
|
}
|
|
return usage, nil
|
|
}
|