* fix(openai): harden Chat-to-Responses compatibility Add a shared Responses-to-Chat stream state machine and use it from the OpenAI relay path. Preserve assistant text alongside tool calls, bind tool argument deltas by output_index, map incomplete finish reasons, support reasoning/custom tool events, and buffer upstream SSE for non-stream Chat clients. Add deterministic service tests and relay SSE tests for the conversion path. Related to #5745. * refactor: rename openaicompat to relayconvert for improved clarity * feat(gemini): support responses request conversion * feat: add responses to chat conversion support * fix: harden responses chat conversion edge cases
186 lines
6.0 KiB
Go
186 lines
6.0 KiB
Go
package relay
|
|
|
|
import (
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/dto"
|
|
"github.com/QuantumNous/new-api/relay/channel"
|
|
openaichannel "github.com/QuantumNous/new-api/relay/channel/openai"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
relayconstant "github.com/QuantumNous/new-api/relay/constant"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/QuantumNous/new-api/types"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func applySystemPromptIfNeeded(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeneralOpenAIRequest) {
|
|
if info == nil || request == nil {
|
|
return
|
|
}
|
|
if info.ChannelSetting.SystemPrompt == "" {
|
|
return
|
|
}
|
|
|
|
systemRole := request.GetSystemRoleName()
|
|
|
|
containSystemPrompt := false
|
|
for _, message := range request.Messages {
|
|
if message.Role == systemRole {
|
|
containSystemPrompt = true
|
|
break
|
|
}
|
|
}
|
|
if !containSystemPrompt {
|
|
systemMessage := dto.Message{
|
|
Role: systemRole,
|
|
Content: info.ChannelSetting.SystemPrompt,
|
|
}
|
|
request.Messages = append([]dto.Message{systemMessage}, request.Messages...)
|
|
return
|
|
}
|
|
|
|
if !info.ChannelSetting.SystemPromptOverride {
|
|
return
|
|
}
|
|
|
|
common.SetContextKey(c, constant.ContextKeySystemPromptOverride, true)
|
|
for i, message := range request.Messages {
|
|
if message.Role != systemRole {
|
|
continue
|
|
}
|
|
if message.IsStringContent() {
|
|
request.Messages[i].SetStringContent(info.ChannelSetting.SystemPrompt + "\n" + message.StringContent())
|
|
return
|
|
}
|
|
contents := message.ParseContent()
|
|
contents = append([]dto.MediaContent{
|
|
{
|
|
Type: dto.ContentTypeText,
|
|
Text: info.ChannelSetting.SystemPrompt,
|
|
},
|
|
}, contents...)
|
|
request.Messages[i].Content = contents
|
|
return
|
|
}
|
|
}
|
|
|
|
func chatCompletionsViaResponses(c *gin.Context, info *relaycommon.RelayInfo, adaptor channel.Adaptor, request *dto.GeneralOpenAIRequest) (*dto.Usage, *types.NewAPIError) {
|
|
chatJSON, err := common.Marshal(request)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
chatJSON, err = relaycommon.RemoveDisabledFields(chatJSON, info.ChannelOtherSettings, info.ChannelSetting.PassThroughBodyEnabled)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
if len(info.ParamOverride) > 0 {
|
|
chatJSON, err = relaycommon.ApplyParamOverrideWithRelayInfo(chatJSON, info)
|
|
if err != nil {
|
|
return nil, newAPIErrorFromParamOverride(err)
|
|
}
|
|
}
|
|
|
|
var overriddenChatReq dto.GeneralOpenAIRequest
|
|
if err := common.Unmarshal(chatJSON, &overriddenChatReq); err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeChannelParamOverrideInvalid, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
responsesReq, err := service.ChatCompletionsRequestToResponsesRequest(&overriddenChatReq)
|
|
if err != nil {
|
|
return nil, types.NewErrorWithStatusCode(err, types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
|
|
}
|
|
info.AppendRequestConversion(types.RelayFormatOpenAIResponses)
|
|
|
|
savedRelayMode := info.RelayMode
|
|
savedRequestURLPath := info.RequestURLPath
|
|
defer func() {
|
|
info.RelayMode = savedRelayMode
|
|
info.RequestURLPath = savedRequestURLPath
|
|
}()
|
|
|
|
info.RelayMode = relayconstant.RelayModeResponses
|
|
info.RequestURLPath = "/v1/responses"
|
|
|
|
convertedRequest, err := adaptor.ConvertOpenAIResponsesRequest(c, info, *responsesReq)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
relaycommon.AppendRequestConversionFromRequest(info, convertedRequest)
|
|
|
|
jsonData, err := common.Marshal(convertedRequest)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
jsonData, err = relaycommon.RemoveDisabledFields(jsonData, info.ChannelOtherSettings, info.ChannelSetting.PassThroughBodyEnabled)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
body, size, closer, err := relaycommon.NewOutboundJSONBody(jsonData)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
defer closer.Close()
|
|
jsonData = nil
|
|
info.UpstreamRequestBodySize = size
|
|
var requestBody io.Reader = body
|
|
|
|
var httpResp *http.Response
|
|
resp, err := adaptor.DoRequest(c, info, requestBody)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeDoRequestFailed, http.StatusInternalServerError)
|
|
}
|
|
if resp == nil {
|
|
return nil, types.NewOpenAIError(nil, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
|
|
statusCodeMappingStr := c.GetString("status_code_mapping")
|
|
|
|
httpResp = resp.(*http.Response)
|
|
clientStream := info.IsStream
|
|
upstreamStream := isResponsesEventStreamContentType(httpResp.Header.Get("Content-Type"))
|
|
info.IsStream = clientStream || upstreamStream
|
|
if httpResp.StatusCode != http.StatusOK {
|
|
newApiErr := service.RelayErrorHandler(c.Request.Context(), httpResp, false)
|
|
service.ResetStatusCode(newApiErr, statusCodeMappingStr)
|
|
return nil, newApiErr
|
|
}
|
|
|
|
if upstreamStream && clientStream {
|
|
usage, newApiErr := openaichannel.OaiResponsesToChatStreamHandler(c, info, httpResp)
|
|
if newApiErr != nil {
|
|
service.ResetStatusCode(newApiErr, statusCodeMappingStr)
|
|
return nil, newApiErr
|
|
}
|
|
return usage, nil
|
|
}
|
|
if upstreamStream {
|
|
info.IsStream = false
|
|
usage, newApiErr := openaichannel.OaiResponsesToChatBufferedStreamHandler(c, info, httpResp)
|
|
if newApiErr != nil {
|
|
service.ResetStatusCode(newApiErr, statusCodeMappingStr)
|
|
return nil, newApiErr
|
|
}
|
|
return usage, nil
|
|
}
|
|
|
|
usage, newApiErr := openaichannel.OaiResponsesToChatHandler(c, info, httpResp)
|
|
if newApiErr != nil {
|
|
service.ResetStatusCode(newApiErr, statusCodeMappingStr)
|
|
return nil, newApiErr
|
|
}
|
|
return usage, nil
|
|
}
|
|
|
|
func isResponsesEventStreamContentType(contentType string) bool {
|
|
return strings.Contains(strings.ToLower(contentType), "text/event-stream")
|
|
}
|