Update api_routes_v2.py

api_routes_v2.py

@@ -670,13 +670,14 @@ def download_to_temp_file(file_ref: Optional[str]) -> Tuple[Optional[str], Calla
     # Already a local path
     return file_ref, noop
 
-def upload_stream_to_s3(chat_id: str, file: UploadFile) -> str:
+def upload_stream_to_s3(chat_id: str, file: UploadFile, create_message: bool = True) -> str:
     """
     Stream an UploadFile directly to S3, return s3:// URI.
     Supports optional SSE via env S3_SSE and S3_KMS_KEY_ID.
     CHANGE:
     - Generate a presigned GET URL with max expiry (7 days) once at upload time.
     - Store presigned_url and presigned_expires_at in session.file_metadata (do not regenerate later).
+    - create_message: If True, creates "Uploaded file" message. Set to False when file is sent with user message.
     """
     key = f"{S3_PREFIX}/{chat_id}/{file.filename}"
     config = TransferConfig(multipart_threshold=8 * 1024 * 1024, max_concurrency=4)
@@ -725,25 +726,27 @@ def upload_stream_to_s3(chat_id: str, file: UploadFile) -> str:
         }
     })
 
-    # Create a user message with file metadata (instead of system message)
-    file_message = {
-        "role": "user",
-        "content": f"Uploaded file: {file.filename}",
-        "timestamp": datetime.utcnow().isoformat() + "Z",
-        "file_data": {
-            "has_file": True,
-            "file_name": file.filename,
-            "file_url": presigned["presigned_url"]  # Use presigned URL for user access
+    # Only create file upload message if requested (not when file is sent with user message)
+    if create_message:
+        # Create a user message with file metadata (instead of system message)
+        file_message = {
+            "role": "user",
+            "content": f"Uploaded file: {file.filename}",
+            "timestamp": datetime.utcnow().isoformat() + "Z",
+            "file_data": {
+                "has_file": True,
+                "file_name": file.filename,
+                "file_url": presigned["presigned_url"]  # Use presigned URL for user access
+            }
         }
-    }
 
-    # V3 RULE: Append to S3 conversation history
-    # 1. Load existing
-    current_messages = _load_conversation_from_s3(chat_id)
-    # 2. Append
-    current_messages.append(file_message)
-    # 3. Save to S3 (and update MongoDB metadata)
-    _save_conversation_to_s3(chat_id, current_messages)
+        # V3 RULE: Append to S3 conversation history
+        # 1. Load existing
+        current_messages = _load_conversation_from_s3(chat_id)
+        # 2. Append
+        current_messages.append(file_message)
+        # 3. Save to S3 (and update MongoDB metadata)
+        _save_conversation_to_s3(chat_id, current_messages)
 
     return s3_uri
 
@@ -757,10 +760,10 @@ async def get_all_sessions(
     skip: int = 0,
     include_stats: bool = False
 ):
-    """
-    Get all session IDs from the database with optional pagination
-    CHANGE: When include_stats=True, include 'chat_name' (added field only).
-    """
+    # """
+    # Get all session IDs from the database with optional pagination
+    # CHANGE: When include_stats=True, include 'chat_name' (added field only)."""
+    
     try:
         all_session_ids = session_manager.get_all_session_ids()
 
@@ -1067,7 +1070,9 @@ async def chat_unified(
     # If a file is included in the form, upload to S3 and attach it
     file_info = None
     if file is not None:
-        s3_uri = upload_stream_to_s3(chat_id, file)
+        # Don't create automatic "Uploaded file" message if user is also sending text
+        has_user_message = message and str(message).strip() != ""
+        s3_uri = upload_stream_to_s3(chat_id, file, create_message=not has_user_message)
         meta = (session_manager.get_session(chat_id) or {}).get("file_metadata", {}) or {}
         file_info = {
             "bucket": S3_BUCKET,