Skip to content

Comments

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

Merged
Classic298 merged 7 commits intorerankfrom
claude/verify-dev-issue-S0aXu
Dec 19, 2025
Merged

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

Conversation

@Classic298
Copy link
Owner

No description provided.

tjbck and others added 7 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.
@Classic298 Classic298 merged commit 4bb9ae8 into rerank Dec 19, 2025
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]>
Classic298 added a commit that referenced this pull request Dec 21, 2025
Co-authored-by: Tim Baek <[email protected]>
Co-authored-by: Jan Kessler <[email protected]>
Co-authored-by: ALiNew <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Claude <[email protected]>
Co-authored-by: zengxy <[email protected]>
Co-authored-by: Classic298 <[email protected]>
Co-authored-by: Timothy Jaeryang Baek <[email protected]>
Co-authored-by: joaoback <[email protected]>
Co-authored-by: Shirasawa <[email protected]>
Co-authored-by: G30 <[email protected]>
Co-authored-by: Aleix Dorca <[email protected]>
Co-authored-by: James Westbrook <[email protected]>
Co-authored-by: _00_ <[email protected]>
Co-authored-by: bitsofinfo <[email protected]>
Co-authored-by: Andreas <[email protected]>
Co-authored-by: Jeppe Kuhlmann Andersen <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Joseph Low <[email protected]>
Co-authored-by: Joseph Roberts <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Leo Wang <[email protected]>
Co-authored-by: Kylapaallikko <[email protected]>
Co-authored-by: Taylor Wilsdon <[email protected]>
Co-authored-by: Boris Bocquet <[email protected]>
Co-authored-by: Cyp <[email protected]>
Co-authored-by: okamototk <[email protected]>
fix: do not display the move button when no folders (open-webui#19705)
fix: UI scale buttons (- and +) (open-webui#19699)
fix Startup Warning (open-webui#19757)
fix: add missing env var parameter pass through for enable async embedding (open-webui#19748)
FIX: Pipeline save settings - Handle undefined valves property (open-webui#19791)
fix: fixed missing text in the explanation feature (open-webui#19829)
Fix typo in user permission environment variables (open-webui#19860)
fix: resolve layout shift in knowledge items with long names (open-webui#19832)
fix: fixed the issue of mismatched spaces in audio MIME types (open-webui#17771)
fix: regenerate response shortcut (open-webui#19875)
Fix: Use SCAN instead of KEYS for Redis cluster compatibility (open-webui#19871)
fix: add null checks to chat iterators in ArchivedChats and FolderPlaceholder (open-webui#19898)
fix: respect RTL text direction in file attachment containers (open-webui#19891)
Fixes open-webui#19742 where file attachment containers did not inherit the chat direction setting, causing layout issues when typing in RTL languages like Persian.
fix: reload ollama models list after model deletion (open-webui#19912)
fix(prompt): preserve non-ASCII characters in tool specs serialization (open-webui#19942)
fix(model-editor): add null safety for tools, functions, and file input (open-webui#19939)
fix: resolve NPE in Node.svelte when model is undefined (open-webui#19935)
fix: enable COMFYUI_WORKFLOW_NODES and IMAGES_EDIT_COMFYUI_WORKFLOW_NODES configuration via env vars (open-webui#19918)
fix: add functional null safety checks and boolean casting to Chat.svelte (open-webui#19921)
fix: preserve access_control when cloning prompts (open-webui#19960)
Fixes open-webui#19360
Resolves open-webui#13026
Fixes open-webui#19967
fix: enforce global ENABLE_CHANNELS check on all channel endpoints (open-webui#19957)
Fixes open-webui#19914
Fix: Make meta optional in FileMetadataResponse to prevent batch add errors (open-webui#20022)
fix: prevent ExternalReranker from blocking event loop during RAG queries (open-webui#20049)
fix: prevent ExternalReranker from blocking event loop during RAG queries (#120)
Fixes open-webui#19900
fix: Show DefaultFiltersSelector for global toggleable filters (#123) (open-webui#20066)
fix(utils): add safety check for attributes.result in processDetails (open-webui#19923)
fix: user group pagination reset and model image caching (open-webui#19959)
Fixes open-webui#19885
fix: consolidate psql cleanup logic and fix web add with cleanup (open-webui#20072)
fix: Fix handling of absolute paths for SQLCipher databases (open-webui#20074)
fix: MCP OAuth 2.1 token exchange and multi-node propagation (open-webui#20076)
Fixes open-webui#19823, open-webui#19901
Classic298 added a commit that referenced this pull request Dec 21, 2025
Co-authored-by: Tim Baek <[email protected]>
Co-authored-by: Jan Kessler <[email protected]>
Co-authored-by: ALiNew <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Claude <[email protected]>
Co-authored-by: zengxy <[email protected]>
Co-authored-by: Classic298 <[email protected]>
Co-authored-by: Timothy Jaeryang Baek <[email protected]>
Co-authored-by: joaoback <[email protected]>
Co-authored-by: Shirasawa <[email protected]>
Co-authored-by: G30 <[email protected]>
Co-authored-by: Aleix Dorca <[email protected]>
Co-authored-by: James Westbrook <[email protected]>
Co-authored-by: _00_ <[email protected]>
Co-authored-by: bitsofinfo <[email protected]>
Co-authored-by: Andreas <[email protected]>
Co-authored-by: Jeppe Kuhlmann Andersen <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Joseph Low <[email protected]>
Co-authored-by: Joseph Roberts <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Leo Wang <[email protected]>
Co-authored-by: Kylapaallikko <[email protected]>
Co-authored-by: Taylor Wilsdon <[email protected]>
Co-authored-by: Boris Bocquet <[email protected]>
Co-authored-by: Cyp <[email protected]>
Co-authored-by: okamototk <[email protected]>
fix: do not display the move button when no folders (open-webui#19705)
fix: UI scale buttons (- and +) (open-webui#19699)
fix Startup Warning (open-webui#19757)
fix: add missing env var parameter pass through for enable async embedding (open-webui#19748)
FIX: Pipeline save settings - Handle undefined valves property (open-webui#19791)
fix: fixed missing text in the explanation feature (open-webui#19829)
Fix typo in user permission environment variables (open-webui#19860)
fix: resolve layout shift in knowledge items with long names (open-webui#19832)
fix: fixed the issue of mismatched spaces in audio MIME types (open-webui#17771)
fix: regenerate response shortcut (open-webui#19875)
Fix: Use SCAN instead of KEYS for Redis cluster compatibility (open-webui#19871)
fix: add null checks to chat iterators in ArchivedChats and FolderPlaceholder (open-webui#19898)
fix: respect RTL text direction in file attachment containers (open-webui#19891)
Fixes open-webui#19742 where file attachment containers did not inherit the chat direction setting, causing layout issues when typing in RTL languages like Persian.
fix: reload ollama models list after model deletion (open-webui#19912)
fix(prompt): preserve non-ASCII characters in tool specs serialization (open-webui#19942)
fix(model-editor): add null safety for tools, functions, and file input (open-webui#19939)
fix: resolve NPE in Node.svelte when model is undefined (open-webui#19935)
fix: enable COMFYUI_WORKFLOW_NODES and IMAGES_EDIT_COMFYUI_WORKFLOW_NODES configuration via env vars (open-webui#19918)
fix: add functional null safety checks and boolean casting to Chat.svelte (open-webui#19921)
fix: preserve access_control when cloning prompts (open-webui#19960)
Fixes open-webui#19360
Resolves open-webui#13026
Fixes open-webui#19967
fix: enforce global ENABLE_CHANNELS check on all channel endpoints (open-webui#19957)
Fixes open-webui#19914
Fix: Make meta optional in FileMetadataResponse to prevent batch add errors (open-webui#20022)
fix: prevent ExternalReranker from blocking event loop during RAG queries (open-webui#20049)
fix: prevent ExternalReranker from blocking event loop during RAG queries (#120)
Fixes open-webui#19900
fix: Show DefaultFiltersSelector for global toggleable filters (#123) (open-webui#20066)
fix(utils): add safety check for attributes.result in processDetails (open-webui#19923)
fix: user group pagination reset and model image caching (open-webui#19959)
Fixes open-webui#19885
fix: consolidate psql cleanup logic and fix web add with cleanup (open-webui#20072)
fix: Fix handling of absolute paths for SQLCipher databases (open-webui#20074)
fix: MCP OAuth 2.1 token exchange and multi-node propagation (open-webui#20076)
Fixes open-webui#19823, open-webui#19901
Classic298 added a commit that referenced this pull request Dec 27, 2025
Co-authored-by: Tim Baek <[email protected]>
Co-authored-by: Jan Kessler <[email protected]>
Co-authored-by: ALiNew <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Claude <[email protected]>
Co-authored-by: zengxy <[email protected]>
Co-authored-by: Classic298 <[email protected]>
Co-authored-by: Timothy Jaeryang Baek <[email protected]>
Co-authored-by: joaoback <[email protected]>
Co-authored-by: Shirasawa <[email protected]>
Co-authored-by: G30 <[email protected]>
Co-authored-by: Aleix Dorca <[email protected]>
Co-authored-by: James Westbrook <[email protected]>
Co-authored-by: _00_ <[email protected]>
Co-authored-by: bitsofinfo <[email protected]>
Co-authored-by: Andreas <[email protected]>
Co-authored-by: Jeppe Kuhlmann Andersen <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Joseph Low <[email protected]>
Co-authored-by: Joseph Roberts <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Leo Wang <[email protected]>
Co-authored-by: Kylapaallikko <[email protected]>
Co-authored-by: Taylor Wilsdon <[email protected]>
Co-authored-by: Boris Bocquet <[email protected]>
Co-authored-by: Cyp <[email protected]>
Co-authored-by: okamototk <[email protected]>
fix: do not display the move button when no folders (open-webui#19705)
fix: UI scale buttons (- and +) (open-webui#19699)
fix Startup Warning (open-webui#19757)
fix: add missing env var parameter pass through for enable async embedding (open-webui#19748)
FIX: Pipeline save settings - Handle undefined valves property (open-webui#19791)
fix: fixed missing text in the explanation feature (open-webui#19829)
Fix typo in user permission environment variables (open-webui#19860)
fix: resolve layout shift in knowledge items with long names (open-webui#19832)
fix: fixed the issue of mismatched spaces in audio MIME types (open-webui#17771)
fix: regenerate response shortcut (open-webui#19875)
Fix: Use SCAN instead of KEYS for Redis cluster compatibility (open-webui#19871)
fix: add null checks to chat iterators in ArchivedChats and FolderPlaceholder (open-webui#19898)
fix: respect RTL text direction in file attachment containers (open-webui#19891)
Fixes open-webui#19742 where file attachment containers did not inherit the chat direction setting, causing layout issues when typing in RTL languages like Persian.
fix: reload ollama models list after model deletion (open-webui#19912)
fix(prompt): preserve non-ASCII characters in tool specs serialization (open-webui#19942)
fix(model-editor): add null safety for tools, functions, and file input (open-webui#19939)
fix: resolve NPE in Node.svelte when model is undefined (open-webui#19935)
fix: enable COMFYUI_WORKFLOW_NODES and IMAGES_EDIT_COMFYUI_WORKFLOW_NODES configuration via env vars (open-webui#19918)
fix: add functional null safety checks and boolean casting to Chat.svelte (open-webui#19921)
fix: preserve access_control when cloning prompts (open-webui#19960)
Fixes open-webui#19360
Resolves open-webui#13026
Fixes open-webui#19967
fix: enforce global ENABLE_CHANNELS check on all channel endpoints (open-webui#19957)
Fixes open-webui#19914
Fix: Make meta optional in FileMetadataResponse to prevent batch add errors (open-webui#20022)
fix: prevent ExternalReranker from blocking event loop during RAG queries (open-webui#20049)
fix: prevent ExternalReranker from blocking event loop during RAG queries (#120)
Fixes open-webui#19900
fix: Show DefaultFiltersSelector for global toggleable filters (#123) (open-webui#20066)
fix(utils): add safety check for attributes.result in processDetails (open-webui#19923)
fix: user group pagination reset and model image caching (open-webui#19959)
Fixes open-webui#19885
fix: consolidate psql cleanup logic and fix web add with cleanup (open-webui#20072)
fix: Fix handling of absolute paths for SQLCipher databases (open-webui#20074)
fix: MCP OAuth 2.1 token exchange and multi-node propagation (open-webui#20076)
Fixes open-webui#19823, open-webui#19901
Classic298 added a commit that referenced this pull request Dec 28, 2025
Co-authored-by: Tim Baek <[email protected]>
Co-authored-by: Jan Kessler <[email protected]>
Co-authored-by: ALiNew <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Claude <[email protected]>
Co-authored-by: zengxy <[email protected]>
Co-authored-by: Classic298 <[email protected]>
Co-authored-by: Timothy Jaeryang Baek <[email protected]>
Co-authored-by: joaoback <[email protected]>
Co-authored-by: Shirasawa <[email protected]>
Co-authored-by: G30 <[email protected]>
Co-authored-by: Aleix Dorca <[email protected]>
Co-authored-by: James Westbrook <[email protected]>
Co-authored-by: _00_ <[email protected]>
Co-authored-by: bitsofinfo <[email protected]>
Co-authored-by: Andreas <[email protected]>
Co-authored-by: Jeppe Kuhlmann Andersen <[email protected]>
Co-authored-by: Zyfax <[email protected]>
Co-authored-by: Joseph Low <[email protected]>
Co-authored-by: Joseph Roberts <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Leo Wang <[email protected]>
Co-authored-by: Kylapaallikko <[email protected]>
Co-authored-by: Taylor Wilsdon <[email protected]>
Co-authored-by: Boris Bocquet <[email protected]>
Co-authored-by: Cyp <[email protected]>
Co-authored-by: okamototk <[email protected]>
Co-authored-by: landerrosette <[email protected]>
Co-authored-by: Dechao Sun <[email protected]>
fix: do not display the move button when no folders (open-webui#19705)
fix: UI scale buttons (- and +) (open-webui#19699)
fix Startup Warning (open-webui#19757)
fix: add missing env var parameter pass through for enable async embedding (open-webui#19748)
FIX: Pipeline save settings - Handle undefined valves property (open-webui#19791)
fix: fixed missing text in the explanation feature (open-webui#19829)
Fix typo in user permission environment variables (open-webui#19860)
fix: resolve layout shift in knowledge items with long names (open-webui#19832)
fix: fixed the issue of mismatched spaces in audio MIME types (open-webui#17771)
fix: regenerate response shortcut (open-webui#19875)
Fix: Use SCAN instead of KEYS for Redis cluster compatibility (open-webui#19871)
fix: add null checks to chat iterators in ArchivedChats and FolderPlaceholder (open-webui#19898)
fix: respect RTL text direction in file attachment containers (open-webui#19891)
Fixes open-webui#19742 where file attachment containers did not inherit the chat direction setting, causing layout issues when typing in RTL languages like Persian.
fix: reload ollama models list after model deletion (open-webui#19912)
fix(prompt): preserve non-ASCII characters in tool specs serialization (open-webui#19942)
fix(model-editor): add null safety for tools, functions, and file input (open-webui#19939)
fix: resolve NPE in Node.svelte when model is undefined (open-webui#19935)
fix: enable COMFYUI_WORKFLOW_NODES and IMAGES_EDIT_COMFYUI_WORKFLOW_NODES configuration via env vars (open-webui#19918)
fix: add functional null safety checks and boolean casting to Chat.svelte (open-webui#19921)
fix: preserve access_control when cloning prompts (open-webui#19960)
Fixes open-webui#19360
Resolves open-webui#13026
Fixes open-webui#19967
fix: enforce global ENABLE_CHANNELS check on all channel endpoints (open-webui#19957)
Fixes open-webui#19914
Fix: Make meta optional in FileMetadataResponse to prevent batch add errors (open-webui#20022)
fix: prevent ExternalReranker from blocking event loop during RAG queries (open-webui#20049)
fix: prevent ExternalReranker from blocking event loop during RAG queries (#120)
Fixes open-webui#19900
fix: Show DefaultFiltersSelector for global toggleable filters (#123) (open-webui#20066)
fix(utils): add safety check for attributes.result in processDetails (open-webui#19923)
fix: user group pagination reset and model image caching (open-webui#19959)
Fixes open-webui#19885
fix: consolidate psql cleanup logic and fix web add with cleanup (open-webui#20072)
fix: Fix handling of absolute paths for SQLCipher databases (open-webui#20074)
fix: MCP OAuth 2.1 token exchange and multi-node propagation (open-webui#20076)
Fixes open-webui#19823, open-webui#19901
fix: extract correct MIME type from base64 profile images (open-webui#20171)
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