Merge upstream/main into feature/websocket-ui-integration

Author: GunaPalanivel

README.md

@@ -51,6 +51,14 @@ curl -X POST http://127.0.0.1:8000/api/chatbot/sessions
 
 See [docs/README.md](docs/README.md) for detailed explanations.
 
+## 🎥 Setup Video Tutorial
+
+[![Local Setup Video Tutorial](https://img.youtube.com/vi/1DnMNA4aLyE/0.jpg)](https://youtu.be/1DnMNA4aLyE)
+
+The tutorial shows how to fork the repo, set up the backend, download the LLM model, run the frontend, and verify the chatbot works.
+
+
+
 ## Troubleshooting
 
 **llama-cpp-python installation fails**: Ensure build tools are installed and use Python 3.11+

chatbot-core/api/services/chat_service.py

@@ -16,7 +16,8 @@
     RETRIEVER_AGENT_PROMPT,
     SPLIT_QUERY_PROMPT,
 )
-from api.services.memory import get_session
+
+from api.services.memory import get_session, get_session_async
 from api.services.file_service import format_file_context
 from api.tools.tools import TOOL_REGISTRY
 from api.tools.utils import (
@@ -462,7 +463,8 @@ async def get_chatbot_reply_stream(
     logger.info("Streaming message from session '%s'", session_id)
     logger.info("Handling user query: %s", user_input)
 
-    memory = get_session(session_id)
+    memory = await get_session_async(session_id)
+
     if memory is None:
         raise RuntimeError(
             f"Session '{session_id}' not found in memory store.")

chatbot-core/api/services/memory.py

@@ -2,7 +2,7 @@
 Handles in-memory chat session state (conversation memory).
 Provides utility functions for session lifecycle.
 """
-
+import asyncio
 import uuid
 from datetime import datetime, timedelta
 from threading import Lock
@@ -77,6 +77,12 @@ def get_session(session_id: str) -> ConversationBufferMemory | None:
 
         return memory
 
+async def get_session_async(session_id: str) -> ConversationBufferMemory | None:
+    """
+    Async wrapper for get_session to prevent event loop blocking.
+    """
+    return await asyncio.to_thread(get_session, session_id)
+
 
 def persist_session(session_id: str)-> None:
     """

chatbot-core/rag/embedding/bm25_indexer.py

@@ -104,5 +104,6 @@ def get(self, index_name: str):
         logger= LoggerFactory.instance().get_logger("bm25indexer")
     )
 
-if not CONFIG["is_test_mode"]:
-    indexer.build()
+if __name__ == "__main__":
+    if not CONFIG["is_test_mode"]:
+        indexer.build()