attach file to user message

Author: leehuwuj

python/llama-index-server/examples/private_file/agent-workflow.py

@@ -18,7 +18,7 @@ def create_file_tool(chat_request: ChatRequest) -> Optional[FunctionTool]:
     Create a tool to read file if the user uploads a file.
     """
     file_ids = []
-    for file in get_file_attachments(chat_request):
+    for file in get_file_attachments(chat_request.messages):
         file_ids.append(file.id)
     if len(file_ids) == 0:
         return None
@@ -29,7 +29,7 @@ def create_file_tool(chat_request: ChatRequest) -> Optional[FunctionTool]:
     )
 
     def read_file(file_id: str) -> str:
-        file_path = FileService.get_private_file_path(file_id)
+        file_path = FileService.get_file_path(file_id)
         try:
             with open(file_path, "r") as file:
                 return file.read()
@@ -57,7 +57,7 @@ def create_app() -> FastAPI:
         workflow_factory=create_workflow,
         suggest_next_questions=False,
         ui_config=UIConfig(
-            file_upload_enabled=True,
+            enable_file_upload=True,
             component_dir="components",
         ),
     )

python/llama-index-server/llama_index/server/api/utils/chat_request.py

@@ -37,10 +37,7 @@ def prepare_user_message(chat_request: ChatRequest) -> ChatMessage:
         raise ValueError("Last message must be from user")
 
     # Add attached files to the user message
-    user_messages = [
-        message for message in chat_request.messages if message.role == MessageRole.USER
-    ]
-    attachment_files = get_file_attachments(user_messages)
+    attachment_files = get_file_attachments(chat_request.messages)
     last_message.blocks += [
         DocumentBlock(
             path=file.path or FileService.get_file_path(file.id),

python/llama-index-server/llama_index/server/utils/chat_attachments.py

@@ -1,23 +1,26 @@
 from typing import List
 
+from llama_index.core.base.message import MessageRole
 from llama_index.server.models.chat import ChatAPIMessage, FileAnnotation, ServerFile
 
 
 def get_file_attachments(messages: List[ChatAPIMessage]) -> List[ServerFile]:
     """
-    Extract all file attachments from the chat request.
+    Extract all file attachments from user messages.
 
     Args:
         messages (List[ChatAPIMessage]): The list of messages.
 
     Returns:
-        List[PrivateFile]: The list of private files.
+        List[ServerFile]: The list of private files.
     """
-    message_annotations = [
-        message.annotations for message in messages if message.annotations
+    user_message_annotations = [
+        message.annotations
+        for message in messages
+        if message.annotations and message.role == MessageRole.USER
     ]
     files: List[ServerFile] = []
-    for annotation in message_annotations:
+    for annotation in user_message_annotations:
         if isinstance(annotation, list):
             for item in annotation:
                 if isinstance(item, FileAnnotation):