4.8 test fix (#1397)

* adapt v1 chat init * adapt v1 chat init * adapt v1 chat init * perf: message input line; fix: http request un stream * perf: message input line; fix: http request un stream * perf: message input line; fix: http request un stream * perf: error tip
2025-07-23 05:12:39 +00:00 · 2024-05-08 22:18:22 +08:00
parent 3c6e5a6e00
commit 917e4e9262
13 changed files with 167 additions and 146 deletions
--- a/projects/app/data/pluginTemplates/customFeedback.json
+++ b/projects/app/data/pluginTemplates/customFeedback.json
@@ -85,7 +85,22 @@
        "x": 1607.7142331269126,
        "y": -151.8669210746189
      },
-      "inputs": [],
+      "inputs": [
+        {
+          "key": "text",
+          "valueType": "string",
+          "label": "text",
+          "renderTypeList": ["reference"],
+          "description": "",
+          "canEdit": true,
+          "editField": {
+            "key": true,
+            "description": true,
+            "valueType": true
+          },
+          "value": ["CRT7oIEU8v2P", "pYKS0LB9gAr3"]
+        }
+      ],
      "outputs": []
    },
    {
@@ -190,6 +205,13 @@
          "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。",
          "valueType": "any",
          "type": "static"
+        },
+        {
+          "id": "pYKS0LB9gAr3",
+          "type": "dynamic",
+          "key": "text",
+          "valueType": "string",
+          "label": "text"
        }
      ]
    }
--- a/projects/app/src/components/ChatBox/MessageInput.tsx
+++ b/projects/app/src/components/ChatBox/MessageInput.tsx
@@ -357,9 +357,16 @@ const MessageInput = ({
              // enter send.(pc or iframe && enter and unPress shift)
              const isEnter = e.keyCode === 13;
              if (isEnter && TextareaDom.current && (e.ctrlKey || e.altKey)) {
-                TextareaDom.current.value += '\n';
+                // Add a new line
+                const index = TextareaDom.current.selectionStart;
+                const val = TextareaDom.current.value;
+                TextareaDom.current.value = `${val.slice(0, index)}\n${val.slice(index)}`;
+                TextareaDom.current.selectionStart = index + 1;
+                TextareaDom.current.selectionEnd = index + 1;
+
                TextareaDom.current.style.height = textareaMinH;
                TextareaDom.current.style.height = `${TextareaDom.current.scrollHeight}px`;
+
                return;
              }

--- a/projects/app/src/components/core/workflow/context.tsx
+++ b/projects/app/src/components/core/workflow/context.tsx
@@ -487,7 +487,6 @@ const WorkflowContextProvider = ({
      // 3. Set entry node status to running
      entryNodes.forEach((node) => {
        if (runtimeNodeStatus[node.nodeId] !== 'wait') {
-          console.log(node.name);
          onChangeNode({
            nodeId: node.nodeId,
            type: 'attr',
--- a/projects/app/src/pages/api/core/chat/init.ts
+++ b/projects/app/src/pages/api/core/chat/init.ts
@@ -1,6 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
 import { authApp } from '@fastgpt/service/support/permission/auth/app';
 import { getGuideModule, replaceAppChatConfig } from '@fastgpt/global/core/workflow/utils';
 import { getChatModelNameListByModules } from '@/service/core/app/workflow';
@@ -10,78 +9,73 @@ import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { getAppLatestVersion } from '@fastgpt/service/core/app/controller';
+import { NextAPI } from '@/service/middle/entry';

-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
+async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse
+): Promise<InitChatResponse | void> {
+  let { appId, chatId, loadCustomFeedbacks } = req.query as InitChatProps;

-    let { appId, chatId, loadCustomFeedbacks } = req.query as InitChatProps;
-
-    if (!appId) {
-      return jsonRes(res, {
-        code: 501,
-        message: "You don't have an app yet"
-      });
-    }
-
-    // auth app permission
-    const [{ app, tmbId }, chat] = await Promise.all([
-      authApp({
-        req,
-        authToken: true,
-        appId,
-        per: 'r'
-      }),
-      chatId ? MongoChat.findOne({ appId, chatId }) : undefined
-    ]);
-
-    // auth chat permission
-    if (chat && !app.canWrite && String(tmbId) !== String(chat?.tmbId)) {
-      throw new Error(ChatErrEnum.unAuthChat);
-    }
-
-    // get app and history
-    const [{ history }, { nodes }] = await Promise.all([
-      getChatItems({
-        appId,
-        chatId,
-        limit: 30,
-        field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback ${
-          DispatchNodeResponseKeyEnum.nodeResponse
-        } ${loadCustomFeedbacks ? 'customFeedbacks' : ''}`
-      }),
-      getAppLatestVersion(app._id, app)
-    ]);
-
-    jsonRes<InitChatResponse>(res, {
-      data: {
-        chatId,
-        appId,
-        title: chat?.title || '新对话',
-        userAvatar: undefined,
-        variables: chat?.variables || {},
-        history,
-        app: {
-          userGuideModule: replaceAppChatConfig({
-            node: getGuideModule(nodes),
-            variableList: chat?.variableList,
-            welcomeText: chat?.welcomeText
-          }),
-          chatModels: getChatModelNameListByModules(nodes),
-          name: app.name,
-          avatar: app.avatar,
-          intro: app.intro
-        }
-      }
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
+  if (!appId) {
+    return jsonRes(res, {
+      code: 501,
+      message: "You don't have an app yet"
    });
  }
+
+  // auth app permission
+  const [{ app, tmbId }, chat] = await Promise.all([
+    authApp({
+      req,
+      authToken: true,
+      appId,
+      per: 'r'
+    }),
+    chatId ? MongoChat.findOne({ appId, chatId }) : undefined
+  ]);
+
+  // auth chat permission
+  if (chat && !app.canWrite && String(tmbId) !== String(chat?.tmbId)) {
+    throw new Error(ChatErrEnum.unAuthChat);
+  }
+
+  // get app and history
+  const [{ history }, { nodes }] = await Promise.all([
+    getChatItems({
+      appId,
+      chatId,
+      limit: 30,
+      field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback ${
+        DispatchNodeResponseKeyEnum.nodeResponse
+      } ${loadCustomFeedbacks ? 'customFeedbacks' : ''}`
+    }),
+    getAppLatestVersion(app._id, app)
+  ]);
+
+  return {
+    chatId,
+    appId,
+    title: chat?.title || '新对话',
+    userAvatar: undefined,
+    variables: chat?.variables || {},
+    history,
+    app: {
+      userGuideModule: replaceAppChatConfig({
+        node: getGuideModule(nodes),
+        variableList: chat?.variableList,
+        welcomeText: chat?.welcomeText
+      }),
+      chatModels: getChatModelNameListByModules(nodes),
+      name: app.name,
+      avatar: app.avatar,
+      intro: app.intro
+    }
+  };
 }

+export default NextAPI(handler);
+
 export const config = {
  api: {
    responseLimit: '10mb'
--- a/projects/app/src/pages/api/core/workflow/debug.ts
+++ b/projects/app/src/pages/api/core/workflow/debug.ts
@@ -1,6 +1,4 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { connectToDatabase } from '@/service/mongo';
-import { jsonRes } from '@fastgpt/service/common/response';
 import { pushChatUsage } from '@/service/support/wallet/usage/push';
 import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
 import { authApp } from '@fastgpt/service/support/permission/auth/app';
@@ -9,8 +7,12 @@ import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
 import { PostWorkflowDebugProps, PostWorkflowDebugResponse } from '@/global/core/workflow/api';
 import { authPluginCrud } from '@fastgpt/service/support/permission/auth/plugin';
+import { NextAPI } from '@/service/middle/entry';

-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse
+): Promise<PostWorkflowDebugResponse> {
  const {
    nodes = [],
    edges = [],
@@ -18,72 +20,65 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    appId,
    pluginId
  } = req.body as PostWorkflowDebugProps;
-  try {
-    await connectToDatabase();
-    if (!nodes) {
-      throw new Error('Prams Error');
-    }
-    if (!Array.isArray(nodes)) {
-      throw new Error('Nodes is not array');
-    }
-    if (!Array.isArray(edges)) {
-      throw new Error('Edges is not array');
-    }

-    /* user auth */
-    const [{ teamId, tmbId }] = await Promise.all([
-      authCert({
-        req,
-        authToken: true
-      }),
-      appId && authApp({ req, authToken: true, appId, per: 'r' }),
-      pluginId && authPluginCrud({ req, authToken: true, pluginId, per: 'r' })
-    ]);
-
-    // auth balance
-    const { user } = await getUserChatInfoAndAuthTeamPoints(tmbId);
-
-    /* start process */
-    const { flowUsages, flowResponses, debugResponse } = await dispatchWorkFlow({
-      res,
-      mode: 'debug',
-      teamId,
-      tmbId,
-      user,
-      appId,
-      runtimeNodes: nodes,
-      runtimeEdges: edges,
-      variables,
-      query: [],
-      histories: [],
-      stream: false,
-      detail: true,
-      maxRunTimes: 200
-    });
-
-    pushChatUsage({
-      appName: '工作流Debug',
-      appId,
-      teamId,
-      tmbId,
-      source: UsageSourceEnum.fastgpt,
-      flowUsages
-    });
-
-    jsonRes<PostWorkflowDebugResponse>(res, {
-      data: {
-        ...debugResponse,
-        flowResponses
-      }
-    });
-  } catch (err: any) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
+  if (!nodes) {
+    throw new Error('Prams Error');
  }
+  if (!Array.isArray(nodes)) {
+    throw new Error('Nodes is not array');
+  }
+  if (!Array.isArray(edges)) {
+    throw new Error('Edges is not array');
+  }
+
+  /* user auth */
+  const [{ teamId, tmbId }] = await Promise.all([
+    authCert({
+      req,
+      authToken: true
+    }),
+    appId && authApp({ req, authToken: true, appId, per: 'r' }),
+    pluginId && authPluginCrud({ req, authToken: true, pluginId, per: 'r' })
+  ]);
+
+  // auth balance
+  const { user } = await getUserChatInfoAndAuthTeamPoints(tmbId);
+
+  /* start process */
+  const { flowUsages, flowResponses, debugResponse } = await dispatchWorkFlow({
+    res,
+    mode: 'debug',
+    teamId,
+    tmbId,
+    user,
+    appId,
+    runtimeNodes: nodes,
+    runtimeEdges: edges,
+    variables,
+    query: [],
+    histories: [],
+    stream: false,
+    detail: true,
+    maxRunTimes: 200
+  });
+
+  pushChatUsage({
+    appName: '工作流Debug',
+    appId,
+    teamId,
+    tmbId,
+    source: UsageSourceEnum.fastgpt,
+    flowUsages
+  });
+
+  return {
+    ...debugResponse,
+    flowResponses
+  };
 }

+export default NextAPI(handler);
+
 export const config = {
  api: {
    bodyParser: {
--- a/projects/app/src/pages/api/plugins/customFeedback/v2/index.ts
+++ b/projects/app/src/pages/api/plugins/customFeedback/v2/index.ts
@@ -34,11 +34,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<

    if (!chatId || !chatItemId) {
      return res.json({
-        [NodeOutputKeyEnum.answerText]: `\\n\\n**自动反馈调试**: "${customFeedback}"\\n\\n`
+        [NodeOutputKeyEnum.answerText]: `\\n\\n**自动反馈调试**: "${customFeedback}"\\n\\n`,
+        text: customFeedback
      });
    }

-    return res.json({});
+    res.json({
+      text: customFeedback
+    });
  } catch (err) {
    console.log(err);
    res.status(500).send(getErrText(err));