mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-12 23:30:35 +00:00
Calcium-Ion
0ed497f066
* 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
281 lines
12 KiB
Go
281 lines
12 KiB
Go
package openai
|
||
|
||
import (
|
||
"io"
|
||
"net/http"
|
||
"net/http/httptest"
|
||
"strings"
|
||
"testing"
|
||
|
||
"github.com/QuantumNous/new-api/common"
|
||
"github.com/QuantumNous/new-api/constant"
|
||
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
||
"github.com/QuantumNous/new-api/relaykit/dto"
|
||
"github.com/QuantumNous/new-api/relaykit/types"
|
||
"github.com/gin-gonic/gin"
|
||
"github.com/stretchr/testify/assert"
|
||
"github.com/stretchr/testify/require"
|
||
)
|
||
|
||
func newResponsesChatTestContext(t *testing.T, body string, isStream bool) (*gin.Context, *httptest.ResponseRecorder, *http.Response, *relaycommon.RelayInfo) {
|
||
t.Helper()
|
||
|
||
recorder := httptest.NewRecorder()
|
||
c, _ := gin.CreateTestContext(recorder)
|
||
c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
|
||
c.Set(common.RequestIdKey, "responses-test")
|
||
|
||
resp := &http.Response{
|
||
StatusCode: http.StatusOK,
|
||
Body: io.NopCloser(strings.NewReader(body)),
|
||
Header: http.Header{"Content-Type": []string{"text/event-stream"}},
|
||
}
|
||
info := &relaycommon.RelayInfo{
|
||
ChannelMeta: &relaycommon.ChannelMeta{UpstreamModelName: "gpt-test"},
|
||
IsStream: isStream,
|
||
RelayFormat: types.RelayFormatOpenAI,
|
||
ShouldIncludeUsage: true,
|
||
DisablePing: true,
|
||
}
|
||
return c, recorder, resp, info
|
||
}
|
||
|
||
func TestOaiResponsesToChatStreamHandlerConvertsSSEOrderAndUsage(t *testing.T) {
|
||
oldMode := gin.Mode()
|
||
gin.SetMode(gin.TestMode)
|
||
t.Cleanup(func() { gin.SetMode(oldMode) })
|
||
|
||
oldTimeout := constant.StreamingTimeout
|
||
constant.StreamingTimeout = 30
|
||
t.Cleanup(func() { constant.StreamingTimeout = oldTimeout })
|
||
|
||
body := strings.Join([]string{
|
||
`data: {"type":"response.created","response":{"id":"resp_1","model":"gpt-test","created_at":1710000000}}`,
|
||
`data: {"type":"response.output_text.delta","delta":"hello"}`,
|
||
`data: {"type":"response.output_item.added","output_index":1,"item":{"type":"function_call","id":"fc_1","call_id":"call_1","name":"lookup"}}`,
|
||
`data: {"type":"response.function_call_arguments.delta","output_index":1,"delta":"{\"q\":\"x\"}"}`,
|
||
`data: {"type":"response.completed","response":{"status":"completed","usage":{"input_tokens":2,"output_tokens":3,"total_tokens":5}}}`,
|
||
`data: [DONE]`,
|
||
``,
|
||
}, "\n")
|
||
|
||
c, recorder, resp, info := newResponsesChatTestContext(t, body, true)
|
||
|
||
usage, err := OaiResponsesToChatStreamHandler(c, info, resp)
|
||
require.Nil(t, err)
|
||
require.NotNil(t, usage)
|
||
require.Equal(t, 2, usage.PromptTokens)
|
||
require.Equal(t, 3, usage.CompletionTokens)
|
||
require.Equal(t, 5, usage.TotalTokens)
|
||
|
||
got := recorder.Body.String()
|
||
require.Equal(t, "text/event-stream", recorder.Header().Get("Content-Type"))
|
||
require.Contains(t, got, `"role":"assistant"`)
|
||
require.Contains(t, got, `"content":"hello"`)
|
||
require.Contains(t, got, `"name":"lookup"`)
|
||
require.Contains(t, got, `"arguments":"{\"q\":\"x\"}"`)
|
||
require.Contains(t, got, `"finish_reason":"tool_calls"`)
|
||
require.Contains(t, got, `"usage":{"prompt_tokens":2,"completion_tokens":3,"total_tokens":5`)
|
||
require.Contains(t, got, `data: [DONE]`)
|
||
requireOrderedSubstrings(t, got,
|
||
`"role":"assistant"`,
|
||
`"content":"hello"`,
|
||
`"name":"lookup"`,
|
||
`"arguments":"{\"q\":\"x\"}"`,
|
||
`"finish_reason":"tool_calls"`,
|
||
`"usage":{"prompt_tokens":2,"completion_tokens":3,"total_tokens":5`,
|
||
`data: [DONE]`,
|
||
)
|
||
}
|
||
|
||
func TestOaiResponsesToChatStreamHandlerConvertsClaudeSSETerminalsAndUsage(t *testing.T) {
|
||
oldMode := gin.Mode()
|
||
gin.SetMode(gin.TestMode)
|
||
t.Cleanup(func() { gin.SetMode(oldMode) })
|
||
|
||
oldTimeout := constant.StreamingTimeout
|
||
constant.StreamingTimeout = 30
|
||
t.Cleanup(func() { constant.StreamingTimeout = oldTimeout })
|
||
|
||
body := strings.Join([]string{
|
||
`data: {"type":"response.created","response":{"id":"resp_1","model":"gpt-test","created_at":1710000000}}`,
|
||
`data: {"type":"response.output_text.delta","delta":"hello"}`,
|
||
`data: {"type":"response.completed","response":{"status":"completed","usage":{"input_tokens":2,"output_tokens":3,"total_tokens":5}}}`,
|
||
`data: [DONE]`,
|
||
``,
|
||
}, "\n")
|
||
|
||
c, recorder, resp, info := newResponsesChatTestContext(t, body, true)
|
||
info.RelayFormat = types.RelayFormatClaude
|
||
|
||
usage, err := OaiResponsesToChatStreamHandler(c, info, resp)
|
||
require.Nil(t, err)
|
||
require.NotNil(t, usage)
|
||
assert.Equal(t, 2, usage.PromptTokens)
|
||
assert.Equal(t, 3, usage.CompletionTokens)
|
||
assert.Equal(t, 5, usage.TotalTokens)
|
||
|
||
got := recorder.Body.String()
|
||
assert.Equal(t, "text/event-stream", recorder.Header().Get("Content-Type"))
|
||
assert.Equal(t, 1, strings.Count(got, "event: message_start\n"))
|
||
assert.Equal(t, 1, strings.Count(got, "event: content_block_stop\n"))
|
||
assert.Equal(t, 1, strings.Count(got, "event: message_delta\n"))
|
||
assert.Equal(t, 1, strings.Count(got, "event: message_stop\n"))
|
||
|
||
messageDeltaFrame := ""
|
||
for _, frame := range strings.Split(got, "\n\n") {
|
||
if strings.HasPrefix(frame, "event: message_delta\n") {
|
||
messageDeltaFrame = frame
|
||
break
|
||
}
|
||
}
|
||
require.NotEmpty(t, messageDeltaFrame)
|
||
assert.Contains(t, messageDeltaFrame, `"type":"message_delta"`)
|
||
assert.Contains(t, messageDeltaFrame, `"stop_reason":"end_turn"`)
|
||
assert.Contains(t, messageDeltaFrame, `"input_tokens":2`)
|
||
assert.Contains(t, messageDeltaFrame, `"output_tokens":3`)
|
||
requireOrderedSubstrings(t, got,
|
||
"event: message_start\n",
|
||
"event: content_block_stop\n",
|
||
"event: message_delta\n",
|
||
"event: message_stop\n",
|
||
)
|
||
}
|
||
|
||
func TestOaiResponsesToChatBufferedStreamHandlerReturnsJSONFromSSE(t *testing.T) {
|
||
oldMode := gin.Mode()
|
||
gin.SetMode(gin.TestMode)
|
||
t.Cleanup(func() { gin.SetMode(oldMode) })
|
||
|
||
body := strings.Join([]string{
|
||
`data: {"type":"response.output_text.delta","delta":"buffered text"}`,
|
||
`data: {"type":"response.output_item.added","output_index":0,"item":{"type":"function_call","id":"fc_1","call_id":"call_1","name":"lookup"}}`,
|
||
`data: {"type":"response.function_call_arguments.delta","output_index":0,"delta":"{\"q\":\"x\"}"}`,
|
||
`data: {"type":"response.done","response":{"model":"gpt-test","status":"completed","usage":{"input_tokens":1,"output_tokens":2,"total_tokens":3}}}`,
|
||
`data: [DONE]`,
|
||
``,
|
||
}, "\n")
|
||
|
||
c, recorder, resp, info := newResponsesChatTestContext(t, body, false)
|
||
|
||
usage, err := OaiResponsesToChatBufferedStreamHandler(c, info, resp)
|
||
require.Nil(t, err)
|
||
require.NotNil(t, usage)
|
||
require.Equal(t, 3, usage.TotalTokens)
|
||
|
||
got := recorder.Body.String()
|
||
require.NotContains(t, got, `data:`)
|
||
require.Contains(t, got, `"object":"chat.completion"`)
|
||
require.Contains(t, got, `"content":"buffered text"`)
|
||
require.Contains(t, got, `"name":"lookup"`)
|
||
require.Contains(t, got, `"arguments":"{\"q\":\"x\"}"`)
|
||
require.Contains(t, got, `"finish_reason":"tool_calls"`)
|
||
}
|
||
|
||
func TestOaiResponsesToChatBufferedStreamHandlerPreservesInterleavedClaudeContent(t *testing.T) {
|
||
oldMode := gin.Mode()
|
||
gin.SetMode(gin.TestMode)
|
||
t.Cleanup(func() { gin.SetMode(oldMode) })
|
||
|
||
body := strings.Join([]string{
|
||
`data: {"type":"response.output_item.added","output_index":0,"item":{"type":"reasoning","id":"rs_1","summary":[]}}`,
|
||
`data: {"type":"response.reasoning_summary_text.delta","output_index":0,"item_id":"rs_1","delta":"**Planning file inspection**"}`,
|
||
`data: {"type":"response.output_item.added","output_index":1,"item":{"type":"message","id":"msg_1","role":"assistant","content":[]}}`,
|
||
`data: {"type":"response.output_text.delta","output_index":1,"item_id":"msg_1","delta":"I’ll inspect the starter repository."}`,
|
||
`data: {"type":"response.output_item.added","output_index":2,"item":{"type":"reasoning","id":"rs_2","summary":[]}}`,
|
||
`data: {"type":"response.reasoning_summary_text.delta","output_index":2,"item_id":"rs_2","delta":"**Clarifying environment task requirements**"}`,
|
||
`data: {"type":"response.output_item.added","output_index":3,"item":{"type":"message","id":"msg_2","role":"assistant","content":[]}}`,
|
||
`data: {"type":"response.output_text.delta","output_index":3,"item_id":"msg_2","delta":"What would you like me to build?"}`,
|
||
`data: {"type":"response.done","response":{"id":"resp_1","model":"gpt-test","status":"completed","usage":{"input_tokens":1,"output_tokens":2,"total_tokens":3}}}`,
|
||
`data: [DONE]`,
|
||
``,
|
||
}, "\n")
|
||
|
||
c, recorder, resp, info := newResponsesChatTestContext(t, body, false)
|
||
info.RelayFormat = types.RelayFormatClaude
|
||
|
||
usage, apiErr := OaiResponsesToChatBufferedStreamHandler(c, info, resp)
|
||
require.Nil(t, apiErr)
|
||
require.NotNil(t, usage)
|
||
assert.Equal(t, 3, usage.TotalTokens)
|
||
|
||
var claudeResponse dto.ClaudeResponse
|
||
require.NoError(t, common.Unmarshal(recorder.Body.Bytes(), &claudeResponse))
|
||
require.Len(t, claudeResponse.Content, 4)
|
||
assert.Equal(t, []string{"thinking", "text", "thinking", "text"}, []string{
|
||
claudeResponse.Content[0].Type,
|
||
claudeResponse.Content[1].Type,
|
||
claudeResponse.Content[2].Type,
|
||
claudeResponse.Content[3].Type,
|
||
})
|
||
require.NotNil(t, claudeResponse.Content[0].Thinking)
|
||
require.NotNil(t, claudeResponse.Content[2].Thinking)
|
||
assert.Equal(t, "**Planning file inspection**", *claudeResponse.Content[0].Thinking)
|
||
assert.Equal(t, "I’ll inspect the starter repository.", claudeResponse.Content[1].GetText())
|
||
assert.Equal(t, "**Clarifying environment task requirements**", *claudeResponse.Content[2].Thinking)
|
||
assert.Equal(t, "What would you like me to build?", claudeResponse.Content[3].GetText())
|
||
}
|
||
|
||
func TestOaiChatToResponsesStreamHandlerConvertsSSEOrderAndUsage(t *testing.T) {
|
||
oldMode := gin.Mode()
|
||
gin.SetMode(gin.TestMode)
|
||
t.Cleanup(func() { gin.SetMode(oldMode) })
|
||
|
||
oldTimeout := constant.StreamingTimeout
|
||
constant.StreamingTimeout = 30
|
||
t.Cleanup(func() { constant.StreamingTimeout = oldTimeout })
|
||
|
||
body := strings.Join([]string{
|
||
`data: {"id":"chatcmpl_1","object":"chat.completion.chunk","created":1710000000,"model":"gpt-test","choices":[{"index":0,"delta":{"role":"assistant"},"finish_reason":null}]}`,
|
||
`data: {"id":"chatcmpl_1","object":"chat.completion.chunk","created":1710000000,"model":"gpt-test","choices":[{"index":0,"delta":{"content":"hello"},"finish_reason":null}]}`,
|
||
`data: {"id":"chatcmpl_1","object":"chat.completion.chunk","created":1710000000,"model":"gpt-test","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"id":"call_1","type":"function","function":{"name":"lookup"}}]},"finish_reason":null}]}`,
|
||
`data: {"id":"chatcmpl_1","object":"chat.completion.chunk","created":1710000000,"model":"gpt-test","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"{\"q\":\"x\"}"}}]},"finish_reason":null}]}`,
|
||
`data: {"id":"chatcmpl_1","object":"chat.completion.chunk","created":1710000000,"model":"gpt-test","choices":[{"index":0,"delta":{},"finish_reason":"tool_calls"}]}`,
|
||
`data: {"id":"chatcmpl_1","object":"chat.completion.chunk","created":1710000000,"model":"gpt-test","choices":[],"usage":{"prompt_tokens":2,"completion_tokens":3,"total_tokens":5}}`,
|
||
`data: [DONE]`,
|
||
``,
|
||
}, "\n")
|
||
|
||
c, recorder, resp, info := newResponsesChatTestContext(t, body, true)
|
||
c.Request = httptest.NewRequest(http.MethodPost, "/v1/responses", nil)
|
||
|
||
usage, err := OaiChatToResponsesStreamHandler(c, info, resp)
|
||
require.Nil(t, err)
|
||
require.NotNil(t, usage)
|
||
require.Equal(t, 2, usage.PromptTokens)
|
||
require.Equal(t, 3, usage.CompletionTokens)
|
||
require.Equal(t, 5, usage.TotalTokens)
|
||
|
||
got := recorder.Body.String()
|
||
require.Equal(t, "text/event-stream", recorder.Header().Get("Content-Type"))
|
||
require.Contains(t, got, `event: response.created`)
|
||
require.Contains(t, got, `event: response.output_text.delta`)
|
||
require.Contains(t, got, `"delta":"hello"`)
|
||
require.Contains(t, got, `event: response.function_call_arguments.delta`)
|
||
require.Contains(t, got, `"delta":"{\"q\":\"x\"}"`)
|
||
require.Contains(t, got, `event: response.completed`)
|
||
require.Contains(t, got, `"input_tokens":2`)
|
||
require.Contains(t, got, `"output_tokens":3`)
|
||
requireOrderedSubstrings(t, got,
|
||
`event: response.created`,
|
||
`event: response.output_item.added`,
|
||
`event: response.output_text.delta`,
|
||
`event: response.output_item.added`,
|
||
`event: response.function_call_arguments.delta`,
|
||
`event: response.output_text.done`,
|
||
`event: response.function_call_arguments.done`,
|
||
`event: response.completed`,
|
||
)
|
||
}
|
||
|
||
func requireOrderedSubstrings(t *testing.T, s string, parts ...string) {
|
||
t.Helper()
|
||
|
||
offset := 0
|
||
for _, part := range parts {
|
||
idx := strings.Index(s[offset:], part)
|
||
require.NotEqualf(t, -1, idx, "missing %q after byte offset %d", part, offset)
|
||
offset += idx + len(part)
|
||
}
|
||
}
|