Send user response to agent

src/client/components/ConversationWrapper.tsx

@@ -89,28 +89,25 @@ export default function ConversationWrapper() {
     try {
       // 1. add new conversation to table
       const payload = {
+        // @ts-ignore
         conversation_id: conversations.id,
-        conversations: [
-          // Todo: remove the below ignore comment
-          // @ts-ignore
-          ...conversations.conversation,
-          ...[{ role: "user", content: userQuery }],
-        ],
+        conversations: [...[{ role: "user", content: userQuery }]],
       };
 
-      await updateConversation(payload);
+      const updatedConversation = await updateConversation(payload);
       // 2. call backend python server to get agent response
       setIsLoading(true);
       const response = await getAgentResponse({
-        message: payload.conversations,
-        conv_id: payload.conversation_id,
+        message: updatedConversation["conversation"],
+        conv_id: updatedConversation.id,
+        // @ts-ignore
+        is_answer_to_agent_question: updatedConversation.status === "pause",
       });
       // 3. add agent response as new conversation in the table
       const openAIResponse = {
+        // @ts-ignore
         conversation_id: conversations.id,
         conversations: [
-          ...payload.conversations,
-          // Todo: remove the below ignore comment
           // @ts-ignore
           ...[{ role: "assistant", content: response.content }],
         ],
@@ -134,7 +131,7 @@ export default function ConversationWrapper() {
     // Todo: remove the below ignore comment
     // @ts-ignore
     target.reset();
-    callAgent(userQuery);
+    await callAgent(userQuery);
   };
 
   if (isConversationLoading && !!id) return <Loader />;

src/server/actions.ts

@@ -204,17 +204,49 @@ type UpdateConversationPayload = {
   status?: string;
 };
 
+type ConversationItem = {
+  role: string;
+  content: string;
+};
+
+function convertConversationList(
+  currentConversation: Conversation
+): Array<ConversationItem> {
+  const conversationList: Array<any> = Object.entries(
+    // @ts-ignore
+    currentConversation.conversation
+  );
+  return conversationList.map((item) => item[1]);
+}
+
 export const updateConversation: UpdateConversation<
   UpdateConversationPayload,
   Conversation
 > = async (args, context) => {
   if (!context.user) {
     throw new HttpError(401);
   }
+  const currentConversation =
+    await context.entities.Conversation.findFirstOrThrow({
+      where: { id: args.conversation_id },
+    });
+
+  let currentConversationList = convertConversationList(currentConversation);
+  const existingRole =
+    currentConversationList[currentConversationList.length - 1]["role"];
+  const openAIResponseRole = args.conversations[0]["role"];
+
+  if (!(existingRole === "assistant" && existingRole === openAIResponseRole)) {
+    currentConversationList = [
+      ...currentConversationList,
+      ...args.conversations,
+    ];
+  }
+
   return context.entities.Conversation.update({
     where: { id: args.conversation_id },
     data: {
-      conversation: args.conversations,
+      conversation: currentConversationList,
       ...(args.status && { status: args.status }),
     },
   });
@@ -223,10 +255,11 @@ export const updateConversation: UpdateConversation<
 type AgentPayload = {
   message: any;
   conv_id: number;
+  is_answer_to_agent_question?: boolean;
 };
 
 export const getAgentResponse: GetAgentResponse<AgentPayload> = async (
-  { message, conv_id },
+  { message, conv_id, is_answer_to_agent_question },
   context
 ) => {
   if (!context.user) {
@@ -237,6 +270,7 @@ export const getAgentResponse: GetAgentResponse<AgentPayload> = async (
     message: message,
     conv_id: conv_id,
     user_id: context.user.id,
+    is_answer_to_agent_question: is_answer_to_agent_question,
   };
   console.log("===========");
   console.log("Payload to Python server");

src/server/webSocket.js

@@ -11,7 +11,6 @@ export const webSocketFn = (io, context) => {
 
       // Check for updates every 3 seconds
       const updateInterval = setInterval(async () => {
-        console.log("Checking database for inprogress tasks");
         const conversations = await context.entities.Conversation.findMany({
           where: { userId: socket.data.user.id, status: "inprogress" },
         });
@@ -43,7 +42,10 @@ export const webSocketFn = (io, context) => {
               }
 
               const conversation_status = json["status"];
-              if (conversation_status === "ready") {
+              if (
+                conversation_status === "completed" ||
+                conversation_status === "pause"
+              ) {
                 const updated_conversation = conversation.conversation.concat([
                   { role: "assistant", content: json["msg"] },
                 ]);