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
main
dev
e1e66f7
4570f6f
dcb32f7
a615308
4e0b32b
db801ae
4a53648
29c6b25
53b277e
c0259aa
85 files changed (+4504 additions, -877 deletions)
📝 .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)
.eslintrc.cjs
.github/pull_request_template.md
.github/workflows/integration-test.yml
.gitignore
CHANGELOG.md
Dockerfile
Makefile
backend/apps/images/main.py
backend/apps/litellm/main.py
backend/apps/ollama/main.py
backend/apps/openai/main.py
backend/apps/rag/main.py
backend/apps/rag/utils.py
backend/apps/web/internal/db.py
backend/apps/web/internal/migrations/001_initial_schema.py
backend/apps/web/internal/migrations/005_add_updated_at.py
backend/apps/web/internal/migrations/006_migrate_timestamps_and_charfields.py
backend/apps/web/internal/migrations/007_add_user_last_active_at.py
backend/apps/web/models/auths.py
backend/apps/web/models/chats.py
...and 65 more files
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.
No dependencies set.
The note is not visible to the blocked user.
📋 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+)
e1e66f7Chose between "docker-compose" and "docker compose" in Makefile4570f6fChose between "docker-compose" and "docker compose" in confirm_remove.shdcb32f7Update pull_request_template.mda615308Update pull_request_template.md4e0b32bfeat: hybrid searchdb801aeMerge branch 'dev' into buroa/hybrid-search4a53648Update pull_request_template.md29c6b25Update pull_request_template.md53b277eUpdate pull_request_template.mdc0259aafeat: 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.