Skip to content

Comments

Merge pull request open-webui#19030 from open-webui/dev#122

Merged
Classic298 merged 9 commits intorerankfrom
claude/verify-dev-issue-S0aXu
Dec 20, 2025
Merged

Merge pull request open-webui#19030 from open-webui/dev#122
Classic298 merged 9 commits intorerankfrom
claude/verify-dev-issue-S0aXu

Conversation

@Classic298
Copy link
Owner

Pull Request Checklist

Note to first-time contributors: Please open a discussion post in Discussions to discuss your idea/fix with the community before creating a pull request, and describe your changes before submitting a pull request.

This is to ensure large feature PRs are discussed with the community first, before starting work on it. If the community does not want this feature or it is not relevant for Open WebUI as a project, it can be identified in the discussion before working on the feature and submitting the PR.

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

  • Target branch: Verify that the pull request targets the dev branch. Not targeting the dev branch will lead to immediate closure of the PR.
  • Description: Provide a concise description of the changes made in this pull request down below.
  • Changelog: Ensure a changelog entry following the format of Keep a Changelog is added at the bottom of the PR description.
  • Documentation: If necessary, update relevant documentation Open WebUI Docs like environment variables, the tutorials, or other documentation sources.
  • Dependencies: Are there any new dependencies? Have you updated the dependency versions in the documentation?
  • Testing: Perform manual tests to verify the implemented fix/feature works as intended AND does not break any other functionality. Take this as an opportunity to make screenshots of the feature/fix and include it in the PR description.
  • Agentic AI Code: Confirm this Pull Request is not written by any AI Agent or has at least gone through additional human review AND manual testing. If any AI Agent is the co-author of this PR, it may lead to immediate closure of the PR.
  • 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?
  • Title 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]

Contributor License Agreement

By submitting this pull request, I confirm that I have read and fully agree to the Contributor License Agreement (CLA), and I am providing my contributions under its terms.

Note

Deleting the CLA section will lead to immediate closure of your PR and it will not be merged in.

tjbck and others added 9 commits November 23, 2025 22:10
…ries

Fixes open-webui#19900

This commit addresses the issue where ExternalReranker's synchronous HTTP
requests blocked the Python event loop, causing the entire application to
freeze during reranking operations.

Changes:
- Wrap reranking_function call with asyncio.to_thread() in acompress_documents
  to prevent blocking the event loop
- Add configurable RAG_EXTERNAL_RERANKER_TIMEOUT environment variable (default: 120s)
- Add timeout parameter to requests.post() in ExternalReranker.predict()
- Update ExternalReranker instantiation to pass timeout through get_rf()

The asyncio.to_thread() approach is consistent with existing patterns in the
codebase (e.g., embedding operations on line 790 of retrieval/utils.py).

This ensures the application remains responsive while waiting for external
reranking API responses, preventing outages during long-running rerank operations.
…to follow system default

- Changed RAG_EXTERNAL_RERANKER_TIMEOUT default from 120 to empty string
- Updated ExternalReranker timeout parameter to Optional[int] = None
- When timeout is empty/None, requests.post() uses system default (no timeout)
- When timeout is set, it's converted to int and used

This follows the pattern of other timeout configs and allows users to
opt-in to timeout behavior rather than forcing a default value.
@Classic298 Classic298 merged commit cc3793f into rerank Dec 20, 2025
@Classic298 Classic298 deleted the claude/verify-dev-issue-S0aXu branch December 20, 2025 13:39
Classic298 added a commit that referenced this pull request Dec 20, 2025
…ries (open-webui#20049)

* fix: prevent ExternalReranker from blocking event loop during RAG queries (#120)

Co-authored-by: Tim Baek <[email protected]>
Co-authored-by: Claude <[email protected]>
Fixes open-webui#19900

* Merge pull request open-webui#19030 from open-webui/dev (#122)

Co-authored-by: Tim Baek <[email protected]>
Co-authored-by: Claude <[email protected]>
Fixes open-webui#19900

---------

Co-authored-by: Tim Baek <[email protected]>
Co-authored-by: Claude <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants