tool box ui (labring#52)

* fix: training queue * feat: simple edit tool select * perf: simple edit dataset prompt * fix: chatbox tool ux * feat: quote prompt module * perf: plugin tools sign * perf: model avatar * tool selector ui * feat: max histories
newfish-cmyk · Mar 20, 2024 · 17922ee · 17922ee
1 parent 9c6b4b2
commit 17922ee
Show file tree

Hide file tree

Showing 62 changed files with 1,444 additions and 584 deletions.
diff --git a/packages/global/common/system/constants.ts b/packages/global/common/system/constants.ts
@@ -1,2 +1,3 @@
 export const HUMAN_ICON = `/icon/human.svg`;
 export const LOGO_ICON = `/icon/logo.svg`;
+export const HUGGING_FACE_ICON = `/imgs/model/huggingface.svg`;
diff --git a/packages/global/core/ai/model.d.ts b/packages/global/core/ai/model.d.ts
@@ -1,6 +1,7 @@
 export type LLMModelItemType = {
   model: string;
   name: string;
+  avatar?: string;
   maxContext: number;
   maxResponse: number;
   quoteMaxToken: number;
@@ -31,6 +32,7 @@ export type LLMModelItemType = {
 export type VectorModelItemType = {
   model: string;
   name: string;
+  avatar?: string;
   defaultToken: number;
   charsPointsPrice: number;
   maxToken: number;

diff --git a/packages/global/core/app/type.d.ts b/packages/global/core/app/type.d.ts
@@ -1,4 +1,9 @@
-import type { AppTTSConfigType, ModuleItemType, VariableItemType } from '../module/type.d';
+import type {
+  AppTTSConfigType,
+  FlowNodeTemplateType,
+  ModuleItemType,
+  VariableItemType
+} from '../module/type.d';
 import { AppTypeEnum } from './constants';
 import { PermissionTypeEnum } from '../../support/permission/constant';
 import type { DatasetModuleProps } from '../module/node/type.d';
@@ -44,20 +49,19 @@ export type AppSimpleEditFormType = {
     temperature: number;
     maxToken: number;
     isResponseAnswerText: boolean;
-    quoteTemplate?: string | undefined;
-    quotePrompt?: string | undefined;
+    maxHistories: number;
   };
   dataset: {
     datasets: SelectedDatasetType;
     searchMode: `${DatasetSearchModeEnum}`;
     similarity?: number;
     limit?: number;
     usingReRank?: boolean;
-    searchEmptyText?: string;
     datasetSearchUsingExtensionQuery?: boolean;
     datasetSearchExtensionModel?: string;
     datasetSearchExtensionBg?: string;
   };
+  selectedTools: FlowNodeTemplateType[];
   userGuide: {
     welcomeText: string;
     variables: {

diff --git a/packages/global/core/app/utils.ts b/packages/global/core/app/utils.ts
@@ -1,6 +1,10 @@
 import type { AppSimpleEditFormType } from '../app/type';
 import { FlowNodeTypeEnum } from '../module/node/constant';
-import { ModuleOutputKeyEnum, ModuleInputKeyEnum } from '../module/constants';
+import {
+  ModuleOutputKeyEnum,
+  ModuleInputKeyEnum,
+  FlowNodeTemplateTypeEnum
+} from '../module/constants';
 import type { FlowNodeInputItemType } from '../module/node/type.d';
 import { getGuideModule, splitGuideModule } from '../module/utils';
 import { ModuleItemType } from '../module/type.d';
@@ -13,20 +17,19 @@ export const getDefaultAppForm = (): AppSimpleEditFormType => {
       systemPrompt: '',
       temperature: 0,
       isResponseAnswerText: true,
-      quotePrompt: '',
-      quoteTemplate: '',
+      maxHistories: 6,
       maxToken: 4000
     },
     dataset: {
       datasets: [],
       similarity: 0.4,
       limit: 1500,
-      searchEmptyText: '',
       searchMode: DatasetSearchModeEnum.embedding,
       usingReRank: false,
       datasetSearchUsingExtensionQuery: true,
       datasetSearchExtensionBg: ''
     },
+    selectedTools: [],
     userGuide: {
       welcomeText: '',
       variables: [],
@@ -67,13 +70,9 @@ export const appModules2Form = ({ modules }: { modules: ModuleItemType[] }) => {
         module.inputs,
         ModuleInputKeyEnum.aiChatMaxToken
       );
-      defaultAppForm.aiSettings.quoteTemplate = findInputValueByKey(
+      defaultAppForm.aiSettings.maxHistories = findInputValueByKey(
         module.inputs,
-        ModuleInputKeyEnum.aiChatQuoteTemplate
-      );
-      defaultAppForm.aiSettings.quotePrompt = findInputValueByKey(
-        module.inputs,
-        ModuleInputKeyEnum.aiChatQuotePrompt
+        ModuleInputKeyEnum.history
       );
     } else if (module.flowType === FlowNodeTypeEnum.datasetSearchNode) {
       defaultAppForm.dataset.datasets = findInputValueByKey(
@@ -107,17 +106,6 @@ export const appModules2Form = ({ modules }: { modules: ModuleItemType[] }) => {
         module.inputs,
         ModuleInputKeyEnum.datasetSearchExtensionBg
       );
-
-      // empty text
-      const emptyOutputs =
-        module.outputs.find((item) => item.key === ModuleOutputKeyEnum.datasetIsEmpty)?.targets ||
-        [];
-      const emptyOutput = emptyOutputs[0];
-      if (emptyOutput) {
-        const target = modules.find((item) => item.moduleId === emptyOutput.moduleId);
-        defaultAppForm.dataset.searchEmptyText =
-          target?.inputs?.find((item) => item.key === ModuleInputKeyEnum.answerText)?.value || '';
-      }
     } else if (module.flowType === FlowNodeTypeEnum.userGuide) {
       const { welcomeText, variableModules, questionGuide, ttsConfig } = splitGuideModule(
         getGuideModule(modules)
@@ -128,6 +116,18 @@ export const appModules2Form = ({ modules }: { modules: ModuleItemType[] }) => {
         questionGuide: questionGuide,
         tts: ttsConfig
       };
+    } else if (module.flowType === FlowNodeTypeEnum.pluginModule) {
+      defaultAppForm.selectedTools.push({
+        id: module.inputs.find((input) => input.key === ModuleInputKeyEnum.pluginId)?.value || '',
+        name: module.name,
+        avatar: module.avatar,
+        intro: module.intro || '',
+        flowType: module.flowType,
+        showStatus: module.showStatus,
+        inputs: module.inputs,
+        outputs: module.outputs,
+        templateType: FlowNodeTemplateTypeEnum.other
+      });
     }
   });
 

diff --git a/packages/global/core/module/node/constant.ts b/packages/global/core/module/node/constant.ts
@@ -26,6 +26,7 @@ export enum FlowNodeInputTypeEnum {
   // dataset special input
   selectDataset = 'selectDataset',
   selectDatasetParamsModal = 'selectDatasetParamsModal',
+  settingDatasetQuotePrompt = 'settingDatasetQuotePrompt',
 
   hidden = 'hidden',
   custom = 'custom'

diff --git a/packages/global/core/module/node/type.d.ts b/packages/global/core/module/node/type.d.ts
@@ -107,6 +107,7 @@ export type SettingAIDataType = {
   temperature: number;
   maxToken: number;
   isResponseAnswerText?: boolean;
+  maxHistories?: number;
 };
 /* ai chat modules props */
 export type AIChatModuleProps = {

diff --git a/packages/global/core/module/template/input.ts b/packages/global/core/module/template/input.ts
@@ -92,7 +92,7 @@ export const Input_Template_System_Prompt: FlowNodeInputItemType = {
 
 export const Input_Template_Dataset_Quote: FlowNodeInputItemType = {
   key: ModuleInputKeyEnum.aiChatDatasetQuote,
-  type: FlowNodeInputTypeEnum.target,
+  type: FlowNodeInputTypeEnum.settingDatasetQuotePrompt,
   label: '知识库引用',
   description: 'core.module.Dataset quote.Input description',
   valueType: ModuleIOValueTypeEnum.datasetQuote,

diff --git a/packages/global/core/plugin/type.d.ts b/packages/global/core/plugin/type.d.ts
@@ -34,5 +34,6 @@ export type PluginRuntimeType = {
   name: string;
   avatar: string;
   showStatus?: boolean;
+  isTool?: boolean;
   modules: ModuleItemType[];
 };
diff --git a/packages/service/core/dataset/search/controller.ts b/packages/service/core/dataset/search/controller.ts
@@ -59,19 +59,19 @@ export async function searchDatasetData(props: SearchDatasetDataProps) {
   const countRecallLimit = () => {
     if (searchMode === DatasetSearchModeEnum.embedding) {
       return {
-        embeddingLimit: 100,
+        embeddingLimit: 150,
         fullTextLimit: 0
       };
     }
     if (searchMode === DatasetSearchModeEnum.fullTextRecall) {
       return {
         embeddingLimit: 0,
-        fullTextLimit: 100
+        fullTextLimit: 150
       };
     }
     return {
-      embeddingLimit: 60,
-      fullTextLimit: 40
+      embeddingLimit: 100,
+      fullTextLimit: 80
     };
   };
   const embeddingRecall = async ({ query, limit }: { query: string; limit: number }) => {
@@ -357,8 +357,8 @@ export async function searchDatasetData(props: SearchDatasetDataProps) {
   // embedding recall and fullText recall rrf concat
   const rrfConcatResults = datasetSearchResultConcat([
     { k: 60, list: embeddingRecallResults },
-    { k: 64, list: fullTextRecallResults },
-    { k: 60, list: reRankResults }
+    { k: 60, list: fullTextRecallResults },
+    { k: 58, list: reRankResults }
   ]);
 
   // remove same q and a data

diff --git a/packages/service/core/dataset/training/controller.ts b/packages/service/core/dataset/training/controller.ts
@@ -31,28 +31,26 @@ export async function pushDataListToTrainingQueue({
   data,
   prompt,
   billId,
-  trainingMode = TrainingModeEnum.chunk,
-
-  vectorModelList = [],
-  datasetModelList = []
+  trainingMode = TrainingModeEnum.chunk
 }: {
   teamId: string;
   tmbId: string;
-  vectorModelList: VectorModelItemType[];
-  datasetModelList: LLMModelItemType[];
 } & PushDatasetDataProps): Promise<PushDatasetDataResponse> {
+  const vectorModelList = global.vectorModels;
+  const datasetModelList = global.llmModels;
+
   const {
     datasetId: { _id: datasetId, vectorModel, agentModel }
   } = await getCollectionWithDataset(collectionId);
 
   const checkModelValid = async () => {
     const agentModelData = datasetModelList?.find((item) => item.model === agentModel);
     if (!agentModelData) {
-      return Promise.reject(`Vector model ${agentModel} is inValid`);
+      return Promise.reject(`File model ${agentModel} is inValid`);
     }
     const vectorModelData = vectorModelList?.find((item) => item.model === vectorModel);
     if (!vectorModelData) {
-      return Promise.reject(`File model ${vectorModel} is inValid`);
+      return Promise.reject(`Vector model ${vectorModel} is inValid`);
     }
 
     if (trainingMode === TrainingModeEnum.chunk) {

diff --git a/packages/service/core/plugin/controller.ts b/packages/service/core/plugin/controller.ts
@@ -71,6 +71,7 @@ export async function getPluginPreviewModule({
     name: plugin.name,
     intro: plugin.intro,
     showStatus: plugin.showStatus,
+    isTool: plugin.isTool,
     ...plugin2ModuleIO(plugin.id, plugin.modules)
   };
 }

diff --git a/packages/web/components/common/Icon/constants.ts b/packages/web/components/common/Icon/constants.ts
@@ -69,6 +69,7 @@ export const iconPaths = {
   'core/app/simpleMode/template': () => import('./icons/core/app/simpleMode/template.svg'),
   'core/app/simpleMode/tts': () => import('./icons/core/app/simpleMode/tts.svg'),
   'core/app/simpleMode/variable': () => import('./icons/core/app/simpleMode/variable.svg'),
+  'core/app/toolCall': () => import('./icons/core/app/toolCall.svg'),
   'core/app/ttsFill': () => import('./icons/core/app/ttsFill.svg'),
   'core/app/variable/external': () => import('./icons/core/app/variable/external.svg'),
   'core/app/variable/input': () => import('./icons/core/app/variable/input.svg'),

diff --git a/packages/web/components/common/Icon/icons/common/addLight.svg b/packages/web/components/common/Icon/icons/common/addLight.svg
diff --git a/packages/web/components/common/Icon/icons/core/app/toolCall.svg b/packages/web/components/common/Icon/icons/core/app/toolCall.svg
diff --git a/packages/web/components/common/MySelect/index.tsx b/packages/web/components/common/MySelect/index.tsx
@@ -92,7 +92,8 @@ const MySelect = (
               : `${width} !important`;
           })()}
           w={'auto'}
-          p={'6px'}
+          px={'6px'}
+          py={'6px'}
           border={'1px solid #fff'}
           boxShadow={
             '0px 2px 4px rgba(161, 167, 179, 0.25), 0px 0px 1px rgba(121, 141, 159, 0.25);'

diff --git a/packages/web/components/common/Tabs/RowTabs.tsx b/packages/web/components/common/Tabs/RowTabs.tsx
@@ -12,7 +12,7 @@ type Props = BoxProps & {
   onChange: (e: string) => void;
 };
 
-const RowTabs = ({ list, value, onChange, py = '7px', ...props }: Props) => {
+const RowTabs = ({ list, value, onChange, py = '7px', px = '12px', ...props }: Props) => {
   return (
     <Box
       display={'inline-flex'}
@@ -32,7 +32,7 @@ const RowTabs = ({ list, value, onChange, py = '7px', ...props }: Props) => {
           alignItems={'center'}
           cursor={'pointer'}
           borderRadius={'md'}
-          px={'12px'}
+          px={px}
           py={py}
           userSelect={'none'}
           whiteSpace={'noWrap'}

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -2,12 +2,12 @@
   "name": "@fastgpt/web",
   "version": "1.0.0",
   "dependencies": {
-    "@chakra-ui/anatomy": "^2.2.1",
-    "@chakra-ui/icons": "^2.1.1",
-    "@chakra-ui/next-js": "^2.1.5",
-    "@chakra-ui/react": "^2.8.1",
-    "@chakra-ui/styled-system": "^2.9.1",
-    "@chakra-ui/system": "^2.6.1",
+    "@chakra-ui/anatomy": "2.2.1",
+    "@chakra-ui/icons": "2.1.1",
+    "@chakra-ui/next-js": "2.1.5",
+    "@chakra-ui/react": "2.8.1",
+    "@chakra-ui/styled-system": "2.9.1",
+    "@chakra-ui/system": "2.6.1",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@fastgpt/global": "workspace:*",

diff --git a/packages/web/styles/theme.ts b/packages/web/styles/theme.ts
@@ -207,6 +207,18 @@ const Button = defineStyleConfig({
       _disabled: {
         bg: 'myGray.50'
       }
+    },
+    grayDanger: {
+      bg: 'myGray.150',
+      color: 'myGray.900',
+      _hover: {
+        color: 'red.600',
+        background: 'red.1',
+        borderColor: 'red.300'
+      },
+      _active: {
+        color: 'red.600'
+      }
     }
   },
   defaultProps: {