file filename fileuri for every chat

api_routes_v2.py

@@ -444,6 +444,9 @@ class Message(BaseModel):
     role: str
     content: str
     timestamp: Optional[str] = None
+    file: Optional[bool] = None     
+    fileName: Optional[str] = None   
+    fileUrl: Optional[str] = None 
 
 
 class ChatRequest(BaseModel):
@@ -460,6 +463,9 @@ class ChatResponse(BaseModel):
     chat_id: str
     state: str
     history: List[Message]
+    file: Optional[bool] = None 
+    fileName: Optional[str] = None
+    fileUrl: Optional[str] = None
 
 
 # ========================
@@ -491,17 +497,38 @@ def _get_session_or_init(chat_id: str) -> Dict[str, Any]:
 def _normalize_history_for_api(chat_id: str) -> List[Message]:
     """
     Return history in Gradio-like format: [{role, content, timestamp}]
+    FILTERS OUT system messages as requested
     """
     session = session_manager.get_session(chat_id) or {}
     raw_messages = session.get("messages") or []
     history: List[Message] = []
+    
     for m in raw_messages:
         role = m.get("role") or m.get("sender") or "assistant"
+        
+        # Skip system messages
+        if role == "system":
+            continue
+            
         content = m.get("content") or m.get("text") or ""
         ts = m.get("timestamp")
+        
         if not isinstance(content, str):
             content = json.dumps(content, ensure_ascii=False)
-        history.append(Message(role=role, content=content, timestamp=ts))
+        
+        # Check if this message has file information
+        file_data = m.get("file_data") or {}
+        
+        message = Message(
+            role=role,
+            content=content,
+            timestamp=ts,
+            file=file_data.get("has_file", False),
+            fileName=file_data.get("file_name"),
+            fileUrl=file_data.get("file_url")
+        )
+        history.append(message)
+    
     return history
 
 
@@ -534,15 +561,24 @@ def _assistant_response_payload(
 ) -> ChatResponse:
     # Persist assistant message
     _add_and_mirror_message(chat_id, "assistant", friendly_response)
+    
+    # Get file metadata from session
+    session = session_manager.get_session(chat_id) or {}
+    file_metadata = session.get("file_metadata", {})
+    
     # Return full history in role/content shape
     history = _normalize_history_for_api(chat_id)
+    
     return ChatResponse(
         assistant_response=friendly_response,
         api_response=api_data,
         intent=intent,
         chat_id=chat_id,
         state=state,
-        history=history
+        history=history,
+        file=file_metadata.get("has_file", False),
+        fileName=file_metadata.get("file_name"),
+        fileUrl=file_metadata.get("file_url")
     )
 
 
@@ -629,8 +665,37 @@ def upload_stream_to_s3(chat_id: str, file: UploadFile) -> str:
         )
 
     s3_uri = f"s3://{S3_BUCKET}/{key}"
-    session_manager.update_session(chat_id, {"current_file": s3_uri, "state": "initial"})
-    _add_and_mirror_message(chat_id, "system", f"File uploaded to S3: {s3_uri}")
+    
+    # Store file metadata in session
+    session_manager.update_session(chat_id, {
+        "current_file": s3_uri,
+        "state": "initial",
+        "file_metadata": {
+            "has_file": True,
+            "file_name": file.filename,
+            "file_url": s3_uri,
+            "uploaded_at": datetime.utcnow().isoformat() + "Z"
+        }
+    })
+    
+    # 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": s3_uri
+        }
+    }
+    
+    # Get existing messages and add the file message
+    s = session_manager.get_session(chat_id) or {}
+    msgs = list(s.get("messages", []))
+    msgs.append(file_message)
+    session_manager.update_session(chat_id, {"messages": msgs})
+    
     return s3_uri
 
 
@@ -1895,24 +1960,39 @@ def get_chat_history(chat_id: str):
         chat_id: Chat identifier
     
     Returns:
-        Chat history with session ID included
+        Chat history with session ID and file metadata
     """
     s = session_manager.get_session(chat_id)
     if not s:
         raise HTTPException(status_code=404, detail="Chat not found")
     
-    # Get the normalized history
+    # Get the normalized history (system messages filtered out)
     history = [m.dict() for m in _normalize_history_for_api(chat_id)]
     
-    # Return with session_id included
+    # Get file metadata
+    file_metadata = s.get("file_metadata", {})
+    
+    # Format datetime objects for JSON serialization
+    created_at = s.get("created_at")
+    updated_at = s.get("updated_at")
+    
+    if isinstance(created_at, datetime):
+        created_at = created_at.isoformat()
+    if isinstance(updated_at, datetime):
+        updated_at = updated_at.isoformat()
+    
+    # Return with session_id and file metadata
     return {
-        "session_id": chat_id,  # chat_id is the session_id in this context
-        "chat_id": chat_id,     # Keep for backward compatibility
+        "session_id": chat_id,
+        "chat_id": chat_id,
         "history": history,
         "count": len(history),
         "state": s.get("state", "initial"),
-        "created_at": s.get("created_at"),
-        "updated_at": s.get("updated_at")
+        "created_at": created_at,
+        "updated_at": updated_at,
+        "file": file_metadata.get("has_file", False),
+        "fileName": file_metadata.get("file_name"),
+        "fileUrl": file_metadata.get("file_url")
     }