UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-01-19 09:16:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #2249 from cheahjs/fix/config-refac-broken

Browse Source 
fix: rag, chat deletion, and webhook after config persistence change
This commit is contained in:
Timothy Jaeryang Baek 2024-05-13 21:07:17 -10:00 committed by GitHub
commit 2290eefcb0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/apps/openai/main.py
View File

@ -119,9 +119,9 @@ async def speech(request: Request, user=Depends(get_verified_user)):
headers = {} headers = {}
headers["Authorization"] = f"Bearer {app.state.config.OPENAI_API_KEYS[idx]}" headers["Authorization"] = f"Bearer {app.state.config.OPENAI_API_KEYS[idx]}"
headers["Content-Type"] = "application/json" headers["Content-Type"] = "application/json"
if "openrouter.ai" in app.state.OPENAI_API_BASE_URLS[idx]: if "openrouter.ai" in app.state.config.OPENAI_API_BASE_URLS[idx]:
headers['HTTP-Referer'] = "https://openwebui.com/" headers["HTTP-Referer"] = "https://openwebui.com/"
headers['X-Title'] = "Open WebUI" headers["X-Title"] = "Open WebUI"
r = None r = None
try: try:
r = requests.post( r = requests.post(

4
backend/apps/web/routers/chats.py
View File

@ -58,7 +58,7 @@ async def delete_all_user_chats(request: Request, user=Depends(get_current_user)
if ( if (
user.role == "user" user.role == "user"
and not request.app.state.USER_PERMISSIONS["chat"]["deletion"] and not request.app.state.config.USER_PERMISSIONS["chat"]["deletion"]
): ):
raise HTTPException( raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED, 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) result = Chats.delete_chat_by_id(id)
return result return result
else: else:
if not request.app.state.USER_PERMISSIONS["chat"]["deletion"]: if not request.app.state.config.USER_PERMISSIONS["chat"]["deletion"]:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED, status_code=status.HTTP_401_UNAUTHORIZED,
detail=ERROR_MESSAGES.ACCESS_PROHIBITED, detail=ERROR_MESSAGES.ACCESS_PROHIBITED,

8
backend/main.py
View File

@ -144,12 +144,12 @@ class RAGMiddleware(BaseHTTPMiddleware):
data["messages"], citations = rag_messages( data["messages"], citations = rag_messages(
docs=data["docs"], docs=data["docs"],
messages=data["messages"], messages=data["messages"],
template=rag_app.state.RAG_TEMPLATE, template=rag_app.state.config.RAG_TEMPLATE,
embedding_function=rag_app.state.EMBEDDING_FUNCTION, 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, reranking_function=rag_app.state.sentence_transformer_rf,
r=rag_app.state.RELEVANCE_THRESHOLD, r=rag_app.state.config.RELEVANCE_THRESHOLD,
hybrid_search=rag_app.state.ENABLE_RAG_HYBRID_SEARCH, hybrid_search=rag_app.state.config.ENABLE_RAG_HYBRID_SEARCH,
) )
del data["docs"] del data["docs"]

4
src/routes/+layout.svelte
View File

@ -24,9 +24,9 @@
let backendConfig = null; let backendConfig = null;
try { try {
backendConfig = await getBackendConfig(); backendConfig = await getBackendConfig();
console.log("Backend config:", backendConfig); console.log('Backend config:', backendConfig);
} catch (error) { } 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, // Initialize i18n even if we didn't get a backend config,
// so `/error` can show something that's not `undefined`. // so `/error` can show something that's not `undefined`.