4.8.10 perf (#2378)

* perf: helpline code * fix: prompt call stream=false response prefix * fix: app chat log auth * perf: new chat i18n * fix: milvus dataset cannot export data * perf: doc intro

4.8.10 perf (#2378)
* perf: helpline code * fix: prompt call stream=false response prefix * fix: app chat log auth * perf: new chat i18n * fix: milvus dataset cannot export data * perf: doc intro
86c27e85 · Archer · GitHub · fdeb1590 · 86c27e85 · 86c27e85
Commit 86c27e85 authored Aug 15, 2024 by Archer Committed by GitHub Aug 15, 2024
16 changed files
--- a/docSite/content/zh-cn/docs/development/upgrading/4810.md
+++ b/docSite/content/zh-cn/docs/development/upgrading/4810.md
@@ -20,4 +20,10 @@ weight: 816
 ## V4.8.10 更新说明
 1. 新增 - 模板市场
-2. 
+2. 新增 - 工作流节点拖动自动对齐吸附
+3. 新增 - 用户选择节点（Debug 模式暂未支持）
+4. 商业版新增 - 飞书机器人接入
+5. 商业版新增 - 公众号接入接入
+6. 修复 - Prompt 模式调用工具，stream=false 模式下，会携带 0: 开头标记。
+7. 修复 - 对话日志鉴权问题：仅为 APP 管理员的用户，无法查看对话日志详情。
+8. 修复 - 选择 Milvus 部署时，无法导出知识库。 
--- a/packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts
+++ b/packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts
@@ -411,6 +411,7 @@ const parseAnswer = (
  str = str.trim();
  // 首先，使用正则表达式提取TOOL_ID和TOOL_ARGUMENTS
  const prefixReg = /^1(:|：)/;
+  const answerPrefixReg = /^0(:|：)/;
  if (prefixReg.test(str)) {
    const toolString = sliceJsonStr(str);
@@ -432,7 +433,7 @@ const parseAnswer = (
    }
  } else {
    return {
-      answer: str
+      answer: str.replace(answerPrefixReg, '')
    };
  }
 };
--- a/projects/app/src/global/core/chat/api.d.ts
+++ b/projects/app/src/global/core/chat/api.d.ts
@@ -30,7 +30,7 @@ export type InitChatResponse = {
  chatId?: string;
  appId: string;
  userAvatar?: string;
-  title: string;
+  title?: string;
  variables: Record<string, any>;
  history: ChatItemType[];
  app: {

--- a/projects/app/src/global/core/chat/constants.ts
+++ b/projects/app/src/global/core/chat/constants.ts
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
 import { InitChatResponse } from './api';
-import { i18nT } from '@fastgpt/web/i18n/utils';
 export const defaultChatData: InitChatResponse = {
  chatId: '',
  appId: '',
@@ -12,7 +12,7 @@ export const defaultChatData: InitChatResponse = {
    type: AppTypeEnum.simple,
    pluginInputs: []
  },
-  title: i18nT('chat:new_chat'),
+  title: '',
  variables: {},
  history: []
 };
--- a/projects/app/src/pages/api/core/chat/getResData.ts
+++ b/projects/app/src/pages/api/core/chat/getResData.ts
 import { authChatCrud } from '@/service/support/permission/auth/chat';
-import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
+import {
+  ManagePermissionVal,
+  ReadPermissionVal
+} from '@fastgpt/global/support/permission/constant';
 import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
 import { NextAPI } from '@/service/middleware/entry';
 import { ChatHistoryItemResType } from '@fastgpt/global/core/chat/type';
 import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
+import { authApp } from '@fastgpt/service/support/permission/app/auth';
 export type getResDataQuery = OutLinkChatAuthProps & {
  chatId?: string;
@@ -25,12 +29,24 @@ async function handler(
  if (!appId || !chatId || !dataId) {
    return {};
  }
+  // 1. Un login api: share chat, team chat
+  // 2. Login api: account chat, chat log
+  try {
    await authChatCrud({
      req,
      authToken: true,
      ...req.query,
      per: ReadPermissionVal
    });
+  } catch (error) {
+    await authApp({
+      req,
+      authToken: true,
+      appId,
+      per: ManagePermissionVal
+    });
+  }
  const chatData = await MongoChatItem.findOne({
    appId,

--- a/projects/app/src/pages/api/core/chat/init.ts
+++ b/projects/app/src/pages/api/core/chat/init.ts
@@ -14,7 +14,7 @@ import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { transformPreviewHistories } from '@/global/core/chat/utils';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import { i18nT } from '@fastgpt/web/i18n/utils';
 async function handler(
  req: NextApiRequest,
  res: NextApiResponse
@@ -62,7 +62,7 @@ async function handler(
  return {
    chatId,
    appId,
-    title: chat?.title || i18nT('chat:new_chat'),
+    title: chat?.title,
    userAvatar: undefined,
    variables: chat?.variables || {},
    history: app.type === AppTypeEnum.plugin ? histories : transformPreviewHistories(histories),

--- a/projects/app/src/pages/api/core/chat/outLink/init.ts
+++ b/projects/app/src/pages/api/core/chat/outLink/init.ts
@@ -18,11 +18,9 @@ import { getAppLatestVersion } from '@fastgpt/service/core/app/controller';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
 import { transformPreviewHistories } from '@/global/core/chat/utils';
-import { i18nT } from '@fastgpt/web/i18n/utils';
+import { NextAPI } from '@/service/middleware/entry';
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
+async function handler(req: NextApiRequest, res: NextApiResponse) {
  let { chatId, shareId, outLinkUid } = req.query as InitOutLinkChatProps;
  // auth link permission
@@ -70,7 +68,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    data: {
      chatId,
      appId: app._id,
-        title: chat?.title || i18nT('chat:new_chat'),
+      title: chat?.title,
      //@ts-ignore
      userAvatar: tmb?.userId?.avatar,
      variables: chat?.variables || {},
@@ -94,14 +92,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      }
    }
  });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
 }
+export default NextAPI(handler);
 export const config = {
  api: {
    responseLimit: '10mb'

--- a/projects/app/src/pages/api/core/chat/team/init.ts
+++ b/projects/app/src/pages/api/core/chat/team/init.ts
@@ -18,12 +18,9 @@ import { getAppLatestVersion } from '@fastgpt/service/core/app/controller';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
 import { transformPreviewHistories } from '@/global/core/chat/utils';
-import { i18nT } from '@fastgpt/web/i18n/utils';
+import { NextAPI } from '@/service/middleware/entry';
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
+async function handler(req: NextApiRequest, res: NextApiResponse) {
  let { teamId, appId, chatId, teamToken } = req.query as InitTeamChatProps;
  if (!teamId || !appId || !teamToken) {
@@ -73,7 +70,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    data: {
      chatId,
      appId,
-        title: chat?.title || i18nT('chat:new_chat'),
+      title: chat?.title,
      userAvatar: team?.avatar,
      variables: chat?.variables || {},
      history: app.type === AppTypeEnum.plugin ? histories : transformPreviewHistories(histories),
@@ -96,14 +93,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      }
    }
  });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
 }
+export default NextAPI(handler);
 export const config = {
  api: {
    responseLimit: '10mb'

--- a/projects/app/src/pages/api/core/dataset/exportAll.ts
+++ b/projects/app/src/pages/api/core/dataset/exportAll.ts
@@ -18,7 +18,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
    datasetId: string;
  };
-  if (!datasetId || !global.pgClient) {
+  if (!datasetId) {
    return Promise.reject(CommonErrEnum.missingParams);
  }

--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/components/HelperLines.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/components/HelperLines.tsx
@@ -89,7 +89,7 @@ function HelperLinesRenderer({ horizontal, vertical }: HelperLinesProps) {
        drawCross(node.right * transform[2] + transform[0], y, 5 * zoom);
      });
    }
-  }, [width, height, transform, horizontal, vertical]);
+  }, [width, height, transform, horizontal, vertical, zoom]);
  return <canvas ref={canvasRef} style={canvasStyle} />;
 }

--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useUtils.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useUtils.tsx
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/index.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/index.tsx
@@ -64,8 +64,7 @@ const edgeTypes = {
 };
 const Workflow = () => {
-  const { nodes, edges, reactFlowWrapper, helperLineHorizontal, helperLineVertical } =
+  const { nodes, edges, reactFlowWrapper } = useContextSelector(WorkflowContext, (v) => v);
-    useContextSelector(WorkflowContext, (v) => v);
  const {
    ConfirmDeleteModal,
@@ -75,7 +74,9 @@ const Workflow = () => {
    onConnectEnd,
    customOnConnect,
    onEdgeMouseEnter,
-    onEdgeMouseLeave
+    onEdgeMouseLeave,
+    helperLineHorizontal,
+    helperLineVertical
  } = useWorkflow();
  const {
@@ -85,7 +86,7 @@ const Workflow = () => {
  } = useDisclosure();
  return (
-    <ReactFlowProvider>
+    <>
      <Box
        flex={'1 0 0'}
        h={0}
@@ -143,11 +144,19 @@ const Workflow = () => {
      </Box>
      <ConfirmDeleteModal />
+    </>
+  );
+};
+const Render = () => {
+  return (
+    <ReactFlowProvider>
+      <Workflow />
    </ReactFlowProvider>
  );
 };
-export default React.memo(Workflow);
+export default React.memo(Render);
 const FlowController = React.memo(function FlowController() {
  const { fitView } = useReactFlow();

--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/context.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/context.tsx
@@ -48,7 +48,6 @@ import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { formatTime2HM, formatTime2YMDHMW } from '@fastgpt/global/common/string/time';
 import type { InitProps } from '@/pages/app/detail/components/PublishHistoriesSlider';
 import { cloneDeep } from 'lodash';
-import { THelperLine } from '@fastgpt/global/core/workflow/type';
 type OnChange<ChangesType> = (changes: ChangesType[]) => void;
@@ -136,12 +135,6 @@ type WorkflowContextType = {
  historiesDefaultData?: InitProps;
  setHistoriesDefaultData: React.Dispatch<React.SetStateAction<undefined | InitProps>>;
-  // helper line
-  helperLineHorizontal?: THelperLine;
-  setHelperLineHorizontal: React.Dispatch<React.SetStateAction<THelperLine | undefined>>;
-  helperLineVertical?: THelperLine;
-  setHelperLineVertical: React.Dispatch<React.SetStateAction<THelperLine | undefined>>;
  // chat test
  setWorkflowTestData: React.Dispatch<
    React.SetStateAction<
@@ -267,14 +260,6 @@ export const WorkflowContext = createContext<WorkflowContextType>({
  setHistoriesDefaultData: function (value: React.SetStateAction<InitProps | undefined>): void {
    throw new Error('Function not implemented.');
  },
-  helperLineHorizontal: undefined,
-  setHelperLineHorizontal: function (value: React.SetStateAction<THelperLine | undefined>): void {
-    throw new Error('Function not implemented.');
-  },
-  helperLineVertical: undefined,
-  setHelperLineVertical: function (value: React.SetStateAction<THelperLine | undefined>): void {
-    throw new Error('Function not implemented.');
-  },
  getNodeDynamicInputs: function (nodeId: string): FlowNodeInputItemType[] {
    throw new Error('Function not implemented.');
  }
@@ -742,11 +727,6 @@ const WorkflowContextProvider = ({
  /* Version histories */
  const [historiesDefaultData, setHistoriesDefaultData] = useState<InitProps>();
-  /* helper line */
-  const [helperLineHorizontal, setHelperLineHorizontal] = useState<THelperLine | undefined>(
-    undefined
-  );
-  const [helperLineVertical, setHelperLineVertical] = useState<THelperLine | undefined>(undefined);
  /* event bus */
  useEffect(() => {
    eventBus.on(EventNameEnum.requestWorkflowStore, () => {
@@ -816,12 +796,6 @@ const WorkflowContextProvider = ({
    historiesDefaultData,
    setHistoriesDefaultData,
-    // helper line
-    helperLineHorizontal,
-    setHelperLineHorizontal,
-    helperLineVertical,
-    setHelperLineVertical,
    // chat test
    setWorkflowTestData
  };

--- a/projects/app/src/pages/chat/components/ChatHeader.tsx
+++ b/projects/app/src/pages/chat/components/ChatHeader.tsx
@@ -36,6 +36,7 @@ const ChatHeader = ({
  apps?: AppListItemType[];
  onRouteToAppDetail?: () => void;
 }) => {
+  const { t } = useTranslation();
  const isPlugin = chatData.app.type === AppTypeEnum.plugin;
  const { isPc } = useSystem();
@@ -50,7 +51,11 @@ const ChatHeader = ({
    >
      {isPc ? (
        <>
-          <PcHeader title={chatData.title} chatModels={chatData.app.chatModels} history={history} />
+          <PcHeader
+            title={chatData.title || t('chat:new_chat')}
+            chatModels={chatData.app.chatModels}
+            history={history}
+          />
          <Box flex={1} />
        </>
      ) : (

--- a/projects/app/src/service/support/permission/auth/chat.ts
+++ b/projects/app/src/service/support/permission/auth/chat.ts
@@ -81,7 +81,7 @@ export async function authChatCrud({
    if (permission.isOwner) return { uid: outLinkUid };
    if (String(tmbId) === String(chat.tmbId)) return { uid: outLinkUid };
-    // admin
+    // Admin can manage all chat
    if (per === WritePermissionVal && permission.hasManagePer) return { uid: outLinkUid };
    return Promise.reject(ChatErrEnum.unAuthChat);