Update api_routes_v2.py

api_routes_v2.py

@@ -857,13 +857,26 @@ async def get_session_history(
     CHANGE: Adds 'chat_name' and 'pipelines_history' (added fields only).
     """
     try:
-        # Get the history using session manager
-        history = session_manager.get_session_history(session_id, limit)
+        # FIXED: Load conversation history from S3 (where messages are actually stored)
+        # Previously was using session_manager.get_session_history() which reads from 
+        # MongoDB messages collection, but messages are stored in S3 conversation file
+        history = _load_conversation_from_s3(session_id)
+        
+        # Apply limit
+        if limit and len(history) > limit:
+            history = history[-limit:]  # Get last N messages
 
         # Format datetime objects to ISO strings for JSON serialization
+        # Also add message_id to each message if not present
+        from services.schemas import generate_message_id
         formatted_history = []
         for msg in history:
             msg_copy = msg.copy()
+            
+            # Add message_id if not present
+            if "message_id" not in msg_copy:
+                msg_copy["message_id"] = generate_message_id()
+            
             if "timestamp" in msg_copy and isinstance(msg_copy["timestamp"], datetime):
                 msg_copy["timestamp"] = msg_copy["timestamp"].isoformat()
             formatted_history.append(msg_copy)