ts convo history

app/utils.py

@@ -173,50 +173,60 @@ def build_conversation_context(messages, max_turns: int = 3, max_chars: int = 80
             logger.debug(f"Added first ASSISTANT message ({msg_chars} chars)")
     
     # Collect last N complete turns (user + assistant pairs)
+    # Find the last N user messages and their corresponding assistant responses
+    user_messages = [msg for msg in messages if msg.role == 'user']
+    
+    # Get the last N user messages (excluding the first one we already included)
+    recent_user_messages = user_messages[1:][-max_turns:] if len(user_messages) > 1 else []
+    
     turn_count = 0
     recent_messages = []
-    current_turn_messages = []
     
-    # Process messages in reverse to get the most recent turns
-    for i, msg in enumerate(reversed(messages)):
-        # Skip if this is one of the first messages we already included
-        if (first_user_msg and msg == first_user_msg) or (first_assistant_msg and msg == first_assistant_msg):
-            continue
+    # Process each recent user message and find its corresponding assistant response
+    for user_msg in recent_user_messages:
+        if turn_count >= max_turns:
+            break
             
-        role_label = msg.role.upper()
-        content = msg.content
+        # Find the assistant response that follows this user message
+        user_index = messages.index(user_msg)
+        assistant_msg = None
         
-        # Build message text
-        msg_text = f"{role_label}: {content}"
-        msg_chars = len(msg_text)
+        # Look for the next assistant message after this user message
+        for i in range(user_index + 1, len(messages)):
+            if messages[i].role == 'assistant':
+                assistant_msg = messages[i]
+                break
+        
+        # Add user message
+        user_text = f"USER: {user_msg.content}"
+        user_chars = len(user_text)
         
-        # Check character limit
-        if char_count + msg_chars > max_chars:
+        if char_count + user_chars > max_chars:
             logger.info(f"Stopping context build: would exceed max_chars ({max_chars})")
             break
-        
-        # Add message to current turn
-        current_turn_messages.insert(0, msg_text)
-        char_count += msg_chars
+            
+        recent_messages.append(user_text)
+        char_count += user_chars
         msgs_included += 1
         
-        # Check if we've completed a turn (assistant message followed by user in reverse order)
-        if msg.role == 'assistant':
-            # Look ahead to see if there's a corresponding user message
-            # In reverse order, we expect: assistant, user, assistant, user...
-            if i + 1 < len(messages):
-                next_msg = list(reversed(messages))[i + 1]
-                if next_msg.role == 'user':
-                    # This is a complete turn, increment counter
-                    turn_count += 1
-                    if turn_count >= max_turns:
-                        logger.info(f"Stopping context build: reached max_turns ({max_turns})")
-                        break
+        # Add assistant message if it exists
+        if assistant_msg:
+            assistant_text = f"ASSISTANT: {assistant_msg.content}"
+            assistant_chars = len(assistant_text)
+            
+            if char_count + assistant_chars > max_chars:
+                logger.info(f"Stopping context build: would exceed max_chars ({max_chars})")
+                break
+                
+            recent_messages.append(assistant_text)
+            char_count += assistant_chars
+            msgs_included += 1
         
-        logger.debug(f"Added {role_label} message ({msg_chars} chars, {msgs_included} total messages)")
+        turn_count += 1
+        logger.debug(f"Added turn {turn_count}: user + assistant messages")
     
     # Add recent messages to context
-    context_parts.extend(current_turn_messages)
+    context_parts.extend(recent_messages)
     
     context = "\n\n".join(context_parts)
     logger.info(f"Built conversation context: {turn_count} recent user turns, {msgs_included} total messages, {char_count} chars")