mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-10 22:20:25 +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
74 lines
2.2 KiB
Go
74 lines
2.2 KiB
Go
package controller
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestCountClaudeTokensReturnsInputTokensWhenRelayCountingDisabled(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
originalCountToken := constant.CountToken
|
|
constant.CountToken = false
|
|
t.Cleanup(func() {
|
|
constant.CountToken = originalCountToken
|
|
})
|
|
|
|
recorder := httptest.NewRecorder()
|
|
ctx, _ := gin.CreateTestContext(recorder)
|
|
ctx.Request = httptest.NewRequest(
|
|
http.MethodPost,
|
|
"/v1/messages/count_tokens?beta=true",
|
|
strings.NewReader(`{
|
|
"model":"gemini-3.6-flash",
|
|
"messages":[{"role":"user","content":"count this prompt"}],
|
|
"tools":[{"name":"lookup","description":"Look up a value","input_schema":{"type":"object","properties":{"query":{"type":"string"}}}}]
|
|
}`),
|
|
)
|
|
ctx.Request.Header.Set("Content-Type", "application/json")
|
|
common.SetContextKey(ctx, constant.ContextKeyOriginalModel, "gemini-3.6-flash")
|
|
|
|
CountClaudeTokens(ctx)
|
|
|
|
require.Equal(t, http.StatusOK, recorder.Code)
|
|
var response struct {
|
|
InputTokens int `json:"input_tokens"`
|
|
}
|
|
require.NoError(t, common.Unmarshal(recorder.Body.Bytes(), &response))
|
|
assert.Positive(t, response.InputTokens)
|
|
}
|
|
|
|
func TestCountClaudeTokensRejectsMissingMessages(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
recorder := httptest.NewRecorder()
|
|
ctx, _ := gin.CreateTestContext(recorder)
|
|
ctx.Request = httptest.NewRequest(
|
|
http.MethodPost,
|
|
"/v1/messages/count_tokens",
|
|
strings.NewReader(`{"model":"gemini-3.6-flash"}`),
|
|
)
|
|
ctx.Request.Header.Set("Content-Type", "application/json")
|
|
|
|
CountClaudeTokens(ctx)
|
|
|
|
require.Equal(t, http.StatusBadRequest, recorder.Code)
|
|
var response struct {
|
|
Type string `json:"type"`
|
|
Error struct {
|
|
Type string `json:"type"`
|
|
Message string `json:"message"`
|
|
} `json:"error"`
|
|
}
|
|
require.NoError(t, common.Unmarshal(recorder.Body.Bytes(), &response))
|
|
assert.Equal(t, "error", response.Type)
|
|
assert.Equal(t, "invalid_request_error", response.Error.Type)
|
|
assert.Contains(t, response.Error.Message, "messages")
|
|
}
|