fix : improve the error

core/chat/bot_service.py

@@ -16,8 +16,6 @@ from service.dto import ChatMessage
 from pymongo.mongo_client import MongoClient
 
 
-
-
 class ChatCompletionService:
     def __init__(self, session_id: str, user_request: str, titles: List = None, type_bot: str = "general"):
         self.session_id = session_id
@@ -42,12 +40,14 @@ class ChatCompletionService:
             response = chat_engine.chat(self.user_request)
             sources = response.sources
             number_reference_sorted = self._extract_sorted_references(response)
+            print("number reference sorted : ",number_reference_sorted)
 
             contents, metadata_collection, scores = self._process_sources(sources, number_reference_sorted)
 
             # Update response and renumber sources
             response = update_response(str(response))
             contents = sort_and_renumber_sources(contents)
+            print(contents)
 
             # Add contents to metadata
             metadata_collection = self._attach_contents_to_metadata(contents, metadata_collection)
@@ -64,7 +64,7 @@ class ChatCompletionService:
 
         try:
             if self.type_bot == "specific":
-                self._save_chat_history_to_db(response, metadata_collection)
+                self._save_chat_history_to_db(str(response), metadata_collection)
 
             return str(response), metadata_collection, scores
 
@@ -101,10 +101,10 @@ class ChatCompletionService:
 
         for number in number_reference_sorted:
             number = int(number)
-            if sources and sources[0].get("raw_output"):
+            if sources and len(sources) > 0:
                 node = dict(sources[0])["raw_output"].source_nodes
                 if 0 <= number - 1 < len(node):
-                    content = clean_text(node[number - 1].node.get_text())
+                    content = node[number - 1].node.get_text()
                     contents.append(content)
                     metadata = dict(node[number - 1].node.metadata)
                     metadata_collection.append(metadata)
@@ -155,9 +155,3 @@ class ChatCompletionService:
         collection = db[self.session_id]  # Replace with your collection name
         result = collection.insert_many(chat_history_json)
         print("Data inserted with record ids", result.inserted_ids)
-
-
-# Example usage
-def generate_completion_non_streaming(session_id, user_request, titles=None, type_bot="general"):
-    chat_service = ChatCompletionService(session_id, user_request, titles, type_bot)
-    return chat_service.generate_completion()

core/chat/chatstore.py

@@ -82,22 +82,18 @@ class ChatStore:
     def clean_message(self, session_id: str) -> Optional[ChatMessage]:
         """Delete specific message for a session_id."""
         current_list = self.redis_client.lrange(session_id, 0, -1)
-
+        
         indices_to_delete = []
         for index, item in enumerate(current_list):
             data = json.loads(item)  # Parse JSON string to dict
 
             # Logic to determine if item should be removed
-            if (data.get("role") == "assistant" and data.get("content") is None) or (
-                data.get("role") == "tool"
-            ):
+            if (data.get("role") == "assistant" and data.get("content") is None) or (data.get("role") == "tool"):
                 indices_to_delete.append(index)
 
         # Remove elements by their indices in reverse order
         for index in reversed(indices_to_delete):
-            self.redis_client.lrem(
-                session_id, 1, current_list[index]
-            )  # Remove the element from the list in Redis
+            self.redis_client.lrem(session_id, 1, current_list[index])  # Remove the element from the list in Redis
 
     def get_keys(self) -> List[str]:
         """Get all keys."""