4.8.10 test (#2601)

* perf: workflow children run params

* feat: workflow userId

* fix: ui size

* perf: Markdown whitespace and ai images split

* fix: openai sdk ts

projects/app/src/pages/api/core/chat/chatTest.ts

@@ -13,10 +13,7 @@ import { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import { removeEmptyUserInput } from '@fastgpt/global/core/chat/utils';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import {
-  removePluginInputVariables,
-  updatePluginInputByVariables
-} from '@fastgpt/global/core/workflow/utils';
+import { updatePluginInputByVariables } from '@fastgpt/global/core/workflow/utils';
 import { NextAPI } from '@/service/middleware/entry';
 import { GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt';
 import { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type';
@@ -89,7 +86,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     // Plugin need to replace inputs
     if (isPlugin) {
       runtimeNodes = updatePluginInputByVariables(runtimeNodes, variables);
-      variables = removePluginInputVariables(variables, runtimeNodes);
+      variables = {};
     } else {
       if (!userInput) {
         throw new Error('Params Error');
@@ -109,10 +106,13 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
       res,
       requestOrigin: req.headers.origin,
       mode: 'test',
-      teamId,
-      tmbId,
+      runningAppInfo: {
+        id: appId,
+        teamId,
+        tmbId
+      },
+      uid: tmbId,
       user,
-      app,
       runtimeNodes,
       runtimeEdges: initWorkflowEdgeStatus(edges, chatMessages),
       variables,

projects/app/src/pages/api/core/workflow/debug.ts

@@ -43,10 +43,13 @@ async function handler(
     res,
     requestOrigin: req.headers.origin,
     mode: 'debug',
-    teamId,
-    tmbId,
+    runningAppInfo: {
+      id: appId,
+      teamId,
+      tmbId
+    },
+    uid: tmbId,
     user,
-    app,
     runtimeNodes: nodes,
     runtimeEdges: edges,
     variables,

projects/app/src/pages/api/v1/chat/completions.ts

@@ -52,18 +52,12 @@ import { NextAPI } from '@/service/middleware/entry';
 import { getAppLatestVersion } from '@fastgpt/service/core/app/controller';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import {
-  removePluginInputVariables,
-  updatePluginInputByVariables
-} from '@fastgpt/global/core/workflow/utils';
+import { updatePluginInputByVariables } from '@fastgpt/global/core/workflow/utils';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
-import {
-  getPluginInputsFromStoreNodes,
-  getPluginRunContent
-} from '@fastgpt/global/core/app/plugin/utils';
 import { getSystemTime } from '@fastgpt/global/common/time/timezone';
 import { rewriteNodeOutputByHistories } from '@fastgpt/global/core/workflow/runtime/utils';
 import { getWorkflowResponseWrite } from '@fastgpt/service/core/workflow/dispatch/utils';
+import { getPluginRunUserQuery } from '@fastgpt/service/core/workflow/utils';
 
 type FastGptWebChatProps = {
   chatId?: string; // undefined: get histories from messages, '': new chat, 'xxxxx': get histories from db
@@ -193,21 +187,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     // Get obj=Human history
     const userQuestion: UserChatItemType = (() => {
       if (isPlugin) {
-        return {
-          dataId: getNanoid(24),
-          obj: ChatRoleEnum.Human,
-          value: [
-            {
-              type: ChatItemValueTypeEnum.text,
-              text: {
-                content: getPluginRunContent({
-                  pluginInputs: getPluginInputsFromStoreNodes(app.modules),
-                  variables
-                })
-              }
-            }
-          ]
-        };
+        return getPluginRunUserQuery(app.modules, variables);
       }
 
       const latestHumanChat = chatMessages.pop() as UserChatItemType | undefined;
@@ -246,8 +226,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     if (isPlugin) {
       // Assign values to runtimeNodes using variables
       runtimeNodes = updatePluginInputByVariables(runtimeNodes, variables);
-      // Remove pluginInput fields from variables (they are not global variables)
-      variables = removePluginInputVariables(variables, runtimeNodes);
+      // Plugin runtime does not need global variables(It has been injected into the pluginInputNode)
+      variables = {};
     }
     runtimeNodes = rewriteNodeOutputByHistories(newHistories, runtimeNodes);
 
@@ -266,9 +246,14 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           requestOrigin: req.headers.origin,
           mode: 'chat',
           user,
-          teamId: String(teamId),
-          tmbId: String(tmbId),
-          app,
+
+          runningAppInfo: {
+            id: String(app._id),
+            teamId: String(app.teamId),
+            tmbId: String(app.tmbId)
+          },
+          uid: String(outLinkUserId || tmbId),
+
           chatId,
           responseChatItemId,
           runtimeNodes,