mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-12 23:30:35 +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
400 lines
11 KiB
Go
400 lines
11 KiB
Go
package oairesponses
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
)
|
|
|
|
const (
|
|
responsesEventCreated = "response.created"
|
|
responsesEventCompleted = "response.completed"
|
|
responsesEventDone = "response.done"
|
|
responsesEventIncomplete = "response.incomplete"
|
|
responsesEventFailed = "response.failed"
|
|
responsesEventError = "response.error"
|
|
responsesEventOutputTextDelta = "response.output_text.delta"
|
|
responsesEventOutputTextAnnotationAdded = "response.output_text.annotation.added"
|
|
responsesEventOutputItemAdded = "response.output_item.added"
|
|
responsesEventOutputItemDone = "response.output_item.done"
|
|
responsesEventFunctionArgsDelta = "response.function_call_arguments.delta"
|
|
responsesEventFunctionArgsDone = "response.function_call_arguments.done"
|
|
responsesEventCustomToolInputDelta = "response.custom_tool_call_input.delta"
|
|
responsesEventCustomToolInputDone = "response.custom_tool_call_input.done"
|
|
responsesEventReasoningSummaryDelta = "response.reasoning_summary_text.delta"
|
|
responsesEventReasoningSummaryDone = "response.reasoning_summary_text.done"
|
|
responsesEventReasoningTextDelta = "response.reasoning_text.delta"
|
|
responsesEventReasoningTextDone = "response.reasoning_text.done"
|
|
responsesOutputTypeFunctionCall = "function_call"
|
|
responsesOutputTypeCustomToolCall = "custom_tool_call"
|
|
responsesOutputTypeMessage = "message"
|
|
responsesOutputTypeReasoning = "reasoning"
|
|
responsesIncompleteReasonContentFilter = "content_filter"
|
|
responsesIncompleteReasonMaxTokens = "max_output_tokens"
|
|
)
|
|
|
|
func ResponsesFinishReasonFromStatus(resp *dto.OpenAIResponsesResponse) (string, bool) {
|
|
if resp == nil {
|
|
return "", false
|
|
}
|
|
|
|
status := responseStatusString(resp)
|
|
if status != "incomplete" {
|
|
return "", false
|
|
}
|
|
|
|
reason := ""
|
|
if resp.IncompleteDetails != nil {
|
|
reason = strings.TrimSpace(resp.IncompleteDetails.Reason)
|
|
}
|
|
if reason == responsesIncompleteReasonContentFilter {
|
|
return "content_filter", true
|
|
}
|
|
return "length", true
|
|
}
|
|
|
|
func ResponsesResponseToChatCompletionsResponse(resp *dto.OpenAIResponsesResponse, id string) (*dto.OpenAITextResponse, *dto.Usage, error) {
|
|
if resp == nil {
|
|
return nil, nil, errors.New("response is nil")
|
|
}
|
|
|
|
text := ExtractOutputTextFromResponses(resp)
|
|
reasoning := ExtractReasoningTextFromResponses(resp)
|
|
|
|
usage := UsageFromResponsesUsage(resp.Usage)
|
|
|
|
created := resp.CreatedAt
|
|
|
|
var toolCalls []dto.ToolCallResponse
|
|
if len(resp.Output) > 0 {
|
|
for _, out := range resp.Output {
|
|
if !isResponsesToolOutputType(out.Type) {
|
|
continue
|
|
}
|
|
name := strings.TrimSpace(out.Name)
|
|
if name == "" {
|
|
continue
|
|
}
|
|
callId := strings.TrimSpace(out.CallId)
|
|
if callId == "" {
|
|
callId = strings.TrimSpace(out.ID)
|
|
}
|
|
toolCalls = append(toolCalls, dto.ToolCallResponse{
|
|
ID: callId,
|
|
Type: "function",
|
|
Function: dto.FunctionResponse{
|
|
Name: name,
|
|
Arguments: out.ArgumentsString(),
|
|
},
|
|
})
|
|
}
|
|
}
|
|
|
|
finishReason := "stop"
|
|
if mappedReason, ok := ResponsesFinishReasonFromStatus(resp); ok {
|
|
finishReason = mappedReason
|
|
} else if len(toolCalls) > 0 {
|
|
finishReason = "tool_calls"
|
|
}
|
|
|
|
msg := dto.Message{
|
|
Role: "assistant",
|
|
Content: text,
|
|
}
|
|
if annotations, err := responsesAnnotationsToChat(resp); err != nil {
|
|
return nil, nil, err
|
|
} else if len(annotations) > 0 {
|
|
msg.Annotations = annotations
|
|
}
|
|
if reasoning != "" {
|
|
msg.ReasoningContent = &reasoning
|
|
}
|
|
if len(toolCalls) > 0 {
|
|
msg.SetToolCalls(toolCalls)
|
|
}
|
|
|
|
out := &dto.OpenAITextResponse{
|
|
Id: id,
|
|
Object: "chat.completion",
|
|
Created: created,
|
|
Model: resp.Model,
|
|
Choices: []dto.OpenAITextResponseChoice{
|
|
{
|
|
Index: 0,
|
|
Message: msg,
|
|
FinishReason: finishReason,
|
|
},
|
|
},
|
|
Usage: *usage,
|
|
}
|
|
|
|
return out, usage, nil
|
|
}
|
|
|
|
func responsesAnnotationsToChat(resp *dto.OpenAIResponsesResponse) ([]byte, error) {
|
|
annotations := make([]any, 0)
|
|
for _, output := range resp.Output {
|
|
if output.Type != responsesOutputTypeMessage {
|
|
continue
|
|
}
|
|
for _, content := range output.Content {
|
|
for _, annotation := range content.Annotations {
|
|
converted, err := responseAnnotationToChat(annotation)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
annotations = append(annotations, converted)
|
|
}
|
|
}
|
|
}
|
|
if len(annotations) == 0 {
|
|
return nil, nil
|
|
}
|
|
return kitutil.Marshal(annotations)
|
|
}
|
|
|
|
func responseAnnotationToChat(annotation any) (map[string]any, error) {
|
|
value, ok := annotation.(map[string]any)
|
|
if !ok {
|
|
converted, err := kitutil.Any2Type[map[string]any](annotation)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid Responses annotation: %w", err)
|
|
}
|
|
value = converted
|
|
}
|
|
if strings.TrimSpace(kitutil.Interface2String(value["type"])) != "url_citation" {
|
|
return value, nil
|
|
}
|
|
citation := make(map[string]any, len(value)-1)
|
|
for key, item := range value {
|
|
if key != "type" {
|
|
citation[key] = item
|
|
}
|
|
}
|
|
return map[string]any{
|
|
"type": "url_citation",
|
|
"url_citation": citation,
|
|
}, nil
|
|
}
|
|
|
|
func UsageFromResponsesUsage(src *dto.Usage) *dto.Usage {
|
|
return usageFromResponsesUsage(src, true)
|
|
}
|
|
|
|
// NormalizeResponsesUsage maps Responses usage into the shared accounting
|
|
// shape without creating a BillingUsage snapshot. Native Responses handlers
|
|
// use it so passthrough traffic preserves an existing snapshot but does not
|
|
// introduce a conversion sidecar solely for local settlement.
|
|
func NormalizeResponsesUsage(src *dto.Usage) *dto.Usage {
|
|
return usageFromResponsesUsage(src, false)
|
|
}
|
|
|
|
func usageFromResponsesUsage(src *dto.Usage, createBillingSnapshot bool) *dto.Usage {
|
|
usage := &dto.Usage{}
|
|
if src == nil {
|
|
return usage
|
|
}
|
|
usage.UsageSemantic = src.UsageSemantic
|
|
usage.UsageSource = src.UsageSource
|
|
usage.BillingUsage = dto.CloneBillingUsage(src.BillingUsage)
|
|
if usage.BillingUsage == nil && createBillingSnapshot {
|
|
usage.BillingUsage = dto.NewOpenAIResponsesBillingUsage(src)
|
|
}
|
|
usage.Cost = src.Cost
|
|
if src.InputTokens != 0 {
|
|
usage.PromptTokens = src.InputTokens
|
|
usage.InputTokens = src.InputTokens
|
|
}
|
|
if src.OutputTokens != 0 {
|
|
usage.CompletionTokens = src.OutputTokens
|
|
usage.OutputTokens = src.OutputTokens
|
|
}
|
|
if src.TotalTokens != 0 {
|
|
usage.TotalTokens = src.TotalTokens
|
|
} else {
|
|
usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
|
|
}
|
|
if src.InputTokensDetails != nil {
|
|
usage.PromptTokensDetails.CachedTokens = src.InputTokensDetails.CachedTokens
|
|
usage.PromptTokensDetails.CachedCreationTokens = src.InputTokensDetails.CachedCreationTokens
|
|
usage.PromptTokensDetails.CacheWriteTokens = src.InputTokensDetails.CacheWriteTokens
|
|
usage.PromptTokensDetails.TextTokens = src.InputTokensDetails.TextTokens
|
|
usage.PromptTokensDetails.ImageTokens = src.InputTokensDetails.ImageTokens
|
|
usage.PromptTokensDetails.AudioTokens = src.InputTokensDetails.AudioTokens
|
|
}
|
|
if src.CompletionTokenDetails.ReasoningTokens != 0 ||
|
|
src.CompletionTokenDetails.TextTokens != 0 ||
|
|
src.CompletionTokenDetails.AudioTokens != 0 ||
|
|
src.CompletionTokenDetails.ImageTokens != 0 {
|
|
usage.CompletionTokenDetails.ReasoningTokens = src.CompletionTokenDetails.ReasoningTokens
|
|
usage.CompletionTokenDetails.TextTokens = src.CompletionTokenDetails.TextTokens
|
|
usage.CompletionTokenDetails.AudioTokens = src.CompletionTokenDetails.AudioTokens
|
|
usage.CompletionTokenDetails.ImageTokens = src.CompletionTokenDetails.ImageTokens
|
|
}
|
|
usage.ClaudeCacheCreation5mTokens = src.ClaudeCacheCreation5mTokens
|
|
usage.ClaudeCacheCreation1hTokens = src.ClaudeCacheCreation1hTokens
|
|
return usage
|
|
}
|
|
|
|
func ExtractOutputTextFromResponses(resp *dto.OpenAIResponsesResponse) string {
|
|
if resp == nil || len(resp.Output) == 0 {
|
|
return ""
|
|
}
|
|
|
|
var sb strings.Builder
|
|
|
|
// Prefer assistant message outputs.
|
|
for _, out := range resp.Output {
|
|
if out.Type != "message" {
|
|
continue
|
|
}
|
|
if out.Role != "" && out.Role != "assistant" {
|
|
continue
|
|
}
|
|
var outputText strings.Builder
|
|
for _, c := range out.Content {
|
|
if c.Type == "output_text" && c.Text != "" {
|
|
outputText.WriteString(c.Text)
|
|
}
|
|
}
|
|
appendSeparatedText(&sb, outputText.String())
|
|
}
|
|
if sb.Len() > 0 {
|
|
return sb.String()
|
|
}
|
|
for _, out := range resp.Output {
|
|
var outputText strings.Builder
|
|
for _, c := range out.Content {
|
|
if c.Text != "" {
|
|
outputText.WriteString(c.Text)
|
|
}
|
|
}
|
|
appendSeparatedText(&sb, outputText.String())
|
|
}
|
|
return sb.String()
|
|
}
|
|
|
|
func ExtractReasoningTextFromResponses(resp *dto.OpenAIResponsesResponse) string {
|
|
if resp == nil || len(resp.Output) == 0 {
|
|
return ""
|
|
}
|
|
|
|
var sb strings.Builder
|
|
for _, out := range resp.Output {
|
|
if out.Type != responsesOutputTypeReasoning {
|
|
continue
|
|
}
|
|
appendSeparatedText(&sb, reasoningOutputText(&out))
|
|
}
|
|
return sb.String()
|
|
}
|
|
|
|
func reasoningOutputText(output *dto.ResponsesOutput) string {
|
|
if output == nil {
|
|
return ""
|
|
}
|
|
var text strings.Builder
|
|
hasContentText := false
|
|
for _, part := range output.Content {
|
|
if part.Text != "" {
|
|
hasContentText = true
|
|
break
|
|
}
|
|
}
|
|
if hasContentText {
|
|
for _, part := range output.Content {
|
|
appendSeparatedText(&text, part.Text)
|
|
}
|
|
return text.String()
|
|
}
|
|
for _, part := range output.Summary {
|
|
appendSeparatedText(&text, part.Text)
|
|
}
|
|
return text.String()
|
|
}
|
|
|
|
func appendSeparatedText(builder *strings.Builder, text string) {
|
|
if builder == nil || text == "" {
|
|
return
|
|
}
|
|
if builder.Len() > 0 {
|
|
current := builder.String()
|
|
trailingNewlines := 0
|
|
for index := len(current) - 1; index >= 0 && trailingNewlines < 2 && current[index] == '\n'; index-- {
|
|
trailingNewlines++
|
|
}
|
|
leadingNewlines := 0
|
|
for leadingNewlines < len(text) && leadingNewlines < 2 && text[leadingNewlines] == '\n' {
|
|
leadingNewlines++
|
|
}
|
|
for missing := 2 - trailingNewlines - leadingNewlines; missing > 0; missing-- {
|
|
builder.WriteByte('\n')
|
|
}
|
|
}
|
|
builder.WriteString(text)
|
|
}
|
|
|
|
func responseStatusString(resp *dto.OpenAIResponsesResponse) string {
|
|
if resp == nil || len(resp.Status) == 0 {
|
|
return ""
|
|
}
|
|
var status string
|
|
_ = kitutil.Unmarshal(resp.Status, &status)
|
|
return strings.TrimSpace(status)
|
|
}
|
|
|
|
func ensureIncompleteResponse(resp *dto.OpenAIResponsesResponse) *dto.OpenAIResponsesResponse {
|
|
if resp == nil {
|
|
resp = &dto.OpenAIResponsesResponse{}
|
|
}
|
|
if len(resp.Status) == 0 {
|
|
resp.Status = []byte(`"incomplete"`)
|
|
}
|
|
return resp
|
|
}
|
|
|
|
func isResponsesToolOutputType(outputType string) bool {
|
|
return outputType == responsesOutputTypeFunctionCall || outputType == responsesOutputTypeCustomToolCall
|
|
}
|
|
|
|
func responseStreamEventItemID(event *dto.ResponsesStreamResponse) string {
|
|
if event == nil {
|
|
return ""
|
|
}
|
|
if event.Item != nil {
|
|
if itemID := strings.TrimSpace(event.Item.ID); itemID != "" {
|
|
return itemID
|
|
}
|
|
}
|
|
return strings.TrimSpace(event.ItemID)
|
|
}
|
|
|
|
func fallbackToolKey(itemID string, callID string, outputIndex *int) string {
|
|
if outputIndex != nil {
|
|
return fmt.Sprintf("output:%d", *outputIndex)
|
|
}
|
|
if strings.TrimSpace(itemID) != "" {
|
|
return "item:" + strings.TrimSpace(itemID)
|
|
}
|
|
if strings.TrimSpace(callID) != "" {
|
|
return "call:" + strings.TrimSpace(callID)
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func fallbackCallID(event *dto.ResponsesStreamResponse) string {
|
|
if event == nil {
|
|
return ""
|
|
}
|
|
if strings.TrimSpace(event.ItemID) != "" {
|
|
return strings.TrimSpace(event.ItemID)
|
|
}
|
|
if event.OutputIndex != nil {
|
|
return fmt.Sprintf("call_output_%d", *event.OutputIndex)
|
|
}
|
|
return ""
|
|
}
|