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
181 lines
5.7 KiB
Go
181 lines
5.7 KiB
Go
package claude
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"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 ClaudeResponsesStreamHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*dto.Usage, *types.NewAPIError) {
|
|
responseID := helper.GetResponseID(c)
|
|
created := common.GetTimestamp()
|
|
state, err := relayconvert.NewResponseStreamState(types.RelayFormatClaude, types.RelayFormatOpenAIResponses, relayconvert.ResponseStreamOptions{
|
|
ID: responseID,
|
|
Model: info.UpstreamModelName,
|
|
Created: created,
|
|
EmitSequenceNumber: true,
|
|
})
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
hostedBridge := relayconvert.NewClaudeHostedStreamBridge()
|
|
|
|
claudeInfo := &ClaudeResponseInfo{
|
|
ResponseId: responseID,
|
|
Created: created,
|
|
Model: info.UpstreamModelName,
|
|
ResponseText: strings.Builder{},
|
|
Usage: &dto.Usage{},
|
|
}
|
|
var streamErr *types.NewAPIError
|
|
// streamFailed means a Responses-native terminal error was sent successfully.
|
|
// In that case the scanner stops without a transport error and the partial
|
|
// upstream usage remains billable.
|
|
streamFailed := false
|
|
|
|
sendResponsesEvent := func(eventType string, payload dto.ResponsesStreamResponse) bool {
|
|
payload.Type = eventType
|
|
data, err := common.Marshal(payload)
|
|
if err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeJsonMarshalFailed, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
if err := helper.ResponseChunkData(c, dto.ResponsesStreamResponse{Type: eventType}, string(data)); err != nil {
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
sendResult := func(result relayconvert.ResponseResult) bool {
|
|
event, ok := result.Value.(relayconvert.ChatToResponsesStreamEvent)
|
|
if !ok {
|
|
streamErr = types.NewOpenAIError(
|
|
fmt.Errorf("expected OpenAI Responses stream event, got %T", result.Value),
|
|
types.ErrorCodeBadResponse,
|
|
http.StatusInternalServerError,
|
|
)
|
|
return false
|
|
}
|
|
return sendResponsesEvent(event.Type, event.Payload)
|
|
}
|
|
failResponsesStream := func(err error) bool {
|
|
failureResults, handled := state.FailResponsesStream("server_error", err.Error(), "")
|
|
if !handled {
|
|
return false
|
|
}
|
|
for _, result := range failureResults {
|
|
if !sendResult(result) {
|
|
return true
|
|
}
|
|
}
|
|
streamFailed = true
|
|
return true
|
|
}
|
|
|
|
helper.StreamScannerHandler(c, resp, info, func(data string, sr *helper.StreamResult) {
|
|
var claudeResponse dto.ClaudeResponse
|
|
if err := common.UnmarshalJsonStr(data, &claudeResponse); err != nil {
|
|
logger.LogError(c, "failed to unmarshal Claude stream event: "+err.Error())
|
|
if failResponsesStream(err) {
|
|
// A nil streamErr here is intentional: the protocol-level failure
|
|
// event was delivered, so only the scanner needs to stop.
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
if claudeError := claudeResponse.GetClaudeError(); claudeError != nil && claudeError.Type != "" {
|
|
if failResponsesStream(fmt.Errorf("%s", claudeError.Message)) {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
streamErr = types.WithClaudeError(*claudeError, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
|
|
if claudeResponse.StopReason != "" {
|
|
maybeMarkClaudeRefusal(c, claudeResponse.StopReason)
|
|
}
|
|
if claudeResponse.Delta != nil && claudeResponse.Delta.StopReason != nil {
|
|
maybeMarkClaudeRefusal(c, *claudeResponse.Delta.StopReason)
|
|
}
|
|
if claudeResponse.Type == "message_start" && claudeResponse.Message != nil {
|
|
info.UpstreamModelName = claudeResponse.Message.Model
|
|
}
|
|
FormatClaudeResponseInfo(&claudeResponse, nil, claudeInfo)
|
|
countClaudeStreamBillableTools(c, info, &claudeResponse)
|
|
hostedEvents, consumed, err := hostedBridge.Convert(&claudeResponse, state)
|
|
if err != nil {
|
|
if failResponsesStream(err) {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
for _, event := range hostedEvents {
|
|
if !sendResponsesEvent(event.Type, event.Payload) {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
}
|
|
if consumed {
|
|
return
|
|
}
|
|
|
|
results, err := service.ConvertStreamResponseChunk(c, info, state, &claudeResponse)
|
|
if err != nil {
|
|
if failResponsesStream(err) {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
for _, result := range results {
|
|
if !sendResult(result) {
|
|
sr.Stop(streamErr)
|
|
return
|
|
}
|
|
}
|
|
})
|
|
if streamErr != nil {
|
|
return nil, streamErr
|
|
}
|
|
if streamFailed {
|
|
return claudeInfo.Usage, nil
|
|
}
|
|
|
|
HandleStreamFinalResponse(c, info, claudeInfo)
|
|
openAIUsage := buildOpenAIStyleUsageFromClaudeUsage(claudeInfo.Usage)
|
|
state.SetUsage(&openAIUsage)
|
|
finalResults, err := service.FinalizeStreamResponse(c, info, state)
|
|
if err != nil {
|
|
if failResponsesStream(err) {
|
|
return claudeInfo.Usage, streamErr
|
|
}
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
|
|
}
|
|
for _, result := range finalResults {
|
|
if !sendResult(result) {
|
|
return nil, streamErr
|
|
}
|
|
}
|
|
return claudeInfo.Usage, nil
|
|
}
|