github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-07 08:30:05 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #14221] [MERGED] add ability to disable cloud #25117

New Issue
Closed
opened 2026-04-19 18:00:35 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-19 18:00:35 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/14221
Author: @drifkin
Created: 2/12/2026
Status: ✅ Merged
Merged: 2/12/2026
Merged by: @drifkin

Base: main ← Head: drifkin/cloud-opt-out

📝 Commits (10+)

  • ded40c4 add ability to disable cloud
  • 839fe6b gate cloud models across TUI and launch flows when cloud is disabled
  • 34ef4b9 rename saveIntegration to SaveIntegration in config.go and tests
  • 059cd8c cmd/config: add --model guarding and empty model list fixes
  • a051cce Update docs/faq.mdx
  • 8bff861 Update internal/cloud/policy.go
  • 106f67d Update internal/cloud/policy.go
  • aec67f5 Update server/routes.go
  • 964fd11 Revert "Update internal/cloud/policy.go"
  • e125964 rename cloud status

📊 Changes

56 files changed (+2026 additions, -155 deletions)

View changed files

📝 api/client.go (+10 -0)
📝 api/types.go (+10 -0)
📝 app/server/server.go (+10 -0)
📝 app/server/server_test.go (+71 -2)
➕ app/store/cloud_config.go (+128 -0)
➕ app/store/cloud_config_test.go (+130 -0)
📝 app/store/database.go (+53 -5)
📝 app/store/migration_test.go (+59 -0)
📝 app/store/store.go (+34 -3)
➕ app/store/test_home_test.go (+11 -0)
➕ app/tools/cloud_policy.go (+35 -0)
➕ app/tools/cloud_policy_test.go (+73 -0)
📝 app/tools/web_fetch.go (+4 -0)
📝 app/tools/web_search.go (+4 -0)
📝 app/ui/app/codegen/gotypes.gen.ts (+0 -2)
📝 app/ui/app/src/api.ts (+41 -0)
📝 app/ui/app/src/components/ChatForm.tsx (+24 -10)
📝 app/ui/app/src/components/ModelPicker.tsx (+6 -6)
📝 app/ui/app/src/components/Settings.tsx (+91 -32)
📝 app/ui/app/src/hooks/useChats.ts (+3 -5)

...and 36 more files

📄 Description

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 runing 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.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/14221 **Author:** [@drifkin](https://github.com/drifkin) **Created:** 2/12/2026 **Status:** ✅ Merged **Merged:** 2/12/2026 **Merged by:** [@drifkin](https://github.com/drifkin) **Base:** `main` ← **Head:** `drifkin/cloud-opt-out` --- ### 📝 Commits (10+) - [`ded40c4`](https://github.com/ollama/ollama/commit/ded40c498528b1515e46cbdf9c9f4289ecc147ff) add ability to disable cloud - [`839fe6b`](https://github.com/ollama/ollama/commit/839fe6b098385d8f2b36ac27737e5277a7deeb9b) gate cloud models across TUI and launch flows when cloud is disabled - [`34ef4b9`](https://github.com/ollama/ollama/commit/34ef4b904c8aabf812c6c65ef4ec391848b9827b) rename saveIntegration to SaveIntegration in config.go and tests - [`059cd8c`](https://github.com/ollama/ollama/commit/059cd8cf0574c1c8943053f75ecb89c572fd194b) cmd/config: add --model guarding and empty model list fixes - [`a051cce`](https://github.com/ollama/ollama/commit/a051ccedcdcb813297777474cdc8c8c23e25cf0c) Update docs/faq.mdx - [`8bff861`](https://github.com/ollama/ollama/commit/8bff8615f9b5751fc5c0d1273b07c9de651e07f9) Update internal/cloud/policy.go - [`106f67d`](https://github.com/ollama/ollama/commit/106f67d11dc5106f098809444cd7d80ddce4dc44) Update internal/cloud/policy.go - [`aec67f5`](https://github.com/ollama/ollama/commit/aec67f555cf185babc1156ba5a91683cbbc06a3b) Update server/routes.go - [`964fd11`](https://github.com/ollama/ollama/commit/964fd11590e2a15d472aa518b3bf07d7ecbbddf6) Revert "Update internal/cloud/policy.go" - [`e125964`](https://github.com/ollama/ollama/commit/e125964e7683a8a2bf007bfe821286edd10e486d) rename cloud status ### 📊 Changes **56 files changed** (+2026 additions, -155 deletions) <details> <summary>View changed files</summary> 📝 `api/client.go` (+10 -0) 📝 `api/types.go` (+10 -0) 📝 `app/server/server.go` (+10 -0) 📝 `app/server/server_test.go` (+71 -2) ➕ `app/store/cloud_config.go` (+128 -0) ➕ `app/store/cloud_config_test.go` (+130 -0) 📝 `app/store/database.go` (+53 -5) 📝 `app/store/migration_test.go` (+59 -0) 📝 `app/store/store.go` (+34 -3) ➕ `app/store/test_home_test.go` (+11 -0) ➕ `app/tools/cloud_policy.go` (+35 -0) ➕ `app/tools/cloud_policy_test.go` (+73 -0) 📝 `app/tools/web_fetch.go` (+4 -0) 📝 `app/tools/web_search.go` (+4 -0) 📝 `app/ui/app/codegen/gotypes.gen.ts` (+0 -2) 📝 `app/ui/app/src/api.ts` (+41 -0) 📝 `app/ui/app/src/components/ChatForm.tsx` (+24 -10) 📝 `app/ui/app/src/components/ModelPicker.tsx` (+6 -6) 📝 `app/ui/app/src/components/Settings.tsx` (+91 -32) 📝 `app/ui/app/src/hooks/useChats.ts` (+3 -5) _...and 36 more files_ </details> ### 📄 Description 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. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-19 18:00:35 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#25117
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?