refac

Author: tjbck

backend/open_webui/utils/chat.py

@@ -74,7 +74,6 @@ async def generate_direct_chat_completion(
     session_id = metadata.get("session_id")
     request_id = str(uuid.uuid4())  # Generate a unique request ID
 
-    event_emitter = get_event_emitter(metadata)
     event_caller = get_event_call(metadata)
 
     channel = f"{user_id}:{session_id}:{request_id}"
@@ -191,7 +190,7 @@ async def generate_chat_completion(
         except Exception as e:
             raise e
 
-    if request.state.direct:
+    if getattr(request.state, "direct", False):
         return await generate_direct_chat_completion(
             request, form_data, user=user, models=models
         )

backend/open_webui/utils/middleware.py

@@ -778,17 +778,7 @@ async def process_chat_payload(request, form_data, metadata, user, model):
 
             if "document" in source:
                 for doc_idx, doc_context in enumerate(source["document"]):
-                    doc_metadata = source.get("metadata")
-                    doc_source_id = None
-
-                    if doc_metadata:
-                        doc_source_id = doc_metadata[doc_idx].get("source", source_id)
-
-                    if source_id:
-                        context_string += f"<source><source_id>{doc_source_id if doc_source_id is not None else source_id}</source_id><source_context>{doc_context}</source_context></source>\n"
-                    else:
-                        # If there is no source_id, then do not include the source_id tag
-                        context_string += f"<source><source_context>{doc_context}</source_context></source>\n"
+                    context_string += f"<source><source_id>{doc_idx}</source_id><source_context>{doc_context}</source_context></source>\n"
 
         context_string = context_string.strip()
         prompt = get_last_user_message(form_data["messages"])

src/routes/+layout.svelte

@@ -294,6 +294,7 @@
 									cb({
 										status: true
 									});
+									console.log({ status: true });
 
 									// res will either be SSE or JSON
 									const reader = res.body.getReader();