* refactor: consolidate relay protocol converters * refactor relayconvert text converters * feat: refine relay converters and advanced custom routing * refactor: enhance logging and add thought signature handling for Gemini requests * refactor: enhance channel cache and pricing endpoint handling for advanced custom models * feat: preserve billing usage semantics * feat: add protocol-aware billing usage * Delete useless files * chore: update action versions in workflow files * chore: update Docker action versions in workflow files * fix: harden billing usage settlement and hot-path route matching - estimate Gemini completion tokens locally when billable usageMetadata is prompt-only but output content was received (e.g. client aborts the stream before the final chunk), and rebuild the attached billing_usage as estimated so settlement does not bill zero output tokens - guard NewClaudeMessagesBillingUsage against all-zero ClaudeUsage, matching the OpenAI/Gemini constructors, so a zero billing_usage cannot override a non-zero top-level usage during settlement - cache compiled advanced-custom route model regexes; they run on the request hot path and were recompiled per request - move the effectiveBillingUsage remap to PostTextConsumeQuota only, and document that calculateTextQuotaSummary expects remapped usage - document the updatePricingLock -> channelSyncLock lock ordering that InitChannelCache/CacheUpdateChannel rely on, and the aux-struct pitfall in GeminiChatResponse.UnmarshalJSON
159 lines
5.6 KiB
Go
159 lines
5.6 KiB
Go
package openai
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/dto"
|
|
"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/service"
|
|
"github.com/QuantumNous/new-api/service/relayconvert"
|
|
"github.com/QuantumNous/new-api/types"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func OaiChatToResponsesHandler(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)
|
|
|
|
body, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
var chatResp dto.OpenAITextResponse
|
|
if err := common.Unmarshal(body, &chatResp); err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
if oaiError := chatResp.GetOpenAIError(); oaiError != nil && oaiError.Type != "" {
|
|
return nil, types.WithOpenAIError(*oaiError, resp.StatusCode)
|
|
}
|
|
|
|
if responseID := helper.GetResponseID(c); responseID != "" {
|
|
chatResp.Id = responseID
|
|
}
|
|
convertResult, err := relayconvert.ConvertResponse(c, info, types.RelayFormatOpenAIResponses, &chatResp)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
responsesResp, ok := convertResult.Value.(*dto.OpenAIResponsesResponse)
|
|
if !ok {
|
|
return nil, types.NewOpenAIError(fmt.Errorf("expected OpenAI responses response, got %T", convertResult.Value), types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
usage := convertResult.Usage
|
|
if usage == nil || usage.TotalTokens == 0 {
|
|
text := service.ExtractOutputTextFromResponses(responsesResp)
|
|
usage = service.ResponseText2Usage(c, text, info.UpstreamModelName, info.GetEstimatePromptTokens())
|
|
responsesResp.Usage = relayconvert.UsageFromChatUsage(usage)
|
|
}
|
|
|
|
responseBody, err := common.Marshal(responsesResp)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeJsonMarshalFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
service.IOCopyBytesGracefully(c, resp, responseBody)
|
|
return usage, nil
|
|
}
|
|
|
|
func OaiChatToResponsesStreamHandler(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)
|
|
state, err := relayconvert.NewResponseStreamState(types.RelayFormatOpenAI, types.RelayFormatOpenAIResponses, relayconvert.ResponseStreamOptions{
|
|
ID: responseID,
|
|
Model: info.UpstreamModelName,
|
|
})
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
streamErr := (*types.NewAPIError)(nil)
|
|
|
|
sendEvent := func(event relayconvert.ChatToResponsesStreamEvent) bool {
|
|
data, err := common.Marshal(event.Payload)
|
|
if err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeJsonMarshalFailed, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
helper.ResponseChunkData(c, dto.ResponsesStreamResponse{Type: event.Type}, string(data))
|
|
return true
|
|
}
|
|
|
|
helper.StreamScannerHandler(c, resp, info, func(data string, sr *helper.StreamResult) {
|
|
if streamErr != nil {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
|
|
var errorResp dto.OpenAITextResponse
|
|
if err := common.UnmarshalJsonStr(data, &errorResp); err == nil {
|
|
if oaiError := errorResp.GetOpenAIError(); oaiError != nil && oaiError.Type != "" {
|
|
streamErr = types.WithOpenAIError(*oaiError, resp.StatusCode)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
}
|
|
|
|
var chunk dto.ChatCompletionsStreamResponse
|
|
if err := common.UnmarshalJsonStr(data, &chunk); err != nil {
|
|
logger.LogError(c, "failed to unmarshal chat stream response: "+err.Error())
|
|
sr.Error(err)
|
|
return
|
|
}
|
|
|
|
results, err := relayconvert.ConvertStreamResponseChunk(c, info, state, &chunk)
|
|
if err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
for _, result := range results {
|
|
event, ok := result.Value.(relayconvert.ChatToResponsesStreamEvent)
|
|
if !ok {
|
|
streamErr = types.NewOpenAIError(fmt.Errorf("expected OAI responses stream event, got %T", result.Value), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
if !sendEvent(event) {
|
|
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)
|
|
}
|
|
|
|
finalResults, err := relayconvert.FinalizeStreamResponse(c, info, state)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
for _, result := range finalResults {
|
|
event, ok := result.Value.(relayconvert.ChatToResponsesStreamEvent)
|
|
if !ok {
|
|
return nil, types.NewOpenAIError(fmt.Errorf("expected OAI responses stream event, got %T", result.Value), types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
if !sendEvent(event) {
|
|
return nil, streamErr
|
|
}
|
|
}
|
|
|
|
return usage, nil
|
|
}
|