Merge branch 'main' into feat/agent-menu

frontend/src/conversation/ConversationBubble.tsx

@@ -57,7 +57,6 @@ const ConversationBubble = forwardRef<
       updated?: boolean,
       index?: number,
     ) => void;
-    attachments?: { fileName: string; id: string }[];
   }
 >(function ConversationBubble(
   {
@@ -72,7 +71,6 @@ const ConversationBubble = forwardRef<
     retryBtn,
     questionNumber,
     handleUpdatedQuestionSubmission,
-    attachments,
   },
   ref,
 ) {
@@ -99,36 +97,6 @@ const ConversationBubble = forwardRef<
     handleUpdatedQuestionSubmission?.(editInputBox, true, questionNumber);
   };
   let bubble;
-  const renderAttachments = () => {
-    if (!attachments || attachments.length === 0) return null;
-    
-    return (
-      <div className="mt-2 flex flex-wrap gap-2">
-        {attachments.map((attachment, index) => (
-          <div 
-            key={index} 
-            className="flex items-center rounded-md bg-gray-100 px-2 py-1 text-sm dark:bg-gray-700"
-          >
-            <svg 
-              className="mr-1 h-4 w-4" 
-              fill="none" 
-              stroke="currentColor" 
-              viewBox="0 0 24 24" 
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path 
-                strokeLinecap="round" 
-                strokeLinejoin="round" 
-                strokeWidth={2} 
-                d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13" 
-              />
-            </svg>
-            <span>{attachment.fileName}</span>
-          </div>
-        ))}
-      </div>
-    );
-  };
   if (type === 'QUESTION') {
     bubble = (
       <div
@@ -157,7 +125,6 @@ const ConversationBubble = forwardRef<
                 >
                   {message}
                 </div>
-                {renderAttachments()}
               </div>
               <button
                 onClick={() => {

frontend/src/conversation/ConversationMessages.tsx

@@ -171,7 +171,6 @@ export default function ConversationMessages({
                 handleUpdatedQuestionSubmission={handleQuestionSubmission}
                 questionNumber={index}
                 sources={query.sources}
-                attachments={query.attachments}
               />
               {prepResponseView(query, index)}
             </Fragment>

frontend/src/conversation/conversationModels.ts

@@ -9,11 +9,21 @@ export interface Message {
   type: MESSAGE_TYPE;
 }
 
+
+export interface Attachment {
+  id?: string;
+  fileName: string;
+  status: 'uploading' | 'processing' | 'completed' | 'failed';
+  progress: number;
+  taskId?: string;
+  token_count?: number;
+}
+
 export interface ConversationState {
   queries: Query[];
   status: Status;
   conversationId: string | null;
-  attachments?: { fileName: string; id: string }[];
+  attachments: Attachment[];
 }
 
 export interface Answer {

frontend/src/conversation/conversationSlice.ts

@@ -7,7 +7,13 @@ import {
   handleFetchAnswer,
   handleFetchAnswerSteaming,
 } from './conversationHandlers';
-import { Answer, ConversationState, Query, Status } from './conversationModels';
+import {
+  Answer,
+  Query,
+  Status,
+  ConversationState,
+  Attachment,
+} from './conversationModels';
 
 const initialState: ConversationState = {
   queries: [],
@@ -38,7 +44,9 @@ export const fetchAnswer = createAsyncThunk<
 
     let isSourceUpdated = false;
     const state = getState() as RootState;
-    const attachments = state.conversation.attachments?.map((a) => a.id) || [];
+    const attachmentIds = state.conversation.attachments
+      .filter((a) => a.id && a.status === 'completed')
+      .map((a) => a.id) as string[];
     const currentConversationId = state.conversation.conversationId;
     const conversationIdToSend = isPreview ? null : currentConversationId;
     const save_conversation = isPreview ? false : true;
@@ -129,7 +137,7 @@ export const fetchAnswer = createAsyncThunk<
           },
           indx,
           state.preference.selectedAgent?.id,
-          attachments,
+          attachmentIds,
           save_conversation,
         );
       } else {
@@ -144,7 +152,7 @@ export const fetchAnswer = createAsyncThunk<
           state.preference.chunks,
           state.preference.token_limit,
           state.preference.selectedAgent?.id,
-          attachments,
+          attachmentIds,
           save_conversation,
         );
         if (answer) {
@@ -301,12 +309,34 @@ export const conversationSlice = createSlice({
       const { index, message } = action.payload;
       state.queries[index].error = message;
     },
-    setAttachments: (
-      state,
-      action: PayloadAction<{ fileName: string; id: string }[]>,
-    ) => {
+    setAttachments: (state, action: PayloadAction<Attachment[]>) => {
       state.attachments = action.payload;
     },
+    addAttachment: (state, action: PayloadAction<Attachment>) => {
+      state.attachments.push(action.payload);
+    },
+    updateAttachment: (
+      state,
+      action: PayloadAction<{
+        taskId: string;
+        updates: Partial<Attachment>;
+      }>,
+    ) => {
+      const index = state.attachments.findIndex(
+        (att) => att.taskId === action.payload.taskId,
+      );
+      if (index !== -1) {
+        state.attachments[index] = {
+          ...state.attachments[index],
+          ...action.payload.updates,
+        };
+      }
+    },
+    removeAttachment: (state, action: PayloadAction<string>) => {
+      state.attachments = state.attachments.filter(
+        (att) => att.taskId !== action.payload && att.id !== action.payload,
+      );
+    },
     resetConversation: (state) => {
       state.queries = initialState.queries;
       state.status = initialState.status;
@@ -337,6 +367,11 @@ export const selectQueries = (state: RootState) => state.conversation.queries;
 
 export const selectStatus = (state: RootState) => state.conversation.status;
 
+export const selectAttachments = (state: RootState) =>
+  state.conversation.attachments;
+export const selectCompletedAttachments = (state: RootState) =>
+  state.conversation.attachments.filter((att) => att.status === 'completed');
+
 export const {
   addQuery,
   updateQuery,
@@ -348,6 +383,9 @@ export const {
   updateToolCalls,
   setConversation,
   setAttachments,
+  addAttachment,
+  updateAttachment,
+  removeAttachment,
   resetConversation,
 } = conversationSlice.actions;
 export default conversationSlice.reducer;