chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 13:00:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #337

Browse Source 
**fix(executor): replace redundant commented code with `checkSystemInstructions` helper**

- Replaced commented-out `sjson.SetRawBytes` lines with the new `checkSystemInstructions` function.
- Centralized system instruction handling for better code clarity and reuse.
- Ensured consistent logic for managing `system` field across Claude executor flows.
This commit is contained in:
Luis Pater
2025-11-26 08:27:48 +08:00
parent 9c1e3c0687
commit ed9f6e897e
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/runtime/executor/claude_executor.go
View File

@@ -62,7 +62,7 @@ func (e *ClaudeExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, r
body = e.injectThinkingConfig(req.Model, body) body = e.injectThinkingConfig(req.Model, body)
if !strings.HasPrefix(modelForUpstream, "claude-3-5-haiku") { if !strings.HasPrefix(modelForUpstream, "claude-3-5-haiku") {
// body, _ = sjson.SetRawBytes(body, "system", []byte(misc.ClaudeCodeInstructions)) body = checkSystemInstructions(body)
} }
body = applyPayloadConfig(e.cfg, req.Model, body) body = applyPayloadConfig(e.cfg, req.Model, body)
@@ -162,7 +162,7 @@ func (e *ClaudeExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.A
} }
// Inject thinking config based on model suffix for thinking variants // Inject thinking config based on model suffix for thinking variants
body = e.injectThinkingConfig(req.Model, body) body = e.injectThinkingConfig(req.Model, body)
// body, _ = sjson.SetRawBytes(body, "system", []byte(misc.ClaudeCodeInstructions)) body = checkSystemInstructions(body)
body = applyPayloadConfig(e.cfg, req.Model, body) body = applyPayloadConfig(e.cfg, req.Model, body)
// Extract betas from body and convert to header // Extract betas from body and convert to header
@@ -295,7 +295,7 @@ func (e *ClaudeExecutor) CountTokens(ctx context.Context, auth *cliproxyauth.Aut
} }
if !strings.HasPrefix(modelForUpstream, "claude-3-5-haiku") { if !strings.HasPrefix(modelForUpstream, "claude-3-5-haiku") {
// body, _ = sjson.SetRawBytes(body, "system", []byte(misc.ClaudeCodeInstructions)) body = checkSystemInstructions(body)
} }
// Extract betas from body and convert to header (for count_tokens too) // Extract betas from body and convert to header (for count_tokens too)
@@ -676,3 +676,22 @@ func claudeCreds(a *cliproxyauth.Auth) (apiKey, baseURL string) {
} }
return return
} }
func checkSystemInstructions(payload []byte) []byte {
system := gjson.GetBytes(payload, "system")
claudeCodeInstructions := `[{"type":"text","text":"You are Claude Code, Anthropic's official CLI for Claude.","cache_control":{"type":"ephemeral"}}]`
if system.IsArray() {
if gjson.GetBytes(payload, "system.0.text").String() != "You are Claude Code, Anthropic's official CLI for Claude." {
system.ForEach(func(_, part gjson.Result) bool {
if part.Get("type").String() == "text" {
claudeCodeInstructions, _ = sjson.SetRaw(claudeCodeInstructions, "-1", part.Raw)
}
return true
})
payload, _ = sjson.SetRawBytes(payload, "system", []byte(claudeCodeInstructions))
}
} else {
payload, _ = sjson.SetRawBytes(payload, "system", []byte(claudeCodeInstructions))
}
return payload
}