fix: improve view last message

api/router/bot_one.py

@@ -20,9 +20,7 @@ from langfuse.llama_index import LlamaIndexCallbackHandler
 
 from api.auth import check_user_authentication
 from api.router.user import user_dependency
-from api.function import (
-    generate_streaming_completion
-)
+from api.function import generate_streaming_completion
 
 
 router = APIRouter(tags=["Bot_One"])
@@ -35,14 +33,19 @@ def get_chat_store():
 
 
 @router.post("/bot_one/{metadata_id}")
-async def create_bot_one(user: user_dependency, db: db_dependency, metadata_id: int, bot_name:BotCreateRequest):
+async def create_bot_one(
+    user: user_dependency,
+    db: db_dependency,
+    metadata_id: int,
+    bot_name: BotCreateRequest,
+):
     auth_response = check_user_authentication(user)
     if auth_response:
         return auth_response
     # Generate a new session ID (UUID)
     try:
         session_id = generate_uuid()
-        
+
         bot_query = BotQuery(user)
         bot_query.add_bot(db, session_id, bot_name.name, metadata_id)
 
@@ -93,19 +96,23 @@ async def generator_bot(
             )
         )
     else:
-        bot_service = ChatCompletionService(session_id, user_prompt_request.prompt, titles, type_bot="specific")
+        bot_service = ChatCompletionService(
+            session_id, user_prompt_request.prompt, titles, type_bot="specific"
+        )
         response, metadata, scores = bot_service.generate_completion()
 
         # Set Jakarta timezone
-        jakarta_tz = pytz.timezone('Asia/Jakarta')
+        jakarta_tz = pytz.timezone("Asia/Jakarta")
 
         existing_session = (
-            db.query(Session_Publisher).filter(Session_Publisher.id == session_id).first()
+            db.query(Session_Publisher)
+            .filter(Session_Publisher.id == session_id)
+            .first()
         )
-        
+
         existing_session.updated_at = datetime.now(jakarta_tz)
         db.commit()
-        
+
         return BotResponse(
             content=response,
             metadata=metadata,
@@ -124,12 +131,25 @@ async def get_all_session_bot_one(
     try:
         # Query the session IDs based on the user ID
         bot_query = BotQuery(user)
+        chat_store = ChatStore()
         sessions = bot_query.get_session_ids_bot(db, metadata_id)
-        
-        session_data = [{"id": session.id, "bot_name":session.bot_name, "updated_at": str(session.updated_at)} for session in sessions]
+
+        session_data = [
+            {
+                "id": session.id,
+                "bot_name": session.bot_name,
+                "updated_at": str(session.updated_at),
+                "last_message": chat_store.get_last_message_mongodb(session.id),
+            }
+            for session in sessions
+        ]
 
         # Convert list of tuples to a simple list
-        session_sorted_data = sorted(session_data, key=lambda x: datetime.fromisoformat(x['updated_at']), reverse=True)
+        session_sorted_data = sorted(
+            session_data,
+            key=lambda x: datetime.fromisoformat(x["updated_at"]),
+            reverse=True,
+        )
 
         return session_sorted_data
 

core/chat/chatstore.py

@@ -21,7 +21,7 @@ class ChatStore:
         self.client = MongoClient(uri)
 
     def initialize_memory_bot(self, session_id):
-        
+
         chat_store = RedisChatStore(
             redis_client=self.redis_client, ttl=86400  # Time-to-live set for 1 hour
         )
@@ -56,17 +56,28 @@ class ChatStore:
 
         # Decode and parse each item into a dictionary
         return [json.loads(m.decode("utf-8")) for m in items]
-    
+
     def get_last_message(self, session_id: str) -> Optional[Dict]:
         """Get the last message for a session_id."""
         last_message = self.redis_client.lindex(session_id, -1)
-        
+
         if last_message is None:
             return None  # Return None if there are no messages
-        
+
         # Decode and parse the last message into a dictionary
         return json.loads(last_message.decode("utf-8"))
 
+    def get_last_message_mongodb(self, session_id: str):
+        db = self.client["bot_database"]
+        collection = db[session_id]
+
+        # Get the last document by sorting by _id in descending order
+        last_document = collection.find().sort("_id", -1).limit(1)
+
+        for doc in last_document:
+            doc["content"]
+
+        return str(doc["content"])
 
     def delete_last_message(self, session_id: str) -> Optional[ChatMessage]:
         """Delete last message for a session_id."""
@@ -82,18 +93,22 @@ 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."""
@@ -154,7 +169,7 @@ class ChatStore:
 
             # Convert the cursor to a list and exclude the _id field
             documents_list = [
-                {key: doc[key] for key in doc if key !="_id" and doc[key] is not None}
+                {key: doc[key] for key in doc if key != "_id" and doc[key] is not None}
                 for doc in documents
             ]
 
@@ -162,7 +177,10 @@ class ChatStore:
             print(documents_list)  # Optional: If you want to see the output
 
             return documents_list
-        
+
         except Exception as e:
             print(f"An error occurred while retrieving messages: {e}")
-            return JSONResponse(status_code=500, content=f"An error occurred while retrieving messages: {e}") 
+            return JSONResponse(
+                status_code=500,
+                content=f"An error occurred while retrieving messages: {e}",
+            )