mirror of
https://github.com/ollama/ollama.git
synced 2026-02-20 08:16:07 -05:00
948de6bbd2
* 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>
74 lines
2.1 KiB
Go
74 lines
2.1 KiB
Go
//go:build windows || darwin
|
|
|
|
package tools
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestEnsureCloudEnabledForTool(t *testing.T) {
|
|
const op = "web search is unavailable"
|
|
const disabledPrefix = "ollama cloud is disabled: web search is unavailable"
|
|
|
|
t.Run("enabled allows tool execution", func(t *testing.T) {
|
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if r.URL.Path != "/api/status" {
|
|
http.NotFound(w, r)
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "application/json")
|
|
_, _ = w.Write([]byte(`{"cloud":{"disabled":false,"source":"none"}}`))
|
|
}))
|
|
t.Cleanup(ts.Close)
|
|
t.Setenv("OLLAMA_HOST", ts.URL)
|
|
|
|
if err := ensureCloudEnabledForTool(context.Background(), op); err != nil {
|
|
t.Fatalf("expected nil error, got %v", err)
|
|
}
|
|
})
|
|
|
|
t.Run("disabled blocks tool execution", func(t *testing.T) {
|
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if r.URL.Path != "/api/status" {
|
|
http.NotFound(w, r)
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "application/json")
|
|
_, _ = w.Write([]byte(`{"cloud":{"disabled":true,"source":"config"}}`))
|
|
}))
|
|
t.Cleanup(ts.Close)
|
|
t.Setenv("OLLAMA_HOST", ts.URL)
|
|
|
|
err := ensureCloudEnabledForTool(context.Background(), op)
|
|
if err == nil {
|
|
t.Fatal("expected error, got nil")
|
|
}
|
|
if got := err.Error(); got != disabledPrefix {
|
|
t.Fatalf("unexpected error: %q", got)
|
|
}
|
|
})
|
|
|
|
t.Run("status unavailable fails closed", func(t *testing.T) {
|
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
http.NotFound(w, r)
|
|
}))
|
|
t.Cleanup(ts.Close)
|
|
t.Setenv("OLLAMA_HOST", ts.URL)
|
|
|
|
err := ensureCloudEnabledForTool(context.Background(), op)
|
|
if err == nil {
|
|
t.Fatal("expected error, got nil")
|
|
}
|
|
if got := err.Error(); !strings.Contains(got, disabledPrefix) {
|
|
t.Fatalf("expected disabled prefix, got %q", got)
|
|
}
|
|
if got := err.Error(); !strings.Contains(got, "unable to verify server cloud policy") {
|
|
t.Fatalf("expected verification failure detail, got %q", got)
|
|
}
|
|
})
|
|
}
|