convo history truncation finalized

app/main.py

@@ -81,40 +81,30 @@ async def chatui_adapter(data):
             messages_value = getattr(data, 'messages', None)
             preprompt_value = getattr(data, 'preprompt', None)
         
-        # Extract query - prefer structured messages over legacy text field
-        if messages_value and len(messages_value) > 0:
-            logger.info("✓ Using structured messages")
-            
-            # Convert dict messages to objects if needed
-            messages = []
-            for msg in messages_value:
-                if isinstance(msg, dict):
-                    messages.append(type('Message', (), {
-                        'role': msg.get('role', 'unknown'),
-                        'content': msg.get('content', '')
-                    })())
-                else:
-                    messages.append(msg)
-            
-            # Extract latest user query
-            user_messages = [msg for msg in messages if msg.role == 'user']
-            query = user_messages[-1].content if user_messages else text_value
-            
-            # Log conversation context
-            logger.info(f"Processing query: {query}")
-            logger.info(f"Total messages in conversation: {len(messages)}")
-            logger.info(f"User messages: {len(user_messages)}, Assistant messages: {len([m for m in messages if m.role == 'assistant'])}")
-            
-            # Build conversation context for generation (last N turns)
-            conversation_context = build_conversation_context(messages, max_turns=MAX_TURNS, max_chars=MAX_CHARS)
-            logger.info(f"Messages: {messages}")
-            logger.info(f"Conversation context: {conversation_context}")
-        else:
-            # Fallback to legacy text field
-            query = text_value
-            conversation_context = None
-            logger.info(f"✗ Using legacy text field (messages not found or empty)")
-            logger.info(f"Processing query: {query[:100]}...")
+        # Extract query
+        
+        # Convert dict messages to objects if needed
+        messages = []
+        for msg in messages_value:
+            if isinstance(msg, dict):
+                messages.append(type('Message', (), {
+                    'role': msg.get('role', 'unknown'),
+                    'content': msg.get('content', '')
+                })())
+            else:
+                messages.append(msg)
+        
+        # Extract latest user query
+        user_messages = [msg for msg in messages if msg.role == 'user']
+        query = user_messages[-1].content if user_messages else text_value
+        
+        # Log conversation context
+        logger.info(f"Processing query: {query}")
+        logger.info(f"Total messages in conversation: {len(messages)}")
+        logger.info(f"User messages: {len(user_messages)}, Assistant messages: {len([m for m in messages if m.role == 'assistant'])}")
+        
+        # Build conversation context for generation (last N turns)
+        conversation_context = build_conversation_context(messages, max_turns=MAX_TURNS, max_chars=MAX_CHARS)
         
         full_response = ""
         sources_collected = None
@@ -190,14 +180,10 @@ async def chatui_file_adapter(data):
             query = user_messages[-1].content if user_messages else text_value
             
             logger.info(f"Processing query: {query}")
-            logger.info(f"Total messages: {len(messages)}")
+            logger.info(f"Total messages in conversation: {len(messages)}")
+            logger.info(f"User messages: {len(user_messages)}, Assistant messages: {len([m for m in messages if m.role == 'assistant'])}")
             
             conversation_context = build_conversation_context(messages, max_turns=MAX_TURNS, max_chars=MAX_CHARS)
-        else:
-            query = text_value
-            conversation_context = None
-            logger.info(f"✗ Using legacy text field")
-            logger.info(f"Processing query: {query[:100]}...")
         
         file_content = None
         filename = None

app/models.py

@@ -29,13 +29,11 @@ class Message(BaseModel):
 
 class ChatUIInput(BaseModel):
     """Input model for text-only ChatUI requests"""
-    text: str  # Legacy: full concatenated prompt (for backward compatibility)
     messages: Optional[List[Message]] = None  # Structured conversation history
     preprompt: Optional[str] = None
 
 class ChatUIFileInput(BaseModel):
     """Input model for ChatUI requests with file attachments"""
-    text: str
     files: Optional[List[Dict[str, Any]]] = None
     messages: Optional[List[Message]] = None  # Structured conversation history
     preprompt: Optional[str] = None

app/utils.py

@@ -123,7 +123,7 @@ def merge_state(base_state: GraphState, updates: dict) -> GraphState:
 
 def build_conversation_context(messages, max_turns: int = 3, max_chars: int = 8000) -> str:
     """
-    Build conversation context from structured messages.
+    Build conversation context from structured messages to send to generator.
     Always keeps the first user and assistant messages, plus the last N turns.
     
     A "turn" is one user message + following assistant response.
@@ -161,7 +161,6 @@ def build_conversation_context(messages, max_turns: int = 3, max_chars: int = 80
             context_parts.append(msg_text)
             char_count += msg_chars
             msgs_included += 1
-            logger.debug(f"Added first USER message ({msg_chars} chars)")
     
     if first_assistant_msg:
         msg_text = f"ASSISTANT: {first_assistant_msg.content}"
@@ -170,7 +169,6 @@ def build_conversation_context(messages, max_turns: int = 3, max_chars: int = 80
             context_parts.append(msg_text)
             char_count += msg_chars
             msgs_included += 1
-            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
@@ -223,12 +221,10 @@ def build_conversation_context(messages, max_turns: int = 3, max_chars: int = 80
             msgs_included += 1
         
         turn_count += 1
-        logger.debug(f"Added turn {turn_count}: user + assistant messages")
     
     # Add recent messages to context
     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")
     
     return context