[PR #2742] [MERGED] 0.2.2 #7875

Closed
opened 2025-11-11 17:38:58 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/2742
Author: @tjbck
Created: 6/3/2024
Status: Merged
Merged: 6/3/2024
Merged by: @tjbck

Base: mainHead: dev


📝 Commits (10+)

  • 24c35c3 fix: stream defaults to true, return request ID
  • 4dd51ba fix: ollama streaming cancellation using aiohttp
  • 7f74426 fix: openai streaming cancellation using aiohttp
  • b5b2b70 fix: bad payload refactor
  • c5ff4c2 Merge branch 'dev' into fix/ollama-cancellation
  • d9a3e4d Merge pull request #2731 from cheahjs/fix/ollama-cancellation
  • 32a61ea fix: pipelines
  • a9e5003 fix: filter outlet
  • 3d74c04 feat: mermaid rendering support
  • 814fbb7 feat: RESET_CONFIG_ON_START

📊 Changes

14 files changed (+1388 additions, -572 deletions)

View changed files

📝 CHANGELOG.md (+11 -0)
📝 backend/apps/ollama/main.py (+54 -347)
📝 backend/apps/openai/main.py (+29 -10)
📝 backend/config.py (+11 -0)
📝 backend/main.py (+10 -4)
📝 package-lock.json (+1117 -5)
📝 package.json (+2 -1)
📝 src/lib/apis/ollama/index.ts (+3 -22)
📝 src/lib/components/chat/Chat.svelte (+86 -115)
📝 src/lib/components/chat/Messages.svelte (+1 -2)
📝 src/lib/components/chat/Messages/ResponseMessage.svelte (+14 -5)
📝 src/lib/components/chat/ModelSelector/Selector.svelte (+21 -21)
📝 src/lib/components/chat/Settings/Models.svelte (+28 -27)
📝 src/lib/components/workspace/Playground.svelte (+1 -13)

📄 Description

No description provided


🔄 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/open-webui/open-webui/pull/2742 **Author:** [@tjbck](https://github.com/tjbck) **Created:** 6/3/2024 **Status:** ✅ Merged **Merged:** 6/3/2024 **Merged by:** [@tjbck](https://github.com/tjbck) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`24c35c3`](https://github.com/open-webui/open-webui/commit/24c35c308d75140717cab82a15a06d3fac55ab89) fix: stream defaults to true, return request ID - [`4dd51ba`](https://github.com/open-webui/open-webui/commit/4dd51badfe2be1a0a85b817a1325227e92938949) fix: ollama streaming cancellation using aiohttp - [`7f74426`](https://github.com/open-webui/open-webui/commit/7f74426a228d592cf4822eff94220547e0142e04) fix: openai streaming cancellation using aiohttp - [`b5b2b70`](https://github.com/open-webui/open-webui/commit/b5b2b70f4a4bc8e608f16e6c9febddaa2e110d84) fix: bad payload refactor - [`c5ff4c2`](https://github.com/open-webui/open-webui/commit/c5ff4c24e16737dd59e7fd63538a543d86b77da1) Merge branch 'dev' into fix/ollama-cancellation - [`d9a3e4d`](https://github.com/open-webui/open-webui/commit/d9a3e4db398bf93392b8e8ee60295de5bd5b3dfe) Merge pull request #2731 from cheahjs/fix/ollama-cancellation - [`32a61ea`](https://github.com/open-webui/open-webui/commit/32a61ea15d685efce2617be20553dfc5505df313) fix: pipelines - [`a9e5003`](https://github.com/open-webui/open-webui/commit/a9e5003c4f9a6e753bc297bd32868106dd154ca1) fix: filter outlet - [`3d74c04`](https://github.com/open-webui/open-webui/commit/3d74c04f5051bbd7d9e4278f821e4d28e77ca524) feat: mermaid rendering support - [`814fbb7`](https://github.com/open-webui/open-webui/commit/814fbb73f312bae289b11dfc0415eb491a04907b) feat: RESET_CONFIG_ON_START ### 📊 Changes **14 files changed** (+1388 additions, -572 deletions) <details> <summary>View changed files</summary> 📝 `CHANGELOG.md` (+11 -0) 📝 `backend/apps/ollama/main.py` (+54 -347) 📝 `backend/apps/openai/main.py` (+29 -10) 📝 `backend/config.py` (+11 -0) 📝 `backend/main.py` (+10 -4) 📝 `package-lock.json` (+1117 -5) 📝 `package.json` (+2 -1) 📝 `src/lib/apis/ollama/index.ts` (+3 -22) 📝 `src/lib/components/chat/Chat.svelte` (+86 -115) 📝 `src/lib/components/chat/Messages.svelte` (+1 -2) 📝 `src/lib/components/chat/Messages/ResponseMessage.svelte` (+14 -5) 📝 `src/lib/components/chat/ModelSelector/Selector.svelte` (+21 -21) 📝 `src/lib/components/chat/Settings/Models.svelte` (+28 -27) 📝 `src/lib/components/workspace/Playground.svelte` (+1 -13) </details> ### 📄 Description _No description provided_ --- <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 2025-11-11 17:38:58 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/open-webui#7875