Tool call support interactive node (#2903)

* feat: tool call support interactive node

* feat: interactive node tool response

* fix: tool call concat

* fix: llm history concat

packages/service/core/chat/saveChat.ts

@@ -12,6 +12,7 @@ import { mongoSessionRun } from '../../common/mongo/sessionRun';
 import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
 import { getAppChatConfig, getGuideModule } from '@fastgpt/global/core/workflow/utils';
 import { AppChatConfigType } from '@fastgpt/global/core/app/type';
+import { mergeChatResponseData } from '@fastgpt/global/core/chat/utils';
 
 type Props = {
   chatId: string;
@@ -143,6 +144,7 @@ export const updateInteractiveChat = async ({
 
   if (!chatItem || chatItem.obj !== ChatRoleEnum.AI) return;
 
+  // Update interactive value
   const interactiveValue = chatItem.value[chatItem.value.length - 1];
 
   if (
@@ -160,31 +162,36 @@ export const updateInteractiveChat = async ({
       return userInteractiveVal;
     }
   })();
-  interactiveValue.interactive =
-    interactiveValue.interactive.type === 'userSelect'
-      ? {
-          ...interactiveValue.interactive,
-          params: {
-            ...interactiveValue.interactive.params,
-            userSelectedVal: userInteractiveVal
-          }
-        }
-      : {
-          ...interactiveValue.interactive,
-          params: {
-            ...interactiveValue.interactive.params,
-            inputForm: interactiveValue.interactive.params.inputForm.map((item) => {
-              const itemValue = parsedUserInteractiveVal[item.label];
-              return itemValue !== undefined
-                ? {
-                    ...item,
-                    value: itemValue
-                  }
-                : item;
-            }),
-            submitted: true
-          }
-        };
+
+  if (interactiveValue.interactive.type === 'userSelect') {
+    interactiveValue.interactive = {
+      ...interactiveValue.interactive,
+      params: {
+        ...interactiveValue.interactive.params,
+        userSelectedVal: userInteractiveVal
+      }
+    };
+  } else if (
+    interactiveValue.interactive.type === 'userInput' &&
+    typeof parsedUserInteractiveVal === 'object'
+  ) {
+    interactiveValue.interactive = {
+      ...interactiveValue.interactive,
+      params: {
+        ...interactiveValue.interactive.params,
+        inputForm: interactiveValue.interactive.params.inputForm.map((item) => {
+          const itemValue = parsedUserInteractiveVal[item.label];
+          return itemValue !== undefined
+            ? {
+                ...item,
+                value: itemValue
+              }
+            : item;
+        }),
+        submitted: true
+      }
+    };
+  }
 
   if (aiResponse.customFeedbacks) {
     chatItem.customFeedbacks = chatItem.customFeedbacks
@@ -194,7 +201,7 @@ export const updateInteractiveChat = async ({
 
   if (aiResponse.responseData) {
     chatItem.responseData = chatItem.responseData
-      ? [...chatItem.responseData, ...aiResponse.responseData]
+      ? mergeChatResponseData([...chatItem.responseData, ...aiResponse.responseData])
       : aiResponse.responseData;
   }
 

packages/service/core/chat/utils.ts

@@ -11,17 +11,6 @@ import { serverRequestBaseUrl } from '../../common/api/serverRequest';
 import { i18nT } from '../../../web/i18n/utils';
 import { addLog } from '../../common/system/log';
 
-/* slice chat context by tokens */
-const filterEmptyMessages = (messages: ChatCompletionMessageParam[]) => {
-  return messages.filter((item) => {
-    if (item.role === ChatCompletionRequestMessageRoleEnum.System) return !!item.content;
-    if (item.role === ChatCompletionRequestMessageRoleEnum.User) return !!item.content;
-    if (item.role === ChatCompletionRequestMessageRoleEnum.Assistant)
-      return !!item.content || !!item.function_call || !!item.tool_calls;
-    return true;
-  });
-};
-
 export const filterGPTMessageByMaxTokens = async ({
   messages = [],
   maxTokens
@@ -52,7 +41,7 @@ export const filterGPTMessageByMaxTokens = async ({
 
   // If the text length is less than half of the maximum token, no calculation is required
   if (rawTextLen < maxTokens * 0.5) {
-    return filterEmptyMessages(messages);
+    return messages;
   }
 
   // filter startWith system prompt
@@ -95,7 +84,7 @@ export const filterGPTMessageByMaxTokens = async ({
     }
   }
 
-  return filterEmptyMessages([...systemPrompts, ...chats]);
+  return [...systemPrompts, ...chats];
 };
 
 /* 
@@ -215,7 +204,7 @@ export const loadRequestMessages = async ({
           return;
         }
         if (item.role === ChatCompletionRequestMessageRoleEnum.User) {
-          if (!item.content) return;
+          if (item.content === undefined) return;
 
           if (typeof item.content === 'string') {
             return {
@@ -233,16 +222,10 @@ export const loadRequestMessages = async ({
             };
           }
         }
-        if (item.role === ChatCompletionRequestMessageRoleEnum.Assistant) {
-          if (
-            item.content !== undefined &&
-            !item.content &&
-            !item.tool_calls &&
-            !item.function_call
-          )
-            return;
-          if (Array.isArray(item.content) && item.content.length === 0) return;
-        }
+        // if (item.role === ChatCompletionRequestMessageRoleEnum.Assistant) {
+        //   if (item.content === undefined && !item.tool_calls && !item.function_call) return;
+        //   if (Array.isArray(item.content) && item.content.length === 0) return;
+        // }
 
         return item;
       })