[PR #12924] [CLOSED] Merge newest version #9848

Closed
opened 2025-11-11 18:33:13 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/12924
Author: @aidenpearce001
Created: 4/16/2025
Status: Closed

Base: devHead: main


📝 Commits (10+)

  • cc777ac rate limit control
  • 9544392 remove unnecessary change
  • 8ce0c64 remove unnecessary change
  • 6c98a52 remove unnecessary change
  • c72572e add feature flag + get token usage for ollama
  • 952e4db update docker-compose build
  • ecf57db Merge pull request #1 from ail-agency/token-limit-control
  • 5d52067 parent document
  • 64923d3 Merge branch 'threat-core' into feat/parent-document
  • efc8aff parent retriever

📊 Changes

96 files changed (+1703 additions, -377 deletions)

View changed files

📝 .env.example (+26 -10)
📝 Dockerfile (+10 -0)
📝 README.md (+3 -3)
📝 backend/open_webui/config.py (+20 -0)
backend/open_webui/decorators/rate_limit.py (+38 -0)
📝 backend/open_webui/env.py (+7 -3)
backend/open_webui/internal/redis.py (+40 -0)
📝 backend/open_webui/main.py (+11 -1)
backend/open_webui/migrations/versions/39eda5e01911_create_document_table.py (+36 -0)
backend/open_webui/migrations/versions/76be63986ba6_add_rate_limit_to_user.py (+31 -0)
backend/open_webui/models/documents.py (+146 -0)
📝 backend/open_webui/models/users.py (+8 -0)
📝 backend/open_webui/retrieval/loaders/main.py (+7 -2)
backend/open_webui/retrieval/models/jina_remote.py (+60 -0)
📝 backend/open_webui/retrieval/utils.py (+186 -95)
📝 backend/open_webui/retrieval/vector/dbs/chroma.py (+22 -0)
📝 backend/open_webui/retrieval/vector/dbs/qdrant.py (+287 -56)
📝 backend/open_webui/retrieval/vector/main.py (+1 -0)
📝 backend/open_webui/routers/knowledge.py (+10 -0)
📝 backend/open_webui/routers/retrieval.py (+139 -19)

...and 76 more files

📄 Description

Pull Request Checklist

Note to first-time contributors: Please open a discussion post in Discussions and describe your changes before submitting a pull request.

Before submitting, make sure you've checked the following:

  • Target branch: Please verify that the pull request targets the dev branch.
  • Description: Provide a concise description of the changes made in this pull request.
  • Changelog: Ensure a changelog entry following the format of Keep a Changelog is added at the bottom of the PR description.
  • Documentation: Have you updated relevant documentation Open WebUI Docs, or other documentation sources?
  • Dependencies: Are there any new dependencies? Have you updated the dependency versions in the documentation?
  • Testing: Have you written and run sufficient tests to validate the changes?
  • Code review: Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards?
  • Prefix: To clearly categorize this pull request, prefix the pull request title using one of the following:
    • BREAKING CHANGE: Significant changes that may affect compatibility
    • build: Changes that affect the build system or external dependencies
    • ci: Changes to our continuous integration processes or workflows
    • chore: Refactor, cleanup, or other non-functional code changes
    • docs: Documentation update or addition
    • feat: Introduces a new feature or enhancement to the codebase
    • fix: Bug fix or error correction
    • i18n: Internationalization or localization changes
    • perf: Performance improvement
    • refactor: Code restructuring for better maintainability, readability, or scalability
    • style: Changes that do not affect the meaning of the code (white space, formatting, missing semi-colons, etc.)
    • test: Adding missing tests or correcting existing tests
    • WIP: Work in progress, a temporary label for incomplete or ongoing work

Changelog Entry

Description

  • [Concisely describe the changes made in this pull request, including any relevant motivation and impact (e.g., fixing a bug, adding a feature, or improving performance)]

Added

  • [List any new features, functionalities, or additions]

Changed

  • [List any changes, updates, refactorings, or optimizations]

Deprecated

  • [List any deprecated functionality or features that have been removed]

Removed

  • [List any removed features, files, or functionalities]

Fixed

  • [List any fixes, corrections, or bug fixes]

Security

  • [List any new or updated security-related changes, including vulnerability fixes]

Breaking Changes

  • BREAKING CHANGE: [List any breaking changes affecting compatibility or functionality]

Additional Information

  • [Insert any additional context, notes, or explanations for the changes]
    • [Reference any related issues, commits, or other relevant information]

Screenshots or Videos

  • [Attach any relevant screenshots or videos demonstrating the changes]

🔄 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/12924 **Author:** [@aidenpearce001](https://github.com/aidenpearce001) **Created:** 4/16/2025 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `main` --- ### 📝 Commits (10+) - [`cc777ac`](https://github.com/open-webui/open-webui/commit/cc777ac630bb3b6785c2df51dae7a7e907c31b66) rate limit control - [`9544392`](https://github.com/open-webui/open-webui/commit/9544392984e4745741aefe887835be3f6835aaf6) remove unnecessary change - [`8ce0c64`](https://github.com/open-webui/open-webui/commit/8ce0c64af378d22ea1fed52df82aa99e797a37e2) remove unnecessary change - [`6c98a52`](https://github.com/open-webui/open-webui/commit/6c98a527160d3a3e2ce9b49affa04143b6fc4ece) remove unnecessary change - [`c72572e`](https://github.com/open-webui/open-webui/commit/c72572e471613e942f9a937da833b180e49cb4f7) add feature flag + get token usage for ollama - [`952e4db`](https://github.com/open-webui/open-webui/commit/952e4dbfd4e2cb0a0ca711f33f020751e8f0f607) update docker-compose build - [`ecf57db`](https://github.com/open-webui/open-webui/commit/ecf57dbc20ff96131eab85c1706b07a4a50af086) Merge pull request #1 from ail-agency/token-limit-control - [`5d52067`](https://github.com/open-webui/open-webui/commit/5d52067c4ece632e09b61452d83c1537df906391) parent document - [`64923d3`](https://github.com/open-webui/open-webui/commit/64923d303d843899f5cc873ec68ef934e01f1b87) Merge branch 'threat-core' into feat/parent-document - [`efc8aff`](https://github.com/open-webui/open-webui/commit/efc8aff1b90386fc6192a1177e733b577af4eb8d) parent retriever ### 📊 Changes **96 files changed** (+1703 additions, -377 deletions) <details> <summary>View changed files</summary> 📝 `.env.example` (+26 -10) 📝 `Dockerfile` (+10 -0) 📝 `README.md` (+3 -3) 📝 `backend/open_webui/config.py` (+20 -0) ➕ `backend/open_webui/decorators/rate_limit.py` (+38 -0) 📝 `backend/open_webui/env.py` (+7 -3) ➕ `backend/open_webui/internal/redis.py` (+40 -0) 📝 `backend/open_webui/main.py` (+11 -1) ➕ `backend/open_webui/migrations/versions/39eda5e01911_create_document_table.py` (+36 -0) ➕ `backend/open_webui/migrations/versions/76be63986ba6_add_rate_limit_to_user.py` (+31 -0) ➕ `backend/open_webui/models/documents.py` (+146 -0) 📝 `backend/open_webui/models/users.py` (+8 -0) 📝 `backend/open_webui/retrieval/loaders/main.py` (+7 -2) ➕ `backend/open_webui/retrieval/models/jina_remote.py` (+60 -0) 📝 `backend/open_webui/retrieval/utils.py` (+186 -95) 📝 `backend/open_webui/retrieval/vector/dbs/chroma.py` (+22 -0) 📝 `backend/open_webui/retrieval/vector/dbs/qdrant.py` (+287 -56) 📝 `backend/open_webui/retrieval/vector/main.py` (+1 -0) 📝 `backend/open_webui/routers/knowledge.py` (+10 -0) 📝 `backend/open_webui/routers/retrieval.py` (+139 -19) _...and 76 more files_ </details> ### 📄 Description # Pull Request Checklist ### Note to first-time contributors: Please open a discussion post in [Discussions](https://github.com/open-webui/open-webui/discussions) and describe your changes before submitting a pull request. **Before submitting, make sure you've checked the following:** - [ ] **Target branch:** Please verify that the pull request targets the `dev` branch. - [ ] **Description:** Provide a concise description of the changes made in this pull request. - [ ] **Changelog:** Ensure a changelog entry following the format of [Keep a Changelog](https://keepachangelog.com/) is added at the bottom of the PR description. - [ ] **Documentation:** Have you updated relevant documentation [Open WebUI Docs](https://github.com/open-webui/docs), or other documentation sources? - [ ] **Dependencies:** Are there any new dependencies? Have you updated the dependency versions in the documentation? - [ ] **Testing:** Have you written and run sufficient tests to validate the changes? - [ ] **Code review:** Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards? - [ ] **Prefix:** To clearly categorize this pull request, prefix the pull request title using one of the following: - **BREAKING CHANGE**: Significant changes that may affect compatibility - **build**: Changes that affect the build system or external dependencies - **ci**: Changes to our continuous integration processes or workflows - **chore**: Refactor, cleanup, or other non-functional code changes - **docs**: Documentation update or addition - **feat**: Introduces a new feature or enhancement to the codebase - **fix**: Bug fix or error correction - **i18n**: Internationalization or localization changes - **perf**: Performance improvement - **refactor**: Code restructuring for better maintainability, readability, or scalability - **style**: Changes that do not affect the meaning of the code (white space, formatting, missing semi-colons, etc.) - **test**: Adding missing tests or correcting existing tests - **WIP**: Work in progress, a temporary label for incomplete or ongoing work # Changelog Entry ### Description - [Concisely describe the changes made in this pull request, including any relevant motivation and impact (e.g., fixing a bug, adding a feature, or improving performance)] ### Added - [List any new features, functionalities, or additions] ### Changed - [List any changes, updates, refactorings, or optimizations] ### Deprecated - [List any deprecated functionality or features that have been removed] ### Removed - [List any removed features, files, or functionalities] ### Fixed - [List any fixes, corrections, or bug fixes] ### Security - [List any new or updated security-related changes, including vulnerability fixes] ### Breaking Changes - **BREAKING CHANGE**: [List any breaking changes affecting compatibility or functionality] --- ### Additional Information - [Insert any additional context, notes, or explanations for the changes] - [Reference any related issues, commits, or other relevant information] ### Screenshots or Videos - [Attach any relevant screenshots or videos demonstrating the changes] --- <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 18:33:13 -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#9848