Update app/main.py

app/main.py

@@ -579,7 +579,31 @@ Ready for your request."""
         )
     ]
     
-    # Create a new list of messages with the pre-messages and encoded content
+    # --- Find the index of the single assistant message to encrypt ---
+    target_assistant_index = -1
+    num_messages = len(messages)
+    for i in range(num_messages - 1, -1, -1): # Iterate backwards
+        if messages[i].role == 'assistant':
+            # Condition 1: Is assistant message - met.
+            # Condition 2: Not the last message overall?
+            is_last_overall = (i == num_messages - 1)
+            if is_last_overall:
+                continue # Cannot be the target if it's the last message
+
+            # Condition 3: Has a user/system message after it?
+            has_user_system_after = False
+            for k in range(i + 1, num_messages):
+                if messages[k].role in ['user', 'system']:
+                    has_user_system_after = True
+                    break
+            
+            if has_user_system_after:
+                # This is the last assistant message meeting all criteria
+                target_assistant_index = i
+                print(f"DEBUG: Identified target assistant message for encoding at index {target_assistant_index}")
+                break # Found the target, stop searching
+
+    # --- Create the new message list with specific encoding ---
     new_messages = []
     
     # Add a system message with instructions at the beginning
@@ -588,74 +612,53 @@ Ready for your request."""
     # Add pre-messages
     new_messages.extend(pre_messages)
     
-    # Process all messages in their original order
+    # Process all original messages
     for i, message in enumerate(messages):
-        if message.role == "system":
-            # Pass system messages through as is
-            new_messages.append(message)
+        encode_this_message = False
         
-        elif message.role == "user":
-            # URL encode user message content
+        if message.role == "user":
+            encode_this_message = True
+            print(f"DEBUG: Encoding user message (index {i})")
+        elif message.role == "assistant" and i == target_assistant_index:
+            encode_this_message = True
+            print(f"DEBUG: Encoding target assistant message (index {i})")
+        else:
+            # Keep system, other assistant, tool messages as is
+            print(f"DEBUG: Passing through message (index {i}, role {message.role}) without encoding")
+            new_messages.append(message)
+            continue # Skip encoding logic below for this message
+
+        # Apply encoding if needed
+        if encode_this_message:
             if isinstance(message.content, str):
                 new_messages.append(OpenAIMessage(
                     role=message.role,
                     content=urllib.parse.quote(message.content)
                 ))
             elif isinstance(message.content, list):
-                # For list content (like with images), we need to handle each part
+                # Handle list content (encode text parts, pass others)
                 encoded_parts = []
                 for part in message.content:
                     if isinstance(part, dict) and part.get('type') == 'text':
-                        # URL encode text parts
                         encoded_parts.append({
                             'type': 'text',
                             'text': urllib.parse.quote(part.get('text', ''))
                         })
-                    else:
-                        # Pass through non-text parts (like images)
-                        encoded_parts.append(part)
-                
+                    # Pass through non-text parts (like images) as is
+                    elif isinstance(part, dict) and part.get('type') == 'image_url':
+                         encoded_parts.append(part)
+                    elif isinstance(part, ContentPartImage): # Handle Pydantic model case
+                         encoded_parts.append(part)
+                    # Add other potential non-text part types if necessary
+                    else: # Pass through any other unknown part types
+                         encoded_parts.append(part)
                 new_messages.append(OpenAIMessage(
                     role=message.role,
                     content=encoded_parts
                 ))
-        else:
-            # For assistant messages
-            # Check if this is the last assistant message in the conversation
-            is_last_assistant = True
-            for remaining_msg in messages[i+1:]:
-                if remaining_msg.role != "user":
-                    is_last_assistant = False
-                    break
-            
-            if is_last_assistant:
-                # URL encode the last assistant message content
-                if isinstance(message.content, str):
-                    new_messages.append(OpenAIMessage(
-                        role=message.role,
-                        content=urllib.parse.quote(message.content)
-                    ))
-                elif isinstance(message.content, list):
-                    # Handle list content similar to user messages
-                    encoded_parts = []
-                    for part in message.content:
-                        if isinstance(part, dict) and part.get('type') == 'text':
-                            encoded_parts.append({
-                                'type': 'text',
-                                'text': urllib.parse.quote(part.get('text', ''))
-                            })
-                        else:
-                            encoded_parts.append(part)
-                    
-                    new_messages.append(OpenAIMessage(
-                        role=message.role,
-                        content=encoded_parts
-                    ))
-                else:
-                    # For non-string/list content, keep as is
-                    new_messages.append(message)
             else:
-                # For other assistant messages, keep as is
+                # For non-string/list content, keep as is (shouldn't be encoded)
+                print(f"DEBUG: Passing through non-string/list content for message index {i} without encoding")
                 new_messages.append(message)
     
     print(f"Created encrypted prompt with {len(new_messages)} messages")