mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-11-16 22:57:53 +08:00
- Replace tidwall/gjson and tidwall/sjson with github.com/MoeForge/moego/ojson and encoding/base64 with github.com/MoeForge/moego/base64 across the main module and examples - Introduce cross-method *ojson.Doc request rewriting pipelines across thinking, signature, client/codex, runtime/executor/helps, pluginhost, and all provider executors with FinalizePayloadDoc as the final semantic barrier - Convert all consecutive JSON mutations (>= 2 Set/SetRaw/Delete operations) to batch edits on ojson.Doc - Upgrade read-only byte paths to ojson.GetBytesNoCopy, ojson.GetManyBytesNoCopy, and util.ParseGJSONBytesNoCopy with explicit strings.Clone ownership protection across streaming and persistent state - Use base64.StdEncoding.ValidateString for zero-allocation signature checks and base64.EncodeDataURL for single-allocation data URL construction
103 lines
4.4 KiB
Go
103 lines
4.4 KiB
Go
package executor
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"net/http"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/MoeForge/moego/ojson"
|
|
"github.com/router-for-me/CLIProxyAPI/v8/internal/config"
|
|
cliproxyauth "github.com/router-for-me/CLIProxyAPI/v8/sdk/cliproxy/auth"
|
|
cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v8/sdk/cliproxy/executor"
|
|
sdktranslator "github.com/router-for-me/CLIProxyAPI/v8/sdk/translator"
|
|
)
|
|
|
|
func TestClaudeExecutor_Issue7000ForcedToolChoiceFallsBackToAuto(t *testing.T) {
|
|
const tools = `[{"name":"lookup_weather","description":"Look up the weather for a city.","input_schema":{"type":"object","properties":{"city":{"type":"string"}},"required":["city"],"additionalProperties":false},"cache_control":{"type":"ephemeral"}}]`
|
|
const messages = `[{"role":"user","content":[{"type":"text","text":"What is the weather in Paris?"}]}]`
|
|
|
|
choices := []struct {
|
|
name string
|
|
body string
|
|
}{
|
|
{name: "any", body: `{"type":"any","disable_parallel_tool_use":true}`},
|
|
{name: "tool", body: `{"type":"tool","name":"lookup_weather","disable_parallel_tool_use":true}`},
|
|
}
|
|
for _, model := range []string{"claude-opus-5-5", "claude-sonnet-5-5"} {
|
|
for _, choice := range choices {
|
|
for _, method := range []string{"Execute", "ExecuteStream"} {
|
|
t.Run(model+"/"+choice.name+"/"+method, func(t *testing.T) {
|
|
stream := method == "ExecuteStream"
|
|
var upstreamBody []byte
|
|
transport := roundTripperFunc(func(req *http.Request) (*http.Response, error) {
|
|
body, errRead := io.ReadAll(req.Body)
|
|
if errRead != nil {
|
|
return nil, errRead
|
|
}
|
|
if errClose := req.Body.Close(); errClose != nil {
|
|
return nil, errClose
|
|
}
|
|
upstreamBody = body
|
|
contentType := "application/json"
|
|
responseBody := `{"id":"msg_issue7000","type":"message","role":"assistant","model":"` + model + `","content":[{"type":"text","text":"ok"}],"stop_reason":"end_turn","stop_sequence":null,"usage":{"input_tokens":1,"output_tokens":1}}`
|
|
if stream {
|
|
contentType = "text/event-stream"
|
|
responseBody = strings.ReplaceAll(claudeIssue6698SSE, "claude-opus-5-5", model)
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Header: http.Header{"Content-Type": {contentType}},
|
|
Body: io.NopCloser(strings.NewReader(responseBody)),
|
|
Request: req,
|
|
}, nil
|
|
})
|
|
ctx := context.WithValue(context.Background(), "cliproxy.roundtripper", http.RoundTripper(transport))
|
|
executor := NewClaudeExecutor(&config.Config{})
|
|
auth := &cliproxyauth.Auth{Attributes: map[string]string{"api_key": "sk-ant-api03-issue7000"}}
|
|
payload := []byte(`{"model":"` + model + `","max_tokens":4096,"tools":` + tools + `,"tool_choice":` + choice.body + `,"messages":` + messages + `,"thinking":{"type":"adaptive"},"output_config":{"effort":"high"}}`)
|
|
request := cliproxyexecutor.Request{Model: model, Payload: payload}
|
|
options := cliproxyexecutor.Options{SourceFormat: sdktranslator.FormatClaude, Stream: stream}
|
|
if stream {
|
|
result, errStream := executor.ExecuteStream(ctx, auth, request, options)
|
|
if errStream != nil {
|
|
t.Fatalf("ExecuteStream() error = %v", errStream)
|
|
}
|
|
for chunk := range result.Chunks {
|
|
if chunk.Err != nil {
|
|
t.Errorf("stream chunk error = %v", chunk.Err)
|
|
}
|
|
}
|
|
} else if _, errExecute := executor.Execute(ctx, auth, request, options); errExecute != nil {
|
|
t.Fatalf("Execute() error = %v", errExecute)
|
|
}
|
|
|
|
if !ojson.ValidBytes(upstreamBody) {
|
|
t.Fatalf("expected a captured JSON upstream request, got %q", upstreamBody)
|
|
}
|
|
for _, assertion := range []struct {
|
|
path string
|
|
want any
|
|
}{
|
|
{path: "tool_choice.type", want: "auto"},
|
|
{path: "tool_choice.disable_parallel_tool_use", want: true},
|
|
{path: "thinking.type", want: "adaptive"},
|
|
{path: "output_config.effort", want: "high"},
|
|
{path: "tools", want: ojson.Parse(tools).Value()},
|
|
{path: "messages", want: ojson.Parse(messages).Value()},
|
|
} {
|
|
if got := ojson.GetBytes(upstreamBody, assertion.path).Value(); !reflect.DeepEqual(got, assertion.want) {
|
|
t.Errorf("upstream %s = %#v, want %#v", assertion.path, got, assertion.want)
|
|
}
|
|
}
|
|
if got := ojson.GetBytes(upstreamBody, "tool_choice.name"); got.Exists() {
|
|
t.Errorf("upstream tool_choice.name = %s, want absent after fallback to auto", got.Raw)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|