From 5369023e34396fba24a53bfb39baecb3c75e7b9e Mon Sep 17 00:00:00 2001
From: Jun Siang Cheah <me@jscheah.me>
Date: Tue, 14 May 2024 14:30:15 +0800
Subject: [PATCH] fix: rag, chat deletion, and webhook after config persistence
 change

---
 backend/apps/openai/main.py       | 6 +++---
 backend/apps/web/routers/chats.py | 4 ++--
 backend/main.py                   | 8 ++++----
 src/routes/+layout.svelte         | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/apps/openai/main.py b/backend/apps/openai/main.py
index fb16a579b..65ed25f1c 100644
--- a/backend/apps/openai/main.py
+++ b/backend/apps/openai/main.py
@@ -119,9 +119,9 @@ async def speech(request: Request, user=Depends(get_verified_user)):
         headers = {}
         headers["Authorization"] = f"Bearer {app.state.config.OPENAI_API_KEYS[idx]}"
         headers["Content-Type"] = "application/json"
-        if "openrouter.ai" in app.state.OPENAI_API_BASE_URLS[idx]:
-            headers['HTTP-Referer'] = "https://openwebui.com/"
-            headers['X-Title'] = "Open WebUI"
+        if "openrouter.ai" in app.state.config.OPENAI_API_BASE_URLS[idx]:
+            headers["HTTP-Referer"] = "https://openwebui.com/"
+            headers["X-Title"] = "Open WebUI"
         r = None
         try:
             r = requests.post(
diff --git a/backend/apps/web/routers/chats.py b/backend/apps/web/routers/chats.py
index f72ed79b3..aaf173521 100644
--- a/backend/apps/web/routers/chats.py
+++ b/backend/apps/web/routers/chats.py
@@ -58,7 +58,7 @@ async def delete_all_user_chats(request: Request, user=Depends(get_current_user)
 
     if (
         user.role == "user"
-        and not request.app.state.USER_PERMISSIONS["chat"]["deletion"]
+        and not request.app.state.config.USER_PERMISSIONS["chat"]["deletion"]
     ):
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -266,7 +266,7 @@ async def delete_chat_by_id(request: Request, id: str, user=Depends(get_current_
         result = Chats.delete_chat_by_id(id)
         return result
     else:
-        if not request.app.state.USER_PERMISSIONS["chat"]["deletion"]:
+        if not request.app.state.config.USER_PERMISSIONS["chat"]["deletion"]:
             raise HTTPException(
                 status_code=status.HTTP_401_UNAUTHORIZED,
                 detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
diff --git a/backend/main.py b/backend/main.py
index 8b7f9af69..e3031e793 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -144,12 +144,12 @@ class RAGMiddleware(BaseHTTPMiddleware):
                 data["messages"], citations = rag_messages(
                     docs=data["docs"],
                     messages=data["messages"],
-                    template=rag_app.state.RAG_TEMPLATE,
+                    template=rag_app.state.config.RAG_TEMPLATE,
                     embedding_function=rag_app.state.EMBEDDING_FUNCTION,
-                    k=rag_app.state.TOP_K,
+                    k=rag_app.state.config.TOP_K,
                     reranking_function=rag_app.state.sentence_transformer_rf,
-                    r=rag_app.state.RELEVANCE_THRESHOLD,
-                    hybrid_search=rag_app.state.ENABLE_RAG_HYBRID_SEARCH,
+                    r=rag_app.state.config.RELEVANCE_THRESHOLD,
+                    hybrid_search=rag_app.state.config.ENABLE_RAG_HYBRID_SEARCH,
                 )
                 del data["docs"]
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 5a8a8bba3..dd90caa27 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -24,9 +24,9 @@
 		let backendConfig = null;
 		try {
 			backendConfig = await getBackendConfig();
-			console.log("Backend config:", backendConfig);
+			console.log('Backend config:', backendConfig);
 		} catch (error) {
-			console.error("Error loading backend config:", error);
+			console.error('Error loading backend config:', error);
 		}
 		// Initialize i18n even if we didn't get a backend config,
 		// so `/error` can show something that's not `undefined`.