diff --git a/backend/open_webui/routers/retrieval.py b/backend/open_webui/routers/retrieval.py index bdeeb3136..26a26c7ec 100644 --- a/backend/open_webui/routers/retrieval.py +++ b/backend/open_webui/routers/retrieval.py @@ -362,8 +362,8 @@ async def get_rag_config(request: Request, user=Depends(get_admin_user)): # Reranking settings "RAG_RERANKING_MODEL": request.app.state.config.RAG_RERANKING_MODEL, "RAG_RERANKING_ENGINE": request.app.state.config.RAG_RERANKING_ENGINE, - "RAG_EXTERNAL_RERANKING_URL": request.app.state.config.RAG_EXTERNAL_RERANKING_URL, - "RAG_EXTERNAL_RERANKING_API_KEY": request.app.state.config.RAG_EXTERNAL_RERANKING_API_KEY, + "RAG_EXTERNAL_RERANKER_URL": request.app.state.config.RAG_EXTERNAL_RERANKER_URL, + "RAG_EXTERNAL_RERANKER_API_KEY": request.app.state.config.RAG_EXTERNAL_RERANKER_API_KEY, # Chunking settings "TEXT_SPLITTER": request.app.state.config.TEXT_SPLITTER, "CHUNK_SIZE": request.app.state.config.CHUNK_SIZE, @@ -503,8 +503,8 @@ class ConfigForm(BaseModel): # Reranking settings RAG_RERANKING_MODEL: Optional[str] = None RAG_RERANKING_ENGINE: Optional[str] = None - RAG_EXTERNAL_RERANKING_URL: Optional[str] = None - RAG_EXTERNAL_RERANKING_API_KEY: Optional[str] = None + RAG_EXTERNAL_RERANKER_URL: Optional[str] = None + RAG_EXTERNAL_RERANKER_API_KEY: Optional[str] = None # Chunking settings TEXT_SPLITTER: Optional[str] = None @@ -624,16 +624,16 @@ async def update_rag_config( else request.app.state.config.RAG_RERANKING_ENGINE ) - request.app.state.config.RAG_EXTERNAL_RERANKING_URL = ( - form_data.RAG_EXTERNAL_RERANKING_URL - if form_data.RAG_EXTERNAL_RERANKING_URL is not None - else request.app.state.config.RAG_EXTERNAL_RERANKING_URL + request.app.state.config.RAG_EXTERNAL_RERANKER_URL = ( + form_data.RAG_EXTERNAL_RERANKER_URL + if form_data.RAG_EXTERNAL_RERANKER_URL is not None + else request.app.state.config.RAG_EXTERNAL_RERANKER_URL ) - request.app.state.config.RAG_EXTERNAL_RERANKING_API_KEY = ( - form_data.RAG_EXTERNAL_RERANKING_API_KEY - if form_data.RAG_EXTERNAL_RERANKING_API_KEY is not None - else request.app.state.config.RAG_EXTERNAL_RERANKING_API_KEY + request.app.state.config.RAG_EXTERNAL_RERANKER_API_KEY = ( + form_data.RAG_EXTERNAL_RERANKER_API_KEY + if form_data.RAG_EXTERNAL_RERANKER_API_KEY is not None + else request.app.state.config.RAG_EXTERNAL_RERANKER_API_KEY ) log.info( @@ -646,8 +646,8 @@ async def update_rag_config( request.app.state.rf = get_rf( request.app.state.config.RAG_RERANKING_ENGINE, request.app.state.config.RAG_RERANKING_MODEL, - request.app.state.config.RAG_EXTERNAL_RERANKING_URL, - request.app.state.config.RAG_EXTERNAL_RERANKING_API_KEY, + request.app.state.config.RAG_EXTERNAL_RERANKER_URL, + request.app.state.config.RAG_EXTERNAL_RERANKER_API_KEY, True, ) except Exception as e: @@ -819,8 +819,8 @@ async def update_rag_config( # Reranking settings "RAG_RERANKING_MODEL": request.app.state.config.RAG_RERANKING_MODEL, "RAG_RERANKING_ENGINE": request.app.state.config.RAG_RERANKING_ENGINE, - "RAG_EXTERNAL_RERANKING_URL": request.app.state.config.RAG_EXTERNAL_RERANKING_URL, - "RAG_EXTERNAL_RERANKING_API_KEY": request.app.state.config.RAG_EXTERNAL_RERANKING_API_KEY, + "RAG_EXTERNAL_RERANKER_URL": request.app.state.config.RAG_EXTERNAL_RERANKER_URL, + "RAG_EXTERNAL_RERANKER_API_KEY": request.app.state.config.RAG_EXTERNAL_RERANKER_API_KEY, # Chunking settings "TEXT_SPLITTER": request.app.state.config.TEXT_SPLITTER, "CHUNK_SIZE": request.app.state.config.CHUNK_SIZE, diff --git a/src/lib/components/admin/Settings/Documents.svelte b/src/lib/components/admin/Settings/Documents.svelte index b54404f79..108c6cb1d 100644 --- a/src/lib/components/admin/Settings/Documents.svelte +++ b/src/lib/components/admin/Settings/Documents.svelte @@ -215,18 +215,8 @@ OllamaUrl = embeddingConfig.ollama_config.url; } }; - - const setRerankingConfig = async () => { - const rerankingConfig = await getRerankingConfig(localStorage.token); - - if (rerankingConfig) { - rerankingModel = rerankingConfig.reranking_model; - } - }; - onMount(async () => { await setEmbeddingConfig(); - await setRerankingConfig(); RAGConfig = await getRAGConfig(localStorage.token); });