fix: Set the default value of Self RAG to false #1220 (#1702)

### What problem does this PR solve?

fix: Set the default value of Self RAG  to false #1220
fix: Change all tool file names to kebab format

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

web/src/app.tsx

@@ -13,7 +13,7 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 import weekYear from 'dayjs/plugin/weekYear';
 import weekday from 'dayjs/plugin/weekday';
 import React, { ReactNode, useEffect, useState } from 'react';
-import storage from './utils/authorizationUtil';
+import storage from './utils/authorization-util';
 
 dayjs.extend(customParseFormat);
 dayjs.extend(advancedFormat);

web/src/components/message-item/index.tsx

@@ -8,7 +8,7 @@ import classNames from 'classnames';
 import { useMemo } from 'react';
 
 import MarkdownContent from '@/pages/chat/markdown-content';
-import { getExtension } from '@/utils/documentUtils';
+import { getExtension } from '@/utils/document-util';
 import { Avatar, Flex, List } from 'antd';
 import NewDocumentLink from '../new-document-link';
 import SvgIcon from '../svg-icon';

web/src/components/new-document-link.tsx

@@ -1,7 +1,7 @@
 import {
   getExtension,
   isSupportedPreviewDocumentType,
-} from '@/utils/documentUtils';
+} from '@/utils/document-util';
 import React from 'react';
 
 interface IProps extends React.PropsWithChildren {

web/src/hooks/auth-hooks.ts

@@ -1,4 +1,4 @@
-import authorizationUtil from '@/utils/authorizationUtil';
+import authorizationUtil from '@/utils/authorization-util';
 import { message } from 'antd';
 import { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useSearchParams } from 'umi';

web/src/hooks/document-hooks.ts

@@ -1,7 +1,7 @@
 import { IChunk, IKnowledgeFile } from '@/interfaces/database/knowledge';
 import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
 import { api_host } from '@/utils/api';
-import { buildChunkHighlights } from '@/utils/documentUtils';
+import { buildChunkHighlights } from '@/utils/document-util';
 import { UploadFile } from 'antd';
 import { useCallback, useMemo, useState } from 'react';
 import { IHighlight } from 'react-pdf-highlighter';

web/src/hooks/llm-hooks.ts

@@ -8,7 +8,7 @@ import {
   IAddLlmRequestBody,
   IDeleteLlmRequestBody,
 } from '@/interfaces/request/llm';
-import { sortLLmFactoryListBySpecifiedOrder } from '@/utils/commonUtil';
+import { sortLLmFactoryListBySpecifiedOrder } from '@/utils/common-util';
 import { useCallback, useEffect, useMemo } from 'react';
 import { useDispatch, useSelector } from 'umi';
 

web/src/hooks/logic-hooks.ts

@@ -6,7 +6,7 @@ import { IAnswer } from '@/interfaces/database/chat';
 import { IKnowledgeFile } from '@/interfaces/database/knowledge';
 import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
 import api from '@/utils/api';
-import { getAuthorization } from '@/utils/authorizationUtil';
+import { getAuthorization } from '@/utils/authorization-util';
 import { PaginationProps } from 'antd';
 import axios from 'axios';
 import { EventSourceParserStream } from 'eventsource-parser/stream';

web/src/hooks/login-hooks.ts

@@ -1,6 +1,6 @@
 import { Authorization } from '@/constants/authorization';
 import userService from '@/services/user-service';
-import authorizationUtil from '@/utils/authorizationUtil';
+import authorizationUtil from '@/utils/authorization-util';
 import { useMutation } from '@tanstack/react-query';
 import { message } from 'antd';
 import { useTranslation } from 'react-i18next';

web/src/hooks/store-hooks.ts

@@ -1,4 +1,4 @@
-import { getOneNamespaceEffectsLoading } from '@/utils/storeUtil';
+import { getOneNamespaceEffectsLoading } from '@/utils/store-util';
 import { useSelector } from 'umi';
 
 // Get the loading status of given effects under a certain namespace

web/src/pages/add-knowledge/components/knowledge-chunk/hooks.ts

@@ -1,6 +1,6 @@
 import { useOneNamespaceEffectsLoading } from '@/hooks/store-hooks';
 import { IChunk, IKnowledgeFile } from '@/interfaces/database/knowledge';
-import { buildChunkHighlights } from '@/utils/documentUtils';
+import { buildChunkHighlights } from '@/utils/document-util';
 import { useCallback, useMemo, useState } from 'react';
 import { IHighlight } from 'react-pdf-highlighter';
 import { useSelector } from 'umi';

web/src/pages/add-knowledge/components/knowledge-chunk/model.ts

@@ -3,7 +3,7 @@ import { IChunk, IKnowledgeFile } from '@/interfaces/database/knowledge';
 import kbService from '@/services/knowledge-service';
 import { message } from 'antd';
 import { pick } from 'lodash';
-// import { delay } from '@/utils/storeUtil';
+// import { delay } from '@/utils/store-util';
 import i18n from '@/locales/config';
 import { DvaModel } from 'umi';
 

web/src/pages/add-knowledge/components/knowledge-file/hooks.ts

@@ -14,7 +14,7 @@ import { useOneNamespaceEffectsLoading } from '@/hooks/store-hooks';
 import { useFetchTenantInfo } from '@/hooks/user-setting-hooks';
 import { Pagination } from '@/interfaces/common';
 import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
-import { getUnSupportedFilesCount } from '@/utils/documentUtils';
+import { getUnSupportedFilesCount } from '@/utils/document-util';
 import { PaginationProps, UploadFile } from 'antd';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch, useNavigate, useSelector } from 'umi';

web/src/pages/add-knowledge/components/knowledge-file/index.tsx

@@ -7,7 +7,7 @@ import {
 import { useSetSelectedRecord } from '@/hooks/logic-hooks';
 import { useSelectParserList } from '@/hooks/user-setting-hooks';
 import { IKnowledgeFile } from '@/interfaces/database/knowledge';
-import { getExtension } from '@/utils/documentUtils';
+import { getExtension } from '@/utils/document-util';
 import { Divider, Flex, Switch, Table, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import { useTranslation } from 'react-i18next';

web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx

@@ -2,7 +2,7 @@ import { useShowDeleteConfirm, useTranslate } from '@/hooks/common-hooks';
 import { useRemoveDocument } from '@/hooks/document-hooks';
 import { IKnowledgeFile } from '@/interfaces/database/knowledge';
 import { api_host } from '@/utils/api';
-import { downloadFile } from '@/utils/fileUtil';
+import { downloadFile } from '@/utils/file-util';
 import {
   DeleteOutlined,
   DownloadOutlined,

web/src/pages/add-knowledge/components/knowledge-setting/configuration.tsx

@@ -1,4 +1,4 @@
-import { normFile } from '@/utils/fileUtil';
+import { normFile } from '@/utils/file-util';
 import { PlusOutlined } from '@ant-design/icons';
 import { Button, Form, Input, Radio, Select, Space, Upload } from 'antd';
 import {

web/src/pages/add-knowledge/components/knowledge-setting/hooks.ts

@@ -11,7 +11,7 @@ import {
 import {
   getBase64FromUploadFileList,
   getUploadFileListFromBase64,
-} from '@/utils/fileUtil';
+} from '@/utils/file-util';
 import { useIsFetching } from '@tanstack/react-query';
 import { Form, UploadFile } from 'antd';
 import { FormInstance } from 'antd/lib';

web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx

@@ -95,7 +95,7 @@ const AssistantSetting = ({ show }: ISegmentedContentProps) => {
         valuePropName="checked"
         name={['prompt_config', 'self_rag']}
         tooltip={t('selfRagTip')}
-        initialValue={true}
+        initialValue={false}
       >
         <Switch />
       </Form.Item>

web/src/pages/chat/chat-configuration-modal/index.tsx

@@ -19,7 +19,7 @@ import {
   useFetchLlmModelOnVisible,
   useFetchModelId,
 } from '@/hooks/logic-hooks';
-import { getBase64FromUploadFileList } from '@/utils/fileUtil';
+import { getBase64FromUploadFileList } from '@/utils/file-util';
 import { removeUselessFieldsFromValues } from '@/utils/form';
 import styles from './index.less';
 

web/src/pages/chat/markdown-content/index.tsx

@@ -3,7 +3,7 @@ import SvgIcon from '@/components/svg-icon';
 import { useSelectFileThumbnails } from '@/hooks/knowledge-hooks';
 import { IReference } from '@/interfaces/database/chat';
 import { IChunk } from '@/interfaces/database/knowledge';
-import { getExtension } from '@/utils/documentUtils';
+import { getExtension } from '@/utils/document-util';
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { Button, Flex, Popover, Space } from 'antd';
 import DOMPurify from 'dompurify';

web/src/pages/file-manager/action-cell/index.tsx

@@ -1,7 +1,7 @@
 import { useTranslate } from '@/hooks/common-hooks';
 import { IFile } from '@/interfaces/database/file-manager';
 import { api_host } from '@/utils/api';
-import { downloadFile } from '@/utils/fileUtil';
+import { downloadFile } from '@/utils/file-util';
 import {
   DeleteOutlined,
   DownloadOutlined,
@@ -16,7 +16,7 @@ import NewDocumentLink from '@/components/new-document-link';
 import {
   getExtension,
   isSupportedPreviewDocumentType,
-} from '@/utils/documentUtils';
+} from '@/utils/document-util';
 import styles from './index.less';
 
 interface IProps {

web/src/pages/file-manager/connect-to-knowledge-modal/index.tsx

@@ -1,7 +1,7 @@
 import { useTranslate } from '@/hooks/common-hooks';
 import { useNextFetchKnowledgeList } from '@/hooks/knowledge-hooks';
 import { IModalProps } from '@/interfaces/common';
-import { filterOptionsByInput } from '@/utils/commonUtil';
+import { filterOptionsByInput } from '@/utils/common-util';
 import { Form, Modal, Select } from 'antd';
 import { useEffect } from 'react';
 

web/src/pages/file-manager/index.tsx

@@ -18,8 +18,8 @@ import FileUploadModal from '@/components/file-upload-modal';
 import RenameModal from '@/components/rename-modal';
 import SvgIcon from '@/components/svg-icon';
 import { useTranslate } from '@/hooks/common-hooks';
-import { formatNumberWithThousandsSeparator } from '@/utils/commonUtil';
+import { formatNumberWithThousandsSeparator } from '@/utils/common-util';
-import { getExtension } from '@/utils/documentUtils';
+import { getExtension } from '@/utils/document-util';
 import ConnectToKnowledgeModal from './connect-to-knowledge-modal';
 import FolderCreateModal from './folder-create-modal';
 import styles from './index.less';

web/src/pages/user-setting/setting-profile/index.tsx

@@ -7,7 +7,7 @@ import {
   getBase64FromUploadFileList,
   getUploadFileListFromBase64,
   normFile,
-} from '@/utils/fileUtil';
+} from '@/utils/file-util';
 import { PlusOutlined } from '@ant-design/icons';
 import {
   Button,

web/src/pages/user-setting/setting-system/index.tsx

@@ -7,7 +7,7 @@ import lowerCase from 'lodash/lowerCase';
 import upperFirst from 'lodash/upperFirst';
 import { useEffect } from 'react';
 
-import { toFixed } from '@/utils/commonUtil';
+import { toFixed } from '@/utils/common-util';
 import styles from './index.less';
 
 const { Text } = Typography;

web/src/services/chat-service.ts

@@ -1,5 +1,5 @@
 import api from '@/utils/api';
-import registerServer from '@/utils/registerServer';
+import registerServer from '@/utils/register-server';
 import request from '@/utils/request';
 
 const {

web/src/services/file-manager-service.ts

@@ -1,5 +1,5 @@
 import api from '@/utils/api';
-import registerServer from '@/utils/registerServer';
+import registerServer from '@/utils/register-server';
 import request from '@/utils/request';
 import pureRequest from 'axios';
 

web/src/services/flow-service.ts

@@ -1,5 +1,5 @@
 import api from '@/utils/api';
-import registerServer from '@/utils/registerServer';
+import registerServer from '@/utils/register-server';
 import request from '@/utils/request';
 
 const {

web/src/services/knowledge-service.ts

@@ -1,5 +1,5 @@
 import api from '@/utils/api';
-import registerServer from '@/utils/registerServer';
+import registerServer from '@/utils/register-server';
 import request from '@/utils/request';
 import pureRequest from 'umi-request';
 

web/src/services/user-service.ts

@@ -1,5 +1,5 @@
 import api from '@/utils/api';
-import registerServer from '@/utils/registerServer';
+import registerServer from '@/utils/register-server';
 import request from '@/utils/request';
 
 const {

web/src/utils/authorization-util.ts

@@ -1,5 +1,5 @@
 import { Authorization, Token, UserInfo } from '@/constants/authorization';
-import { getSearchValue } from './commonUtil';
+import { getSearchValue } from './common-util';
 const KeySet = [Authorization, Token, UserInfo];
 
 const storage = {

web/src/utils/hooks.ts

@@ -1,14 +0,0 @@
-import { useState } from 'react';
-
-export const usePagination = function (defaultPage: number, defaultPageSize: number, total: number) {
-  const [page = 1, setPage] = useState(defaultPage);
-  const [pageSize = 10, setPageSize] = useState(defaultPageSize);
-  return {
-    page,
-    pageSize,
-    count: total,
-    setPage,
-    setPageSize,
-    nextPage: () => setPage(page + 1)
-  };
-};

web/src/utils/register-server.ts

@@ -1,39 +1,39 @@
-import omit from 'lodash/omit';
+import omit from 'lodash/omit';
-import { RequestMethod } from 'umi-request';
+import { RequestMethod } from 'umi-request';
-
+
-type Service<T extends string> = Record<
+type Service<T extends string> = Record<
-  T,
+  T,
-  (params?: any, urlAppendix?: string) => any
+  (params?: any, urlAppendix?: string) => any
->;
+>;
-
+
-const registerServer = <T extends string>(
+const registerServer = <T extends string>(
-  opt: Record<T, { url: string; method: string }>,
+  opt: Record<T, { url: string; method: string }>,
-  request: RequestMethod,
+  request: RequestMethod,
-) => {
+) => {
-  const server: Service<T> = {} as Service<T>;
+  const server: Service<T> = {} as Service<T>;
-  for (let key in opt) {
+  for (let key in opt) {
-    server[key] = (params?: any, urlAppendix?: string) => {
+    server[key] = (params?: any, urlAppendix?: string) => {
-      let url = opt[key].url;
+      let url = opt[key].url;
-      const requestOptions = opt[key];
+      const requestOptions = opt[key];
-      if (urlAppendix) {
+      if (urlAppendix) {
-        url = url + '/' + urlAppendix;
+        url = url + '/' + urlAppendix;
-      }
+      }
-      if (opt[key].method === 'post' || opt[key].method === 'POST') {
+      if (opt[key].method === 'post' || opt[key].method === 'POST') {
-        return request(url, {
+        return request(url, {
-          method: opt[key].method,
+          method: opt[key].method,
-          data: params,
+          data: params,
-        });
+        });
-      }
+      }
-
+
-      if (opt[key].method === 'get' || opt[key].method === 'GET') {
+      if (opt[key].method === 'get' || opt[key].method === 'GET') {
-        return request.get(url, {
+        return request.get(url, {
-          ...omit(requestOptions, ['method', 'url']),
+          ...omit(requestOptions, ['method', 'url']),
-          params,
+          params,
-        });
+        });
-      }
+      }
-    };
+    };
-  }
+  }
-  return server;
+  return server;
-};
+};
-
+
-export default registerServer;
+export default registerServer;

web/src/utils/request.ts

@@ -1,130 +1,132 @@
-import { Authorization } from '@/constants/authorization';
+import { Authorization } from '@/constants/authorization';
-import { ResponseType } from '@/interfaces/database/base';
+import { ResponseType } from '@/interfaces/database/base';
-import i18n from '@/locales/config';
+import i18n from '@/locales/config';
-import authorizationUtil, { getAuthorization } from '@/utils/authorizationUtil';
+import authorizationUtil, {
-import { message, notification } from 'antd';
+  getAuthorization,
-import { history } from 'umi';
+} from '@/utils/authorization-util';
-import { RequestMethod, extend } from 'umi-request';
+import { message, notification } from 'antd';
-import { convertTheKeysOfTheObjectToSnake } from './commonUtil';
+import { history } from 'umi';
-
+import { RequestMethod, extend } from 'umi-request';
-const ABORT_REQUEST_ERR_MESSAGE = 'The user aborted a request.';
+import { convertTheKeysOfTheObjectToSnake } from './common-util';
-
+
-const RetcodeMessage = {
+const ABORT_REQUEST_ERR_MESSAGE = 'The user aborted a request.';
-  200: i18n.t('message.200'),
+
-  201: i18n.t('message.201'),
+const RetcodeMessage = {
-  202: i18n.t('message.202'),
+  200: i18n.t('message.200'),
-  204: i18n.t('message.204'),
+  201: i18n.t('message.201'),
-  400: i18n.t('message.400'),
+  202: i18n.t('message.202'),
-  401: i18n.t('message.401'),
+  204: i18n.t('message.204'),
-  403: i18n.t('message.403'),
+  400: i18n.t('message.400'),
-  404: i18n.t('message.404'),
+  401: i18n.t('message.401'),
-  406: i18n.t('message.406'),
+  403: i18n.t('message.403'),
-  410: i18n.t('message.410'),
+  404: i18n.t('message.404'),
-  422: i18n.t('message.422'),
+  406: i18n.t('message.406'),
-  500: i18n.t('message.500'),
+  410: i18n.t('message.410'),
-  502: i18n.t('message.502'),
+  422: i18n.t('message.422'),
-  503: i18n.t('message.503'),
+  500: i18n.t('message.500'),
-  504: i18n.t('message.504'),
+  502: i18n.t('message.502'),
-};
+  503: i18n.t('message.503'),
-type ResultCode =
+  504: i18n.t('message.504'),
-  | 200
+};
-  | 201
+type ResultCode =
-  | 202
+  | 200
-  | 204
+  | 201
-  | 400
+  | 202
-  | 401
+  | 204
-  | 403
+  | 400
-  | 404
+  | 401
-  | 406
+  | 403
-  | 410
+  | 404
-  | 422
+  | 406
-  | 500
+  | 410
-  | 502
+  | 422
-  | 503
+  | 500
-  | 504;
+  | 502
-
+  | 503
-const errorHandler = (error: {
+  | 504;
-  response: Response;
+
-  message: string;
+const errorHandler = (error: {
-}): Response => {
+  response: Response;
-  const { response } = error;
+  message: string;
-  if (error.message === ABORT_REQUEST_ERR_MESSAGE) {
+}): Response => {
-    console.log('user abort  request');
+  const { response } = error;
-  } else {
+  if (error.message === ABORT_REQUEST_ERR_MESSAGE) {
-    if (response && response.status) {
+    console.log('user abort  request');
-      const errorText =
+  } else {
-        RetcodeMessage[response.status as ResultCode] || response.statusText;
+    if (response && response.status) {
-      const { status, url } = response;
+      const errorText =
-      notification.error({
+        RetcodeMessage[response.status as ResultCode] || response.statusText;
-        message: `${i18n.t('message.requestError')} ${status}: ${url}`,
+      const { status, url } = response;
-        description: errorText,
+      notification.error({
-      });
+        message: `${i18n.t('message.requestError')} ${status}: ${url}`,
-    } else if (!response) {
+        description: errorText,
-      notification.error({
+      });
-        description: i18n.t('message.networkAnomalyDescription'),
+    } else if (!response) {
-        message: i18n.t('message.networkAnomaly'),
+      notification.error({
-      });
+        description: i18n.t('message.networkAnomalyDescription'),
-    }
+        message: i18n.t('message.networkAnomaly'),
-  }
+      });
-  return response;
+    }
-};
+  }
-
+  return response;
-const request: RequestMethod = extend({
+};
-  errorHandler,
+
-  timeout: 300000,
+const request: RequestMethod = extend({
-  getResponse: true,
+  errorHandler,
-});
+  timeout: 300000,
-
+  getResponse: true,
-request.interceptors.request.use((url: string, options: any) => {
+});
-  const data = convertTheKeysOfTheObjectToSnake(options.data);
+
-  const params = convertTheKeysOfTheObjectToSnake(options.params);
+request.interceptors.request.use((url: string, options: any) => {
-
+  const data = convertTheKeysOfTheObjectToSnake(options.data);
-  return {
+  const params = convertTheKeysOfTheObjectToSnake(options.params);
-    url,
+
-    options: {
+  return {
-      ...options,
+    url,
-      data,
+    options: {
-      params,
+      ...options,
-      headers: {
+      data,
-        ...(options.skipToken
+      params,
-          ? undefined
+      headers: {
-          : { [Authorization]: getAuthorization() }),
+        ...(options.skipToken
-        ...options.headers,
+          ? undefined
-      },
+          : { [Authorization]: getAuthorization() }),
-      interceptors: true,
+        ...options.headers,
-    },
+      },
-  };
+      interceptors: true,
-});
+    },
-
+  };
-request.interceptors.response.use(async (response: any, options) => {
+});
-  if (options.responseType === 'blob') {
+
-    return response;
+request.interceptors.response.use(async (response: any, options) => {
-  }
+  if (options.responseType === 'blob') {
-  const data: ResponseType = await response.clone().json();
+    return response;
-
+  }
-  if (data.retcode === 401 || data.retcode === 401) {
+  const data: ResponseType = await response.clone().json();
-    notification.error({
+
-      message: data.retmsg,
+  if (data.retcode === 401 || data.retcode === 401) {
-      description: data.retmsg,
+    notification.error({
-      duration: 3,
+      message: data.retmsg,
-    });
+      description: data.retmsg,
-    authorizationUtil.removeAll();
+      duration: 3,
-    history.push('/login'); // Will not jump to the login page
+    });
-  } else if (data.retcode !== 0) {
+    authorizationUtil.removeAll();
-    if (data.retcode === 100) {
+    history.push('/login'); // Will not jump to the login page
-      message.error(data.retmsg);
+  } else if (data.retcode !== 0) {
-    } else {
+    if (data.retcode === 100) {
-      notification.error({
+      message.error(data.retmsg);
-        message: `${i18n.t('message.hint')} : ${data.retcode}`,
+    } else {
-        description: data.retmsg,
+      notification.error({
-        duration: 3,
+        message: `${i18n.t('message.hint')} : ${data.retcode}`,
-      });
+        description: data.retmsg,
-    }
+        duration: 3,
-
+      });
-    return response;
+    }
-  } else {
+
-    return response;
+    return response;
-  }
+  } else {
-});
+    return response;
-
+  }
-export default request;
+});
+
+export default request;