* refactor: consolidate relay protocol converters * refactor relayconvert text converters * feat: refine relay converters and advanced custom routing * refactor: enhance logging and add thought signature handling for Gemini requests * refactor: enhance channel cache and pricing endpoint handling for advanced custom models * feat: preserve billing usage semantics * feat: add protocol-aware billing usage * Delete useless files * chore: update action versions in workflow files * chore: update Docker action versions in workflow files * fix: harden billing usage settlement and hot-path route matching - estimate Gemini completion tokens locally when billable usageMetadata is prompt-only but output content was received (e.g. client aborts the stream before the final chunk), and rebuild the attached billing_usage as estimated so settlement does not bill zero output tokens - guard NewClaudeMessagesBillingUsage against all-zero ClaudeUsage, matching the OpenAI/Gemini constructors, so a zero billing_usage cannot override a non-zero top-level usage during settlement - cache compiled advanced-custom route model regexes; they run on the request hot path and were recompiled per request - move the effectiveBillingUsage remap to PostTextConsumeQuota only, and document that calculateTextQuotaSummary expects remapped usage - document the updatePricingLock -> channelSyncLock lock ordering that InitChannelCache/CacheUpdateChannel rely on, and the aux-struct pitfall in GeminiChatResponse.UnmarshalJSON
143 lines
4.6 KiB
Go
143 lines
4.6 KiB
Go
package common
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestSanitizeURLForLogMasksSensitiveQueryValues(t *testing.T) {
|
|
rawURL := "https://example.test/v1beta/models/gemini:streamGenerateContent?alt=sse&key=sk-secret&access_token=ya29-secret&api-version=2024-02-01"
|
|
|
|
got := SanitizeURLForLog(rawURL)
|
|
|
|
assert.NotContains(t, got, "sk-secret")
|
|
assert.NotContains(t, got, "ya29-secret")
|
|
parsedURL, err := url.Parse(got)
|
|
require.NoError(t, err)
|
|
query := parsedURL.Query()
|
|
assert.Equal(t, "***masked***", query.Get("key"))
|
|
assert.Equal(t, "***masked***", query.Get("access_token"))
|
|
assert.Equal(t, "sse", query.Get("alt"))
|
|
assert.Equal(t, "2024-02-01", query.Get("api-version"))
|
|
}
|
|
|
|
func TestSanitizeURLForLogMasksAWSAndSecretLikeQueryKeys(t *testing.T) {
|
|
rawURL := "https://example.test/path?X-Amz-Credential=credential&X-Amz-Signature=signature&session_token=session&client_secret=secret&model=gpt-test"
|
|
|
|
got := SanitizeURLForLog(rawURL)
|
|
|
|
assert.NotContains(t, got, "X-Amz-Credential=credential")
|
|
assert.NotContains(t, got, "X-Amz-Signature=signature")
|
|
assert.NotContains(t, got, "session_token=session")
|
|
assert.NotContains(t, got, "client_secret=secret")
|
|
parsedURL, err := url.Parse(got)
|
|
require.NoError(t, err)
|
|
query := parsedURL.Query()
|
|
assert.Equal(t, "***masked***", query.Get("X-Amz-Credential"))
|
|
assert.Equal(t, "***masked***", query.Get("X-Amz-Signature"))
|
|
assert.Equal(t, "***masked***", query.Get("session_token"))
|
|
assert.Equal(t, "***masked***", query.Get("client_secret"))
|
|
assert.Equal(t, "gpt-test", query.Get("model"))
|
|
}
|
|
|
|
func TestSanitizeURLForLogKeepsURLWithoutSensitiveQuery(t *testing.T) {
|
|
rawURL := "https://example.test/v1/chat/completions?api-version=2024-02-01&alt=sse"
|
|
|
|
got := SanitizeURLForLog(rawURL)
|
|
|
|
assert.Equal(t, rawURL, got)
|
|
}
|
|
|
|
func TestValidateMultipartDirectNormalizesImageField(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
body := strings.NewReader(`{"model":"wan2.7-i2v","prompt":"animate","image":" https://example.com/first.png "}`)
|
|
request := httptest.NewRequest(http.MethodPost, "/v1/video/generations", body)
|
|
request.Header.Set("Content-Type", "application/json")
|
|
recorder := httptest.NewRecorder()
|
|
context, _ := gin.CreateTestContext(recorder)
|
|
context.Request = request
|
|
info := &RelayInfo{
|
|
TaskRelayInfo: &TaskRelayInfo{},
|
|
}
|
|
|
|
taskErr := ValidateMultipartDirect(context, info)
|
|
|
|
require.Nil(t, taskErr)
|
|
storedReq, err := GetTaskRequest(context)
|
|
require.NoError(t, err)
|
|
require.Equal(t, []string{"https://example.com/first.png"}, storedReq.Images)
|
|
require.Equal(t, constant.TaskActionGenerate, info.Action)
|
|
}
|
|
|
|
// TestTaskDurationBounds guards the billing invariant that user-supplied
|
|
// video duration (a quota multiplier via OtherRatio "seconds") is bounded, so
|
|
// it can never overflow quota calculation into a negative charge.
|
|
func TestTaskDurationBounds(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
|
|
newContext := func(t *testing.T, body string) (*gin.Context, *RelayInfo) {
|
|
request := httptest.NewRequest(http.MethodPost, "/v1/video/generations", strings.NewReader(body))
|
|
request.Header.Set("Content-Type", "application/json")
|
|
context, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
context.Request = request
|
|
return context, &RelayInfo{TaskRelayInfo: &TaskRelayInfo{}}
|
|
}
|
|
|
|
tests := []struct {
|
|
name string
|
|
body string
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "huge duration is rejected",
|
|
body: `{"model":"sora-2","prompt":"a cat","duration":9999999999}`,
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "huge seconds string is rejected",
|
|
body: `{"model":"sora-2","prompt":"a cat","seconds":"9999999999"}`,
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "negative duration is rejected",
|
|
body: `{"model":"sora-2","prompt":"a cat","duration":-8}`,
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "normal duration is accepted",
|
|
body: `{"model":"sora-2","prompt":"a cat","seconds":"8"}`,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name+" (multipart direct)", func(t *testing.T) {
|
|
context, info := newContext(t, tt.body)
|
|
taskErr := ValidateMultipartDirect(context, info)
|
|
if tt.wantErr {
|
|
require.NotNil(t, taskErr)
|
|
require.Equal(t, "invalid_seconds", taskErr.Code)
|
|
} else {
|
|
require.Nil(t, taskErr)
|
|
}
|
|
})
|
|
t.Run(tt.name+" (basic task request)", func(t *testing.T) {
|
|
context, info := newContext(t, tt.body)
|
|
taskErr := ValidateBasicTaskRequest(context, info, constant.TaskActionGenerate)
|
|
if tt.wantErr {
|
|
require.NotNil(t, taskErr)
|
|
require.Equal(t, "invalid_seconds", taskErr.Code)
|
|
} else {
|
|
require.Nil(t, taskErr)
|
|
}
|
|
})
|
|
}
|
|
}
|