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/packages/global/common/error/code/app.ts
+++ b/packages/global/common/error/code/app.ts
@@ -2,7 +2,7 @@ import { ErrType } from '../errorCode';

 /* dataset: 502000 */
 export enum AppErrEnum {
-  unExist = 'unExist',
+  unExist = 'appUnExist',
  unAuthApp = 'unAuthApp'
 }
 const appErrList = [
--- a/packages/global/common/error/code/openapi.ts
+++ b/packages/global/common/error/code/openapi.ts
@@ -2,8 +2,8 @@ import { ErrType } from '../errorCode';

 /* dataset: 506000 */
 export enum OpenApiErrEnum {
-  unExist = 'unExist',
-  unAuth = 'unAuth'
+  unExist = 'openapiUnExist',
+  unAuth = 'openapiUnAuth'
 }
 const errList = [
  {
--- a/packages/global/common/error/code/outLink.ts
+++ b/packages/global/common/error/code/outLink.ts
@@ -2,7 +2,7 @@ import { ErrType } from '../errorCode';

 /* dataset: 505000 */
 export enum OutLinkErrEnum {
-  unExist = 'unExist',
+  unExist = 'outlinkUnExist',
  unAuthLink = 'unAuthLink',
  linkUnInvalid = 'linkUnInvalid',

--- a/packages/global/common/error/code/plugin.ts
+++ b/packages/global/common/error/code/plugin.ts
@@ -2,8 +2,8 @@ import { ErrType } from '../errorCode';

 /* dataset: 507000 */
 export enum PluginErrEnum {
-  unExist = 'unExist',
-  unAuth = 'unAuth'
+  unExist = 'pluginUnExist',
+  unAuth = 'pluginUnAuth'
 }
 const errList = [
  {
--- a/packages/global/core/workflow/template/system/variableUpdate/index.tsx
+++ b/packages/global/core/workflow/template/system/variableUpdate/index.tsx
@@ -15,7 +15,7 @@ export const VariableUpdateNode: FlowNodeTemplateType = {
  targetHandle: getHandleConfig(true, true, true, true),
  avatar: '/imgs/workflow/variable.png',
  name: '变量更新',
-  intro: '可以更新指定节点的输出值和全局变量',
+  intro: '可以更新指定节点的输出值或更新全局变量',
  showStatus: true,
  isTool: false,
  inputs: [
--- a/packages/service/core/workflow/dispatch/index.ts
+++ b/packages/service/core/workflow/dispatch/index.ts
@@ -290,7 +290,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
      runtimeNodes,
      runtimeEdges,
      params,
-      mode: 'test'
+      mode: props.mode === 'debug' ? 'test' : props.mode
    };

    // run module
--- a/packages/service/core/workflow/dispatch/tools/http468.ts
+++ b/packages/service/core/workflow/dispatch/tools/http468.ts
@@ -45,6 +45,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
    detail,
    appId,
    chatId,
+    stream,
    responseChatItemId,
    variables,
    node: { outputs },
@@ -132,7 +133,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
      results[key] = valueTypeFormat(formatResponse[key], output.valueType);
    }

-    if (typeof formatResponse[NodeOutputKeyEnum.answerText] === 'string') {
+    if (stream && typeof formatResponse[NodeOutputKeyEnum.answerText] === 'string') {
      responseWrite({
        res,
        event: detail ? SseResponseEventEnum.fastAnswer : undefined,
--- 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,11 +9,12 @@ 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;

  if (!appId) {
@@ -53,8 +53,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    getAppLatestVersion(app._id, app)
  ]);

-    jsonRes<InitChatResponse>(res, {
-      data: {
+  return {
    chatId,
    appId,
    title: chat?.title || '新对话',
@@ -72,15 +71,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      avatar: app.avatar,
      intro: app.intro
    }
+  };
 }
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}
+
+export default NextAPI(handler);

 export const config = {
  api: {
--- 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,8 +20,7 @@ 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');
  }
@@ -70,19 +71,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    flowUsages
  });

-    jsonRes<PostWorkflowDebugResponse>(res, {
-      data: {
+  return {
    ...debugResponse,
    flowResponses
+  };
 }
-    });
-  } catch (err: any) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}
+
+export default NextAPI(handler);

 export const config = {
  api: {
--- 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));