mirror of
https://github.com/ollama/ollama.git
synced 2026-11-22 00:01:45 +00:00
launch: use cloud model context in Claude Code (#19119)
This commit is contained in:
parent
8dce29aa1b
commit
8886afcd80
2 changed files with 97 additions and 22 deletions
|
|
@ -49,7 +49,7 @@ func (c *Claude) findPath() (string, error) {
|
|||
return "", fmt.Errorf("claude binary not found")
|
||||
}
|
||||
|
||||
func (c *Claude) Run(model string, _ []LaunchModel, args []string) error {
|
||||
func (c *Claude) Run(model string, models []LaunchModel, args []string) error {
|
||||
claudePath, err := ensureClaudeInstalled()
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -60,11 +60,11 @@ func (c *Claude) Run(model string, _ []LaunchModel, args []string) error {
|
|||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
cmd.Env = append(os.Environ(), c.envVars(model)...)
|
||||
cmd.Env = append(os.Environ(), c.envVars(model, models)...)
|
||||
return cmd.Run()
|
||||
}
|
||||
|
||||
func (c *Claude) envVars(model string) []string {
|
||||
func (c *Claude) envVars(model string, models []LaunchModel) []string {
|
||||
env := []string{
|
||||
"ANTHROPIC_BASE_URL=" + envconfig.Host().String(),
|
||||
"ANTHROPIC_API_KEY=",
|
||||
|
|
@ -83,7 +83,7 @@ func (c *Claude) envVars(model string) []string {
|
|||
env = append(env, "CLAUDE_CODE_AUTO_MODE_SERVER=0")
|
||||
}
|
||||
|
||||
env = append(env, c.modelEnvVars(model)...)
|
||||
env = append(env, c.modelEnvVars(model, models)...)
|
||||
return env
|
||||
}
|
||||
|
||||
|
|
@ -177,7 +177,7 @@ const (
|
|||
)
|
||||
|
||||
// modelEnvVars returns Claude Code env vars that route all model tiers through Ollama.
|
||||
func (c *Claude) modelEnvVars(model string) []string {
|
||||
func (c *Claude) modelEnvVars(model string, models []LaunchModel) []string {
|
||||
env := []string{
|
||||
"ANTHROPIC_DEFAULT_OPUS_MODEL=" + model,
|
||||
"ANTHROPIC_DEFAULT_SONNET_MODEL=" + model,
|
||||
|
|
@ -185,12 +185,19 @@ func (c *Claude) modelEnvVars(model string) []string {
|
|||
"CLAUDE_CODE_SUBAGENT_MODEL=" + model,
|
||||
}
|
||||
|
||||
if isCloudModelName(model) {
|
||||
if l, ok := lookupCloudModelLimit(model); ok {
|
||||
env = append(env, "CLAUDE_CODE_MAX_CONTEXT_TOKENS="+strconv.Itoa(l.Context))
|
||||
if os.Getenv("CLAUDE_CODE_AUTO_COMPACT_WINDOW") == "" && l.Context >= claudeMinAutoCompactWindow {
|
||||
env = append(env, "CLAUDE_CODE_AUTO_COMPACT_WINDOW="+strconv.Itoa(min(l.Context, claudeMaxAutoCompactWindow)))
|
||||
}
|
||||
var contextLength int
|
||||
if m, ok := findLaunchModel(models, model); ok && (m.Remote || isCloudModelName(model)) {
|
||||
contextLength = m.ContextLength
|
||||
}
|
||||
if contextLength <= 0 {
|
||||
if limit, ok := lookupCloudModelLimit(model); ok {
|
||||
contextLength = limit.Context
|
||||
}
|
||||
}
|
||||
if contextLength > 0 {
|
||||
env = append(env, "CLAUDE_CODE_MAX_CONTEXT_TOKENS="+strconv.Itoa(contextLength))
|
||||
if os.Getenv("CLAUDE_CODE_AUTO_COMPACT_WINDOW") == "" && contextLength >= claudeMinAutoCompactWindow {
|
||||
env = append(env, "CLAUDE_CODE_AUTO_COMPACT_WINDOW="+strconv.Itoa(min(contextLength, claudeMaxAutoCompactWindow)))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ func TestClaudeEnvVars(t *testing.T) {
|
|||
return m
|
||||
}
|
||||
|
||||
got := envMap(c.envVars("llama3.2"))
|
||||
got := envMap(c.envVars("llama3.2", nil))
|
||||
for key, want := range map[string]string{
|
||||
"ANTHROPIC_BASE_URL": envconfig.Host().String(),
|
||||
"ANTHROPIC_API_KEY": "",
|
||||
|
|
@ -486,7 +486,7 @@ func TestClaudeModelEnvVars(t *testing.T) {
|
|||
}
|
||||
|
||||
t.Run("maps all Claude model env vars to the provided model", func(t *testing.T) {
|
||||
got := envMap(c.modelEnvVars("llama3.2"))
|
||||
got := envMap(c.modelEnvVars("llama3.2", nil))
|
||||
if got["ANTHROPIC_DEFAULT_OPUS_MODEL"] != "llama3.2" {
|
||||
t.Errorf("OPUS = %q, want llama3.2", got["ANTHROPIC_DEFAULT_OPUS_MODEL"])
|
||||
}
|
||||
|
|
@ -507,7 +507,7 @@ func TestClaudeModelEnvVars(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("supports empty model", func(t *testing.T) {
|
||||
got := envMap(c.modelEnvVars(""))
|
||||
got := envMap(c.modelEnvVars("", nil))
|
||||
if got["ANTHROPIC_DEFAULT_OPUS_MODEL"] != "" {
|
||||
t.Errorf("OPUS = %q, want empty", got["ANTHROPIC_DEFAULT_OPUS_MODEL"])
|
||||
}
|
||||
|
|
@ -532,7 +532,7 @@ func TestClaudeModelEnvVars(t *testing.T) {
|
|||
"glm-5:cloud": "202752",
|
||||
"kimi-k2.6:cloud": "262144",
|
||||
} {
|
||||
got := envMap(c.modelEnvVars(model))
|
||||
got := envMap(c.modelEnvVars(model, nil))
|
||||
for _, key := range windowKeys {
|
||||
if got[key] != want {
|
||||
t.Errorf("%s: %s = %q, want %s", model, key, got[key], want)
|
||||
|
|
@ -544,12 +544,19 @@ func TestClaudeModelEnvVars(t *testing.T) {
|
|||
t.Run("keeps the auto compact window within Claude Code's range", func(t *testing.T) {
|
||||
setDynamicCloudModelLimits(map[string]cloudModelLimit{"tiny": {Context: 65_536}})
|
||||
t.Cleanup(func() { setDynamicCloudModelLimits(nil) })
|
||||
for model, want := range map[string]string{
|
||||
"nemotron-3-nano:30b:cloud": "1000000",
|
||||
"tiny:cloud": "",
|
||||
for _, tt := range []struct {
|
||||
model LaunchModel
|
||||
wantContext string
|
||||
wantCompact string
|
||||
}{
|
||||
{model: LaunchModel{Name: "nemotron-3-nano:30b:cloud"}, wantContext: "1048576", wantCompact: "1000000"},
|
||||
{model: LaunchModel{Name: "tiny:cloud"}, wantContext: "65536"},
|
||||
{model: LaunchModel{Name: "new-large:cloud", ContextLength: 1_048_576}, wantContext: "1048576", wantCompact: "1000000"},
|
||||
{model: LaunchModel{Name: "new-small:cloud", ContextLength: 65_536}, wantContext: "65536"},
|
||||
} {
|
||||
if got := envMap(c.modelEnvVars(model))["CLAUDE_CODE_AUTO_COMPACT_WINDOW"]; got != want {
|
||||
t.Errorf("%s: AUTO_COMPACT_WINDOW = %q, want %q", model, got, want)
|
||||
got := envMap(c.modelEnvVars(tt.model.Name, []LaunchModel{tt.model}))
|
||||
if got["CLAUDE_CODE_MAX_CONTEXT_TOKENS"] != tt.wantContext || got["CLAUDE_CODE_AUTO_COMPACT_WINDOW"] != tt.wantCompact {
|
||||
t.Errorf("%s: context = %q, compact = %q; want %q, %q", tt.model.Name, got["CLAUDE_CODE_MAX_CONTEXT_TOKENS"], got["CLAUDE_CODE_AUTO_COMPACT_WINDOW"], tt.wantContext, tt.wantCompact)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
@ -557,7 +564,7 @@ func TestClaudeModelEnvVars(t *testing.T) {
|
|||
t.Run("keeps the user's auto compact window but not their context window", func(t *testing.T) {
|
||||
t.Setenv("CLAUDE_CODE_AUTO_COMPACT_WINDOW", "150000")
|
||||
t.Setenv("CLAUDE_CODE_MAX_CONTEXT_TOKENS", "150000")
|
||||
got := envMap(c.modelEnvVars("kimi-k2.6:cloud"))
|
||||
got := envMap(c.modelEnvVars("kimi-k2.6:cloud", nil))
|
||||
if v, ok := got["CLAUDE_CODE_AUTO_COMPACT_WINDOW"]; ok {
|
||||
t.Errorf("AUTO_COMPACT_WINDOW = %q, want left to the user's setting", v)
|
||||
}
|
||||
|
|
@ -566,8 +573,26 @@ func TestClaudeModelEnvVars(t *testing.T) {
|
|||
}
|
||||
})
|
||||
|
||||
t.Run("resolved cloud metadata takes precedence over fallback", func(t *testing.T) {
|
||||
t.Setenv("CLAUDE_CODE_AUTO_COMPACT_WINDOW", "")
|
||||
models := []LaunchModel{{Name: "kimi-k2.6:cloud", ContextLength: 524288}}
|
||||
env := c.modelEnvVars("kimi-k2.6:cloud", models)
|
||||
got := envMap(env)
|
||||
for _, key := range windowKeys {
|
||||
count := 0
|
||||
for _, entry := range env {
|
||||
if strings.HasPrefix(entry, key+"=") {
|
||||
count++
|
||||
}
|
||||
}
|
||||
if got[key] != "524288" || count != 1 {
|
||||
t.Errorf("%s = %q (%d entries), want 524288 once", key, got[key], count)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("does not set windows for unknown cloud models", func(t *testing.T) {
|
||||
got := envMap(c.modelEnvVars("unknown-model:cloud"))
|
||||
got := envMap(c.modelEnvVars("unknown-model:cloud", nil))
|
||||
for _, key := range windowKeys {
|
||||
if v, ok := got[key]; ok {
|
||||
t.Errorf("%s = %q, want unset", key, v)
|
||||
|
|
@ -575,3 +600,46 @@ func TestClaudeModelEnvVars(t *testing.T) {
|
|||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestClaudeRunCloudContextWindow(t *testing.T) {
|
||||
if runtime.GOOS == "windows" {
|
||||
t.Skip("uses a POSIX shell fake binary")
|
||||
}
|
||||
|
||||
dir := t.TempDir()
|
||||
output := filepath.Join(dir, "context")
|
||||
t.Setenv("PATH", dir)
|
||||
t.Setenv("CLAUDE_LAUNCH_TEST_OUTPUT", output)
|
||||
t.Setenv("CLAUDE_CODE_MAX_CONTEXT_TOKENS", "12345")
|
||||
t.Setenv("CLAUDE_CODE_AUTO_COMPACT_WINDOW", "150000")
|
||||
script := `#!/bin/sh
|
||||
printf '%s\n' "$CLAUDE_CODE_MAX_CONTEXT_TOKENS" "$CLAUDE_CODE_AUTO_COMPACT_WINDOW" > "$CLAUDE_LAUNCH_TEST_OUTPUT"
|
||||
`
|
||||
if err := os.WriteFile(filepath.Join(dir, "claude"), []byte(script), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
model LaunchModel
|
||||
want string
|
||||
}{
|
||||
{name: "cloud model absent from fallback table", model: LaunchModel{Name: "muse-spark-open:cloud", ContextLength: 1048576}, want: "1048576"},
|
||||
{name: "remote model without cloud suffix", model: LaunchModel{Name: "custom-cloud", Remote: true, ContextLength: 262144}, want: "262144"},
|
||||
{name: "local trained maximum is not the allocated context", model: LaunchModel{Name: "qwen3:8b", ContextLength: 131072}, want: "12345"},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
models := []LaunchModel{{Name: "other:cloud", ContextLength: 65536}, tt.model}
|
||||
if err := (&Claude{}).Run(tt.model.Name, models, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got, err := os.ReadFile(output)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if want := tt.want + "\n150000\n"; string(got) != want {
|
||||
t.Fatalf("child context settings = %q, want %q", got, want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue