github-starred/open-webui
2
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-03-11 00:04:08 -05:00
Code Issues 308 Packages Projects Releases 100 Wiki Activity

[PR #1781] [MERGED] 0.1.122 #7571

New Issue
Closed
opened 2025-11-11 17:30:32 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-11 17:30:32 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/1781
Author: @tjbck
Created: 4/26/2024
Status: ✅ Merged
Merged: 4/28/2024
Merged by: @tjbck

Base: main ← Head: dev

📝 Commits (10+)

  • e1e66f7 Chose between "docker-compose" and "docker compose" in Makefile
  • 4570f6f Chose between "docker-compose" and "docker compose" in confirm_remove.sh
  • dcb32f7 Update pull_request_template.md
  • a615308 Update pull_request_template.md
  • 4e0b32b feat: hybrid search
  • db801ae Merge branch 'dev' into buroa/hybrid-search
  • 4a53648 Update pull_request_template.md
  • 29c6b25 Update pull_request_template.md
  • 53b277e Update pull_request_template.md
  • c0259aa feat: hybrid search and reranking support

📊 Changes

85 files changed (+4504 additions, -877 deletions)

View changed files

📝 .eslintrc.cjs (+1 -0)
📝 .github/pull_request_template.md (+24 -6)
➕ .github/workflows/integration-test.yml (+55 -0)
📝 .gitignore (+5 -1)
📝 CHANGELOG.md (+24 -0)
📝 Dockerfile (+9 -3)
📝 Makefile (+14 -8)
📝 backend/apps/images/main.py (+8 -4)
📝 backend/apps/litellm/main.py (+63 -42)
📝 backend/apps/ollama/main.py (+7 -4)
📝 backend/apps/openai/main.py (+3 -3)
📝 backend/apps/rag/main.py (+168 -100)
📝 backend/apps/rag/utils.py (+336 -77)
📝 backend/apps/web/internal/db.py (+5 -4)
📝 backend/apps/web/internal/migrations/001_initial_schema.py (+105 -0)
📝 backend/apps/web/internal/migrations/005_add_updated_at.py (+53 -0)
➕ backend/apps/web/internal/migrations/006_migrate_timestamps_and_charfields.py (+130 -0)
➕ backend/apps/web/internal/migrations/007_add_user_last_active_at.py (+79 -0)
📝 backend/apps/web/models/auths.py (+1 -1)
📝 backend/apps/web/models/chats.py (+26 -21)

...and 65 more files

📄 Description

Resolves #1800 #1793 #1759 #1750 #1747 #1740 #1721 #1556 #1397 #1176

🔄 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/1781 **Author:** [@tjbck](https://github.com/tjbck) **Created:** 4/26/2024 **Status:** ✅ Merged **Merged:** 4/28/2024 **Merged by:** [@tjbck](https://github.com/tjbck) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`e1e66f7`](https://github.com/open-webui/open-webui/commit/e1e66f708f595388b49af54f6765adf31b9a1d4d) Chose between "docker-compose" and "docker compose" in Makefile - [`4570f6f`](https://github.com/open-webui/open-webui/commit/4570f6fb0e0dac8b477b15696a6d447f7ddfe847) Chose between "docker-compose" and "docker compose" in confirm_remove.sh - [`dcb32f7`](https://github.com/open-webui/open-webui/commit/dcb32f78fe0a84100cb18879099e81f89a07a1ef) Update pull_request_template.md - [`a615308`](https://github.com/open-webui/open-webui/commit/a615308111a423e760a3d4dc5a6e9a90a0b36e1e) Update pull_request_template.md - [`4e0b32b`](https://github.com/open-webui/open-webui/commit/4e0b32b5052275829f254d81d7ceb38a06e64ad1) feat: hybrid search - [`db801ae`](https://github.com/open-webui/open-webui/commit/db801aee79382019f394ae039a8acfbef1b2e0f2) Merge branch 'dev' into buroa/hybrid-search - [`4a53648`](https://github.com/open-webui/open-webui/commit/4a536484a69dfed5aa040d9ed3998cf8b25132c8) Update pull_request_template.md - [`29c6b25`](https://github.com/open-webui/open-webui/commit/29c6b253ca28f57c9a74e717e78b15c06fc8d547) Update pull_request_template.md - [`53b277e`](https://github.com/open-webui/open-webui/commit/53b277e575f7d6b4a3481ba06bd6f5f52af5e634) Update pull_request_template.md - [`c0259aa`](https://github.com/open-webui/open-webui/commit/c0259aad67627de344e42d0f062b0a93d48ef41f) feat: hybrid search and reranking support ### 📊 Changes **85 files changed** (+4504 additions, -877 deletions) <details> <summary>View changed files</summary> 📝 `.eslintrc.cjs` (+1 -0) 📝 `.github/pull_request_template.md` (+24 -6) ➕ `.github/workflows/integration-test.yml` (+55 -0) 📝 `.gitignore` (+5 -1) 📝 `CHANGELOG.md` (+24 -0) 📝 `Dockerfile` (+9 -3) 📝 `Makefile` (+14 -8) 📝 `backend/apps/images/main.py` (+8 -4) 📝 `backend/apps/litellm/main.py` (+63 -42) 📝 `backend/apps/ollama/main.py` (+7 -4) 📝 `backend/apps/openai/main.py` (+3 -3) 📝 `backend/apps/rag/main.py` (+168 -100) 📝 `backend/apps/rag/utils.py` (+336 -77) 📝 `backend/apps/web/internal/db.py` (+5 -4) 📝 `backend/apps/web/internal/migrations/001_initial_schema.py` (+105 -0) 📝 `backend/apps/web/internal/migrations/005_add_updated_at.py` (+53 -0) ➕ `backend/apps/web/internal/migrations/006_migrate_timestamps_and_charfields.py` (+130 -0) ➕ `backend/apps/web/internal/migrations/007_add_user_last_active_at.py` (+79 -0) 📝 `backend/apps/web/models/auths.py` (+1 -1) 📝 `backend/apps/web/models/chats.py` (+26 -21) _...and 65 more files_ </details> ### 📄 Description Resolves #1800 #1793 #1759 #1750 #1747 #1740 #1721 #1556 #1397 #1176 --- <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:30:32 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
bug
core
documentation
enhancement
good first issue
help wanted
non-core
pull-request
Mirrored from GitHub Pull Request
 python
question
testing wanted
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/open-webui#7571
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?