mirror of
https://github.com/ollama/ollama.git
synced 2026-04-17 21:54:08 +02:00
* add ability to disable cloud
Users can now easily opt-out of cloud inference and web search by
setting
```
"disable_ollama_cloud": true
```
in their `~/.ollama/server.json` settings file. After a setting update,
the server must be restarted.
Alternatively, setting the environment variable `OLLAMA_NO_CLOUD=1` will
also disable cloud features. While users previously were able to avoid
cloud models by not pulling or `ollama run`ing them, this gives them an
easy way to enforce that decision. Any attempt to run a cloud model when
cloud is disabled will fail.
The app's old "airplane mode" setting, which did a similar thing for
hiding cloud models within the app is now unified with this new cloud
disabled mode. That setting has been replaced with a "Cloud" toggle,
which behind the scenes edits `server.json` and then restarts the
server.
* gate cloud models across TUI and launch flows when cloud is disabled
Block cloud models from being selected, launched, or written to
integration configs when cloud mode is turned off:
- TUI main menu: open model picker instead of launching with a
disabled cloud model
- cmd.go: add IsCloudModelDisabled checks for all Selection* paths
- LaunchCmd: filter cloud models from saved Editor configs before
launch, fall through to picker if none remain
- Editor Run() methods (droid, opencode, openclaw): filter cloud
models before calling Edit() and persist the cleaned list
- Export SaveIntegration, remove SaveIntegrationModel wrapper that
was accumulating models instead of replacing them
* rename saveIntegration to SaveIntegration in config.go and tests
* cmd/config: add --model guarding and empty model list fixes
* Update docs/faq.mdx
Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
* Update internal/cloud/policy.go
Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
* Update internal/cloud/policy.go
Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
* Update server/routes.go
Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
* Revert "Update internal/cloud/policy.go"
This reverts commit 8bff8615f9.
Since this error shows up in other integrations, we want it to be
prefixed with Ollama
* rename cloud status
* more status renaming
* fix tests that weren't updated after rename
---------
Co-authored-by: ParthSareen <parth.sareen@ollama.com>
Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
199 lines
5.7 KiB
Go
199 lines
5.7 KiB
Go
package config
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"runtime"
|
|
"slices"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestClaudeIntegration(t *testing.T) {
|
|
c := &Claude{}
|
|
|
|
t.Run("String", func(t *testing.T) {
|
|
if got := c.String(); got != "Claude Code" {
|
|
t.Errorf("String() = %q, want %q", got, "Claude Code")
|
|
}
|
|
})
|
|
|
|
t.Run("implements Runner", func(t *testing.T) {
|
|
var _ Runner = c
|
|
})
|
|
}
|
|
|
|
func TestClaudeFindPath(t *testing.T) {
|
|
c := &Claude{}
|
|
|
|
t.Run("finds claude in PATH", func(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
name := "claude"
|
|
if runtime.GOOS == "windows" {
|
|
name = "claude.exe"
|
|
}
|
|
fakeBin := filepath.Join(tmpDir, name)
|
|
os.WriteFile(fakeBin, []byte("#!/bin/sh\n"), 0o755)
|
|
t.Setenv("PATH", tmpDir)
|
|
|
|
got, err := c.findPath()
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if got != fakeBin {
|
|
t.Errorf("findPath() = %q, want %q", got, fakeBin)
|
|
}
|
|
})
|
|
|
|
t.Run("falls back to ~/.claude/local/claude", func(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
setTestHome(t, tmpDir)
|
|
t.Setenv("PATH", t.TempDir()) // empty dir, no claude binary
|
|
|
|
name := "claude"
|
|
if runtime.GOOS == "windows" {
|
|
name = "claude.exe"
|
|
}
|
|
fallback := filepath.Join(tmpDir, ".claude", "local", name)
|
|
os.MkdirAll(filepath.Dir(fallback), 0o755)
|
|
os.WriteFile(fallback, []byte("#!/bin/sh\n"), 0o755)
|
|
|
|
got, err := c.findPath()
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if got != fallback {
|
|
t.Errorf("findPath() = %q, want %q", got, fallback)
|
|
}
|
|
})
|
|
|
|
t.Run("returns error when neither PATH nor fallback exists", func(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
setTestHome(t, tmpDir)
|
|
t.Setenv("PATH", t.TempDir()) // empty dir, no claude binary
|
|
|
|
_, err := c.findPath()
|
|
if err == nil {
|
|
t.Fatal("expected error, got nil")
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestClaudeArgs(t *testing.T) {
|
|
c := &Claude{}
|
|
|
|
tests := []struct {
|
|
name string
|
|
model string
|
|
args []string
|
|
want []string
|
|
}{
|
|
{"with model", "llama3.2", nil, []string{"--model", "llama3.2"}},
|
|
{"empty model", "", nil, nil},
|
|
{"with model and verbose", "llama3.2", []string{"--verbose"}, []string{"--model", "llama3.2", "--verbose"}},
|
|
{"empty model with help", "", []string{"--help"}, []string{"--help"}},
|
|
{"with allowed tools", "llama3.2", []string{"--allowedTools", "Read,Write,Bash"}, []string{"--model", "llama3.2", "--allowedTools", "Read,Write,Bash"}},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got := c.args(tt.model, tt.args)
|
|
if !slices.Equal(got, tt.want) {
|
|
t.Errorf("args(%q, %v) = %v, want %v", tt.model, tt.args, got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestClaudeModelEnvVars(t *testing.T) {
|
|
c := &Claude{}
|
|
|
|
envMap := func(envs []string) map[string]string {
|
|
m := make(map[string]string)
|
|
for _, e := range envs {
|
|
k, v, _ := strings.Cut(e, "=")
|
|
m[k] = v
|
|
}
|
|
return m
|
|
}
|
|
|
|
t.Run("falls back to model param when no aliases saved", func(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
setTestHome(t, tmpDir)
|
|
|
|
got := envMap(c.modelEnvVars("llama3.2"))
|
|
if got["ANTHROPIC_DEFAULT_OPUS_MODEL"] != "llama3.2" {
|
|
t.Errorf("OPUS = %q, want llama3.2", got["ANTHROPIC_DEFAULT_OPUS_MODEL"])
|
|
}
|
|
if got["ANTHROPIC_DEFAULT_SONNET_MODEL"] != "llama3.2" {
|
|
t.Errorf("SONNET = %q, want llama3.2", got["ANTHROPIC_DEFAULT_SONNET_MODEL"])
|
|
}
|
|
if got["ANTHROPIC_DEFAULT_HAIKU_MODEL"] != "llama3.2" {
|
|
t.Errorf("HAIKU = %q, want llama3.2", got["ANTHROPIC_DEFAULT_HAIKU_MODEL"])
|
|
}
|
|
if got["CLAUDE_CODE_SUBAGENT_MODEL"] != "llama3.2" {
|
|
t.Errorf("SUBAGENT = %q, want llama3.2", got["CLAUDE_CODE_SUBAGENT_MODEL"])
|
|
}
|
|
})
|
|
|
|
t.Run("uses primary alias for opus sonnet and subagent", func(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
setTestHome(t, tmpDir)
|
|
|
|
SaveIntegration("claude", []string{"qwen3:8b"})
|
|
saveAliases("claude", map[string]string{"primary": "qwen3:8b"})
|
|
|
|
got := envMap(c.modelEnvVars("qwen3:8b"))
|
|
if got["ANTHROPIC_DEFAULT_OPUS_MODEL"] != "qwen3:8b" {
|
|
t.Errorf("OPUS = %q, want qwen3:8b", got["ANTHROPIC_DEFAULT_OPUS_MODEL"])
|
|
}
|
|
if got["ANTHROPIC_DEFAULT_SONNET_MODEL"] != "qwen3:8b" {
|
|
t.Errorf("SONNET = %q, want qwen3:8b", got["ANTHROPIC_DEFAULT_SONNET_MODEL"])
|
|
}
|
|
if got["ANTHROPIC_DEFAULT_HAIKU_MODEL"] != "qwen3:8b" {
|
|
t.Errorf("HAIKU = %q, want qwen3:8b (no fast alias)", got["ANTHROPIC_DEFAULT_HAIKU_MODEL"])
|
|
}
|
|
if got["CLAUDE_CODE_SUBAGENT_MODEL"] != "qwen3:8b" {
|
|
t.Errorf("SUBAGENT = %q, want qwen3:8b", got["CLAUDE_CODE_SUBAGENT_MODEL"])
|
|
}
|
|
})
|
|
|
|
t.Run("uses fast alias for haiku", func(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
setTestHome(t, tmpDir)
|
|
|
|
SaveIntegration("claude", []string{"llama3.2:70b"})
|
|
saveAliases("claude", map[string]string{
|
|
"primary": "llama3.2:70b",
|
|
"fast": "llama3.2:8b",
|
|
})
|
|
|
|
got := envMap(c.modelEnvVars("llama3.2:70b"))
|
|
if got["ANTHROPIC_DEFAULT_OPUS_MODEL"] != "llama3.2:70b" {
|
|
t.Errorf("OPUS = %q, want llama3.2:70b", got["ANTHROPIC_DEFAULT_OPUS_MODEL"])
|
|
}
|
|
if got["ANTHROPIC_DEFAULT_SONNET_MODEL"] != "llama3.2:70b" {
|
|
t.Errorf("SONNET = %q, want llama3.2:70b", got["ANTHROPIC_DEFAULT_SONNET_MODEL"])
|
|
}
|
|
if got["ANTHROPIC_DEFAULT_HAIKU_MODEL"] != "llama3.2:8b" {
|
|
t.Errorf("HAIKU = %q, want llama3.2:8b", got["ANTHROPIC_DEFAULT_HAIKU_MODEL"])
|
|
}
|
|
if got["CLAUDE_CODE_SUBAGENT_MODEL"] != "llama3.2:70b" {
|
|
t.Errorf("SUBAGENT = %q, want llama3.2:70b", got["CLAUDE_CODE_SUBAGENT_MODEL"])
|
|
}
|
|
})
|
|
|
|
t.Run("alias primary overrides model param", func(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
setTestHome(t, tmpDir)
|
|
|
|
SaveIntegration("claude", []string{"saved-model"})
|
|
saveAliases("claude", map[string]string{"primary": "saved-model"})
|
|
|
|
got := envMap(c.modelEnvVars("different-model"))
|
|
if got["ANTHROPIC_DEFAULT_OPUS_MODEL"] != "saved-model" {
|
|
t.Errorf("OPUS = %q, want saved-model", got["ANTHROPIC_DEFAULT_OPUS_MODEL"])
|
|
}
|
|
})
|
|
}
|