mirror of
https://github.com/ollama/ollama.git
synced 2026-03-08 23:04:13 -05: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>
476 lines
13 KiB
Go
476 lines
13 KiB
Go
package server
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
"github.com/ollama/ollama/api"
|
|
"github.com/ollama/ollama/types/model"
|
|
)
|
|
|
|
func TestAliasShadowingRejected(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
setTestHome(t, t.TempDir())
|
|
|
|
s := Server{}
|
|
w := createRequest(t, s.CreateHandler, api.CreateRequest{
|
|
Model: "shadowed-model",
|
|
RemoteHost: "example.com",
|
|
From: "test",
|
|
Info: map[string]any{
|
|
"capabilities": []string{"completion"},
|
|
},
|
|
Stream: &stream,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d", w.Code)
|
|
}
|
|
|
|
w = createRequest(t, s.CreateAliasHandler, aliasEntry{Alias: "shadowed-model", Target: "other-model"})
|
|
if w.Code != http.StatusBadRequest {
|
|
t.Fatalf("expected status 400, got %d", w.Code)
|
|
}
|
|
}
|
|
|
|
func TestAliasResolvesForChatRemote(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
setTestHome(t, t.TempDir())
|
|
|
|
var remoteModel string
|
|
rs := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
var req api.ChatRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
remoteModel = req.Model
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
resp := api.ChatResponse{
|
|
Model: req.Model,
|
|
Done: true,
|
|
DoneReason: "load",
|
|
}
|
|
if err := json.NewEncoder(w).Encode(&resp); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}))
|
|
defer rs.Close()
|
|
|
|
p, err := url.Parse(rs.URL)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
t.Setenv("OLLAMA_REMOTES", p.Hostname())
|
|
|
|
s := Server{}
|
|
w := createRequest(t, s.CreateHandler, api.CreateRequest{
|
|
Model: "target-model",
|
|
RemoteHost: rs.URL,
|
|
From: "test",
|
|
Info: map[string]any{
|
|
"capabilities": []string{"completion"},
|
|
},
|
|
Stream: &stream,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d", w.Code)
|
|
}
|
|
|
|
w = createRequest(t, s.CreateAliasHandler, aliasEntry{Alias: "alias-model", Target: "target-model"})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d", w.Code)
|
|
}
|
|
|
|
w = createRequest(t, s.ChatHandler, api.ChatRequest{
|
|
Model: "alias-model",
|
|
Messages: []api.Message{{Role: "user", Content: "hi"}},
|
|
Stream: &stream,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d", w.Code)
|
|
}
|
|
|
|
var resp api.ChatResponse
|
|
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if resp.Model != "alias-model" {
|
|
t.Fatalf("expected response model to be alias-model, got %q", resp.Model)
|
|
}
|
|
|
|
if remoteModel != "test" {
|
|
t.Fatalf("expected remote model to be 'test', got %q", remoteModel)
|
|
}
|
|
}
|
|
|
|
func TestPrefixAliasBasicMatching(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
store, err := createStore(filepath.Join(tmpDir, "server.json"))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create a prefix alias: "myprefix-" -> "targetmodel"
|
|
targetName := model.ParseName("targetmodel")
|
|
|
|
// Set a prefix alias (using "myprefix-" as the pattern)
|
|
store.mu.Lock()
|
|
store.prefixEntries = append(store.prefixEntries, aliasEntry{
|
|
Alias: "myprefix-",
|
|
Target: "targetmodel",
|
|
PrefixMatching: true,
|
|
})
|
|
store.mu.Unlock()
|
|
|
|
// Test that "myprefix-foo" resolves to "targetmodel"
|
|
testName := model.ParseName("myprefix-foo")
|
|
resolved, wasResolved, err := store.ResolveName(testName)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected name to be resolved")
|
|
}
|
|
if resolved.DisplayShortest() != targetName.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be %q, got %q", targetName.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
|
|
// Test that "otherprefix-foo" does not resolve
|
|
otherName := model.ParseName("otherprefix-foo")
|
|
_, wasResolved, err = store.ResolveName(otherName)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if wasResolved {
|
|
t.Fatal("expected name not to be resolved")
|
|
}
|
|
|
|
// Test that exact alias takes precedence
|
|
exactAlias := model.ParseName("myprefix-exact")
|
|
exactTarget := model.ParseName("exacttarget")
|
|
if err := store.Set(exactAlias, exactTarget, false); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
resolved, wasResolved, err = store.ResolveName(exactAlias)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected name to be resolved")
|
|
}
|
|
if resolved.DisplayShortest() != exactTarget.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be %q (exact match), got %q", exactTarget.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
}
|
|
|
|
func TestPrefixAliasLongestMatchWins(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
store, err := createStore(filepath.Join(tmpDir, "server.json"))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Add two prefix aliases with overlapping patterns
|
|
store.mu.Lock()
|
|
store.prefixEntries = []aliasEntry{
|
|
{Alias: "abc-", Target: "short-target", PrefixMatching: true},
|
|
{Alias: "abc-def-", Target: "long-target", PrefixMatching: true},
|
|
}
|
|
store.sortPrefixEntriesLocked()
|
|
store.mu.Unlock()
|
|
|
|
// "abc-def-ghi" should match the longer prefix "abc-def-"
|
|
testName := model.ParseName("abc-def-ghi")
|
|
resolved, wasResolved, err := store.ResolveName(testName)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected name to be resolved")
|
|
}
|
|
expectedLongTarget := model.ParseName("long-target")
|
|
if resolved.DisplayShortest() != expectedLongTarget.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be %q (longest prefix match), got %q", expectedLongTarget.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
|
|
// "abc-xyz" should match the shorter prefix "abc-"
|
|
testName2 := model.ParseName("abc-xyz")
|
|
resolved, wasResolved, err = store.ResolveName(testName2)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected name to be resolved")
|
|
}
|
|
expectedShortTarget := model.ParseName("short-target")
|
|
if resolved.DisplayShortest() != expectedShortTarget.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be %q, got %q", expectedShortTarget.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
}
|
|
|
|
func TestPrefixAliasChain(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
store, err := createStore(filepath.Join(tmpDir, "server.json"))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create a chain: prefix "test-" -> "intermediate" -> "final"
|
|
intermediate := model.ParseName("intermediate")
|
|
final := model.ParseName("final")
|
|
|
|
// Add prefix alias
|
|
store.mu.Lock()
|
|
store.prefixEntries = []aliasEntry{
|
|
{Alias: "test-", Target: "intermediate", PrefixMatching: true},
|
|
}
|
|
store.mu.Unlock()
|
|
|
|
// Add exact alias for the intermediate step
|
|
if err := store.Set(intermediate, final, false); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// "test-foo" should resolve through the chain to "final"
|
|
testName := model.ParseName("test-foo")
|
|
resolved, wasResolved, err := store.ResolveName(testName)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected name to be resolved")
|
|
}
|
|
if resolved.DisplayShortest() != final.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be %q, got %q", final.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
}
|
|
|
|
func TestPrefixAliasCRUD(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
setTestHome(t, t.TempDir())
|
|
|
|
s := Server{}
|
|
|
|
// Create a prefix alias via API
|
|
w := createRequest(t, s.CreateAliasHandler, aliasEntry{
|
|
Alias: "myprefix-",
|
|
Target: "llama2",
|
|
PrefixMatching: true,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
var createResp aliasEntry
|
|
if err := json.NewDecoder(w.Body).Decode(&createResp); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !createResp.PrefixMatching {
|
|
t.Fatal("expected prefix_matching to be true in response")
|
|
}
|
|
|
|
// List aliases and verify the prefix alias is included
|
|
w = createRequest(t, s.ListAliasesHandler, nil)
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d", w.Code)
|
|
}
|
|
|
|
var listResp aliasListResponse
|
|
if err := json.NewDecoder(w.Body).Decode(&listResp); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
found := false
|
|
for _, a := range listResp.Aliases {
|
|
if a.PrefixMatching && a.Target == "llama2" {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
t.Fatal("expected to find prefix alias in list")
|
|
}
|
|
|
|
// Delete the prefix alias
|
|
w = createRequest(t, s.DeleteAliasHandler, aliasDeleteRequest{Alias: "myprefix-"})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
// Verify it's deleted
|
|
w = createRequest(t, s.ListAliasesHandler, nil)
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d", w.Code)
|
|
}
|
|
|
|
if err := json.NewDecoder(w.Body).Decode(&listResp); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
for _, a := range listResp.Aliases {
|
|
if a.PrefixMatching {
|
|
t.Fatal("expected prefix alias to be deleted")
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPrefixAliasCaseInsensitive(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
store, err := createStore(filepath.Join(tmpDir, "server.json"))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Add a prefix alias with mixed case
|
|
store.mu.Lock()
|
|
store.prefixEntries = []aliasEntry{
|
|
{Alias: "MyPrefix-", Target: "targetmodel", PrefixMatching: true},
|
|
}
|
|
store.mu.Unlock()
|
|
|
|
// Test that matching is case-insensitive
|
|
testName := model.ParseName("myprefix-foo")
|
|
resolved, wasResolved, err := store.ResolveName(testName)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected name to be resolved (case-insensitive)")
|
|
}
|
|
expectedTarget := model.ParseName("targetmodel")
|
|
if resolved.DisplayShortest() != expectedTarget.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be %q, got %q", expectedTarget.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
|
|
// Test uppercase request
|
|
testName2 := model.ParseName("MYPREFIX-BAR")
|
|
_, wasResolved, err = store.ResolveName(testName2)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected name to be resolved (uppercase)")
|
|
}
|
|
}
|
|
|
|
func TestPrefixAliasLocalModelPrecedence(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
setTestHome(t, t.TempDir())
|
|
|
|
s := Server{}
|
|
|
|
// Create a local model that would match a prefix alias
|
|
w := createRequest(t, s.CreateHandler, api.CreateRequest{
|
|
Model: "myprefix-localmodel",
|
|
RemoteHost: "example.com",
|
|
From: "test",
|
|
Info: map[string]any{
|
|
"capabilities": []string{"completion"},
|
|
},
|
|
Stream: &stream,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
// Create a prefix alias that would match the local model name
|
|
w = createRequest(t, s.CreateAliasHandler, aliasEntry{
|
|
Alias: "myprefix-",
|
|
Target: "someothermodel",
|
|
PrefixMatching: true,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
// Verify that resolving "myprefix-localmodel" returns the local model, not the alias target
|
|
store, err := s.aliasStore()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
localModelName := model.ParseName("myprefix-localmodel")
|
|
resolved, wasResolved, err := store.ResolveName(localModelName)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if wasResolved {
|
|
t.Fatalf("expected local model to take precedence (wasResolved should be false), but got resolved to %q", resolved.DisplayShortest())
|
|
}
|
|
if resolved.DisplayShortest() != localModelName.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be local model %q, got %q", localModelName.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
|
|
// Also verify that a non-local model matching the prefix DOES resolve to the alias target
|
|
nonLocalName := model.ParseName("myprefix-nonexistent")
|
|
resolved, wasResolved, err = store.ResolveName(nonLocalName)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if !wasResolved {
|
|
t.Fatal("expected non-local model to resolve via prefix alias")
|
|
}
|
|
expectedTarget := model.ParseName("someothermodel")
|
|
if resolved.DisplayShortest() != expectedTarget.DisplayShortest() {
|
|
t.Fatalf("expected resolved name to be %q, got %q", expectedTarget.DisplayShortest(), resolved.DisplayShortest())
|
|
}
|
|
}
|
|
|
|
func TestAliasSavePreservesCloudDisable(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
tmpDir := t.TempDir()
|
|
setTestHome(t, tmpDir)
|
|
|
|
configPath := filepath.Join(tmpDir, ".ollama", "server.json")
|
|
if err := os.MkdirAll(filepath.Dir(configPath), 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
initial := map[string]any{
|
|
"version": serverConfigVersion,
|
|
"disable_ollama_cloud": true,
|
|
"aliases": []aliasEntry{},
|
|
}
|
|
data, err := json.Marshal(initial)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(configPath, data, 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
s := Server{}
|
|
w := createRequest(t, s.CreateAliasHandler, aliasEntry{Alias: "alias-model", Target: "target-model"})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("expected status 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
updated, err := os.ReadFile(configPath)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
var updatedCfg map[string]json.RawMessage
|
|
if err := json.Unmarshal(updated, &updatedCfg); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
raw, ok := updatedCfg["disable_ollama_cloud"]
|
|
if !ok {
|
|
t.Fatal("expected disable_ollama_cloud key to be preserved")
|
|
}
|
|
if string(raw) != "true" {
|
|
t.Fatalf("expected disable_ollama_cloud to remain true, got %s", string(raw))
|
|
}
|
|
}
|