Made the requested changes

frontend/src/conversation/conversationSlice.ts

@@ -25,138 +25,139 @@ export function handleAbort() {
   }
 }
 
-export const fetchAnswer = createAsyncThunk<Answer, { question: string }>(
-  'fetchAnswer',
-  async ({ question }, { dispatch, getState }) => {
-    if (abortController) {
-      abortController.abort();
-    }
-    abortController = new AbortController();
-    const { signal } = abortController;
+export const fetchAnswer = createAsyncThunk<
+  Answer,
+  { question: string; indx?: number }
+>('fetchAnswer', async ({ question, indx }, { dispatch, getState }) => {
+  if (abortController) {
+    abortController.abort();
+  }
+  abortController = new AbortController();
+  const { signal } = abortController;
 
-    let isSourceUpdated = false;
-    const state = getState() as RootState;
-    if (state.preference) {
-      if (API_STREAMING) {
-        await handleFetchAnswerSteaming(
-          question,
-          signal,
-          state.preference.selectedDocs!,
-          state.conversation.queries,
-          state.conversation.conversationId,
-          state.preference.prompt.id,
-          state.preference.chunks,
-          state.preference.token_limit,
+  let isSourceUpdated = false;
+  const state = getState() as RootState;
+  if (state.preference) {
+    if (API_STREAMING) {
+      await handleFetchAnswerSteaming(
+        question,
+        signal,
+        state.preference.selectedDocs!,
+        state.conversation.queries,
+        state.conversation.conversationId,
+        state.preference.prompt.id,
+        state.preference.chunks,
+        state.preference.token_limit,
+        (event) => {
+          const data = JSON.parse(event.data);
 
-          (event) => {
-            const data = JSON.parse(event.data);
-
-            if (data.type === 'end') {
-              dispatch(conversationSlice.actions.setStatus('idle'));
-              getConversations()
-                .then((fetchedConversations) => {
-                  dispatch(setConversations(fetchedConversations));
-                })
-                .catch((error) => {
-                  console.error('Failed to fetch conversations: ', error);
-                });
-              if (!isSourceUpdated) {
-                dispatch(
-                  updateStreamingSource({
-                    index: state.conversation.queries.length - 1,
-                    query: { sources: [] },
-                  }),
-                );
-              }
-            } else if (data.type === 'id') {
-              dispatch(
-                updateConversationId({
-                  query: { conversationId: data.id },
-                }),
-              );
-            } else if (data.type === 'source') {
-              isSourceUpdated = true;
+          if (data.type === 'end') {
+            dispatch(conversationSlice.actions.setStatus('idle'));
+            getConversations()
+              .then((fetchedConversations) => {
+                dispatch(setConversations(fetchedConversations));
+              })
+              .catch((error) => {
+                console.error('Failed to fetch conversations: ', error);
+              });
+            if (!isSourceUpdated) {
               dispatch(
                 updateStreamingSource({
-                  index: state.conversation.queries.length - 1,
-                  query: { sources: data.source ?? [] },
-                }),
-              );
-            } else if (data.type === 'error') {
-              // set status to 'failed'
-              dispatch(conversationSlice.actions.setStatus('failed'));
-              dispatch(
-                conversationSlice.actions.raiseError({
-                  index: state.conversation.queries.length - 1,
-                  message: data.error,
-                }),
-              );
-            } else {
-              const result = data.answer;
-              dispatch(
-                updateStreamingQuery({
-                  index: state.conversation.queries.length - 1,
-                  query: { response: result },
+                  index: indx ?? state.conversation.queries.length - 1,
+                  query: { sources: [] },
                 }),
               );
             }
-          },
-        );
-      } else {
-        const answer = await handleFetchAnswer(
-          question,
-          signal,
-          state.preference.selectedDocs!,
-          state.conversation.queries,
-          state.conversation.conversationId,
-          state.preference.prompt.id,
-          state.preference.chunks,
-          state.preference.token_limit,
-        );
-        if (answer) {
-          let sourcesPrepped = [];
-          sourcesPrepped = answer.sources.map((source: { title: string }) => {
-            if (source && source.title) {
-              const titleParts = source.title.split('/');
-              return {
-                ...source,
-                title: titleParts[titleParts.length - 1],
-              };
-            }
-            return source;
-          });
+          } else if (data.type === 'id') {
+            dispatch(
+              updateConversationId({
+                query: { conversationId: data.id },
+              }),
+            );
+          } else if (data.type === 'source') {
+            isSourceUpdated = true;
+            dispatch(
+              updateStreamingSource({
+                index: indx ?? state.conversation.queries.length - 1,
+                query: { sources: data.source ?? [] },
+              }),
+            );
+          } else if (data.type === 'error') {
+            // set status to 'failed'
+            dispatch(conversationSlice.actions.setStatus('failed'));
+            dispatch(
+              conversationSlice.actions.raiseError({
+                index: indx ?? state.conversation.queries.length - 1,
+                message: data.error,
+              }),
+            );
+          } else {
+            const result = data.answer;
+            dispatch(
+              updateStreamingQuery({
+                index: indx ?? state.conversation.queries.length - 1,
+                query: { response: result },
+              }),
+            );
+          }
+        },
+        indx,
+      );
+    } else {
+      const answer = await handleFetchAnswer(
+        question,
+        signal,
+        state.preference.selectedDocs!,
+        state.conversation.queries,
+        state.conversation.conversationId,
+        state.preference.prompt.id,
+        state.preference.chunks,
+        state.preference.token_limit,
+      );
+      if (answer) {
+        let sourcesPrepped = [];
+        sourcesPrepped = answer.sources.map((source: { title: string }) => {
+          if (source && source.title) {
+            const titleParts = source.title.split('/');
+            return {
+              ...source,
+              title: titleParts[titleParts.length - 1],
+            };
+          }
+          return source;
+        });
 
-          dispatch(
-            updateQuery({
-              index: state.conversation.queries.length - 1,
-              query: { response: answer.answer, sources: sourcesPrepped },
-            }),
-          );
-          dispatch(
-            updateConversationId({
-              query: { conversationId: answer.conversationId },
-            }),
-          );
-          dispatch(conversationSlice.actions.setStatus('idle'));
-          getConversations()
-            .then((fetchedConversations) => {
-              dispatch(setConversations(fetchedConversations));
-            })
-            .catch((error) => {
-              console.error('Failed to fetch conversations: ', error);
-            });
-        }
+        dispatch(
+          updateQuery({
+            index: indx ?? state.conversation.queries.length - 1,
+            query: { response: answer.answer, sources: sourcesPrepped },
+          }),
+        );
+        dispatch(
+          updateConversationId({
+            query: { conversationId: answer.conversationId },
+          }),
+        );
+        dispatch(conversationSlice.actions.setStatus('idle'));
+        getConversations()
+          .then((fetchedConversations) => {
+            dispatch(setConversations(fetchedConversations));
+          })
+          .catch((error) => {
+            console.error('Failed to fetch conversations: ', error);
+          });
       }
     }
-    return {
-      conversationId: null,
-      title: null,
-      answer: '',
-      query: question,
-      result: '',
-      sources: [],
-    };
-  },
+  }
+  return {
+    conversationId: null,
+    title: null,
+    answer: '',
+    query: question,
+    result: '',
+    sources: [],
+  };
+},
 );
 
 export const conversationSlice = createSlice({
@@ -169,6 +170,12 @@ export const conversationSlice = createSlice({
     setConversation(state, action: PayloadAction<Query[]>) {
       state.queries = action.payload;
     },
+    resendQuery(
+      state,
+      action: PayloadAction<{ index: number; prompt: string; query?: Query }>,
+    ) {
+      state.queries[action.payload.index] = action.payload;
+    },
     updateStreamingQuery(
       state,
       action: PayloadAction<{ index: number; query: Partial<Query> }>,
@@ -250,6 +257,7 @@ export const selectStatus = (state: RootState) => state.conversation.status;
 export const {
   addQuery,
   updateQuery,
+  resendQuery,
   updateStreamingQuery,
   updateConversationId,
   updateStreamingSource,