- |
+ |
|
-
+ |
{limit}
|
-
+ |
{hasSimilarityMode ? similarity : t('core.dataset.search.Nonsupport')}
|
{hasReRankModel && (
-
+ |
{usingReRank ? '✅' : '❌'}
|
)}
-
+ |
{usingQueryExtension ? '✅' : '❌'}
|
{hasEmptyResponseMode && {responseEmptyText !== '' ? '✅' : '❌'} | }
diff --git a/projects/app/src/components/core/dataset/SelectModal.tsx b/projects/app/src/components/core/dataset/SelectModal.tsx
index ceb936767..65e829567 100644
--- a/projects/app/src/components/core/dataset/SelectModal.tsx
+++ b/projects/app/src/components/core/dataset/SelectModal.tsx
@@ -1,5 +1,5 @@
import { getDatasets, getDatasetPaths } from '@/web/core/dataset/api';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useQuery } from '@tanstack/react-query';
import React, { Dispatch, useMemo, useState } from 'react';
import { useTranslation } from 'next-i18next';
diff --git a/projects/app/src/components/core/module/AIChatSettingsModal.tsx b/projects/app/src/components/core/module/AIChatSettingsModal.tsx
deleted file mode 100644
index 09183e9f2..000000000
--- a/projects/app/src/components/core/module/AIChatSettingsModal.tsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import MyModal from '@/components/MyModal';
-import { useTranslation } from 'next-i18next';
-import { useForm } from 'react-hook-form';
-import {
- Box,
- BoxProps,
- Button,
- Flex,
- Link,
- ModalBody,
- ModalFooter,
- Switch
-} from '@chakra-ui/react';
-import MyTooltip from '@/components/MyTooltip';
-import { QuestionOutlineIcon } from '@chakra-ui/icons';
-import { Prompt_QuotePromptList, Prompt_QuoteTemplateList } from '@/global/core/prompt/AIChat';
-import { useSystemStore } from '@/web/common/system/useSystemStore';
-import MySlider from '@/components/Slider';
-import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
-import dynamic from 'next/dynamic';
-import { PromptTemplateItem } from '@fastgpt/global/core/ai/type.d';
-import type { AIChatModuleProps } from '@fastgpt/global/core/module/node/type.d';
-import type { AppSimpleEditConfigTemplateType } from '@fastgpt/global/core/app/type.d';
-import { SimpleModeTemplate_FastGPT_Universal } from '@/global/core/app/constants';
-import { getDocPath } from '@/web/common/system/doc';
-import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
-import { EditorVariablePickerType } from '@fastgpt/web/components/common/Textarea/PromptEditor/type';
-
-const PromptTemplate = dynamic(() => import('@/components/PromptTemplate'));
-
-const AIChatSettingsModal = ({
- isAdEdit,
- onClose,
- onSuccess,
- defaultData,
- pickerMenu = []
-}: {
- isAdEdit?: boolean;
- onClose: () => void;
- onSuccess: (e: AIChatModuleProps) => void;
- defaultData: AIChatModuleProps;
- pickerMenu?: EditorVariablePickerType[];
-}) => {
- const { t } = useTranslation();
- const [refresh, setRefresh] = useState(false);
- const { feConfigs, llmModelList } = useSystemStore();
-
- const { handleSubmit, getValues, setValue, watch } = useForm({
- defaultValues: defaultData
- });
- const aiChatQuoteTemplate = watch(ModuleInputKeyEnum.aiChatQuoteTemplate);
- const aiChatQuotePrompt = watch(ModuleInputKeyEnum.aiChatQuotePrompt);
-
- const [selectTemplateData, setSelectTemplateData] = useState<{
- title: string;
- templates: PromptTemplateItem[];
- }>();
-
- const tokenLimit = useMemo(() => {
- return (
- llmModelList.find((item) => item.model === getValues(ModuleInputKeyEnum.aiModel))
- ?.maxResponse || 4000
- );
- }, [getValues, llmModelList]);
-
- const quoteTemplateVariables = (() => [
- {
- key: 'q',
- label: 'q',
- icon: 'core/app/simpleMode/variable'
- },
- {
- key: 'a',
- label: 'a',
- icon: 'core/app/simpleMode/variable'
- },
- {
- key: 'source',
- label: t('core.dataset.search.Source name'),
- icon: 'core/app/simpleMode/variable'
- },
- {
- key: 'sourceId',
- label: t('core.dataset.search.Source id'),
- icon: 'core/app/simpleMode/variable'
- },
- {
- key: 'index',
- label: t('core.dataset.search.Quote index'),
- icon: 'core/app/simpleMode/variable'
- },
- ...pickerMenu
- ])();
- const quotePromptVariables = (() => [
- {
- key: 'quote',
- label: t('core.app.Quote templates'),
- icon: 'core/app/simpleMode/variable'
- },
- {
- key: 'question',
- label: t('core.module.input.label.user question'),
- icon: 'core/app/simpleMode/variable'
- },
- ...pickerMenu
- ])();
-
- const LabelStyles: BoxProps = {
- fontSize: ['sm', 'md']
- };
- const selectTemplateBtn: BoxProps = {
- color: 'primary.500',
- cursor: 'pointer'
- };
-
- return (
-
- {t('common.More settings')}
- {feConfigs?.docUrl && (
-
- {t('common.Read intro')}
-
- )}
-
- }
- isCentered
- w={'700px'}
- h={['90vh', 'auto']}
- >
-
- {isAdEdit && (
-
-
- {t('core.app.Ai response')}
-
-
- {
- const value = e.target.checked;
- setValue(ModuleInputKeyEnum.aiChatIsResponseText, value);
- setRefresh((state) => !state);
- }}
- />
-
-
- )}
-
-
- {t('core.app.Temperature')}
-
-
- {
- setValue(ModuleInputKeyEnum.aiChatTemperature, e);
- setRefresh(!refresh);
- }}
- />
-
-
-
-
- {t('core.app.Max tokens')}
-
-
- {
- setValue(ModuleInputKeyEnum.aiChatMaxToken, val);
- setRefresh(!refresh);
- }}
- />
-
-
-
-
-
- {t('core.app.Quote templates')}
-
-
-
-
-
- setSelectTemplateData({
- title: t('core.app.Select quote template'),
- templates: Prompt_QuoteTemplateList
- })
- }
- >
- {t('common.Select template')}
-
-
-
- {
- setValue(ModuleInputKeyEnum.aiChatQuoteTemplate, e);
- // setRefresh(!refresh);
- }}
- />
-
-
-
- {t('core.app.Quote prompt')}
-
-
-
-
- {
- setValue(ModuleInputKeyEnum.aiChatQuotePrompt, e);
- }}
- />
-
-
-
-
-
-
- {!!selectTemplateData && (
- setSelectTemplateData(undefined)}
- onSuccess={(e) => {
- const quoteVal = e.value;
- const promptVal = Prompt_QuotePromptList.find((item) => item.title === e.title)?.value;
- setValue(ModuleInputKeyEnum.aiChatQuoteTemplate, quoteVal);
- setValue(ModuleInputKeyEnum.aiChatQuotePrompt, promptVal);
- }}
- />
- )}
-
- );
-};
-
-export default AIChatSettingsModal;
diff --git a/projects/app/src/components/core/module/DatasetParamsModal.tsx b/projects/app/src/components/core/module/DatasetParamsModal.tsx
index a06122a31..75edb45fc 100644
--- a/projects/app/src/components/core/module/DatasetParamsModal.tsx
+++ b/projects/app/src/components/core/module/DatasetParamsModal.tsx
@@ -15,7 +15,7 @@ import { useForm } from 'react-hook-form';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import MySlider from '@/components/Slider';
import MyTooltip from '@/components/MyTooltip';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next';
import { useSystemStore } from '@/web/common/system/useSystemStore';
@@ -28,7 +28,7 @@ import Tabs from '@/components/Tabs';
import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
import { useUserStore } from '@/web/support/user/useUserStore';
import { useToast } from '@fastgpt/web/hooks/useToast';
-import SelectAiModel from '@/components/Select/SelectAiModel';
+import SelectAiModel from '@/components/Select/AIModelSelector';
export type DatasetParamsProps = {
searchMode: `${DatasetSearchModeEnum}`;
@@ -40,7 +40,6 @@ export type DatasetParamsProps = {
datasetSearchExtensionBg?: string;
maxTokens?: number; // limit max tokens
- searchEmptyText?: string;
};
enum SearchSettingTabEnum {
searchMode = 'searchMode',
@@ -50,7 +49,6 @@ enum SearchSettingTabEnum {
const DatasetParamsModal = ({
searchMode = DatasetSearchModeEnum.embedding,
- searchEmptyText,
limit,
similarity,
usingReRank,
@@ -71,11 +69,10 @@ const DatasetParamsModal = ({
const { register, setValue, getValues, handleSubmit, watch } = useForm({
defaultValues: {
- searchEmptyText,
limit,
similarity,
searchMode,
- usingReRank: !!usingReRank && !!teamPlanStatus?.standardConstants?.permissionReRank,
+ usingReRank: !!usingReRank && teamPlanStatus?.standardConstants?.permissionReRank !== false,
datasetSearchUsingExtensionQuery,
datasetSearchExtensionModel: datasetSearchExtensionModel ?? llmModelList[0]?.model,
datasetSearchExtensionBg
@@ -272,21 +269,6 @@ const DatasetParamsModal = ({
)}
- {searchEmptyText !== undefined && (
-
-
- {t('core.dataset.search.Empty result response')}
-
-
-
-
-
- )}
)}
{currentTabType === SearchSettingTabEnum.queryExtension && (
diff --git a/projects/app/src/components/core/module/Flow/FlowProvider.tsx b/projects/app/src/components/core/module/Flow/FlowProvider.tsx
index 271788081..b8e1b2e87 100644
--- a/projects/app/src/components/core/module/Flow/FlowProvider.tsx
+++ b/projects/app/src/components/core/module/Flow/FlowProvider.tsx
@@ -8,10 +8,7 @@ import {
Connection,
addEdge
} from 'reactflow';
-import type {
- FlowModuleItemType,
- FlowModuleTemplateType
-} from '@fastgpt/global/core/module/type.d';
+import type { FlowModuleItemType, FlowNodeTemplateType } from '@fastgpt/global/core/module/type.d';
import type {
FlowNodeChangeProps,
FlowNodeInputItemType
@@ -64,7 +61,7 @@ export type useFlowProviderStoreType = {
onDelNode: (nodeId: string) => void;
onChangeNode: (e: FlowNodeChangeProps) => void;
onCopyNode: (nodeId: string) => void;
- onResetNode: (e: { id: string; module: FlowModuleTemplateType }) => void;
+ onResetNode: (e: { id: string; module: FlowNodeTemplateType }) => void;
onDelEdge: (e: {
moduleId: string;
sourceHandle?: string | undefined;
@@ -417,7 +414,7 @@ export const FlowProvider = ({
// reset a node data. delete edge and replace it
const onResetNode = useCallback(
- ({ id, module }: { id: string; module: FlowModuleTemplateType }) => {
+ ({ id, module }: { id: string; module: FlowNodeTemplateType }) => {
setNodes((state) =>
state.map((node) => {
if (node.id === id) {
@@ -549,12 +546,6 @@ export const onResetNode = (e: Parameters {
- eventBus.emit(EventNameEnum.requestFlowEvent, {
- type: 'onDelNode',
- data: nodeId
- });
-};
export const onDelConnect = (e: Parameters[0]) => {
eventBus.emit(EventNameEnum.requestFlowEvent, {
type: 'onDelConnect',
diff --git a/projects/app/src/components/core/module/Flow/ImportSettings.tsx b/projects/app/src/components/core/module/Flow/ImportSettings.tsx
index ee13108e1..58bae427e 100644
--- a/projects/app/src/components/core/module/Flow/ImportSettings.tsx
+++ b/projects/app/src/components/core/module/Flow/ImportSettings.tsx
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import { Textarea, Button, ModalBody, ModalFooter } from '@chakra-ui/react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { useFlowProviderStore } from './FlowProvider';
diff --git a/projects/app/src/components/core/module/Flow/ModuleTemplateList.tsx b/projects/app/src/components/core/module/Flow/ModuleTemplateList.tsx
index 42a406533..540acf2cd 100644
--- a/projects/app/src/components/core/module/Flow/ModuleTemplateList.tsx
+++ b/projects/app/src/components/core/module/Flow/ModuleTemplateList.tsx
@@ -1,13 +1,13 @@
-import React, { useCallback, useMemo } from 'react';
-import { Box, Flex } from '@chakra-ui/react';
+import React, { useCallback, useMemo, useState } from 'react';
+import { Box, Flex, IconButton, Input, InputGroup, InputLeftElement } from '@chakra-ui/react';
import type {
- FlowModuleTemplateType,
+ FlowNodeTemplateType,
moduleTemplateListType
} from '@fastgpt/global/core/module/type.d';
import { useViewport, XYPosition } from 'reactflow';
import { useSystemStore } from '@/web/common/system/useSystemStore';
import Avatar from '@/components/Avatar';
-import { getFlowStore, onSetNodes } from './FlowProvider';
+import { onSetNodes, useFlowProviderStore } from './FlowProvider';
import { customAlphabet } from 'nanoid';
import { appModule2FlowNode } from '@/utils/adapt';
import { useTranslation } from 'next-i18next';
@@ -18,22 +18,83 @@ import { getPreviewPluginModule } from '@/web/core/plugin/api';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { moduleTemplatesList } from '@fastgpt/global/core/module/template/constants';
+import RowTabs from '@fastgpt/web/components/common/Tabs/RowTabs';
+import { useWorkflowStore } from '@/web/core/workflow/store/workflow';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import ParentPaths from '@/components/common/ParentPaths';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useRouter } from 'next/router';
+import { PluginTypeEnum } from '@fastgpt/global/core/plugin/constants';
+import { useQuery } from '@tanstack/react-query';
+import { debounce } from 'lodash';
-export type ModuleTemplateProps = {
- templates: FlowModuleTemplateType[];
-};
-
-type ModuleTemplateListProps = ModuleTemplateProps & {
+type ModuleTemplateListProps = {
isOpen: boolean;
onClose: () => void;
};
type RenderListProps = {
- templates: FlowModuleTemplateType[];
+ templates: FlowNodeTemplateType[];
onClose: () => void;
+ currentParent?: { parentId: string; parentName: string };
+ setCurrentParent: (e: { parentId: string; parentName: string }) => void;
};
-const ModuleTemplateList = ({ templates, isOpen, onClose }: ModuleTemplateListProps) => {
+enum TemplateTypeEnum {
+ 'basic' = 'basic',
+ 'systemPlugin' = 'systemPlugin',
+ 'teamPlugin' = 'teamPlugin'
+}
+
+const sliderWidth = 380;
+
+const ModuleTemplateList = ({ isOpen, onClose }: ModuleTemplateListProps) => {
const { t } = useTranslation();
+ const router = useRouter();
+ const [currentParent, setCurrentParent] = useState();
+ const [searchKey, setSearchKey] = useState('');
+
+ const {
+ basicNodeTemplates,
+ systemNodeTemplates,
+ loadSystemNodeTemplates,
+ teamPluginNodeTemplates,
+ loadTeamPluginNodeTemplates
+ } = useWorkflowStore();
+ const [templateType, setTemplateType] = useState(TemplateTypeEnum.basic);
+
+ const templates = useMemo(() => {
+ const map = {
+ [TemplateTypeEnum.basic]: basicNodeTemplates,
+ [TemplateTypeEnum.systemPlugin]: systemNodeTemplates,
+ [TemplateTypeEnum.teamPlugin]: teamPluginNodeTemplates.filter((item) =>
+ searchKey ? item.pluginType !== PluginTypeEnum.folder : true
+ )
+ };
+ return map[templateType];
+ }, [basicNodeTemplates, searchKey, systemNodeTemplates, teamPluginNodeTemplates, templateType]);
+
+ const { mutate: onChangeTab } = useRequest({
+ mutationFn: async (e: any) => {
+ const val = e as TemplateTypeEnum;
+ if (val === TemplateTypeEnum.systemPlugin) {
+ await loadSystemNodeTemplates();
+ } else if (val === TemplateTypeEnum.teamPlugin) {
+ await loadTeamPluginNodeTemplates({
+ parentId: currentParent?.parentId
+ });
+ }
+ setTemplateType(val);
+ },
+ errorToast: t('core.module.templates.Load plugin error')
+ });
+
+ useQuery(['teamNodeTemplate', currentParent?.parentId, searchKey], () =>
+ loadTeamPluginNodeTemplates({
+ parentId: currentParent?.parentId,
+ searchKey,
+ init: true
+ })
+ );
return (
<>
@@ -44,27 +105,108 @@ const ModuleTemplateList = ({ templates, isOpen, onClose }: ModuleTemplateListPr
top={0}
left={0}
bottom={0}
- w={'360px'}
+ w={`${sliderWidth}px`}
onClick={onClose}
/>
-
+
+
+
+ {/* close icon */}
+ }
+ w={'26px'}
+ h={'26px'}
+ borderColor={'myGray.300'}
+ variant={'grayBase'}
+ aria-label={''}
+ onClick={onClose}
+ />
+
+ {templateType === TemplateTypeEnum.teamPlugin && (
+
+
+
+
+
+ setSearchKey(e.target.value), 200)}
+ />
+
+
+ router.push('/plugin/list')}
+ >
+ 去创建
+
+
+
+ )}
+ {templateType === TemplateTypeEnum.teamPlugin && !searchKey && currentParent && (
+
+ {
+ setCurrentParent(undefined);
+ }}
+ fontSize="md"
+ />
+
+ )}
+
+
);
@@ -72,12 +214,18 @@ const ModuleTemplateList = ({ templates, isOpen, onClose }: ModuleTemplateListPr
export default React.memo(ModuleTemplateList);
-const RenderList = React.memo(function RenderList({ templates, onClose }: RenderListProps) {
+const RenderList = React.memo(function RenderList({
+ templates,
+ onClose,
+ currentParent,
+ setCurrentParent
+}: RenderListProps) {
const { t } = useTranslation();
const { isPc } = useSystemStore();
const { x, y, zoom } = useViewport();
const { setLoading } = useSystemStore();
const { toast } = useToast();
+ const { reactFlowWrapper, nodes } = useFlowProviderStore();
const formatTemplates = useMemo(() => {
const copy: moduleTemplateListType = JSON.parse(JSON.stringify(moduleTemplatesList));
@@ -87,11 +235,11 @@ const RenderList = React.memo(function RenderList({ templates, onClose }: Render
copy[index].list.push(item);
});
return copy.filter((item) => item.list.length > 0);
- }, [templates]);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [templates, currentParent]);
const onAddNode = useCallback(
- async ({ template, position }: { template: FlowModuleTemplateType; position: XYPosition }) => {
- const { reactFlowWrapper, nodes } = await getFlowStore();
+ async ({ template, position }: { template: FlowNodeTemplateType; position: XYPosition }) => {
if (!reactFlowWrapper?.current) return;
const templateModule = await (async () => {
@@ -131,34 +279,24 @@ const RenderList = React.memo(function RenderList({ templates, onClose }: Render
)
);
},
- [setLoading, t, toast, x, y, zoom]
+ [nodes, reactFlowWrapper, setLoading, t, toast, x, y, zoom]
);
return templates.length === 0 ? (
) : (
-
-
+
+
{formatTemplates.map((item, i) => (
-
-
- {t(item.label)}
-
- {/* {isPlugin && item.type === ModuleTemplateTypeEnum.personalPlugin && (
- router.push('/plugin/list')}
- >
-
- {t('plugin.To Edit Plugin')}
-
-
-
- )} */}
-
+ {item.label && (
+
+
+ {t(item.label)}
+
+
+ )}
+
<>
{item.list.map((template) => (
{
- if (e.clientX < 360) return;
+ if (e.clientX < sliderWidth) return;
onAddNode({
template: template,
position: { x: e.clientX, y: e.clientY }
});
}}
onClick={(e) => {
- if (isPc) return;
- onClose();
+ if (template.pluginType === PluginTypeEnum.folder) {
+ return setCurrentParent({
+ parentId: template.id,
+ parentName: template.name
+ });
+ }
+ if (isPc) {
+ return onAddNode({
+ template,
+ position: { x: sliderWidth * 1.5, y: 200 }
+ });
+ }
onAddNode({
template: template,
position: { x: e.clientX, y: e.clientY }
});
+ onClose();
}}
>
-
{formLabel}
-
+
{
const results = formatEditorVariablePickerIcon(variables);
return results.map((item) => {
@@ -114,17 +104,20 @@ const VariableEdit = ({
- }
+ iconSpacing={1}
+ size={'sm'}
+ mr={'-5px'}
+ fontSize={'md'}
onClick={() => {
resetEdit({ variable: addVariable() });
onOpenEdit();
}}
>
-
{t('common.Add New')}
-
+
{formatVariables.length > 0 && (
diff --git a/projects/app/src/components/core/module/Flow/components/nodes/NodeExtract/ExtractFieldModal.tsx b/projects/app/src/components/core/module/Flow/components/nodes/NodeExtract/ExtractFieldModal.tsx
index 1a4868f79..9733c23dc 100644
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeExtract/ExtractFieldModal.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeExtract/ExtractFieldModal.tsx
@@ -11,7 +11,7 @@ import {
} from '@chakra-ui/react';
import type { ContextExtractAgentItemType } from '@fastgpt/global/core/module/type';
import { useForm } from 'react-hook-form';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import MyTooltip from '@/components/MyTooltip';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
diff --git a/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/OpenApiImportModal.tsx b/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/OpenApiImportModal.tsx
index ec83f551d..0f62ac795 100644
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/OpenApiImportModal.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/OpenApiImportModal.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { ModalBody, Button, ModalFooter, useDisclosure, Textarea, Box } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import { onChangeNode } from '../../../FlowProvider';
diff --git a/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/index.tsx b/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/index.tsx
index c5e03e796..3893d7a55 100644
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/index.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp/index.tsx
@@ -41,6 +41,47 @@ import MySelect from '@fastgpt/web/components/common/MySelect';
import RenderToolInput from '../../render/RenderToolInput';
const OpenApiImportModal = dynamic(() => import('./OpenApiImportModal'));
+export const HttpHeaders = [
+ { key: 'A-IM', label: 'A-IM' },
+ { key: 'Accept', label: 'Accept' },
+ { key: 'Accept-Charset', label: 'Accept-Charset' },
+ { key: 'Accept-Encoding', label: 'Accept-Encoding' },
+ { key: 'Accept-Language', label: 'Accept-Language' },
+ { key: 'Accept-Datetime', label: 'Accept-Datetime' },
+ { key: 'Access-Control-Request-Method', label: 'Access-Control-Request-Method' },
+ { key: 'Access-Control-Request-Headers', label: 'Access-Control-Request-Headers' },
+ { key: 'Authorization', label: 'Authorization' },
+ { key: 'Cache-Control', label: 'Cache-Control' },
+ { key: 'Connection', label: 'Connection' },
+ { key: 'Content-Length', label: 'Content-Length' },
+ { key: 'Content-Type', label: 'Content-Type' },
+ { key: 'Cookie', label: 'Cookie' },
+ { key: 'Date', label: 'Date' },
+ { key: 'Expect', label: 'Expect' },
+ { key: 'Forwarded', label: 'Forwarded' },
+ { key: 'From', label: 'From' },
+ { key: 'Host', label: 'Host' },
+ { key: 'If-Match', label: 'If-Match' },
+ { key: 'If-Modified-Since', label: 'If-Modified-Since' },
+ { key: 'If-None-Match', label: 'If-None-Match' },
+ { key: 'If-Range', label: 'If-Range' },
+ { key: 'If-Unmodified-Since', label: 'If-Unmodified-Since' },
+ { key: 'Max-Forwards', label: 'Max-Forwards' },
+ { key: 'Origin', label: 'Origin' },
+ { key: 'Pragma', label: 'Pragma' },
+ { key: 'Proxy-Authorization', label: 'Proxy-Authorization' },
+ { key: 'Range', label: 'Range' },
+ { key: 'Referer', label: 'Referer' },
+ { key: 'TE', label: 'TE' },
+ { key: 'User-Agent', label: 'User-Agent' },
+ { key: 'Upgrade', label: 'Upgrade' },
+ { key: 'Via', label: 'Via' },
+ { key: 'Warning', label: 'Warning' },
+ { key: 'Dnt', label: 'Dnt' },
+ { key: 'X-Requested-With', label: 'X-Requested-With' },
+ { key: 'X-CSRF-Token', label: 'X-CSRF-Token' }
+];
+
enum TabEnum {
params = 'params',
headers = 'headers',
@@ -342,47 +383,6 @@ const RenderForm = ({
const [shouldUpdateNode, setShouldUpdateNode] = useState(false);
const leftVariables = useMemo(() => {
- const HttpHeaders = [
- { key: 'A-IM', label: 'A-IM' },
- { key: 'Accept', label: 'Accept' },
- { key: 'Accept-Charset', label: 'Accept-Charset' },
- { key: 'Accept-Encoding', label: 'Accept-Encoding' },
- { key: 'Accept-Language', label: 'Accept-Language' },
- { key: 'Accept-Datetime', label: 'Accept-Datetime' },
- { key: 'Access-Control-Request-Method', label: 'Access-Control-Request-Method' },
- { key: 'Access-Control-Request-Headers', label: 'Access-Control-Request-Headers' },
- { key: 'Authorization', label: 'Authorization' },
- { key: 'Cache-Control', label: 'Cache-Control' },
- { key: 'Connection', label: 'Connection' },
- { key: 'Content-Length', label: 'Content-Length' },
- { key: 'Content-Type', label: 'Content-Type' },
- { key: 'Cookie', label: 'Cookie' },
- { key: 'Date', label: 'Date' },
- { key: 'Expect', label: 'Expect' },
- { key: 'Forwarded', label: 'Forwarded' },
- { key: 'From', label: 'From' },
- { key: 'Host', label: 'Host' },
- { key: 'If-Match', label: 'If-Match' },
- { key: 'If-Modified-Since', label: 'If-Modified-Since' },
- { key: 'If-None-Match', label: 'If-None-Match' },
- { key: 'If-Range', label: 'If-Range' },
- { key: 'If-Unmodified-Since', label: 'If-Unmodified-Since' },
- { key: 'Max-Forwards', label: 'Max-Forwards' },
- { key: 'Origin', label: 'Origin' },
- { key: 'Pragma', label: 'Pragma' },
- { key: 'Proxy-Authorization', label: 'Proxy-Authorization' },
- { key: 'Range', label: 'Range' },
- { key: 'Referer', label: 'Referer' },
- { key: 'TE', label: 'TE' },
- { key: 'User-Agent', label: 'User-Agent' },
- { key: 'Upgrade', label: 'Upgrade' },
- { key: 'Via', label: 'Via' },
- { key: 'Warning', label: 'Warning' },
- { key: 'Dnt', label: 'Dnt' },
- { key: 'X-Requested-With', label: 'X-Requested-With' },
- { key: 'X-CSRF-Token', label: 'X-CSRF-Token' }
- ];
-
return (tabType === TabEnum.headers ? HttpHeaders : variables).filter((variable) => {
const existVariables = list.map((item) => item.key);
return !existVariables.includes(variable.key);
@@ -455,7 +455,7 @@ const RenderForm = ({
};
return (
-
+
diff --git a/projects/app/src/components/core/module/Flow/components/nodes/NodePluginInput.tsx b/projects/app/src/components/core/module/Flow/components/nodes/NodePluginInput.tsx
index c85c0f581..d9707f410 100644
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodePluginInput.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodePluginInput.tsx
@@ -62,44 +62,48 @@ const NodePluginInput = ({ data, selected }: NodeProps) => {
position={'relative'}
mb={7}
>
-
- setEditField({
- inputType: item.type,
- valueType: item.valueType,
- key: item.key,
- label: item.label,
- description: item.description,
- required: item.required,
- isToolInput: !!item.toolDescription
- })
- }
- />
- {
- onChangeNode({
- moduleId,
- type: 'delInput',
- key: item.key
- });
- onChangeNode({
- moduleId,
- type: 'delOutput',
- key: item.key
- });
- }}
- />
+ {item.edit && (
+ <>
+
+ setEditField({
+ inputType: item.type,
+ valueType: item.valueType,
+ key: item.key,
+ label: item.label,
+ description: item.description,
+ required: item.required,
+ isToolInput: !!item.toolDescription
+ })
+ }
+ />
+ {
+ onChangeNode({
+ moduleId,
+ type: 'delInput',
+ key: item.key
+ });
+ onChangeNode({
+ moduleId,
+ type: 'delOutput',
+ key: item.key
+ });
+ }}
+ />
+
+ )}
{item.description && (
diff --git a/projects/app/src/components/core/module/Flow/components/nodes/NodeSimple.tsx b/projects/app/src/components/core/module/Flow/components/nodes/NodeSimple.tsx
index e0bda0989..41460d707 100644
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeSimple.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeSimple.tsx
@@ -10,7 +10,12 @@ import RenderToolInput from '../render/RenderToolInput';
import { useTranslation } from 'next-i18next';
import { useFlowProviderStore } from '../../FlowProvider';
-const NodeSimple = ({ data, selected }: NodeProps) => {
+const NodeSimple = ({
+ data,
+ selected,
+ minW = '350px',
+ maxW
+}: NodeProps & { minW?: string | number; maxW?: string | number }) => {
const { t } = useTranslation();
const { splitToolInputs } = useFlowProviderStore();
const { moduleId, inputs, outputs } = data;
@@ -22,7 +27,7 @@ const NodeSimple = ({ data, selected }: NodeProps) => {
);
return (
-
+
{toolInputs.length > 0 && (
<>
diff --git a/projects/app/src/components/core/module/Flow/components/render/FieldEditModal.tsx b/projects/app/src/components/core/module/Flow/components/render/FieldEditModal.tsx
index 6018b59af..ef2595fd1 100644
--- a/projects/app/src/components/core/module/Flow/components/render/FieldEditModal.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/FieldEditModal.tsx
@@ -10,10 +10,10 @@ import {
Textarea
} from '@chakra-ui/react';
import { useForm } from 'react-hook-form';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { DYNAMIC_INPUT_KEY, ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
import { useTranslation } from 'next-i18next';
-import { FlowValueTypeMap } from '@/web/core/modules/constants/dataType';
+import { FlowValueTypeMap } from '@/web/core/workflow/constants/dataType';
import {
FlowNodeInputTypeEnum,
FlowNodeOutputTypeEnum
@@ -265,10 +265,6 @@ const FieldEditModal = ({
placeholder="appointment/sql"
{...register('key', {
required: true,
- pattern: {
- value: /^[a-zA-Z]+[0-9]*$/,
- message: '字段key必须是纯英文字母或数字，并且不能以数字开头。'
- },
onChange: (e) => {
const value = e.target.value;
// auto fill label
diff --git a/projects/app/src/components/core/module/Flow/components/render/NodeCard.tsx b/projects/app/src/components/core/module/Flow/components/render/NodeCard.tsx
index c6652a044..b2856ad34 100644
--- a/projects/app/src/components/core/module/Flow/components/render/NodeCard.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/NodeCard.tsx
@@ -6,13 +6,7 @@ import type { FlowModuleItemType } from '@fastgpt/global/core/module/type.d';
import { useTranslation } from 'next-i18next';
import { useEditTitle } from '@/web/common/hooks/useEditTitle';
import { useToast } from '@fastgpt/web/hooks/useToast';
-import {
- onChangeNode,
- onCopyNode,
- onResetNode,
- onDelNode,
- useFlowProviderStore
-} from '../../FlowProvider';
+import { onChangeNode, onCopyNode, onResetNode, useFlowProviderStore } from '../../FlowProvider';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
import { useSystemStore } from '@/web/common/system/useSystemStore';
@@ -26,6 +20,7 @@ import { useEditTextarea } from '@fastgpt/web/hooks/useEditTextarea';
type Props = FlowModuleItemType & {
children?: React.ReactNode | React.ReactNode[] | string;
minW?: string | number;
+ maxW?: string | number;
forbidMenu?: boolean;
selected?: boolean;
};
@@ -38,6 +33,7 @@ const NodeCard = (props: Props) => {
name = t('core.module.template.UnKnow Module'),
intro,
minW = '300px',
+ maxW = '600px',
moduleId,
flowType,
inputs,
@@ -48,21 +44,25 @@ const NodeCard = (props: Props) => {
const { toast } = useToast();
const { setLoading } = useSystemStore();
- const { nodes, splitToolInputs } = useFlowProviderStore();
+ const { nodes, splitToolInputs, onDelNode } = useFlowProviderStore();
+ // edit intro
const { onOpenModal: onOpenIntroModal, EditModal: EditIntroModal } = useEditTextarea({
title: t('core.module.Edit intro'),
tip: '调整该模块会对工具调用时机有影响。\n你可以通过精确的描述该模块功能，引导模型进行工具调用。',
canEmpty: false
});
-
// custom title edit
const { onOpenModal, EditModal: EditTitleModal } = useEditTitle({
title: t('common.Custom Title'),
placeholder: t('app.module.Custom Title Tip') || ''
});
- const { openConfirm, ConfirmModal } = useConfirm({
+ const { openConfirm: onOpenConfirmSync, ConfirmModal: ConfirmSyncModal } = useConfirm({
content: t('module.Confirm Sync Plugin')
});
+ const { openConfirm: onOpenConfirmDeleteNode, ConfirmModal: ConfirmDeleteModal } = useConfirm({
+ content: t('core.module.Confirm Delete Node'),
+ type: 'delete'
+ });
const showToolHandle = useMemo(
() => isTool && !!nodes.find((item) => item.data?.flowType === FlowNodeTypeEnum.tools),
@@ -86,7 +86,7 @@ const NodeCard = (props: Props) => {
(item) => item.key === ModuleInputKeyEnum.pluginId
)?.value;
if (!pluginId) return;
- openConfirm(async () => {
+ onOpenConfirmSync(async () => {
try {
setLoading(true);
const pluginModule = await getPreviewPluginModule(pluginId);
@@ -140,7 +140,7 @@ const NodeCard = (props: Props) => {
icon: 'delete',
label: t('common.Delete'),
variant: 'whiteDanger',
- onClick: () => onDelNode(moduleId)
+ onClick: onOpenConfirmDeleteNode(() => onDelNode(moduleId))
}
];
@@ -211,21 +211,23 @@ const NodeCard = (props: Props) => {
);
}, [
- avatar,
flowType,
- forbidMenu,
- inputs,
- intro,
- moduleId,
- moduleIsTool,
- name,
- onOpenIntroModal,
- onOpenModal,
- openConfirm,
- setLoading,
- showToolHandle,
t,
- toast
+ onOpenConfirmDeleteNode,
+ showToolHandle,
+ moduleId,
+ avatar,
+ name,
+ forbidMenu,
+ intro,
+ moduleIsTool,
+ inputs,
+ onOpenConfirmSync,
+ setLoading,
+ toast,
+ onOpenModal,
+ onDelNode,
+ onOpenIntroModal
]);
const RenderModal = useMemo(() => {
@@ -233,15 +235,16 @@ const NodeCard = (props: Props) => {
<>
{moduleIsTool && }
-
+
+
);
- }, [ConfirmModal, EditIntroModal, EditTitleModal, moduleIsTool]);
+ }, [ConfirmDeleteModal, ConfirmSyncModal, EditIntroModal, EditTitleModal, moduleIsTool]);
return (
import('./templates/SelectApp'))
},
{
- types: [FlowNodeInputTypeEnum.aiSettings],
- Component: dynamic(() => import('./templates/AiSetting'))
+ types: [FlowNodeInputTypeEnum.selectLLMModel],
+ Component: dynamic(() => import('./templates/SelectLLMModel'))
},
{
- types: [FlowNodeInputTypeEnum.selectLLMModel],
- Component: dynamic(() => import('./templates/SelectAiModel'))
+ types: [FlowNodeInputTypeEnum.settingLLMModel],
+ Component: dynamic(() => import('./templates/SettingLLMModel'))
},
{
types: [FlowNodeInputTypeEnum.selectDataset],
@@ -64,6 +64,10 @@ const RenderList: {
{
types: [FlowNodeInputTypeEnum.JSONEditor],
Component: dynamic(() => import('./templates/JsonEditor'))
+ },
+ {
+ types: [FlowNodeInputTypeEnum.settingDatasetQuotePrompt],
+ Component: dynamic(() => import('./templates/SettingQuotePrompt'))
}
];
const UserChatInput = dynamic(() => import('./templates/UserChatInput'));
diff --git a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/AiSetting.tsx b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/AiSetting.tsx
deleted file mode 100644
index 17aa406c6..000000000
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/AiSetting.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { useMemo } from 'react';
-import type { RenderInputProps } from '../type';
-import { onChangeNode } from '../../../../FlowProvider';
-import { useTranslation } from 'next-i18next';
-import { Button, useDisclosure } from '@chakra-ui/react';
-import { AIChatModuleProps } from '@fastgpt/global/core/module/node/type';
-import MyIcon from '@fastgpt/web/components/common/Icon';
-import AIChatSettingsModal from '@/components/core/module/AIChatSettingsModal';
-
-const AiSettingRender = ({ inputs = [], moduleId }: RenderInputProps) => {
- const { t } = useTranslation();
- const chatModulesData = useMemo(() => {
- const obj: Record = {};
- inputs.forEach((item) => {
- obj[item.key] = item.value;
- });
- return obj as AIChatModuleProps;
- }, [inputs]);
-
- const {
- isOpen: isOpenAIChatSetting,
- onOpen: onOpenAIChatSetting,
- onClose: onCloseAIChatSetting
- } = useDisclosure();
-
- return (
- <>
- }
- onClick={onOpenAIChatSetting}
- >
- {t('app.AI Settings')}
-
- {isOpenAIChatSetting && (
- {
- for (let key in e) {
- const item = inputs.find((input) => input.key === key);
- if (!item) continue;
- onChangeNode({
- moduleId,
- type: 'updateInput',
- key,
- value: {
- ...item,
- //@ts-ignore
- value: e[key]
- }
- });
- }
- onCloseAIChatSetting();
- }}
- defaultData={chatModulesData}
- />
- )}
-
- );
-};
-
-export default React.memo(AiSettingRender);
diff --git a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectAiModel.tsx b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectAiModel.tsx
deleted file mode 100644
index 2d52f3475..000000000
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectAiModel.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { useCallback, useEffect } from 'react';
-import type { RenderInputProps } from '../type';
-import { onChangeNode } from '../../../../FlowProvider';
-import { useSystemStore } from '@/web/common/system/useSystemStore';
-import SelectAiModel from '@/components/Select/SelectAiModel';
-import { llmModelTypeFilterMap } from '@fastgpt/global/core/ai/constants';
-
-const SelectAiModelRender = ({ item, inputs = [], moduleId }: RenderInputProps) => {
- const { llmModelList } = useSystemStore();
-
- const modelList = llmModelList
- .filter((model) => {
- if (!item.llmModelType) return true;
- const filterField = llmModelTypeFilterMap[item.llmModelType];
- if (!filterField) return true;
- //@ts-ignore
- return !!model[filterField];
- })
- .map((item) => ({
- model: item.model,
- name: item.name,
- maxResponse: item.maxResponse
- }));
-
- const onChangeModel = useCallback(
- (e: string) => {
- onChangeNode({
- moduleId,
- type: 'updateInput',
- key: item.key,
- value: {
- ...item,
- value: e
- }
- });
-
- // update max tokens
- const model = modelList.find((item) => item.model === e) || modelList[0];
- if (!model) return;
-
- onChangeNode({
- moduleId,
- type: 'updateInput',
- key: 'maxToken',
- value: {
- ...inputs.find((input) => input.key === 'maxToken'),
- markList: [
- { label: '100', value: 100 },
- { label: `${model.maxResponse}`, value: model.maxResponse }
- ],
- max: model.maxResponse,
- value: model.maxResponse / 2
- }
- });
- },
- [inputs, item, modelList, moduleId]
- );
-
- const list = modelList.map((item) => {
- return {
- value: item.model,
- label: item.name
- };
- });
-
- useEffect(() => {
- if (!item.value && list.length > 0) {
- onChangeModel(list[0].value);
- }
- }, [item.value, list, onChangeModel]);
-
- return (
-
- );
-};
-
-export default React.memo(SelectAiModelRender);
diff --git a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectLLMModel.tsx b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectLLMModel.tsx
new file mode 100644
index 000000000..3b08fea0a
--- /dev/null
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectLLMModel.tsx
@@ -0,0 +1,54 @@
+import React, { useCallback, useEffect } from 'react';
+import type { RenderInputProps } from '../type';
+import { onChangeNode } from '../../../../FlowProvider';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
+import { llmModelTypeFilterMap } from '@fastgpt/global/core/ai/constants';
+import AIModelSelector from '@/components/Select/AIModelSelector';
+
+const SelectAiModelRender = ({ item, moduleId }: RenderInputProps) => {
+ const { llmModelList } = useSystemStore();
+
+ const modelList = llmModelList.filter((model) => {
+ if (!item.llmModelType) return true;
+ const filterField = llmModelTypeFilterMap[item.llmModelType];
+ if (!filterField) return true;
+ //@ts-ignore
+ return !!model[filterField];
+ });
+
+ const onChangeModel = useCallback(
+ (e: string) => {
+ onChangeNode({
+ moduleId,
+ type: 'updateInput',
+ key: item.key,
+ value: {
+ ...item,
+ value: e
+ }
+ });
+ },
+ [item, moduleId]
+ );
+
+ useEffect(() => {
+ if (!item.value && modelList.length > 0) {
+ onChangeModel(modelList[0].model);
+ }
+ }, [item.value, modelList, onChangeModel]);
+
+ return (
+ ({
+ value: item.model,
+ label: item.name
+ }))}
+ onchange={onChangeModel}
+ />
+ );
+};
+
+export default React.memo(SelectAiModelRender);
diff --git a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SettingLLMModel.tsx b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SettingLLMModel.tsx
new file mode 100644
index 000000000..c77d5410b
--- /dev/null
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SettingLLMModel.tsx
@@ -0,0 +1,49 @@
+import React, { useCallback } from 'react';
+import type { RenderInputProps } from '../type';
+import { onChangeNode } from '../../../../FlowProvider';
+import { SettingAIDataType } from '@fastgpt/global/core/module/node/type';
+import SettingLLMModel from '@/components/core/ai/SettingLLMModel';
+import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
+
+const SelectAiModelRender = ({ item, inputs = [], moduleId }: RenderInputProps) => {
+ const onChangeModel = useCallback(
+ (e: SettingAIDataType) => {
+ for (const key in e) {
+ const input = inputs.find((input) => input.key === key);
+ input &&
+ onChangeNode({
+ moduleId,
+ type: 'updateInput',
+ key,
+ value: {
+ ...input,
+ // @ts-ignore
+ value: e[key]
+ }
+ });
+ }
+ },
+ [inputs, moduleId]
+ );
+
+ const llmModelData: SettingAIDataType = {
+ model: inputs.find((input) => input.key === ModuleInputKeyEnum.aiModel)?.value ?? '',
+ maxToken:
+ inputs.find((input) => input.key === ModuleInputKeyEnum.aiChatMaxToken)?.value ?? 2048,
+ temperature:
+ inputs.find((input) => input.key === ModuleInputKeyEnum.aiChatTemperature)?.value ?? 1,
+ isResponseAnswerText: inputs.find(
+ (input) => input.key === ModuleInputKeyEnum.aiChatIsResponseText
+ )?.value
+ };
+
+ return (
+
+ );
+};
+
+export default React.memo(SelectAiModelRender);
diff --git a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SettingQuotePrompt.tsx b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SettingQuotePrompt.tsx
new file mode 100644
index 000000000..8ee1c11a4
--- /dev/null
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SettingQuotePrompt.tsx
@@ -0,0 +1,243 @@
+import React, { useMemo, useState } from 'react';
+import type { RenderInputProps } from '../type';
+import { Box, BoxProps, Button, Flex, ModalFooter, useDisclosure } from '@chakra-ui/react';
+import { onChangeNode, useFlowProviderStore } from '../../../../FlowProvider';
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import { useForm } from 'react-hook-form';
+import { PromptTemplateItem } from '@fastgpt/global/core/ai/type';
+import { useTranslation } from 'next-i18next';
+import {
+ formatEditorVariablePickerIcon,
+ getGuideModule,
+ splitGuideModule
+} from '@fastgpt/global/core/module/utils';
+import { ModalBody } from '@chakra-ui/react';
+import MyTooltip from '@/components/MyTooltip';
+import {
+ Prompt_QuotePromptList,
+ Prompt_QuoteTemplateList
+} from '@fastgpt/global/core/ai/prompt/AIChat';
+import { QuestionOutlineIcon } from '@chakra-ui/icons';
+import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
+import PromptTemplate from '@/components/PromptTemplate';
+import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
+
+const SettingQuotePrompt = ({ inputs = [], moduleId }: RenderInputProps) => {
+ const { t } = useTranslation();
+ const { isOpen, onOpen, onClose } = useDisclosure();
+ const { nodes } = useFlowProviderStore();
+ const { watch, setValue, handleSubmit } = useForm({
+ defaultValues: {
+ quoteTemplate: inputs.find((input) => input.key === 'quoteTemplate')?.value || '',
+ quotePrompt: inputs.find((input) => input.key === 'quotePrompt')?.value || ''
+ }
+ });
+ const aiChatQuoteTemplate = watch('quoteTemplate');
+ const aiChatQuotePrompt = watch('quotePrompt');
+
+ const variables = useMemo(() => {
+ const globalVariables = formatEditorVariablePickerIcon(
+ splitGuideModule(getGuideModule(nodes.map((node) => node.data)))?.variableModules || []
+ );
+ const moduleVariables = formatEditorVariablePickerIcon(
+ inputs
+ .filter((input) => input.edit)
+ .map((item) => ({
+ key: item.key,
+ label: item.label
+ }))
+ );
+ const systemVariables = [
+ {
+ key: 'cTime',
+ label: t('core.module.http.Current time')
+ }
+ ];
+
+ return [...globalVariables, ...moduleVariables, ...systemVariables];
+ }, [inputs, t]);
+ const [selectTemplateData, setSelectTemplateData] = useState<{
+ title: string;
+ templates: PromptTemplateItem[];
+ }>();
+ const quoteTemplateVariables = (() => [
+ {
+ key: 'q',
+ label: 'q',
+ icon: 'core/app/simpleMode/variable'
+ },
+ {
+ key: 'a',
+ label: 'a',
+ icon: 'core/app/simpleMode/variable'
+ },
+ {
+ key: 'source',
+ label: t('core.dataset.search.Source name'),
+ icon: 'core/app/simpleMode/variable'
+ },
+ {
+ key: 'sourceId',
+ label: t('core.dataset.search.Source id'),
+ icon: 'core/app/simpleMode/variable'
+ },
+ {
+ key: 'index',
+ label: t('core.dataset.search.Quote index'),
+ icon: 'core/app/simpleMode/variable'
+ },
+ ...variables
+ ])();
+ const quotePromptVariables = (() => [
+ {
+ key: 'quote',
+ label: t('core.app.Quote templates'),
+ icon: 'core/app/simpleMode/variable'
+ },
+ {
+ key: 'question',
+ label: t('core.module.input.label.user question'),
+ icon: 'core/app/simpleMode/variable'
+ },
+ ...variables
+ ])();
+
+ const LabelStyles: BoxProps = {
+ fontSize: ['sm', 'md']
+ };
+ const selectTemplateBtn: BoxProps = {
+ color: 'primary.500',
+ cursor: 'pointer'
+ };
+
+ const onSubmit = (data: { quoteTemplate: string; quotePrompt: string }) => {
+ const quoteTemplateInput = inputs.find(
+ (input) => input.key === ModuleInputKeyEnum.aiChatQuoteTemplate
+ );
+ const quotePromptInput = inputs.find(
+ (input) => input.key === ModuleInputKeyEnum.aiChatQuotePrompt
+ );
+ if (quoteTemplateInput) {
+ onChangeNode({
+ moduleId,
+ type: 'updateInput',
+ key: quoteTemplateInput.key,
+ value: {
+ ...quoteTemplateInput,
+ value: data.quoteTemplate
+ }
+ });
+ }
+ if (quotePromptInput) {
+ onChangeNode({
+ moduleId,
+ type: 'updateInput',
+ key: quotePromptInput.key,
+ value: {
+ ...quotePromptInput,
+ value: data.quotePrompt
+ }
+ });
+ }
+ onClose();
+ };
+
+ return (
+ <>
+
+
+
+
+
+ {t('core.app.Quote templates')}
+
+
+
+
+
+ setSelectTemplateData({
+ title: t('core.app.Select quote template'),
+ templates: Prompt_QuoteTemplateList
+ })
+ }
+ >
+ {t('common.Select template')}
+
+
+
+ {
+ setValue('quoteTemplate', e);
+ }}
+ />
+
+
+
+ {t('core.app.Quote prompt')}
+
+
+
+
+ {
+ setValue('quotePrompt', e);
+ }}
+ />
+
+
+
+
+
+
+
+ {!!selectTemplateData && (
+ setSelectTemplateData(undefined)}
+ onSuccess={(e) => {
+ const quoteVal = e.value;
+ const promptVal = Prompt_QuotePromptList.find((item) => item.title === e.title)?.value;
+ setValue('quoteTemplate', quoteVal);
+ setValue('quotePrompt', promptVal);
+ }}
+ />
+ )}
+
+ );
+};
+
+export default React.memo(SettingQuotePrompt);
diff --git a/projects/app/src/components/core/module/Flow/components/render/RenderToolInput/EditFieldModal.tsx b/projects/app/src/components/core/module/Flow/components/render/RenderToolInput/EditFieldModal.tsx
index a8fdbc09c..4042e2ae0 100644
--- a/projects/app/src/components/core/module/Flow/components/render/RenderToolInput/EditFieldModal.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderToolInput/EditFieldModal.tsx
@@ -1,5 +1,5 @@
import React, { useCallback, useRef } from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import type { EditFieldModalProps } from './type.d';
import { useTranslation } from 'next-i18next';
import {
diff --git a/projects/app/src/components/core/module/Flow/components/render/SourceHandle.tsx b/projects/app/src/components/core/module/Flow/components/render/SourceHandle.tsx
index 89cee29dc..af0f96e5a 100644
--- a/projects/app/src/components/core/module/Flow/components/render/SourceHandle.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/SourceHandle.tsx
@@ -1,7 +1,7 @@
import React, { useMemo } from 'react';
import { Box, BoxProps } from '@chakra-ui/react';
import { Handle, Position } from 'reactflow';
-import { FlowValueTypeMap } from '@/web/core/modules/constants/dataType';
+import { FlowValueTypeMap } from '@/web/core/workflow/constants/dataType';
import MyTooltip from '@/components/MyTooltip';
import { useTranslation } from 'next-i18next';
import { ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
diff --git a/projects/app/src/components/core/module/Flow/components/render/TargetHandle.tsx b/projects/app/src/components/core/module/Flow/components/render/TargetHandle.tsx
index 7985cd0a3..70da91a14 100644
--- a/projects/app/src/components/core/module/Flow/components/render/TargetHandle.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/TargetHandle.tsx
@@ -1,7 +1,7 @@
import React, { useMemo } from 'react';
import { Box, BoxProps } from '@chakra-ui/react';
import { Handle, OnConnect, Position } from 'reactflow';
-import { FlowValueTypeMap } from '@/web/core/modules/constants/dataType';
+import { FlowValueTypeMap } from '@/web/core/workflow/constants/dataType';
import MyTooltip from '@/components/MyTooltip';
import { useTranslation } from 'next-i18next';
import { ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
diff --git a/projects/app/src/components/core/module/Flow/components/render/ToolHandle.tsx b/projects/app/src/components/core/module/Flow/components/render/ToolHandle.tsx
index 087723e93..1119889d1 100644
--- a/projects/app/src/components/core/module/Flow/components/render/ToolHandle.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/ToolHandle.tsx
@@ -1,5 +1,5 @@
import MyTooltip from '@/components/MyTooltip';
-import { FlowValueTypeMap } from '@/web/core/modules/constants/dataType';
+import { FlowValueTypeMap } from '@/web/core/workflow/constants/dataType';
import { Box, BoxProps } from '@chakra-ui/react';
import {
ModuleIOValueTypeEnum,
diff --git a/projects/app/src/components/core/module/Flow/index.tsx b/projects/app/src/components/core/module/Flow/index.tsx
index 5a8862c2c..66ccc2871 100644
--- a/projects/app/src/components/core/module/Flow/index.tsx
+++ b/projects/app/src/components/core/module/Flow/index.tsx
@@ -1,5 +1,11 @@
import React, { useCallback, useMemo } from 'react';
-import ReactFlow, { Background, Connection, Controls, ReactFlowProvider } from 'reactflow';
+import ReactFlow, {
+ Background,
+ Connection,
+ Controls,
+ NodeProps,
+ ReactFlowProvider
+} from 'reactflow';
import { Box, Flex, IconButton, useDisclosure } from '@chakra-ui/react';
import { SmallCloseIcon } from '@chakra-ui/icons';
import { EDGE_TYPE, FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
@@ -7,12 +13,13 @@ import { EDGE_TYPE, FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/co
import dynamic from 'next/dynamic';
import ButtonEdge from './components/modules/ButtonEdge';
-import ModuleTemplateList, { type ModuleTemplateProps } from './ModuleTemplateList';
+import ModuleTemplateList from './ModuleTemplateList';
import { useFlowProviderStore } from './FlowProvider';
import 'reactflow/dist/style.css';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { useTranslation } from 'next-i18next';
+import { FlowModuleItemType } from '@fastgpt/global/core/module/type';
const NodeSimple = dynamic(() => import('./components/nodes/NodeSimple'));
const nodeTypes: Record<`${FlowNodeTypeEnum}`, any> = {
@@ -34,7 +41,10 @@ const nodeTypes: Record<`${FlowNodeTypeEnum}`, any> = {
[FlowNodeTypeEnum.pluginOutput]: dynamic(() => import('./components/nodes/NodePluginOutput')),
[FlowNodeTypeEnum.pluginModule]: NodeSimple,
[FlowNodeTypeEnum.queryExtension]: NodeSimple,
- [FlowNodeTypeEnum.tools]: dynamic(() => import('./components/nodes/NodeTools'))
+ [FlowNodeTypeEnum.tools]: dynamic(() => import('./components/nodes/NodeTools')),
+ [FlowNodeTypeEnum.stopTool]: (data: NodeProps) => (
+
+ )
};
const edgeTypes = {
[EDGE_TYPE]: ButtonEdge
@@ -99,11 +109,7 @@ const Container = React.memo(function Container() {
);
});
-const Flow = ({
- Header,
- templates,
- ...data
-}: ModuleTemplateProps & { Header: React.ReactNode }) => {
+const Flow = ({ Header, ...data }: { Header: React.ReactNode }) => {
const {
isOpen: isOpenTemplate,
onOpen: onOpenTemplate,
@@ -143,14 +149,10 @@ const Flow = ({
-
+
);
- }, [data, isOpenTemplate, onCloseTemplate, onOpenTemplate, templates]);
+ }, [data, isOpenTemplate, onCloseTemplate, onOpenTemplate]);
return (
diff --git a/projects/app/src/components/support/apikey/Table.tsx b/projects/app/src/components/support/apikey/Table.tsx
index b8820d820..7632b24df 100644
--- a/projects/app/src/components/support/apikey/Table.tsx
+++ b/projects/app/src/components/support/apikey/Table.tsx
@@ -35,7 +35,7 @@ import { useCopyData } from '@/web/common/hooks/useCopyData';
import { useSystemStore } from '@/web/common/system/useSystemStore';
import { useTranslation } from 'next-i18next';
import MyIcon from '@fastgpt/web/components/common/Icon';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useForm } from 'react-hook-form';
import { useRequest } from '@/web/common/hooks/useRequest';
import MyTooltip from '@/components/MyTooltip';
diff --git a/projects/app/src/components/support/permission/IconText/index.tsx b/projects/app/src/components/support/permission/IconText/index.tsx
index 7dfde2572..8659aeab3 100644
--- a/projects/app/src/components/support/permission/IconText/index.tsx
+++ b/projects/app/src/components/support/permission/IconText/index.tsx
@@ -12,7 +12,9 @@ const PermissionIconText = ({
return PermissionTypeMap[permission] ? (
- {t(PermissionTypeMap[permission]?.label)}
+
+ {t(PermissionTypeMap[permission]?.label)}
+
) : null;
};
diff --git a/projects/app/src/components/support/user/team/TeamManageModal/EditModal.tsx b/projects/app/src/components/support/user/team/TeamManageModal/EditModal.tsx
index 1df7db1a9..40ef454f5 100644
--- a/projects/app/src/components/support/user/team/TeamManageModal/EditModal.tsx
+++ b/projects/app/src/components/support/user/team/TeamManageModal/EditModal.tsx
@@ -6,7 +6,7 @@ import { compressImgFileAndUpload } from '@/web/common/file/controller';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { useRequest } from '@/web/common/hooks/useRequest';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { Box, Button, Flex, Input, ModalBody, ModalFooter } from '@chakra-ui/react';
import MyTooltip from '@/components/MyTooltip';
import Avatar from '@/components/Avatar';
diff --git a/projects/app/src/components/support/user/team/TeamManageModal/InviteModal.tsx b/projects/app/src/components/support/user/team/TeamManageModal/InviteModal.tsx
index 536fcc2ef..d2de22266 100644
--- a/projects/app/src/components/support/user/team/TeamManageModal/InviteModal.tsx
+++ b/projects/app/src/components/support/user/team/TeamManageModal/InviteModal.tsx
@@ -1,5 +1,5 @@
import React, { useMemo, useState } from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { ModalCloseButton, ModalBody, Box, ModalFooter, Button } from '@chakra-ui/react';
import TagTextarea from '@/components/common/Textarea/TagTextarea';
diff --git a/projects/app/src/components/support/user/team/TeamManageModal/index.tsx b/projects/app/src/components/support/user/team/TeamManageModal/index.tsx
index d4b542044..1e468eff0 100644
--- a/projects/app/src/components/support/user/team/TeamManageModal/index.tsx
+++ b/projects/app/src/components/support/user/team/TeamManageModal/index.tsx
@@ -1,5 +1,5 @@
import React, { useMemo, useState } from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useQuery } from '@tanstack/react-query';
import { DragHandleIcon } from '@chakra-ui/icons';
@@ -194,7 +194,6 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
bg: 'myGray.100'
}
})}
- onClick={() => onSwitchTeam(team.teamId)}
>
{
+ const { t } = useTranslation();
+ const router = useRouter();
+ const { setIsNotSufficientModal } = useSystemStore();
+
+ const onClose = () => setIsNotSufficientModal(false);
+
+ return (
+
+ {t('support.wallet.Not sufficient')}
+
+
+
+
+
+ );
+};
+
+export default NotSufficientModal;
diff --git a/projects/app/src/components/support/wallet/QRCodePayModal.tsx b/projects/app/src/components/support/wallet/QRCodePayModal.tsx
index 521479154..8aaa777ff 100644
--- a/projects/app/src/components/support/wallet/QRCodePayModal.tsx
+++ b/projects/app/src/components/support/wallet/QRCodePayModal.tsx
@@ -1,4 +1,4 @@
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import React, { useEffect } from 'react';
import { useTranslation } from 'next-i18next';
import { Box, ModalBody, ModalFooter } from '@chakra-ui/react';
diff --git a/projects/app/src/components/support/wallet/StandardPlanContentList.tsx b/projects/app/src/components/support/wallet/StandardPlanContentList.tsx
index 6a5eda487..1614dd9ac 100644
--- a/projects/app/src/components/support/wallet/StandardPlanContentList.tsx
+++ b/projects/app/src/components/support/wallet/StandardPlanContentList.tsx
@@ -5,6 +5,10 @@ import { standardSubLevelMap } from '@fastgpt/global/support/wallet/sub/constant
import { Box, Flex, Grid } from '@chakra-ui/react';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { useTranslation } from 'next-i18next';
+import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
+import { QuestionOutlineIcon } from '@chakra-ui/icons';
+import { useRouter } from 'next/router';
+import { AI_POINT_USAGE_CARD_ROUTE } from '@/web/support/wallet/sub/constants';
const StandardPlanContentList = ({
level,
@@ -15,6 +19,7 @@ const StandardPlanContentList = ({
}) => {
const { t } = useTranslation();
const { subPlans } = useSystemStore();
+ const router = useRouter();
const planContent = useMemo(() => {
const plan = subPlans?.standard?.[level];
@@ -87,6 +92,14 @@ const StandardPlanContentList = ({
amount: planContent.totalPoints
})}
+
+ {
+ router.push(AI_POINT_USAGE_CARD_ROUTE);
+ }}
+ />
+
diff --git a/projects/app/src/constants/app.ts b/projects/app/src/constants/app.ts
index de53fbab3..0d4c5963f 100644
--- a/projects/app/src/constants/app.ts
+++ b/projects/app/src/constants/app.ts
@@ -6,7 +6,6 @@ export const defaultApp: AppDetailType = {
userId: 'userId',
name: '应用加载中',
type: 'simple',
- simpleTemplateId: 'fastgpt-universal',
avatar: '/icon/logo.svg',
intro: '',
updateTime: Date.now(),
diff --git a/projects/app/src/global/common/api/systemRes.d.ts b/projects/app/src/global/common/api/systemRes.d.ts
index 1262e3dad..8ddf33697 100644
--- a/projects/app/src/global/common/api/systemRes.d.ts
+++ b/projects/app/src/global/common/api/systemRes.d.ts
@@ -7,7 +7,6 @@ import type {
} from '@fastgpt/global/core/ai/model.d';
import type { FastGPTFeConfigsType } from '@fastgpt/global/common/system/types/index.d';
-import { AppSimpleEditConfigTemplateType } from '@fastgpt/global/core/app/type';
import { SubPlanType } from '@fastgpt/global/support/wallet/sub/type';
export type InitDateResponse = {
@@ -19,5 +18,4 @@ export type InitDateResponse = {
feConfigs: FastGPTFeConfigsType;
subPlans?: SubPlanType;
systemVersion: string;
- simpleModeTemplates: AppSimpleEditConfigTemplateType[];
};
diff --git a/projects/app/src/global/core/app/constants.ts b/projects/app/src/global/core/app/constants.ts
deleted file mode 100644
index a397ff992..000000000
--- a/projects/app/src/global/core/app/constants.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { AppSimpleEditConfigTemplateType } from '@fastgpt/global/core/app/type.d';
-import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
-
-export const SimpleModeTemplate_FastGPT_Universal: AppSimpleEditConfigTemplateType = {
- id: 'fastgpt-universal',
- name: 'core.app.template.Common template',
- desc: 'core.app.template.Common template tip',
- systemForm: {
- aiSettings: {
- model: true,
- systemPrompt: true,
- temperature: true,
- maxToken: true,
- quoteTemplate: true,
- quotePrompt: true
- },
- dataset: {
- datasets: true,
- similarity: true,
- limit: true,
- searchMode: DatasetSearchModeEnum.embedding,
- usingReRank: true,
- searchEmptyText: true
- },
- userGuide: {
- welcomeText: true,
- variables: true,
- questionGuide: true,
- tts: true
- }
- }
-};
diff --git a/projects/app/src/global/core/dataset/api.d.ts b/projects/app/src/global/core/dataset/api.d.ts
index 53a422440..314a4fe77 100644
--- a/projects/app/src/global/core/dataset/api.d.ts
+++ b/projects/app/src/global/core/dataset/api.d.ts
@@ -19,7 +19,6 @@ export type CreateDatasetParams = {
avatar: string;
vectorModel?: string;
agentModel?: string;
- type: `${DatasetTypeEnum}`;
};
/* ================= collection ===================== */
diff --git a/projects/app/src/pages/account/components/BillTable.tsx b/projects/app/src/pages/account/components/BillTable.tsx
index ad394837a..a8bfd5ec5 100644
--- a/projects/app/src/pages/account/components/BillTable.tsx
+++ b/projects/app/src/pages/account/components/BillTable.tsx
@@ -30,7 +30,7 @@ import MyBox from '@/components/common/MyBox';
import { useRequest } from '@/web/common/hooks/useRequest';
import { standardSubLevelMap, subModeMap } from '@fastgpt/global/support/wallet/sub/constants';
import MySelect from '@fastgpt/web/components/common/MySelect';
-import MyModal from '@fastgpt/web/components/common/CustomModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { usePagination } from '@fastgpt/web/hooks/usePagination';
const BillTable = () => {
diff --git a/projects/app/src/pages/account/components/Info.tsx b/projects/app/src/pages/account/components/Info.tsx
index 646977b52..659b9e50d 100644
--- a/projects/app/src/pages/account/components/Info.tsx
+++ b/projects/app/src/pages/account/components/Info.tsx
@@ -16,6 +16,7 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
import { useUserStore } from '@/web/support/user/useUserStore';
import type { UserType } from '@fastgpt/global/support/user/type.d';
import { useQuery } from '@tanstack/react-query';
+import { QuestionOutlineIcon } from '@chakra-ui/icons';
import dynamic from 'next/dynamic';
import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
import { compressImgFileAndUpload } from '@/web/common/file/controller';
@@ -29,16 +30,24 @@ import { formatStorePrice2Read } from '@fastgpt/global/support/wallet/usage/tool
import { putUpdateMemberName } from '@/web/support/user/team/api';
import { getDocPath } from '@/web/common/system/doc';
import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
-import { standardSubLevelMap } from '@fastgpt/global/support/wallet/sub/constants';
+import {
+ StandardSubLevelEnum,
+ standardSubLevelMap
+} from '@fastgpt/global/support/wallet/sub/constants';
import { formatTime2YMD } from '@fastgpt/global/common/string/time';
-import { AI_POINT_USAGE_CARD_ROUTE } from '@/web/support/wallet/sub/constants';
+import {
+ AI_POINT_USAGE_CARD_ROUTE,
+ EXTRA_PLAN_CARD_ROUTE
+} from '@/web/support/wallet/sub/constants';
import StandardPlanContentList from '@/components/support/wallet/StandardPlanContentList';
+
const StandDetailModal = dynamic(() => import('./standardDetailModal'));
const TeamMenu = dynamic(() => import('@/components/support/user/team/TeamMenu'));
const PayModal = dynamic(() => import('./PayModal'));
const UpdatePswModal = dynamic(() => import('./UpdatePswModal'));
const OpenAIAccountModal = dynamic(() => import('./OpenAIAccountModal'));
+const CommunityModal = dynamic(() => import('@/components/CommunityModal'));
const Account = () => {
const { isPc } = useSystemStore();
@@ -113,11 +122,11 @@ const MyInfo = () => {
});
reset(data);
toast({
- title: '更新数据成功',
+ title: t('dataset.data.Update Success Tip'),
status: 'success'
});
},
- [reset, toast, updateUserInfo]
+ [reset, t, toast, updateUserInfo]
);
const onSelectFile = useCallback(
@@ -184,7 +193,7 @@ const MyInfo = () => {
cursor={'pointer'}
onClick={onOpenSelectFile}
>
-
+
{
);
};
const PlanUsage = () => {
- const { isPc } = useSystemStore();
const router = useRouter();
const { t } = useTranslation();
const { userInfo, initUserInfo, teamPlanStatus } = useUserStore();
@@ -288,6 +296,21 @@ const PlanUsage = () => {
return standardSubLevelMap[teamPlanStatus.standard.currentSubLevel].label;
}, [teamPlanStatus?.standard?.currentSubLevel]);
const standardPlan = teamPlanStatus?.standard;
+ const isFreeTeam = useMemo(() => {
+ if (!teamPlanStatus || !teamPlanStatus?.standardConstants) return false;
+ const hasExtraDatasetSize =
+ teamPlanStatus.datasetMaxSize > teamPlanStatus.standardConstants.maxDatasetSize;
+ const hasExtraPoints =
+ teamPlanStatus.totalPoints > teamPlanStatus.standardConstants.totalPoints;
+ if (
+ teamPlanStatus?.standard?.currentSubLevel === StandardSubLevelEnum.free &&
+ !hasExtraDatasetSize &&
+ !hasExtraPoints
+ ) {
+ return true;
+ }
+ return false;
+ }, [teamPlanStatus]);
useQuery(['init'], initUserInfo, {
onSuccess(res) {
@@ -374,6 +397,11 @@ const PlanUsage = () => {
{t(planName)}
+ {isFreeTeam && (
+
+ 免费版用户15天无任何使用记录时，系统会自动清理账号知识库。
+
+ )}
{t('common.Expired Time')}:
{formatTime2YMD(standardPlan?.expiredTime)}
@@ -399,9 +427,29 @@ const PlanUsage = () => {
borderColor={'borderColor.low'}
borderRadius={'md'}
px={[5, 10]}
- py={[4, 7]}
+ pt={[2, 4]}
+ pb={[4, 7]}
>
-
+
+
+ 资源用量
+
+ (包含标准套餐与额外资源包)
+
+
+
+ 购买额外套餐
+
+
+
+
{t('support.user.team.Dataset usage')}
@@ -426,7 +474,10 @@ const PlanUsage = () => {
- {t('support.wallet.subscription.AI points')}
+ {t('support.wallet.subscription.AI points usage')}
+
+
+
{aiPointsUsageMap.used}/{aiPointsUsageMap.max}
@@ -445,7 +496,6 @@ const PlanUsage = () => {
/>
-
{isOpenStandardModal && }
@@ -462,6 +512,7 @@ const Other = () => {
});
const { isOpen: isOpenOpenai, onClose: onCloseOpenai, onOpen: onOpenOpenai } = useDisclosure();
+ const { isOpen: isOpenConcat, onClose: onCloseConcat, onOpen: onOpenConcat } = useDisclosure();
const onclickSave = useCallback(
async (data: UserType) => {
@@ -552,6 +603,17 @@ const Other = () => {
/>
)}
+ {feConfigs?.concatMd && (
+ }
+ onClick={onOpenConcat}
+ h={'48px'}
+ >
+ 联系我们
+
+ )}
{isOpenOpenai && userInfo && (
@@ -566,6 +628,7 @@ const Other = () => {
onClose={onCloseOpenai}
/>
)}
+ {isOpenConcat && }
);
};
diff --git a/projects/app/src/pages/account/components/OpenAIAccountModal.tsx b/projects/app/src/pages/account/components/OpenAIAccountModal.tsx
index 81d22f85d..10b8e1dea 100644
--- a/projects/app/src/pages/account/components/OpenAIAccountModal.tsx
+++ b/projects/app/src/pages/account/components/OpenAIAccountModal.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { ModalBody, Box, Flex, Input, ModalFooter, Button } from '@chakra-ui/react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useForm } from 'react-hook-form';
import { useRequest } from '@/web/common/hooks/useRequest';
diff --git a/projects/app/src/pages/account/components/PayModal.tsx b/projects/app/src/pages/account/components/PayModal.tsx
index b61e3211c..fe4e754d9 100644
--- a/projects/app/src/pages/account/components/PayModal.tsx
+++ b/projects/app/src/pages/account/components/PayModal.tsx
@@ -1,15 +1,16 @@
import React, { useState, useCallback, useMemo } from 'react';
-import { ModalFooter, ModalBody, Button, Input, Box, Grid } from '@chakra-ui/react';
+import { ModalFooter, ModalBody, Button, Input, Box, Grid, Link } from '@chakra-ui/react';
import { getWxPayQRCode } from '@/web/support/wallet/bill/api';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { useRouter } from 'next/router';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { useTranslation } from 'next-i18next';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
import QRCodePayModal, { type QRPayProps } from '@/components/support/wallet/QRCodePayModal';
import { useSystemStore } from '@/web/common/system/useSystemStore';
+import { EXTRA_PLAN_CARD_ROUTE } from '@/web/support/wallet/sub/constants';
const PayModal = ({
onClose,
@@ -59,8 +60,12 @@ const PayModal = ({
return (
-
- 该余额仅用于自动续费标准套餐。如需购买额外套餐，可直接下单，无需充值余额。
+
+ 该余额仅用于自动续费标准套餐。如需购买额外套餐，可
+
+ 直接下单
+
+ ，无需充值余额。
{payList.map((item) => (
diff --git a/projects/app/src/pages/account/components/UpdatePswModal.tsx b/projects/app/src/pages/account/components/UpdatePswModal.tsx
index 1c6a915c7..5decc22ea 100644
--- a/projects/app/src/pages/account/components/UpdatePswModal.tsx
+++ b/projects/app/src/pages/account/components/UpdatePswModal.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { ModalBody, Box, Flex, Input, ModalFooter, Button } from '@chakra-ui/react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useForm } from 'react-hook-form';
import { useRequest } from '@/web/common/hooks/useRequest';
diff --git a/projects/app/src/pages/account/components/UsageDetail.tsx b/projects/app/src/pages/account/components/UsageDetail.tsx
index 3482f5df7..2acb11720 100644
--- a/projects/app/src/pages/account/components/UsageDetail.tsx
+++ b/projects/app/src/pages/account/components/UsageDetail.tsx
@@ -14,7 +14,7 @@ import {
import { UsageItemType } from '@fastgpt/global/support/wallet/usage/type.d';
import dayjs from 'dayjs';
import { UsageSourceMap } from '@fastgpt/global/support/wallet/usage/constants';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { formatNumber } from '@fastgpt/global/common/math/tools';
diff --git a/projects/app/src/pages/account/components/standardDetailModal.tsx b/projects/app/src/pages/account/components/standardDetailModal.tsx
index 657099fb3..ae6070619 100644
--- a/projects/app/src/pages/account/components/standardDetailModal.tsx
+++ b/projects/app/src/pages/account/components/standardDetailModal.tsx
@@ -11,7 +11,7 @@ import {
TableContainer,
ModalCloseButton
} from '@chakra-ui/react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useQuery } from '@tanstack/react-query';
import { useLoading } from '@fastgpt/web/hooks/useLoading';
diff --git a/projects/app/src/pages/api/admin/initv462.ts b/projects/app/src/pages/api/admin/initv462.ts
deleted file mode 100644
index 7678e778c..000000000
--- a/projects/app/src/pages/api/admin/initv462.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import { delay } from '@fastgpt/global/common/system/utils';
-import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
-import { jiebaSplit } from '@/service/common/string/jieba';
-
-let success = 0;
-/* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- try {
- const { limit = 50 } = req.body as { limit: number };
- await authCert({ req, authRoot: true });
- await connectToDatabase();
- success = 0;
-
- console.log(
- 'total',
- await MongoDatasetData.countDocuments({
- fullTextToken: { $exists: false },
- updateTime: { $lt: new Date() }
- })
- );
-
- await initFullTextToken(limit, new Date());
-
- jsonRes(res, {
- message: 'success'
- });
- } catch (error) {
- console.log(error);
-
- jsonRes(res, {
- code: 500,
- error
- });
- }
-}
-export async function initFullTextToken(limit = 50, endDate: Date): Promise {
- try {
- const dataList = await MongoDatasetData.find(
- { fullTextToken: { $exists: false }, updateTime: { $lt: endDate } },
- '_id q a'
- )
- .limit(limit)
- .lean();
- if (dataList.length === 0) return;
-
- const result = await Promise.allSettled(
- dataList.map((item) => {
- const text = item.q + (item.a || '');
- const tokens = jiebaSplit({ text });
-
- return MongoDatasetData.findByIdAndUpdate(item._id, {
- $set: {
- fullTextToken: tokens
- }
- });
- })
- );
-
- success += result.filter((item) => item.status === 'fulfilled').length;
- console.log(`success: ${success}`);
- return initFullTextToken(limit, endDate);
- } catch (error) {
- await delay(1000);
- return initFullTextToken(limit, endDate);
- }
-}
diff --git a/projects/app/src/pages/api/admin/initv463-2.ts b/projects/app/src/pages/api/admin/initv463-2.ts
deleted file mode 100644
index ae9d33788..000000000
--- a/projects/app/src/pages/api/admin/initv463-2.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import { delay } from '@fastgpt/global/common/system/utils';
-import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
-import { jiebaSplit } from '@/service/common/string/jieba';
-
-let success = 0;
-/* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- try {
- const { limit = 50 } = req.body as { limit: number };
- await authCert({ req, authRoot: true });
- await connectToDatabase();
- success = 0;
-
- console.log('total', await MongoDatasetData.countDocuments({ inited: { $exists: false } }));
-
- await initFullTextToken(limit);
-
- jsonRes(res, {
- message: 'success'
- });
- } catch (error) {
- console.log(error);
-
- jsonRes(res, {
- code: 500,
- error
- });
- }
-}
-export async function initFullTextToken(limit = 50): Promise {
- try {
- const dataList = await MongoDatasetData.find({ inited: { $exists: false } }, '_id q a')
- .limit(limit)
- .lean();
- if (dataList.length === 0) return;
-
- const result = await Promise.allSettled(
- dataList.map((item) => {
- const text = item.q + (item.a || '');
- const tokens = jiebaSplit({ text });
-
- return MongoDatasetData.findByIdAndUpdate(item._id, {
- $set: {
- inited: true,
- fullTextToken: tokens
- }
- });
- })
- );
-
- success += result.filter((item) => item.status === 'fulfilled').length;
- console.log(`success: ${success}`);
- return initFullTextToken(limit);
- } catch (error) {
- await delay(1000);
- return initFullTextToken(limit);
- }
-}
diff --git a/projects/app/src/pages/api/admin/initv463.ts b/projects/app/src/pages/api/admin/initv463.ts
deleted file mode 100644
index 3142b98d0..000000000
--- a/projects/app/src/pages/api/admin/initv463.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
-import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection/schema';
-import { DatasetStatusEnum, TrainingModeEnum } from '@fastgpt/global/core/dataset/constants';
-import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
-
-let success = 0;
-/* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- try {
- const { limit = 50 } = req.body as { limit: number };
- await authCert({ req, authRoot: true });
- await connectToDatabase();
- success = 0;
-
- await MongoDatasetCollection.updateMany({ createTime: { $exists: false } }, [
- {
- $set: {
- createTime: '$updateTime'
- }
- }
- ]);
- await MongoDatasetCollection.updateMany({ trainingType: { $exists: false } }, [
- {
- $set: {
- trainingType: {
- $cond: {
- if: { $ifNull: ['$a', false] },
- then: TrainingModeEnum.qa,
- else: TrainingModeEnum.chunk
- }
- }
- }
- }
- ]);
- await MongoDatasetCollection.updateMany({ chunkSize: { $exists: false } }, [
- {
- $set: {
- chunkSize: 0
- }
- }
- ]);
- await MongoDatasetCollection.updateMany({ fileId: { $exists: false } }, [
- {
- $set: {
- fileId: '$metadata.fileId'
- }
- }
- ]);
- await MongoDatasetCollection.updateMany({ rawLink: { $exists: false } }, [
- {
- $set: {
- rawLink: '$metadata.rawLink'
- }
- }
- ]);
-
- await MongoDatasetData.updateMany(
- { chunkIndex: { $exists: false } },
- {
- chunkIndex: 0
- }
- );
- await MongoDatasetData.updateMany(
- { updateTime: { $exists: false } },
- {
- updateTime: new Date()
- }
- );
-
- await MongoDataset.updateMany(
- { status: { $exists: false } },
- {
- $set: {
- status: DatasetStatusEnum.active
- }
- }
- );
-
- // dataset tags to intro
- await MongoDataset.updateMany({ tags: { $exists: true } }, [
- {
- $set: {
- intro: {
- $reduce: {
- input: '$tags',
- initialValue: '',
- in: { $concat: ['$$value', ' ', '$$this'] }
- }
- }
- }
- }
- ]);
-
- jsonRes(res, {
- message: 'success'
- });
- } catch (error) {
- console.log(error);
-
- jsonRes(res, {
- code: 500,
- error
- });
- }
-}
diff --git a/projects/app/src/pages/api/admin/initv47.ts b/projects/app/src/pages/api/admin/initv47.ts
new file mode 100644
index 000000000..2892c5714
--- /dev/null
+++ b/projects/app/src/pages/api/admin/initv47.ts
@@ -0,0 +1,49 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { MongoUsage } from '@fastgpt/service/support/wallet/usage/schema';
+import { connectionMongo } from '@fastgpt/service/common/mongo';
+import { checkFiles } from '../timerTask/dataset/checkInValidDatasetFiles';
+import { addHours } from 'date-fns';
+import { checkInvalid as checkInvalidImg } from '../timerTask/dataset/checkInvalidDatasetImage';
+import { checkInvalidCollection } from '../timerTask/dataset/checkInvalidMongoCollection';
+import { checkInvalidVector } from '../timerTask/dataset/checkInvalidVector';
+import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
+import { PluginTypeEnum } from '@fastgpt/global/core/plugin/constants';
+
+/* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+ try {
+ await connectToDatabase();
+ await authCert({ req, authRoot: true });
+
+ await MongoPlugin.updateMany(
+ { type: { $exists: false } },
+ {
+ $set: {
+ type: PluginTypeEnum.custom
+ }
+ }
+ );
+ await MongoPlugin.updateMany(
+ { parentId: { $exists: false } },
+ {
+ $set: {
+ parentId: null
+ }
+ }
+ );
+
+ jsonRes(res, {
+ message: 'success'
+ });
+ } catch (error) {
+ console.log(error);
+
+ jsonRes(res, {
+ code: 500,
+ error
+ });
+ }
+}
diff --git a/projects/app/src/pages/api/common/system/getInitData.ts b/projects/app/src/pages/api/common/system/getInitData.ts
index 0003d1b45..0efaeb737 100644
--- a/projects/app/src/pages/api/common/system/getInitData.ts
+++ b/projects/app/src/pages/api/common/system/getInitData.ts
@@ -30,8 +30,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
})) || [],
whisperModel: global.whisperModel,
audioSpeechModels: global.audioSpeechModels,
- systemVersion: global.systemVersion || '0.0.0',
- simpleModeTemplates: global.simpleModeTemplates
+ systemVersion: global.systemVersion || '0.0.0'
}
});
}
@@ -43,7 +42,7 @@ const defaultFeConfigs: FastGPTFeConfigsType = {
openAPIDocUrl: 'https://doc.fastgpt.in/docs/development/openapi',
systemTitle: 'FastGPT',
concatMd:
- '* 项目开源地址: [FastGPT GitHub](https://github.com/labring/FastGPT)\n* 交流群: ',
+ '* 项目开源地址: [FastGPT GitHub](https://github.com/labring/FastGPT)\n* 交流群: ',
limit: {
exportDatasetLimitMinutes: 0,
websiteSyncLimitMinuted: 0
@@ -68,7 +67,6 @@ export async function getInitConfig() {
]);
console.log({
- // simpleModeTemplates: global.simpleModeTemplates,
communityPlugins: global.communityPlugins
});
} catch (error) {
@@ -141,39 +139,6 @@ export function getSystemVersion() {
}
}
-// async function getSimpleModeTemplates() {
-// if (global.simpleModeTemplates && global.simpleModeTemplates.length > 0) return;
-
-// try {
-// const basePath =
-// process.env.NODE_ENV === 'development' ? 'data/simpleTemplates' : '/app/data/simpleTemplates';
-// // read data/simpleTemplates directory, get all json file
-// const files = readdirSync(basePath);
-// // filter json file
-// const filterFiles = files.filter((item) => item.endsWith('.json'));
-
-// // read json file
-// const fileTemplates = filterFiles.map((item) => {
-// const content = readFileSync(`${basePath}/${item}`, 'utf-8');
-// return {
-// id: item.replace('.json', ''),
-// ...JSON.parse(content)
-// };
-// });
-
-// // fetch templates from plus
-// const plusTemplates = await getSimpleTemplatesFromPlus();
-
-// global.simpleModeTemplates = [
-// SimpleModeTemplate_FastGPT_Universal,
-// ...plusTemplates,
-// ...fileTemplates
-// ];
-// } catch (error) {
-// global.simpleModeTemplates = [SimpleModeTemplate_FastGPT_Universal];
-// }
-// }
-
function getSystemPlugin() {
if (global.communityPlugins && global.communityPlugins.length > 0) return;
diff --git a/projects/app/src/pages/api/core/app/create.ts b/projects/app/src/pages/api/core/app/create.ts
index aa3f9a838..6dcb130bf 100644
--- a/projects/app/src/pages/api/core/app/create.ts
+++ b/projects/app/src/pages/api/core/app/create.ts
@@ -5,7 +5,6 @@ import type { CreateAppParams } from '@fastgpt/global/core/app/api.d';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { MongoApp } from '@fastgpt/service/core/app/schema';
import { authUserNotVisitor } from '@fastgpt/service/support/permission/auth/user';
-import { SimpleModeTemplate_FastGPT_Universal } from '@/global/core/app/constants';
import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -35,8 +34,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
teamId,
tmbId,
modules,
- type,
- simpleTemplateId: SimpleModeTemplate_FastGPT_Universal.id
+ type
});
jsonRes(res, {
diff --git a/projects/app/src/pages/api/core/app/form2Modules/fastgpt-simple.ts b/projects/app/src/pages/api/core/app/form2Modules/fastgpt-simple.ts
deleted file mode 100644
index 668b9c0de..000000000
--- a/projects/app/src/pages/api/core/app/form2Modules/fastgpt-simple.ts
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- universal mode.
- @author: FastGpt Team
-*/
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type.d';
-import type { ModuleItemType } from '@fastgpt/global/core/module/type';
-import { FormatForm2ModulesProps } from '@fastgpt/global/core/app/api';
-import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- try {
- const { formData, chatModelMaxToken } = req.body as FormatForm2ModulesProps;
-
- const modules = [
- ...(formData.dataset.datasets.length > 0
- ? datasetTemplate({ formData, maxToken: chatModelMaxToken })
- : simpleChatTemplate({ formData, maxToken: chatModelMaxToken }))
- ];
-
- jsonRes(res, {
- data: modules
- });
- } catch (err) {
- jsonRes(res, {
- code: 500,
- error: err
- });
- }
-}
-
-type Props = { formData: AppSimpleEditFormType; maxToken: number };
-
-function simpleChatTemplate({ formData, maxToken }: Props): ModuleItemType[] {
- return [
- {
- moduleId: 'userChatInput',
- name: 'core.module.template.Chat entrance',
- avatar: '/imgs/module/userChatInput.png',
- flowType: 'questionInput',
- position: {
- x: 464.32198615344566,
- y: 1602.2698463081606
- },
- inputs: [
- {
- key: 'userChatInput',
- type: 'systemInput',
- valueType: 'string',
- label: 'core.module.input.label.user question',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- }
- ],
- outputs: [
- {
- key: 'userChatInput',
- label: 'core.module.input.label.user question',
- type: 'source',
- valueType: 'string',
- targets: [
- {
- moduleId: 'chatModule',
- key: 'userChatInput'
- }
- ]
- }
- ]
- },
- {
- moduleId: 'chatModule',
- name: 'AI 对话',
- avatar: '/imgs/module/AI.png',
- flowType: 'chatNode',
- showStatus: true,
- position: {
- x: 981.9682828103937,
- y: 890.014595014464
- },
- inputs: [
- {
- key: 'switch',
- type: 'target',
- label: 'core.module.input.label.switch',
- valueType: 'any',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'model',
- type: 'selectLLMModel',
- label: 'core.module.input.label.aiModel',
- required: true,
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.model,
- connected: false
- },
- {
- key: 'temperature',
- type: 'hidden',
- label: '温度',
- value: 1,
- valueType: 'number',
- min: 0,
- max: 10,
- step: 1,
- markList: [
- {
- label: '严谨',
- value: 0
- },
- {
- label: '发散',
- value: 10
- }
- ],
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'maxToken',
- type: 'hidden',
- label: '回复上限',
- value: maxToken,
- valueType: 'number',
- min: 100,
- max: 4000,
- step: 50,
- markList: [
- {
- label: '100',
- value: 100
- },
- {
- label: '4000',
- value: 4000
- }
- ],
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'isResponseAnswerText',
- type: 'hidden',
- label: '返回AI内容',
- value: true,
- valueType: 'boolean',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'quoteTemplate',
- type: 'hidden',
- label: '引用内容模板',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.quoteTemplate,
- connected: false
- },
- {
- key: 'quotePrompt',
- type: 'hidden',
- label: '引用内容提示词',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.quotePrompt,
- connected: false
- },
- {
- key: 'aiSettings',
- type: 'aiSettings',
- label: '',
- valueType: 'any',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'systemPrompt',
- type: 'textarea',
- label: 'core.ai.Prompt',
- max: 300,
- valueType: 'string',
- description:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- placeholder:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- showTargetInApp: true,
- showTargetInPlugin: true,
- value: formData.aiSettings.systemPrompt,
- connected: false
- },
- {
- key: 'history',
- type: 'numberInput',
- label: 'core.module.input.label.chat history',
- required: true,
- min: 0,
- max: 30,
- valueType: 'chatHistory',
- value: 8,
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'quoteQA',
- type: 'target',
- label: '引用内容',
- description: "对象数组格式，结构：\n [{q:'问题',a:'回答'}]",
- valueType: 'datasetQuote',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'userChatInput',
- type: 'target',
- label: 'core.module.input.label.user question',
- required: true,
- valueType: 'string',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- }
- ],
- outputs: [
- {
- key: 'answerText',
- label: 'AI回复',
- description: '将在 stream 回复完毕后触发',
- valueType: 'string',
- type: 'source',
- targets: []
- },
- {
- key: 'finish',
- label: 'core.module.output.label.running done',
- description: 'core.module.output.description.running done',
- valueType: 'boolean',
- type: 'source',
- targets: []
- },
- {
- key: 'history',
- label: '新的上下文',
- description: '将本次回复内容拼接上历史记录，作为新的上下文返回',
- valueType: 'chatHistory',
- type: 'source',
- targets: []
- }
- ]
- }
- ];
-}
-function datasetTemplate({ formData, maxToken }: Props): ModuleItemType[] {
- const modules: ModuleItemType[] = [
- {
- moduleId: 'userChatInput',
- name: 'core.module.template.Chat entrance',
- avatar: '/imgs/module/userChatInput.png',
- flowType: 'questionInput',
- position: {
- x: 324.81436595478294,
- y: 1527.0012457753612
- },
- inputs: [
- {
- key: 'userChatInput',
- type: 'systemInput',
- valueType: 'string',
- label: 'core.module.input.label.user question',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- }
- ],
- outputs: [
- {
- key: 'userChatInput',
- label: 'core.module.input.label.user question',
- type: 'source',
- valueType: 'string',
- targets: [
- {
- moduleId: 'datasetSearch',
- key: 'userChatInput'
- }
- ]
- }
- ]
- },
- {
- moduleId: 'datasetSearch',
- name: 'core.module.template.Dataset search',
- avatar: '/imgs/module/db.png',
- flowType: 'datasetSearchNode',
- showStatus: true,
- position: {
- x: 1351.5043753345153,
- y: 947.0780385418003
- },
- inputs: [
- {
- key: 'switch',
- type: 'target',
- label: 'core.module.input.label.switch',
- valueType: 'any',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'datasets',
- type: 'selectDataset',
- label: '关联的知识库',
- value: formData.dataset.datasets,
- valueType: 'selectDataset',
- list: [],
- required: true,
- showTargetInApp: false,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'similarity',
- type: 'hidden',
- label: '最低相关性',
- value: 0.15,
- valueType: 'number',
- min: 0,
- max: 1,
- step: 0.01,
- markList: [
- {
- label: '0',
- value: 0
- },
- {
- label: '1',
- value: 1
- }
- ],
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'limit',
- type: 'hidden',
- label: '引用上限',
- description: '单次搜索最大的 Tokens 数量，中文约1字=1.7Tokens，英文约1字=1Tokens',
- value: 2000,
- valueType: 'number',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'searchMode',
- type: 'hidden',
- label: '',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: DatasetSearchModeEnum.mixedRecall,
- connected: false
- },
- {
- key: 'usingReRank',
- type: 'hidden',
- label: '',
- valueType: 'boolean',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: true,
- connected: false
- },
- {
- key: 'userChatInput',
- type: 'target',
- label: 'core.module.input.label.user question',
- required: true,
- valueType: 'string',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- }
- ],
- outputs: [
- {
- key: 'isEmpty',
- label: '搜索结果为空',
- type: 'source',
- valueType: 'boolean',
- targets: []
- },
- {
- key: 'unEmpty',
- label: '搜索结果不为空',
- type: 'source',
- valueType: 'boolean',
- targets: []
- },
- {
- key: 'quoteQA',
- label: '引用内容',
- description:
- '始终返回数组，如果希望搜索结果为空时执行额外操作，需要用到上面的两个输入以及目标模块的触发器',
- type: 'source',
- valueType: 'datasetQuote',
- targets: [
- {
- moduleId: 'chatModule',
- key: 'quoteQA'
- }
- ]
- },
- {
- key: 'finish',
- label: 'core.module.output.label.running done',
- description: 'core.module.output.description.running done',
- valueType: 'boolean',
- type: 'source',
- targets: []
- },
- {
- key: 'userChatInput',
- label: 'core.module.input.label.user question',
- type: 'hidden',
- valueType: 'string',
- targets: [
- {
- moduleId: 'chatModule',
- key: 'userChatInput'
- }
- ]
- }
- ]
- },
- {
- moduleId: 'chatModule',
- name: 'AI 对话',
- avatar: '/imgs/module/AI.png',
- flowType: 'chatNode',
- showStatus: true,
- position: {
- x: 2022.7264786978908,
- y: 1006.3102431257475
- },
- inputs: [
- {
- key: 'switch',
- type: 'target',
- label: 'core.module.input.label.switch',
- valueType: 'any',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'model',
- type: 'selectLLMModel',
- label: 'core.module.input.label.aiModel',
- required: true,
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.model,
- connected: false
- },
- {
- key: 'temperature',
- type: 'hidden',
- label: '温度',
- value: 0,
- valueType: 'number',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'maxToken',
- type: 'hidden',
- label: '回复上限',
- value: maxToken,
- valueType: 'number',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'isResponseAnswerText',
- type: 'hidden',
- label: '返回AI内容',
- value: true,
- valueType: 'boolean',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'quoteTemplate',
- type: 'hidden',
- label: '引用内容模板',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: '',
- connected: false
- },
- {
- key: 'quotePrompt',
- type: 'hidden',
- label: '引用内容提示词',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: '',
- connected: false
- },
- {
- key: 'aiSettings',
- type: 'aiSettings',
- label: '',
- valueType: 'any',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'systemPrompt',
- type: 'textarea',
- label: 'core.ai.Prompt',
- max: 300,
- valueType: 'string',
- description:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- placeholder:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- showTargetInApp: true,
- showTargetInPlugin: true,
- value: formData.aiSettings.systemPrompt,
- connected: false
- },
- {
- key: 'history',
- type: 'numberInput',
- label: 'core.module.input.label.chat history',
- required: true,
- min: 0,
- max: 30,
- valueType: 'chatHistory',
- value: 6,
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'quoteQA',
- type: 'target',
- label: '引用内容',
- description: "对象数组格式，结构：\n [{q:'问题',a:'回答'}]",
- valueType: 'datasetQuote',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- },
- {
- key: 'userChatInput',
- type: 'target',
- label: 'core.module.input.label.user question',
- required: true,
- valueType: 'string',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- }
- ],
- outputs: [
- {
- key: 'answerText',
- label: 'AI回复',
- description: '将在 stream 回复完毕后触发',
- valueType: 'string',
- type: 'source',
- targets: []
- },
- {
- key: 'finish',
- label: 'core.module.output.label.running done',
- description: 'core.module.output.description.running done',
- valueType: 'boolean',
- type: 'source',
- targets: []
- },
- {
- key: 'history',
- label: '新的上下文',
- description: '将本次回复内容拼接上历史记录，作为新的上下文返回',
- valueType: 'chatHistory',
- type: 'source',
- targets: []
- }
- ]
- }
- ];
-
- return modules;
-}
diff --git a/projects/app/src/pages/api/core/app/form2Modules/fastgpt-universal.ts b/projects/app/src/pages/api/core/app/form2Modules/fastgpt-universal.ts
deleted file mode 100644
index 0aedf254d..000000000
--- a/projects/app/src/pages/api/core/app/form2Modules/fastgpt-universal.ts
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
- universal mode.
- @author: FastGpt Team
-*/
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type.d';
-import type { ModuleItemType } from '@fastgpt/global/core/module/type';
-import { FormatForm2ModulesProps } from '@fastgpt/global/core/app/api';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- try {
- const { formData } = req.body as FormatForm2ModulesProps;
-
- const modules =
- formData.dataset.datasets.length > 0
- ? datasetTemplate(formData)
- : simpleChatTemplate(formData);
-
- jsonRes(res, {
- data: modules
- });
- } catch (err) {
- jsonRes(res, {
- code: 500,
- error: err
- });
- }
-}
-
-function simpleChatTemplate(formData: AppSimpleEditFormType): ModuleItemType[] {
- return [
- {
- moduleId: 'userChatInput',
- name: 'core.module.template.Chat entrance',
- avatar: '/imgs/module/userChatInput.png',
- flowType: 'questionInput',
- position: {
- x: 464.32198615344566,
- y: 1602.2698463081606
- },
- inputs: [
- {
- key: 'userChatInput',
- type: 'systemInput',
- valueType: 'string',
- label: 'core.module.input.label.user question',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- }
- ],
- outputs: [
- {
- key: 'userChatInput',
- label: 'core.module.input.label.user question',
- type: 'source',
- valueType: 'string',
- targets: [
- {
- moduleId: 'chatModule',
- key: 'userChatInput'
- }
- ]
- }
- ]
- },
- {
- moduleId: 'chatModule',
- name: 'AI 对话',
- avatar: '/imgs/module/AI.png',
- flowType: 'chatNode',
- showStatus: true,
- position: {
- x: 981.9682828103937,
- y: 890.014595014464
- },
- inputs: [
- {
- key: 'switch',
- type: 'target',
- label: 'core.module.input.label.switch',
- valueType: 'any',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'model',
- type: 'selectLLMModel',
- label: 'core.module.input.label.aiModel',
- required: true,
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.model,
- connected: false
- },
- {
- key: 'temperature',
- type: 'hidden',
- label: '温度',
- value: formData.aiSettings.temperature,
- valueType: 'number',
- min: 0,
- max: 10,
- step: 1,
- markList: [
- {
- label: '严谨',
- value: 0
- },
- {
- label: '发散',
- value: 10
- }
- ],
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'maxToken',
- type: 'hidden',
- label: '回复上限',
- value: formData.aiSettings.maxToken,
- valueType: 'number',
- min: 100,
- max: 4000,
- step: 50,
- markList: [
- {
- label: '100',
- value: 100
- },
- {
- label: '4000',
- value: 4000
- }
- ],
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'isResponseAnswerText',
- type: 'hidden',
- label: '返回AI内容',
- value: true,
- valueType: 'boolean',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'quoteTemplate',
- type: 'hidden',
- label: '引用内容模板',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.quoteTemplate,
- connected: false
- },
- {
- key: 'quotePrompt',
- type: 'hidden',
- label: '引用内容提示词',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.quotePrompt,
- connected: false
- },
- {
- key: 'aiSettings',
- type: 'aiSettings',
- label: '',
- valueType: 'any',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'systemPrompt',
- type: 'textarea',
- label: 'core.ai.Prompt',
- max: 300,
- valueType: 'string',
- description:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- placeholder:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- showTargetInApp: true,
- showTargetInPlugin: true,
- value: formData.aiSettings.systemPrompt,
- connected: false
- },
- {
- key: 'history',
- type: 'numberInput',
- label: 'core.module.input.label.chat history',
- required: true,
- min: 0,
- max: 30,
- valueType: 'chatHistory',
- value: 6,
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'quoteQA',
- type: 'target',
- label: '引用内容',
- description: "对象数组格式，结构：\n [{q:'问题',a:'回答'}]",
- valueType: 'datasetQuote',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'userChatInput',
- type: 'target',
- label: 'core.module.input.label.user question',
- required: true,
- valueType: 'string',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- }
- ],
- outputs: [
- {
- key: 'answerText',
- label: 'AI回复',
- description: '将在 stream 回复完毕后触发',
- valueType: 'string',
- type: 'source',
- targets: []
- },
- {
- key: 'finish',
- label: 'core.module.output.label.running done',
- description: 'core.module.output.description.running done',
- valueType: 'boolean',
- type: 'source',
- targets: []
- },
- {
- key: 'history',
- label: '新的上下文',
- description: '将本次回复内容拼接上历史记录，作为新的上下文返回',
- valueType: 'chatHistory',
- type: 'source',
- targets: []
- }
- ]
- }
- ];
-}
-function datasetTemplate(formData: AppSimpleEditFormType): ModuleItemType[] {
- const modules: ModuleItemType[] = [
- {
- moduleId: 'userChatInput',
- name: 'core.module.template.Chat entrance',
- avatar: '/imgs/module/userChatInput.png',
- flowType: 'questionInput',
- position: {
- x: 324.81436595478294,
- y: 1527.0012457753612
- },
- inputs: [
- {
- key: 'userChatInput',
- type: 'systemInput',
- valueType: 'string',
- label: 'core.module.input.label.user question',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- }
- ],
- outputs: [
- {
- key: 'userChatInput',
- label: 'core.module.input.label.user question',
- type: 'source',
- valueType: 'string',
- targets: [
- {
- moduleId: 'datasetSearch',
- key: 'userChatInput'
- }
- ]
- }
- ]
- },
- {
- moduleId: 'datasetSearch',
- name: 'core.module.template.Dataset search',
- avatar: '/imgs/module/db.png',
- flowType: 'datasetSearchNode',
- showStatus: true,
- position: {
- x: 1351.5043753345153,
- y: 947.0780385418003
- },
- inputs: [
- {
- key: 'switch',
- type: 'target',
- label: 'core.module.input.label.switch',
- valueType: 'any',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'datasets',
- type: 'selectDataset',
- label: '关联的知识库',
- value: formData.dataset.datasets,
- valueType: 'selectDataset',
- list: [],
- required: true,
- showTargetInApp: false,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'similarity',
- type: 'hidden',
- label: '最低相关性',
- value: formData.dataset.similarity,
- valueType: 'number',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'limit',
- type: 'hidden',
- label: '引用上限',
- description: '单次搜索最大的 Tokens 数量，中文约1字=1.7Tokens，英文约1字=1Tokens',
- value: formData.dataset.limit,
- valueType: 'number',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'searchMode',
- type: 'hidden',
- label: 'core.dataset.search.Mode',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.dataset.searchMode,
- connected: false
- },
- {
- key: 'usingReRank',
- type: 'hidden',
- label: '',
- valueType: 'boolean',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.dataset.usingReRank,
- connected: false
- },
- {
- key: 'datasetSearchUsingExtensionQuery',
- type: 'hidden',
- label: '',
- valueType: 'boolean',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.dataset.datasetSearchUsingExtensionQuery,
- connected: false
- },
- {
- key: 'datasetSearchExtensionBg',
- type: 'hidden',
- label: '',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.dataset.datasetSearchExtensionBg,
- connected: false
- },
- {
- key: 'datasetSearchExtensionModel',
- type: 'hidden',
- label: '',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.dataset.datasetSearchExtensionModel,
- connected: false
- },
- {
- key: 'userChatInput',
- type: 'target',
- label: 'core.module.input.label.user question',
- required: true,
- valueType: 'string',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- }
- ],
- outputs: [
- {
- key: 'isEmpty',
- label: '搜索结果为空',
- type: 'source',
- valueType: 'boolean',
- targets: formData.dataset.searchEmptyText
- ? [
- {
- moduleId: '6dtsvu',
- key: 'switch'
- }
- ]
- : []
- },
- {
- key: 'unEmpty',
- label: '搜索结果不为空',
- type: 'source',
- valueType: 'boolean',
- targets: formData.dataset.searchEmptyText
- ? [
- {
- moduleId: 'chatModule',
- key: 'switch'
- }
- ]
- : []
- },
- {
- key: 'quoteQA',
- label: '引用内容',
- description:
- '始终返回数组，如果希望搜索结果为空时执行额外操作，需要用到上面的两个输入以及目标模块的触发器',
- type: 'source',
- valueType: 'datasetQuote',
- targets: [
- {
- moduleId: 'chatModule',
- key: 'quoteQA'
- }
- ]
- },
- {
- key: 'finish',
- label: 'core.module.output.label.running done',
- description: 'core.module.output.description.running done',
- valueType: 'boolean',
- type: 'source',
- targets: []
- },
- {
- key: 'userChatInput',
- label: 'core.module.input.label.user question',
- type: 'hidden',
- valueType: 'string',
- targets: [
- {
- moduleId: 'chatModule',
- key: 'userChatInput'
- }
- ]
- }
- ]
- },
- {
- moduleId: 'chatModule',
- name: 'AI 对话',
- avatar: '/imgs/module/AI.png',
- flowType: 'chatNode',
- showStatus: true,
- position: {
- x: 2022.7264786978908,
- y: 1006.3102431257475
- },
- inputs: [
- {
- key: 'switch',
- type: 'target',
- label: 'core.module.input.label.switch',
- valueType: 'any',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: !!formData.dataset?.searchEmptyText
- },
- {
- key: 'model',
- type: 'selectLLMModel',
- label: 'core.module.input.label.aiModel',
- required: true,
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.model,
- connected: false
- },
- {
- key: 'temperature',
- type: 'hidden',
- label: '温度',
- value: formData.aiSettings.temperature,
- valueType: 'number',
- min: 0,
- max: 10,
- step: 1,
- markList: [
- {
- label: '严谨',
- value: 0
- },
- {
- label: '发散',
- value: 10
- }
- ],
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'maxToken',
- type: 'hidden',
- label: '回复上限',
- value: formData.aiSettings.maxToken,
- valueType: 'number',
- min: 100,
- max: 4000,
- step: 50,
- markList: [
- {
- label: '100',
- value: 100
- },
- {
- label: '4000',
- value: 4000
- }
- ],
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'isResponseAnswerText',
- type: 'hidden',
- label: '返回AI内容',
- value: true,
- valueType: 'boolean',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'quoteTemplate',
- type: 'hidden',
- label: '引用内容模板',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.quoteTemplate,
- connected: false
- },
- {
- key: 'quotePrompt',
- type: 'hidden',
- label: '引用内容提示词',
- valueType: 'string',
- showTargetInApp: false,
- showTargetInPlugin: false,
- value: formData.aiSettings.quotePrompt,
- connected: false
- },
- {
- key: 'aiSettings',
- type: 'aiSettings',
- label: '',
- valueType: 'any',
- showTargetInApp: false,
- showTargetInPlugin: false,
- connected: false
- },
- {
- key: 'systemPrompt',
- type: 'textarea',
- label: 'core.ai.Prompt',
- max: 300,
- valueType: 'string',
- description:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- placeholder:
- '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
- showTargetInApp: true,
- showTargetInPlugin: true,
- value: formData.aiSettings.systemPrompt,
- connected: false
- },
- {
- key: 'history',
- type: 'numberInput',
- label: 'core.module.input.label.chat history',
- required: true,
- min: 0,
- max: 30,
- valueType: 'chatHistory',
- value: 6,
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- },
- {
- key: 'quoteQA',
- type: 'target',
- label: '引用内容',
- description: "对象数组格式，结构：\n [{q:'问题',a:'回答'}]",
- valueType: 'datasetQuote',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- },
- {
- key: 'userChatInput',
- type: 'target',
- label: 'core.module.input.label.user question',
- required: true,
- valueType: 'string',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- }
- ],
- outputs: [
- {
- key: 'answerText',
- label: 'AI回复',
- description: '将在 stream 回复完毕后触发',
- valueType: 'string',
- type: 'source',
- targets: []
- },
- {
- key: 'finish',
- label: 'core.module.output.label.running done',
- description: 'core.module.output.description.running done',
- valueType: 'boolean',
- type: 'source',
- targets: []
- },
- {
- key: 'history',
- label: '新的上下文',
- description: '将本次回复内容拼接上历史记录，作为新的上下文返回',
- valueType: 'chatHistory',
- type: 'source',
- targets: []
- }
- ]
- }
- ];
-
- if (formData.dataset?.searchEmptyText) {
- modules.push({
- moduleId: '6dtsvu',
- name: '指定回复',
- avatar: '/imgs/module/reply.png',
- flowType: 'answerNode',
- position: {
- x: 2018.2744321961648,
- y: 616.1220817209096
- },
- inputs: [
- {
- key: 'switch',
- type: 'target',
- label: 'core.module.input.label.switch',
- valueType: 'any',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: true
- },
- {
- key: 'text',
- type: 'textarea',
- value: formData.dataset.searchEmptyText,
- valueType: 'any',
- label: '回复的内容',
- description:
- '可以使用 \\n 来实现连续换行。\n可以通过外部模块输入实现回复，外部模块输入时会覆盖当前填写的内容。\n如传入非字符串类型数据将会自动转成字符串',
- placeholder:
- '可以使用 \\n 来实现连续换行。\n可以通过外部模块输入实现回复，外部模块输入时会覆盖当前填写的内容。\n如传入非字符串类型数据将会自动转成字符串',
- showTargetInApp: true,
- showTargetInPlugin: true,
- connected: false
- }
- ],
- outputs: [
- {
- key: 'finish',
- label: 'core.module.output.label.running done',
- description: 'core.module.output.description.running done',
- valueType: 'boolean',
- type: 'source',
- targets: []
- }
- ]
- });
- }
-
- return modules;
-}
diff --git a/projects/app/src/pages/api/core/app/update.ts b/projects/app/src/pages/api/core/app/update.ts
index df90ee75d..dbe410754 100644
--- a/projects/app/src/pages/api/core/app/update.ts
+++ b/projects/app/src/pages/api/core/app/update.ts
@@ -12,7 +12,7 @@ import { getLLMModel } from '@fastgpt/service/core/ai/model';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
await connectToDatabase();
- const { name, avatar, type, simpleTemplateId, intro, modules, permission, teamTags } =
+ const { name, avatar, type, intro, modules, permission, teamTags } =
req.body as AppUpdateParams;
const { appId } = req.query as { appId: string };
@@ -29,7 +29,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
let maxTokens = 3000;
modules.forEach((item) => {
- if (item.flowType === FlowNodeTypeEnum.chatNode) {
+ if (
+ item.flowType === FlowNodeTypeEnum.chatNode ||
+ item.flowType === FlowNodeTypeEnum.tools
+ ) {
const model =
item.inputs.find((item) => item.key === ModuleInputKeyEnum.aiModel)?.value || '';
const chatModel = getLLMModel(model);
@@ -61,7 +64,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
{
name,
type,
- simpleTemplateId,
avatar,
intro,
permission,
diff --git a/projects/app/src/pages/api/core/app/updateTeamTasg.ts b/projects/app/src/pages/api/core/app/updateTeamTasg.ts
index 0647c6eb3..5c0871f4c 100644
--- a/projects/app/src/pages/api/core/app/updateTeamTasg.ts
+++ b/projects/app/src/pages/api/core/app/updateTeamTasg.ts
@@ -12,7 +12,7 @@ import { getLLMModel } from '@fastgpt/service/core/ai/model';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
await connectToDatabase();
- const { name, avatar, type, simpleTemplateId, intro, modules, permission, teamTags } =
+ const { name, avatar, type, intro, modules, permission, teamTags } =
req.body as AppUpdateParams;
const { appId } = req.query as { appId: string };
@@ -61,7 +61,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
{
name,
type,
- simpleTemplateId,
avatar,
intro,
permission,
diff --git a/projects/app/src/pages/api/core/chat/chatTest.ts b/projects/app/src/pages/api/core/chat/chatTest.ts
index 63b6ea17a..7c178f524 100644
--- a/projects/app/src/pages/api/core/chat/chatTest.ts
+++ b/projects/app/src/pages/api/core/chat/chatTest.ts
@@ -8,10 +8,10 @@ import { pushChatUsage } from '@/service/support/wallet/usage/push';
import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
import type { ChatItemType, ChatItemValueItemType } from '@fastgpt/global/core/chat/type';
import { authApp } from '@fastgpt/service/support/permission/auth/app';
-import { dispatchWorkFlow } from '@/service/moduleDispatch';
+import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
import { authCert } from '@fastgpt/service/support/permission/auth/common';
import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
-import { setEntryEntries } from '@/service/moduleDispatch/utils';
+import { setEntryEntries } from '@fastgpt/service/core/workflow/dispatch/utils';
import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
export type Props = {
diff --git a/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts b/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts
index 6cdd98675..b02274a0d 100644
--- a/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts
+++ b/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts
@@ -7,8 +7,17 @@ import { autChatCrud } from '@/service/support/permission/auth/chat';
/* 初始化我的聊天框，需要身份验证 */
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- const { appId, chatId, chatItemId, shareId, outLinkUid, userBadFeedback, userGoodFeedback } =
- req.body as UpdateChatFeedbackProps;
+ const {
+ appId,
+ chatId,
+ chatItemId,
+ shareId,
+ teamId,
+ teamToken,
+ outLinkUid,
+ userBadFeedback,
+ userGoodFeedback
+ } = req.body as UpdateChatFeedbackProps;
try {
await connectToDatabase();
@@ -17,6 +26,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
req,
authToken: true,
appId,
+ teamId,
+ teamToken,
chatId,
shareId,
outLinkUid,
diff --git a/projects/app/src/pages/api/core/chat/updateHistory.ts b/projects/app/src/pages/api/core/chat/updateHistory.ts
index 634604894..7a434d7ac 100644
--- a/projects/app/src/pages/api/core/chat/updateHistory.ts
+++ b/projects/app/src/pages/api/core/chat/updateHistory.ts
@@ -9,12 +9,13 @@ import { autChatCrud } from '@/service/support/permission/auth/chat';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
await connectToDatabase();
- const { appId, chatId, shareId, outLinkUid, customTitle, top } = req.body as UpdateHistoryProps;
-
+ const { appId, chatId, teamId, shareId, outLinkUid, customTitle, top } =
+ req.body as UpdateHistoryProps;
await autChatCrud({
req,
authToken: true,
appId,
+ teamId,
chatId,
shareId,
outLinkUid,
diff --git a/projects/app/src/pages/api/core/dataset/collection/create/text.ts b/projects/app/src/pages/api/core/dataset/collection/create/text.ts
index af700c101..686c748d1 100644
--- a/projects/app/src/pages/api/core/dataset/collection/create/text.ts
+++ b/projects/app/src/pages/api/core/dataset/collection/create/text.ts
@@ -14,7 +14,7 @@ import {
import { splitText2Chunks } from '@fastgpt/global/common/string/textSplitter';
import { checkDatasetLimit } from '@fastgpt/service/support/permission/teamLimit';
import { predictDataLimitLength } from '@fastgpt/global/core/dataset/utils';
-import { pushDataToTrainingQueue } from '@/service/core/dataset/data/controller';
+import { pushDataListToTrainingQueue } from '@fastgpt/service/core/dataset/training/controller';
import { hashStr } from '@fastgpt/global/common/string/tools';
import { createTrainingUsage } from '@fastgpt/service/support/wallet/usage/controller';
import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
@@ -83,7 +83,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
]);
// 4. push chunks to training queue
- const insertResults = await pushDataToTrainingQueue({
+ const insertResults = await pushDataListToTrainingQueue({
teamId,
tmbId,
collectionId,
diff --git a/projects/app/src/pages/api/core/dataset/data/insertData.ts b/projects/app/src/pages/api/core/dataset/data/insertData.ts
index fa8e2de1b..35d114ca9 100644
--- a/projects/app/src/pages/api/core/dataset/data/insertData.ts
+++ b/projects/app/src/pages/api/core/dataset/data/insertData.ts
@@ -23,11 +23,11 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
const { collectionId, q, a, indexes } = req.body as InsertOneDatasetDataProps;
if (!q) {
- return Promise.reject('q is required');
+ throw new Error('q is required');
}
if (!collectionId) {
- return Promise.reject('collectionId is required');
+ throw new Error('collectionId is required');
}
// 凭证校验
diff --git a/projects/app/src/pages/api/core/dataset/data/pushData.ts b/projects/app/src/pages/api/core/dataset/data/pushData.ts
index 186d58fc6..de5efc81f 100644
--- a/projects/app/src/pages/api/core/dataset/data/pushData.ts
+++ b/projects/app/src/pages/api/core/dataset/data/pushData.ts
@@ -10,7 +10,7 @@ import type {
import { authDatasetCollection } from '@fastgpt/service/support/permission/auth/dataset';
import { checkDatasetLimit } from '@fastgpt/service/support/permission/teamLimit';
import { predictDataLimitLength } from '@fastgpt/global/core/dataset/utils';
-import { pushDataToTrainingQueue } from '@/service/core/dataset/data/controller';
+import { pushDataListToTrainingQueue } from '@fastgpt/service/core/dataset/training/controller';
export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
@@ -41,7 +41,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
});
jsonRes(res, {
- data: await pushDataToTrainingQueue({
+ data: await pushDataListToTrainingQueue({
...req.body,
teamId,
tmbId
diff --git a/projects/app/src/pages/api/core/dataset/file/getPreviewUrl.ts b/projects/app/src/pages/api/core/dataset/file/getPreviewUrl.ts
index 7b0eb8358..db65d8df5 100644
--- a/projects/app/src/pages/api/core/dataset/file/getPreviewUrl.ts
+++ b/projects/app/src/pages/api/core/dataset/file/getPreviewUrl.ts
@@ -3,7 +3,7 @@ import { jsonRes } from '@fastgpt/service/common/response';
import { connectToDatabase } from '@/service/mongo';
import { authDatasetFile } from '@fastgpt/service/support/permission/auth/dataset';
import { createFileToken } from '@fastgpt/service/support/permission/controller';
-import { BucketNameEnum, FileBaseUrl } from '@fastgpt/global/common/file/constants';
+import { BucketNameEnum, ReadFileBaseUrl } from '@fastgpt/global/common/file/constants';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
@@ -25,7 +25,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
});
jsonRes(res, {
- data: `${FileBaseUrl}?token=${token}`
+ data: `${ReadFileBaseUrl}?token=${token}`
});
} catch (error) {
jsonRes(res, {
diff --git a/projects/app/src/pages/api/core/dataset/searchTest.ts b/projects/app/src/pages/api/core/dataset/searchTest.ts
index 9e6efeb71..0ce217156 100644
--- a/projects/app/src/pages/api/core/dataset/searchTest.ts
+++ b/projects/app/src/pages/api/core/dataset/searchTest.ts
@@ -5,7 +5,7 @@ import type { SearchTestProps, SearchTestResponse } from '@/global/core/dataset/
import { connectToDatabase } from '@/service/mongo';
import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
import { pushGenerateVectorUsage } from '@/service/support/wallet/usage/push';
-import { searchDatasetData } from '@/service/core/dataset/data/controller';
+import { searchDatasetData } from '@fastgpt/service/core/dataset/search/controller';
import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
import { getLLMModel } from '@fastgpt/service/core/ai/model';
diff --git a/projects/app/src/pages/api/core/plugin/create.ts b/projects/app/src/pages/api/core/plugin/create.ts
index 71232711d..7b58b789a 100644
--- a/projects/app/src/pages/api/core/plugin/create.ts
+++ b/projects/app/src/pages/api/core/plugin/create.ts
@@ -5,6 +5,8 @@ import type { CreateOnePluginParams } from '@fastgpt/global/core/plugin/controll
import { authUserNotVisitor } from '@fastgpt/service/support/permission/auth/user';
import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
import { checkTeamPluginLimit } from '@fastgpt/service/support/permission/teamLimit';
+import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
+import { httpApiSchema2Plugins } from '@fastgpt/global/core/plugin/httpPlugin/utils';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
@@ -12,17 +14,58 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
const { teamId, tmbId } = await authUserNotVisitor({ req, authToken: true });
const body = req.body as CreateOnePluginParams;
- await checkTeamPluginLimit(teamId);
+ // await checkTeamPluginLimit(teamId);
- const { _id } = await MongoPlugin.create({
- ...body,
- teamId,
- tmbId
- });
+ // create parent plugin and child plugin
+ if (body.metadata?.apiSchemaStr) {
+ const parentId = await mongoSessionRun(async (session) => {
+ const [{ _id: parentId }] = await MongoPlugin.create(
+ [
+ {
+ ...body,
+ parentId: null,
+ teamId,
+ tmbId
+ }
+ ],
+ { session }
+ );
- jsonRes(res, {
- data: _id
- });
+ const childrenPlugins = httpApiSchema2Plugins({
+ parentId,
+ apiSchemaStr: body.metadata?.apiSchemaStr,
+ customHeader: body.metadata?.customHeaders
+ });
+
+ await MongoPlugin.create(
+ childrenPlugins.map((item) => ({
+ ...item,
+ metadata: {
+ pluginUid: item.name
+ },
+ teamId,
+ tmbId
+ })),
+ {
+ session
+ }
+ );
+ return parentId;
+ });
+
+ jsonRes(res, {
+ data: parentId
+ });
+ } else {
+ const { _id } = await MongoPlugin.create({
+ ...body,
+ teamId,
+ tmbId
+ });
+ jsonRes(res, {
+ data: _id
+ });
+ }
} catch (err) {
jsonRes(res, {
code: 500,
diff --git a/projects/app/src/pages/api/core/plugin/delete.ts b/projects/app/src/pages/api/core/plugin/delete.ts
index c843dad39..50906ab75 100644
--- a/projects/app/src/pages/api/core/plugin/delete.ts
+++ b/projects/app/src/pages/api/core/plugin/delete.ts
@@ -3,14 +3,32 @@ import { jsonRes } from '@fastgpt/service/common/response';
import { connectToDatabase } from '@/service/mongo';
import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
import { authPluginCrud } from '@fastgpt/service/support/permission/auth/plugin';
+import { authUserNotVisitor } from '@fastgpt/service/support/permission/auth/user';
+import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
- const { id } = req.query as { id: string };
await connectToDatabase();
- await authPluginCrud({ req, authToken: true, id, per: 'owner' });
+ const { teamId } = await authUserNotVisitor({ req, authToken: true });
+ const { pluginId } = req.query as { pluginId: string };
- await MongoPlugin.findByIdAndRemove(id);
+ if (!pluginId) {
+ throw new Error('缺少参数');
+ }
+ await authPluginCrud({ req, authToken: true, id: pluginId, per: 'owner' });
+
+ await mongoSessionRun(async (session) => {
+ await MongoPlugin.deleteMany(
+ {
+ teamId,
+ parentId: pluginId
+ },
+ {
+ session
+ }
+ );
+ await MongoPlugin.findByIdAndDelete(pluginId, { session });
+ });
jsonRes(res, {});
} catch (err) {
diff --git a/projects/app/src/pages/api/core/plugin/getPreviewModule.ts b/projects/app/src/pages/api/core/plugin/getPreviewModule.ts
index 09d1c11fb..2dae0d164 100644
--- a/projects/app/src/pages/api/core/plugin/getPreviewModule.ts
+++ b/projects/app/src/pages/api/core/plugin/getPreviewModule.ts
@@ -6,7 +6,7 @@ import { jsonRes } from '@fastgpt/service/common/response';
import { connectToDatabase } from '@/service/mongo';
import { getPluginPreviewModule } from '@fastgpt/service/core/plugin/controller';
import { authPluginCanUse } from '@fastgpt/service/support/permission/auth/plugin';
-import { FlowModuleTemplateType } from '@fastgpt/global/core/module/type';
+import { FlowNodeTemplateType } from '@fastgpt/global/core/module/type';
import { authCert } from '@fastgpt/service/support/permission/auth/common';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -16,7 +16,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
const { teamId, tmbId } = await authCert({ req, authToken: true });
await authPluginCanUse({ id, teamId, tmbId });
- jsonRes(res, {
+ jsonRes(res, {
data: await getPluginPreviewModule({ id })
});
} catch (err) {
diff --git a/projects/app/src/pages/api/core/plugin/httpPlugin/getApiSchemaByUrl.ts b/projects/app/src/pages/api/core/plugin/httpPlugin/getApiSchemaByUrl.ts
new file mode 100644
index 000000000..1fb178000
--- /dev/null
+++ b/projects/app/src/pages/api/core/plugin/httpPlugin/getApiSchemaByUrl.ts
@@ -0,0 +1,20 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import * as SwaggerParser from '@apidevtools/swagger-parser';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+ try {
+ const apiURL = req.body.url as string;
+
+ const api = await (SwaggerParser as any).validate(apiURL);
+
+ return jsonRes(res, {
+ data: api
+ });
+ } catch (err) {
+ jsonRes(res, {
+ code: 500,
+ error: err
+ });
+ }
+}
diff --git a/projects/app/src/pages/api/core/plugin/list.ts b/projects/app/src/pages/api/core/plugin/list.ts
index ec965e825..94f676b4a 100644
--- a/projects/app/src/pages/api/core/plugin/list.ts
+++ b/projects/app/src/pages/api/core/plugin/list.ts
@@ -1,16 +1,31 @@
import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@fastgpt/service/common/response';
import { connectToDatabase } from '@/service/mongo';
+import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { authCert } from '@fastgpt/service/support/permission/auth/common';
import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
+import { PluginListItemType } from '@fastgpt/global/core/plugin/controller';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
await connectToDatabase();
+ const { parentId, type } = req.query as { parentId?: string; type?: `${DatasetTypeEnum}` };
+
const { teamId } = await authCert({ req, authToken: true });
- jsonRes(res, {
- data: await MongoPlugin.find({ teamId })
+ const plugins = await MongoPlugin.find(
+ {
+ teamId,
+ ...(parentId !== undefined && { parentId: parentId || null }),
+ ...(type && { type })
+ },
+ '_id parentId type name avatar intro metadata'
+ )
+ .sort({ updateTime: -1 })
+ .lean();
+
+ jsonRes(res, {
+ data: plugins
});
} catch (err) {
jsonRes(res, {
diff --git a/projects/app/src/pages/api/core/plugin/paths.ts b/projects/app/src/pages/api/core/plugin/paths.ts
new file mode 100644
index 000000000..d25c75af4
--- /dev/null
+++ b/projects/app/src/pages/api/core/plugin/paths.ts
@@ -0,0 +1,46 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import type { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type.d';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+ try {
+ await connectToDatabase();
+
+ const { parentId } = req.query as { parentId: string };
+
+ if (!parentId) {
+ return jsonRes(res, {
+ data: []
+ });
+ }
+
+ await authCert({ req, authToken: true });
+
+ jsonRes(res, {
+ data: await getParents(parentId)
+ });
+ } catch (err) {
+ jsonRes(res, {
+ code: 500,
+ error: err
+ });
+ }
+}
+
+async function getParents(parentId?: string): Promise {
+ if (!parentId) {
+ return [];
+ }
+
+ const parent = await MongoPlugin.findById(parentId, 'name parentId');
+
+ if (!parent) return [];
+
+ const paths = await getParents(parent.parentId);
+ paths.push({ parentId, parentName: parent.name });
+
+ return paths;
+}
diff --git a/projects/app/src/pages/api/core/plugin/pluginTemplate/getSystemPluginTemplates.ts b/projects/app/src/pages/api/core/plugin/pluginTemplate/getSystemPluginTemplates.ts
new file mode 100644
index 000000000..2eaf63313
--- /dev/null
+++ b/projects/app/src/pages/api/core/plugin/pluginTemplate/getSystemPluginTemplates.ts
@@ -0,0 +1,37 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
+import { FlowNodeTemplateType } from '@fastgpt/global/core/module/type';
+import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/module/constants';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+ try {
+ await connectToDatabase();
+ await authCert({ req, authToken: true });
+
+ const data: FlowNodeTemplateType[] =
+ global.communityPlugins?.map((plugin) => ({
+ id: plugin.id,
+ templateType: plugin.templateType ?? FlowNodeTemplateTypeEnum.other,
+ flowType: FlowNodeTypeEnum.pluginModule,
+ avatar: plugin.avatar,
+ name: plugin.name,
+ intro: plugin.intro,
+ showStatus: true,
+ isTool: plugin.isTool,
+ inputs: [],
+ outputs: []
+ })) || [];
+
+ jsonRes(res, {
+ data
+ });
+ } catch (err) {
+ jsonRes(res, {
+ code: 500,
+ error: err
+ });
+ }
+}
diff --git a/projects/app/src/pages/api/core/plugin/pluginTemplate/getTeamPluginTemplates.ts b/projects/app/src/pages/api/core/plugin/pluginTemplate/getTeamPluginTemplates.ts
new file mode 100644
index 000000000..c6deff26d
--- /dev/null
+++ b/projects/app/src/pages/api/core/plugin/pluginTemplate/getTeamPluginTemplates.ts
@@ -0,0 +1,62 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
+import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
+import { FlowNodeTemplateType } from '@fastgpt/global/core/module/type';
+import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/module/constants';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+ try {
+ await connectToDatabase();
+ const { parentId, searchKey } = req.query as { parentId?: string; searchKey?: string };
+ const { teamId } = await authCert({ req, authToken: true });
+
+ const userPlugins = await (async () => {
+ if (searchKey) {
+ return MongoPlugin.find({
+ teamId,
+ // search name or intro
+ $or: [
+ { name: { $regex: searchKey, $options: 'i' } },
+ { intro: { $regex: searchKey, $options: 'i' } }
+ ]
+ })
+ .sort({
+ updateTime: -1
+ })
+ .lean();
+ } else {
+ return MongoPlugin.find({ teamId, parentId: parentId || null })
+ .sort({
+ updateTime: -1
+ })
+ .lean();
+ }
+ })();
+
+ const data: FlowNodeTemplateType[] = userPlugins.map((plugin) => ({
+ id: String(plugin._id),
+ parentId: String(plugin.parentId),
+ pluginType: plugin.type,
+ templateType: FlowNodeTemplateTypeEnum.personalPlugin,
+ flowType: FlowNodeTypeEnum.pluginModule,
+ avatar: plugin.avatar,
+ name: plugin.name,
+ intro: plugin.intro,
+ showStatus: false,
+ inputs: [],
+ outputs: []
+ }));
+
+ jsonRes(res, {
+ data
+ });
+ } catch (err) {
+ jsonRes(res, {
+ code: 500,
+ error: err
+ });
+ }
+}
diff --git a/projects/app/src/pages/api/core/plugin/templates.ts b/projects/app/src/pages/api/core/plugin/templates.ts
deleted file mode 100644
index 99d640e61..000000000
--- a/projects/app/src/pages/api/core/plugin/templates.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
-import { FlowModuleTemplateType } from '@fastgpt/global/core/module/type';
-import { ModuleTemplateTypeEnum } from '@fastgpt/global/core/module/constants';
-import { GET } from '@fastgpt/service/common/api/plusRequest';
-import type { PluginTemplateType } from '@fastgpt/global/core/plugin/type.d';
-import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
- try {
- await connectToDatabase();
- const { teamId } = await authCert({ req, authToken: true });
-
- const [userPlugins, plusPlugins] = await Promise.all([
- MongoPlugin.find({ teamId }).lean(),
- FastGPTProUrl ? GET('/core/plugin/getTemplates') : []
- ]);
-
- const data: FlowModuleTemplateType[] = [
- ...userPlugins.map((plugin) => ({
- id: String(plugin._id),
- templateType: ModuleTemplateTypeEnum.personalPlugin,
- flowType: FlowNodeTypeEnum.pluginModule,
- avatar: plugin.avatar,
- name: plugin.name,
- intro: plugin.intro,
- showStatus: false,
- inputs: [],
- outputs: []
- })),
- ...(global.communityPlugins?.map((plugin) => ({
- id: plugin.id,
- templateType: plugin.templateType ?? ModuleTemplateTypeEnum.other,
- flowType: FlowNodeTypeEnum.pluginModule,
- avatar: plugin.avatar,
- name: plugin.name,
- intro: plugin.intro,
- showStatus: true,
- inputs: [],
- outputs: []
- })) || [])
- ];
-
- jsonRes(res, {
- data
- });
- } catch (err) {
- jsonRes(res, {
- code: 500,
- error: err
- });
- }
-}
diff --git a/projects/app/src/pages/api/core/plugin/update.ts b/projects/app/src/pages/api/core/plugin/update.ts
index 20279c3b6..216bb9a24 100644
--- a/projects/app/src/pages/api/core/plugin/update.ts
+++ b/projects/app/src/pages/api/core/plugin/update.ts
@@ -4,17 +4,37 @@ import { connectToDatabase } from '@/service/mongo';
import type { UpdatePluginParams } from '@fastgpt/global/core/plugin/controller';
import { authPluginCrud } from '@fastgpt/service/support/permission/auth/plugin';
import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
+import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
+import { ClientSession } from '@fastgpt/service/common/mongo';
+import { httpApiSchema2Plugins } from '@fastgpt/global/core/plugin/httpPlugin/utils';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
await connectToDatabase();
- const { id, ...props } = req.body as UpdatePluginParams;
+ const body = req.body as UpdatePluginParams;
- await authPluginCrud({ req, authToken: true, id, per: 'owner' });
+ const { id, ...props } = body;
- jsonRes(res, {
- data: await MongoPlugin.findByIdAndUpdate(id, props)
- });
+ const { teamId, tmbId } = await authPluginCrud({ req, authToken: true, id, per: 'owner' });
+
+ if (props.metadata?.apiSchemaStr) {
+ await mongoSessionRun(async (session) => {
+ // update children
+ await updateHttpChildrenPlugin({
+ teamId,
+ tmbId,
+ parent: body,
+ session
+ });
+ await MongoPlugin.findByIdAndUpdate(id, props, { session });
+ });
+
+ jsonRes(res, {});
+ } else {
+ jsonRes(res, {
+ data: await MongoPlugin.findByIdAndUpdate(id, props)
+ });
+ }
} catch (err) {
jsonRes(res, {
code: 500,
@@ -22,3 +42,64 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
});
}
}
+
+const updateHttpChildrenPlugin = async ({
+ teamId,
+ tmbId,
+ parent,
+ session
+}: {
+ teamId: string;
+ tmbId: string;
+ parent: UpdatePluginParams;
+ session: ClientSession;
+}) => {
+ if (!parent.metadata?.apiSchemaStr) return;
+ const dbPlugins = await MongoPlugin.find(
+ {
+ parentId: parent.id,
+ teamId
+ },
+ '_id metadata'
+ );
+
+ const schemaPlugins = httpApiSchema2Plugins({
+ parentId: parent.id,
+ apiSchemaStr: parent.metadata?.apiSchemaStr,
+ customHeader: parent.metadata?.customHeaders
+ });
+
+ // 数据库中存在，schema不存在，删除
+ for await (const plugin of dbPlugins) {
+ if (!schemaPlugins.find((p) => p.name === plugin.metadata?.pluginUid)) {
+ await MongoPlugin.deleteOne({ _id: plugin._id }, { session });
+ }
+ }
+ // 数据库中不存在，schema存在，新增
+ for await (const plugin of schemaPlugins) {
+ if (!dbPlugins.find((p) => p.metadata?.pluginUid === plugin.name)) {
+ await MongoPlugin.create(
+ [
+ {
+ ...plugin,
+ metadata: {
+ pluginUid: plugin.name
+ },
+ teamId,
+ tmbId
+ }
+ ],
+ {
+ session
+ }
+ );
+ }
+ }
+ // 数据库中存在，schema存在，更新
+ for await (const plugin of schemaPlugins) {
+ const dbPlugin = dbPlugins.find((p) => plugin.name === p.metadata?.pluginUid);
+ if (dbPlugin) {
+ await MongoPlugin.findByIdAndUpdate(dbPlugin._id, plugin, { session });
+ }
+ }
+};
diff --git a/projects/app/src/pages/api/v1/chat/completions.ts b/projects/app/src/pages/api/v1/chat/completions.ts
index 26d432f2e..5dc438e90 100644
--- a/projects/app/src/pages/api/v1/chat/completions.ts
+++ b/projects/app/src/pages/api/v1/chat/completions.ts
@@ -6,7 +6,7 @@ import { addLog } from '@fastgpt/service/common/system/log';
import { withNextCors } from '@fastgpt/service/common/middle/cors';
import { ChatRoleEnum, ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
import { SseResponseEventEnum } from '@fastgpt/global/core/module/runtime/constants';
-import { dispatchWorkFlow } from '@/service/moduleDispatch';
+import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
import type { ChatCompletionCreateParams } from '@fastgpt/global/core/ai/type.d';
import type { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type.d';
import { textAdaptGptResponse } from '@fastgpt/global/core/module/runtime/utils';
@@ -32,7 +32,7 @@ import { AuthOutLinkChatProps } from '@fastgpt/global/support/outLink/api';
import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
-import { setEntryEntries } from '@/service/moduleDispatch/utils';
+import { setEntryEntries } from '@fastgpt/service/core/workflow/dispatch/utils';
import { UserChatItemType } from '@fastgpt/global/core/chat/type';
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/module/runtime/constants';
diff --git a/projects/app/src/pages/app/detail/components/FlowEdit/Header.tsx b/projects/app/src/pages/app/detail/components/FlowEdit/Header.tsx
index 62494a689..d07ec28b9 100644
--- a/projects/app/src/pages/app/detail/components/FlowEdit/Header.tsx
+++ b/projects/app/src/pages/app/detail/components/FlowEdit/Header.tsx
@@ -17,6 +17,7 @@ import { flowNode2Modules, filterExportModules } from '@/components/core/module/
import { useAppStore } from '@/web/core/app/store/useAppStore';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { getErrText } from '@fastgpt/global/common/error/utils';
const ImportSettings = dynamic(() => import('@/components/core/module/Flow/ImportSettings'));
@@ -43,6 +44,7 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
const { isOpen: isOpenImport, onOpen: onOpenImport, onClose: onCloseImport } = useDisclosure();
const { updateAppDetail } = useAppStore();
const { nodes, edges, splitToolInputs } = useFlowProviderStore();
+ const [isSaving, setIsSaving] = useState(false);
const flow2ModulesAndCheck = useCallback(async () => {
const modules = flowNode2Modules({ nodes, edges });
@@ -75,20 +77,45 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
return modules;
}, [edges, nodes, splitToolInputs, t, toast]);
- const { mutate: onclickSave, isLoading } = useRequest({
- mutationFn: async (modules: ModuleItemType[]) => {
- return updateAppDetail(app._id, {
- modules: modules,
- type: AppTypeEnum.advanced,
- permission: undefined
- });
+ const onclickSave = useCallback(
+ async (modules: ModuleItemType[]) => {
+ setIsSaving(true);
+ try {
+ await updateAppDetail(app._id, {
+ modules: modules,
+ type: AppTypeEnum.advanced,
+ permission: undefined
+ });
+ toast({
+ status: 'success',
+ title: t('common.Save Success')
+ });
+ ChatTestRef.current?.resetChatTest();
+ } catch (error) {
+ toast({
+ status: 'warning',
+ title: getErrText(error, t('common.Save Failed'))
+ });
+ }
+ setIsSaving(false);
},
- successToast: t('common.Save Success'),
- errorToast: t('common.Save Failed'),
- onSuccess() {
- ChatTestRef.current?.resetChatTest();
+ [ChatTestRef, app._id, t, toast, updateAppDetail]
+ );
+
+ const saveAndBack = useCallback(async () => {
+ try {
+ const modules = await flow2ModulesAndCheck();
+ if (modules) {
+ await onclickSave(modules);
+ }
+ onClose();
+ } catch (error) {
+ toast({
+ status: 'warning',
+ title: getErrText(error)
+ });
}
- });
+ }, [flow2ModulesAndCheck, onClose, onclickSave, toast]);
return (
<>
@@ -109,13 +136,8 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
borderColor={'myGray.300'}
variant={'whiteBase'}
aria-label={''}
- onClick={openConfirmOut(async () => {
- const modules = await flow2ModulesAndCheck();
- if (modules) {
- await onclickSave(modules);
- }
- onClose();
- }, onClose)}
+ isLoading={isSaving}
+ onClick={openConfirmOut(saveAndBack, onClose)}
/>
{app.name}
@@ -178,7 +200,7 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
}
size={'smSquare'}
- isLoading={isLoading}
+ isLoading={isSaving}
aria-label={'save'}
onClick={async () => {
const modules = await flow2ModulesAndCheck();
diff --git a/projects/app/src/pages/app/detail/components/FlowEdit/index.tsx b/projects/app/src/pages/app/detail/components/FlowEdit/index.tsx
index 6f9d2d37f..768360667 100644
--- a/projects/app/src/pages/app/detail/components/FlowEdit/index.tsx
+++ b/projects/app/src/pages/app/detail/components/FlowEdit/index.tsx
@@ -3,22 +3,25 @@ import { AppSchema } from '@fastgpt/global/core/app/type.d';
import Header from './Header';
import Flow from '@/components/core/module/Flow';
import FlowProvider, { useFlowProviderStore } from '@/components/core/module/Flow/FlowProvider';
-import type { FlowModuleTemplateType } from '@fastgpt/global/core/module/type.d';
+import type { FlowNodeTemplateType } from '@fastgpt/global/core/module/type.d';
import { appSystemModuleTemplates } from '@fastgpt/global/core/module/template/constants';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
-import { usePluginStore } from '@/web/core/plugin/store/plugin';
-import { useQuery } from '@tanstack/react-query';
+import { useWorkflowStore } from '@/web/core/workflow/store/workflow';
type Props = { app: AppSchema; onClose: () => void };
const Render = ({ app, onClose }: Props) => {
const { nodes, initData } = useFlowProviderStore();
- const { pluginModuleTemplates, loadPluginTemplates } = usePluginStore();
+ const { setBasicNodeTemplates } = useWorkflowStore();
- const moduleTemplates = useMemo(() => {
- const concatTemplates = [...appSystemModuleTemplates, ...pluginModuleTemplates];
+ useEffect(() => {
+ initData(JSON.parse(JSON.stringify(app.modules)));
+ }, [app.modules]);
- const copyTemplates: FlowModuleTemplateType[] = JSON.parse(JSON.stringify(concatTemplates));
+ useEffect(() => {
+ const concatTemplates = [...appSystemModuleTemplates];
+
+ const copyTemplates: FlowNodeTemplateType[] = JSON.parse(JSON.stringify(concatTemplates));
const filterType: Record = {
[FlowNodeTypeEnum.userGuide]: 1
@@ -35,18 +38,12 @@ const Render = ({ app, onClose }: Props) => {
}
});
- return copyTemplates;
- }, [nodes, pluginModuleTemplates]);
-
- useQuery(['getPlugTemplates'], () => loadPluginTemplates());
-
- useEffect(() => {
- initData(JSON.parse(JSON.stringify(app.modules)));
- }, [app.modules]);
+ setBasicNodeTemplates(copyTemplates);
+ }, [nodes, setBasicNodeTemplates]);
const memoRender = useMemo(() => {
- return } />;
- }, [app, moduleTemplates.length, onClose]);
+ return } />;
+ }, [app, onClose]);
return memoRender;
};
diff --git a/projects/app/src/pages/app/detail/components/InfoModal.tsx b/projects/app/src/pages/app/detail/components/InfoModal.tsx
index b9e44a4e2..8f2dca1f6 100644
--- a/projects/app/src/pages/app/detail/components/InfoModal.tsx
+++ b/projects/app/src/pages/app/detail/components/InfoModal.tsx
@@ -18,7 +18,7 @@ import { compressImgFileAndUpload } from '@/web/common/file/controller';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { useRequest } from '@/web/common/hooks/useRequest';
import Avatar from '@/components/Avatar';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useAppStore } from '@/web/core/app/store/useAppStore';
import PermissionRadio from '@/components/support/permission/Radio';
import { useTranslation } from 'next-i18next';
diff --git a/projects/app/src/pages/app/detail/components/Logs.tsx b/projects/app/src/pages/app/detail/components/Logs.tsx
index 1cfd4e534..0d00ea81d 100644
--- a/projects/app/src/pages/app/detail/components/Logs.tsx
+++ b/projects/app/src/pages/app/detail/components/Logs.tsx
@@ -26,7 +26,7 @@ import type { ComponentRef } from '@/components/ChatBox/type.d';
import { useQuery } from '@tanstack/react-query';
import { getInitChatInfo } from '@/web/core/chat/api';
import Tag from '@/components/Tag';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { addDays } from 'date-fns';
import MyBox from '@/components/common/MyBox';
import { usePagination } from '@fastgpt/web/hooks/usePagination';
diff --git a/projects/app/src/pages/app/detail/components/OutLink/SelectUsingWayModal.tsx b/projects/app/src/pages/app/detail/components/OutLink/SelectUsingWayModal.tsx
index fb0b34523..578a6cb14 100644
--- a/projects/app/src/pages/app/detail/components/OutLink/SelectUsingWayModal.tsx
+++ b/projects/app/src/pages/app/detail/components/OutLink/SelectUsingWayModal.tsx
@@ -1,6 +1,6 @@
import { OutLinkSchema } from '@fastgpt/global/support/outLink/type';
import React, { useCallback, useState } from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { Box, Flex, FlexProps, Grid, Image, ModalBody, Switch, useTheme } from '@chakra-ui/react';
import MyRadio from '@/components/common/MyRadio';
diff --git a/projects/app/src/pages/app/detail/components/OutLink/Share.tsx b/projects/app/src/pages/app/detail/components/OutLink/Share.tsx
index e32264ab9..d5f6b0855 100644
--- a/projects/app/src/pages/app/detail/components/OutLink/Share.tsx
+++ b/projects/app/src/pages/app/detail/components/OutLink/Share.tsx
@@ -37,7 +37,7 @@ import { useTranslation } from 'next-i18next';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { useSystemStore } from '@/web/common/system/useSystemStore';
import MyTooltip from '@/components/MyTooltip';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import dayjs from 'dayjs';
import { getDocPath } from '@/web/common/system/doc';
import dynamic from 'next/dynamic';
diff --git a/projects/app/src/pages/app/detail/components/SimpleEdit/AppCard.tsx b/projects/app/src/pages/app/detail/components/SimpleEdit/AppCard.tsx
index fa5e43740..e4ec51701 100644
--- a/projects/app/src/pages/app/detail/components/SimpleEdit/AppCard.tsx
+++ b/projects/app/src/pages/app/detail/components/SimpleEdit/AppCard.tsx
@@ -27,7 +27,8 @@ const AppCard = ({ appId }: { appId: string }) => {
const [TeamTagsSet, setTeamTagsSet] = useState();
const { openConfirm: openConfirmDel, ConfirmModal: ConfirmDelModal } = useConfirm({
- content: t('app.Confirm Del App Tip')
+ content: t('app.Confirm Del App Tip'),
+ type: 'delete'
});
/* 点击删除 */
diff --git a/projects/app/src/pages/app/detail/components/SimpleEdit/EditForm.tsx b/projects/app/src/pages/app/detail/components/SimpleEdit/EditForm.tsx
index 7b753bf8d..6d7536036 100644
--- a/projects/app/src/pages/app/detail/components/SimpleEdit/EditForm.tsx
+++ b/projects/app/src/pages/app/detail/components/SimpleEdit/EditForm.tsx
@@ -1,16 +1,7 @@
import React, { useMemo, useState, useTransition } from 'react';
-import {
- Box,
- Flex,
- Grid,
- BoxProps,
- useTheme,
- useDisclosure,
- Button,
- Image
-} from '@chakra-ui/react';
+import { Box, Flex, Grid, BoxProps, useTheme, useDisclosure, Button } from '@chakra-ui/react';
import { useQuery } from '@tanstack/react-query';
-import { QuestionOutlineIcon, SmallAddIcon } from '@chakra-ui/icons';
+import { AddIcon, QuestionOutlineIcon, SmallAddIcon } from '@chakra-ui/icons';
import { useForm, useFieldArray } from 'react-hook-form';
import { useSystemStore } from '@/web/common/system/useSystemStore';
import { appModules2Form, getDefaultAppForm } from '@fastgpt/global/core/app/utils';
@@ -34,11 +25,13 @@ import MyTextarea from '@/components/common/Textarea/MyTextarea/index';
import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/module/utils';
import SearchParamsTip from '@/components/core/dataset/SearchParamsTip';
-import SelectAiModel from '@/components/Select/SelectAiModel';
+import SettingLLMModel from '@/components/core/ai/SettingLLMModel';
+import { SettingAIDataType } from '@fastgpt/global/core/module/node/type';
+import DeleteIcon, { hoverDeleteStyles } from '@fastgpt/web/components/common/Icon/delete';
const DatasetSelectModal = dynamic(() => import('@/components/core/module/DatasetSelectModal'));
const DatasetParamsModal = dynamic(() => import('@/components/core/module/DatasetParamsModal'));
-const AIChatSettingsModal = dynamic(() => import('@/components/core/module/AIChatSettingsModal'));
+const ToolSelectModal = dynamic(() => import('./ToolSelectModal'));
const TTSSelect = dynamic(
() => import('@/components/core/module/Flow/components/modules/TTSSelect')
);
@@ -56,7 +49,7 @@ const EditForm = ({
const { t } = useTranslation();
const { appDetail, updateAppDetail } = useAppStore();
const { loadAllDatasets, allDatasets } = useDatasetStore();
- const { isPc, llmModelList, reRankModelList } = useSystemStore();
+ const { isPc, llmModelList } = useSystemStore();
const [refresh, setRefresh] = useState(false);
const [, startTst] = useTransition();
@@ -69,12 +62,8 @@ const EditForm = ({
control,
name: 'dataset.datasets'
});
+ const selectedTools = watch('selectedTools');
- const {
- isOpen: isOpenAIChatSetting,
- onOpen: onOpenAIChatSetting,
- onClose: onCloseAIChatSetting
- } = useDisclosure();
const {
isOpen: isOpenDatasetSelect,
onOpen: onOpenKbSelect,
@@ -85,6 +74,11 @@ const EditForm = ({
onOpen: onOpenDatasetParams,
onClose: onCloseDatasetParams
} = useDisclosure();
+ const {
+ isOpen: isOpenToolsSelect,
+ onOpen: onOpenToolsSelect,
+ onClose: onCloseToolsSelect
+ } = useDisclosure();
const { openConfirm: openConfirmSave, ConfirmModal: ConfirmSaveModal } = useConfirm({
content: t('core.app.edit.Confirm Save App Tip')
@@ -97,12 +91,6 @@ const EditForm = ({
const formatVariables = useMemo(() => formatEditorVariablePickerIcon(variables), [variables]);
const searchMode = watch('dataset.searchMode');
- const chatModelSelectList = (() =>
- llmModelList.map((item) => ({
- value: item.model,
- label: item.name
- })))();
-
const selectDatasets = useMemo(
() => allDatasets.filter((item) => datasets.find((dataset) => dataset.datasetId === item._id)),
[allDatasets, datasets]
@@ -112,6 +100,7 @@ const EditForm = ({
return llmModelList.find((item) => item.model === selectLLMModel)?.quoteMaxToken || 3000;
}, [selectLLMModel, llmModelList]);
+ /* on save app */
const { mutate: onSubmitSave, isLoading: isSaving } = useRequest({
mutationFn: async (data: AppSimpleEditFormType) => {
const modules = await postForm2Modules(data);
@@ -126,7 +115,7 @@ const EditForm = ({
errorToast: t('common.Save Failed')
});
- const { isSuccess: isInitd } = useQuery(
+ useQuery(
['init', appDetail],
() => {
const formatVal = appModules2Form({
@@ -148,15 +137,6 @@ const EditForm = ({
borderBottomWidth: '1px',
borderBottomColor: 'borderColor.low'
};
- const BoxBtnStyles: BoxProps = {
- cursor: 'pointer',
- px: 3,
- py: 1,
- borderRadius: 'md',
- _hover: {
- bg: 'myGray.150'
- }
- };
const LabelStyles: BoxProps = {
w: ['60px', '100px'],
flexShrink: 0,
@@ -207,29 +187,6 @@ const EditForm = ({
- {/* simple mode select */}
- {/*
-
-
- {t('core.app.simple.mode template select')}
-
- ({
- alias: t(item.name),
- label: t(item.desc),
- value: item.id
- })) || []
- }
- value={getValues('templateId')}
- onchange={(val) => {
- setValue('templateId', val);
- setRefresh(!refresh);
- }}
- />
- */}
-
{/* ai */}
@@ -237,39 +194,36 @@ const EditForm = ({
{t('app.AI Settings')}
-
-
- {t('common.More settings')}
-
{t('core.ai.Model')}
- {
- setValue('aiSettings.model', val);
- const maxToken =
- llmModelList.find((item) => item.model === getValues('aiSettings.model'))
- ?.maxResponse || 4000;
- const token = maxToken / 2;
- setValue('aiSettings.maxToken', token);
- setRefresh(!refresh);
+ {
+ setValue('aiSettings.model', model);
+ setValue('aiSettings.maxToken', maxToken);
+ setValue('aiSettings.temperature', temperature);
+ setValue('aiSettings.maxHistories', maxHistories ?? 6);
}}
/>
-
+
{t('core.ai.Prompt')}
-
+
- {isInitd && (
+
{
@@ -281,8 +235,8 @@ const EditForm = ({
placeholder={t('core.app.tip.chatNodeSystemPromptTip')}
title={t('core.ai.Prompt')}
/>
- )}
-
+
+
{/* dataset */}
@@ -292,14 +246,26 @@ const EditForm = ({
{t('core.dataset.Choose Dataset')}
-
-
+ }
+ iconSpacing={1}
+ size={'sm'}
+ fontSize={'md'}
+ onClick={onOpenKbSelect}
+ >
{t('common.Choose')}
-
-
-
+
+ }
+ iconSpacing={1}
+ size={'sm'}
+ fontSize={'md'}
+ onClick={onOpenDatasetParams}
+ >
{t('common.Params')}
-
+
{getValues('dataset.datasets').length > 0 && (
@@ -309,7 +275,6 @@ const EditForm = ({
limit={getValues('dataset.limit')}
usingReRank={getValues('dataset.usingReRank')}
usingQueryExtension={getValues('dataset.datasetSearchUsingExtensionQuery')}
- responseEmptyText={getValues('dataset.searchEmptyText')}
/>
)}
@@ -347,6 +312,65 @@ const EditForm = ({
+ {/* tool choice */}
+
+
+
+
+ {t('core.app.Tool call')}(实验功能)
+
+
+
+
+ }
+ iconSpacing={1}
+ mr={'-5px'}
+ size={'sm'}
+ fontSize={'md'}
+ onClick={onOpenToolsSelect}
+ >
+ {t('common.Choose')}
+
+
+ 0 ? 2 : 0}
+ gridTemplateColumns={'repeat(2, minmax(0, 1fr))'}
+ gridGap={[2, 4]}
+ >
+ {selectedTools.map((item) => (
+
+
+
+ {item.name}
+
+ {
+ setValue(
+ 'selectedTools',
+ selectedTools.filter((tool) => tool.id !== item.id)
+ );
+ }}
+ />
+
+ ))}
+
+
+
{/* variable */}
- {isOpenAIChatSetting && (
- {
- setValue('aiSettings', e);
- onCloseAIChatSetting();
- }}
- defaultData={getValues('aiSettings')}
- pickerMenu={formatVariables}
- />
- )}
{isOpenDatasetSelect && (
)}
+ {isOpenToolsSelect && (
+ setValue('selectedTools', [...selectedTools, e])}
+ onRemoveTool={(e) => {
+ setValue(
+ 'selectedTools',
+ selectedTools.filter((item) => item.id !== e.id)
+ );
+ }}
+ onClose={onCloseToolsSelect}
+ />
+ )}
);
};
diff --git a/projects/app/src/pages/app/detail/components/SimpleEdit/TagsEditModal.tsx b/projects/app/src/pages/app/detail/components/SimpleEdit/TagsEditModal.tsx
index 445551eed..6b88b84bc 100644
--- a/projects/app/src/pages/app/detail/components/SimpleEdit/TagsEditModal.tsx
+++ b/projects/app/src/pages/app/detail/components/SimpleEdit/TagsEditModal.tsx
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import {
Button,
diff --git a/projects/app/src/pages/app/detail/components/SimpleEdit/ToolSelectModal.tsx b/projects/app/src/pages/app/detail/components/SimpleEdit/ToolSelectModal.tsx
new file mode 100644
index 000000000..6fe11adcd
--- /dev/null
+++ b/projects/app/src/pages/app/detail/components/SimpleEdit/ToolSelectModal.tsx
@@ -0,0 +1,270 @@
+import React, { useMemo, useState } from 'react';
+
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import { useTranslation } from 'next-i18next';
+import {
+ Box,
+ Button,
+ Flex,
+ Input,
+ InputGroup,
+ InputLeftElement,
+ ModalBody
+} from '@chakra-ui/react';
+import RowTabs from '@fastgpt/web/components/common/Tabs/RowTabs';
+import { useWorkflowStore } from '@/web/core/workflow/store/workflow';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { useQuery } from '@tanstack/react-query';
+import EmptyTip from '@/components/EmptyTip';
+import { FlowNodeTemplateType } from '@fastgpt/global/core/module/type';
+import { useToast } from '@fastgpt/web/hooks/useToast';
+import Avatar from '@/components/Avatar';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { AddIcon } from '@chakra-ui/icons';
+import { getPreviewPluginModule } from '@/web/core/plugin/api';
+import MyBox from '@/components/common/MyBox';
+import { FlowNodeInputTypeEnum } from '@fastgpt/global/core/module/node/constant';
+import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
+import ParentPaths from '@/components/common/ParentPaths';
+import { PluginTypeEnum } from '@fastgpt/global/core/plugin/constants';
+import { debounce } from 'lodash';
+
+type Props = {
+ selectedTools: FlowNodeTemplateType[];
+ onAddTool: (tool: FlowNodeTemplateType) => void;
+ onRemoveTool: (tool: FlowNodeTemplateType) => void;
+};
+
+enum TemplateTypeEnum {
+ 'systemPlugin' = 'systemPlugin',
+ 'teamPlugin' = 'teamPlugin'
+}
+
+const ToolSelectModal = ({ onClose, ...props }: Props & { onClose: () => void }) => {
+ const { t } = useTranslation();
+ const {
+ systemNodeTemplates,
+ loadSystemNodeTemplates,
+ teamPluginNodeTemplates,
+ loadTeamPluginNodeTemplates
+ } = useWorkflowStore();
+
+ const [templateType, setTemplateType] = useState(TemplateTypeEnum.teamPlugin);
+ const [currentParent, setCurrentParent] = useState<{
+ parentId: string;
+ parentName: string;
+ }>();
+ const [searchKey, setSearchKey] = useState('');
+
+ const templates = useMemo(() => {
+ const map = {
+ [TemplateTypeEnum.systemPlugin]: systemNodeTemplates.filter(
+ (item) => item.isTool && item.name.toLowerCase().includes(searchKey.toLowerCase())
+ ),
+ [TemplateTypeEnum.teamPlugin]: teamPluginNodeTemplates.filter((item) =>
+ searchKey ? item.pluginType !== PluginTypeEnum.folder : true
+ )
+ };
+ return map[templateType];
+ }, [searchKey, systemNodeTemplates, teamPluginNodeTemplates, templateType]);
+
+ const { mutate: onChangeTab } = useRequest({
+ mutationFn: async (e: any) => {
+ const val = e as TemplateTypeEnum;
+ if (val === TemplateTypeEnum.systemPlugin) {
+ await loadSystemNodeTemplates();
+ } else if (val === TemplateTypeEnum.teamPlugin) {
+ await loadTeamPluginNodeTemplates({
+ parentId: currentParent?.parentId
+ });
+ }
+ setTemplateType(val);
+ },
+ errorToast: t('core.module.templates.Load plugin error')
+ });
+
+ const { isLoading } = useQuery(['teamNodeTemplate', currentParent?.parentId, searchKey], () =>
+ loadTeamPluginNodeTemplates({
+ parentId: currentParent?.parentId,
+ searchKey,
+ init: true
+ })
+ );
+
+ return (
+
+
+
+
+
+
+
+ setSearchKey(e.target.value), 200)}
+ />
+
+
+ {templateType === TemplateTypeEnum.teamPlugin && !searchKey && currentParent && (
+
+ {
+ setCurrentParent(undefined);
+ }}
+ fontSize="md"
+ />
+
+ )}
+
+
+
+
+ );
+};
+
+export default React.memo(ToolSelectModal);
+
+const RenderList = React.memo(function RenderList({
+ templates,
+ selectedTools,
+ isLoadingData,
+ onAddTool,
+ onRemoveTool,
+ setCurrentParent
+}: Props & {
+ templates: FlowNodeTemplateType[];
+ isLoadingData: boolean;
+ setCurrentParent: (e: { parentId: string; parentName: string }) => void;
+}) {
+ const { t } = useTranslation();
+ const { toast } = useToast();
+
+ const { mutate: onClickAdd, isLoading } = useRequest({
+ mutationFn: async (template: FlowNodeTemplateType) => {
+ const res = await getPreviewPluginModule(template.id);
+
+ // check inputs valid
+ for (const input of res.inputs) {
+ if (
+ [
+ ModuleInputKeyEnum.switch,
+ ModuleInputKeyEnum.pluginStart,
+ ModuleInputKeyEnum.pluginId
+ ].includes(input.key as any)
+ ) {
+ continue;
+ }
+
+ if (!input.toolDescription) {
+ return toast({
+ status: 'warning',
+ title: t('core.app.ToolCall.This plugin cannot be called as a tool')
+ });
+ }
+ }
+ return res;
+ },
+ onSuccess(res: FlowNodeTemplateType) {
+ res && onAddTool(res);
+ },
+ errorToast: t('core.module.templates.Load plugin error')
+ });
+
+ return templates.length === 0 && !isLoadingData ? (
+
+ ) : (
+
+ {templates.map((item, i) => {
+ const selected = !!selectedTools.find((tool) => tool.id === item.id);
+ return (
+
+
+
+ {t(item.name)}
+
+ {t(item.intro)}
+
+
+ {selected ? (
+ }
+ onClick={() => onRemoveTool(item)}
+ >
+ {t('common.Remove')}
+
+ ) : item.pluginType === PluginTypeEnum.folder ? (
+
+ ) : (
+ }
+ onClick={() => onClickAdd(item)}
+ >
+ {t('common.Add')}
+
+ )}
+
+ );
+ })}
+
+ );
+});
diff --git a/projects/app/src/pages/app/detail/components/SimpleEdit/index.tsx b/projects/app/src/pages/app/detail/components/SimpleEdit/index.tsx
index 3ae2bdc31..00a5f5d67 100644
--- a/projects/app/src/pages/app/detail/components/SimpleEdit/index.tsx
+++ b/projects/app/src/pages/app/detail/components/SimpleEdit/index.tsx
@@ -12,7 +12,7 @@ const SimpleEdit = ({ appId }: { appId: string }) => {
const { parentRef, divRef, isSticky } = useSticky();
return (
-
+
{
const setCurrentTab = useCallback(
(tab: `${TabEnum}`) => {
- router.replace({
+ router.push({
query: {
- appId,
+ ...router.query,
currentTab: tab
}
});
},
- [appId, router]
+ [router]
);
const tabList = useMemo(
diff --git a/projects/app/src/pages/app/list/component/CreateModal.tsx b/projects/app/src/pages/app/list/component/CreateModal.tsx
index fa3039bd6..a2b236dda 100644
--- a/projects/app/src/pages/app/list/component/CreateModal.tsx
+++ b/projects/app/src/pages/app/list/component/CreateModal.tsx
@@ -26,7 +26,7 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
import { useRequest } from '@/web/common/hooks/useRequest';
import Avatar from '@/components/Avatar';
import MyTooltip from '@/components/MyTooltip';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
diff --git a/projects/app/src/pages/chat/team.tsx b/projects/app/src/pages/chat/team.tsx
index 290f5f4b4..3cd9a7410 100644
--- a/projects/app/src/pages/chat/team.tsx
+++ b/projects/app/src/pages/chat/team.tsx
@@ -36,19 +36,23 @@ import MyBox from '@/components/common/MyBox';
import SliderApps from './components/SliderApps';
import { GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt';
-const OutLink = ({
- teamId,
- appId,
- chatId,
- teamToken
-}: {
- teamId: string;
- appId: string;
- chatId: string;
- teamToken: string;
-}) => {
+const OutLink = () => {
const { t } = useTranslation();
const router = useRouter();
+ const {
+ teamId = '',
+ appId = '',
+ chatId = '',
+ teamToken,
+ ...customVariables
+ } = router.query as {
+ teamId: string;
+ appId: string;
+ chatId: string;
+ teamToken: string;
+ [key: string]: string;
+ };
+
const { toast } = useToast();
const theme = useTheme();
const { isPc } = useSystemStore();
@@ -78,7 +82,10 @@ const OutLink = ({
const { responseText, responseData } = await streamFetch({
data: {
messages: prompts,
- variables,
+ variables: {
+ ...customVariables,
+ ...variables
+ },
appId,
teamId,
teamToken,
@@ -372,17 +379,8 @@ const OutLink = ({
};
export async function getServerSideProps(context: any) {
- const teamId = context?.query?.teamId || '';
- const appId = context?.query?.appId || '';
- const chatId = context?.query?.chatId || '';
- const teamToken: string = context?.query?.teamToken || '';
-
return {
props: {
- teamId,
- appId,
- chatId,
- teamToken,
...(await serviceSideProps(context))
}
};
diff --git a/projects/app/src/pages/dataset/component/EditFolderModal.tsx b/projects/app/src/pages/dataset/component/EditFolderModal.tsx
index 6264d6a25..d3bbf04ff 100644
--- a/projects/app/src/pages/dataset/component/EditFolderModal.tsx
+++ b/projects/app/src/pages/dataset/component/EditFolderModal.tsx
@@ -1,6 +1,6 @@
import React, { useMemo, useRef, useState } from 'react';
import { ModalFooter, ModalBody, Input, Button } from '@chakra-ui/react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useRequest } from '@/web/common/hooks/useRequest';
diff --git a/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx b/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx
index 2d9b62f2c..05534263d 100644
--- a/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx
@@ -4,7 +4,7 @@ import { splitText2Chunks } from '@fastgpt/global/common/string/textSplitter';
import { TrainingModeEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next';
import { DatasetItemType } from '@fastgpt/global/core/dataset/type';
-import { Prompt_AgentQA } from '@/global/core/prompt/agent';
+import { Prompt_AgentQA } from '@fastgpt/global/core/ai/prompt/agent';
import { UseFormReturn, useForm } from 'react-hook-form';
import { ImportProcessWayEnum } from '@/web/core/dataset/constants';
import { ImportSourceItemType } from '@/web/core/dataset/type';
diff --git a/projects/app/src/pages/dataset/detail/components/Import/WebsiteConfig.tsx b/projects/app/src/pages/dataset/detail/components/Import/WebsiteConfig.tsx
index 217c9275b..777fb5eca 100644
--- a/projects/app/src/pages/dataset/detail/components/Import/WebsiteConfig.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/WebsiteConfig.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { Box, Button, Input, Link, ModalBody, ModalFooter } from '@chakra-ui/react';
import { strIsLink } from '@fastgpt/global/common/string/tools';
diff --git a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx b/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx
index 74448e7fa..1dc770004 100644
--- a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx
@@ -23,8 +23,8 @@ import MyTooltip from '@/components/MyTooltip';
import { useImportStore } from '../Provider';
import Tag from '@/components/Tag';
import { useSystemStore } from '@/web/common/system/useSystemStore';
-import MyModal from '@/components/MyModal';
-import { Prompt_AgentQA } from '@/global/core/prompt/agent';
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import { Prompt_AgentQA } from '@fastgpt/global/core/ai/prompt/agent';
import Preview from '../components/Preview';
function DataProcess({
diff --git a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/PreviewData.tsx b/projects/app/src/pages/dataset/detail/components/Import/commonProgress/PreviewData.tsx
index 52f9e7df0..4f6dccfda 100644
--- a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/PreviewData.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/commonProgress/PreviewData.tsx
@@ -13,7 +13,6 @@ const PreviewData = ({
}) => {
const { t } = useTranslation();
const { sources, setSources } = useImportStore();
- console.log(sources);
return (
diff --git a/projects/app/src/pages/dataset/detail/components/Import/components/PreviewRawText.tsx b/projects/app/src/pages/dataset/detail/components/Import/components/PreviewRawText.tsx
index 68aa4d6de..d98c386e1 100644
--- a/projects/app/src/pages/dataset/detail/components/Import/components/PreviewRawText.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/components/PreviewRawText.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { ModalBody } from '@chakra-ui/react';
export type PreviewRawTextProps = {
diff --git a/projects/app/src/pages/dataset/detail/components/Import/sourceSelector/FileSourceSelector.tsx b/projects/app/src/pages/dataset/detail/components/Import/sourceSelector/FileSourceSelector.tsx
index 4fc875902..e30bab240 100644
--- a/projects/app/src/pages/dataset/detail/components/Import/sourceSelector/FileSourceSelector.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Import/sourceSelector/FileSourceSelector.tsx
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { ModalBody, ModalFooter, Button } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import LeftRadio from '@fastgpt/web/components/common/Radio/LeftRadio';
diff --git a/projects/app/src/pages/dataset/detail/components/Info.tsx b/projects/app/src/pages/dataset/detail/components/Info.tsx
index 3182d2423..3bf1ce9bf 100644
--- a/projects/app/src/pages/dataset/detail/components/Info.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Info.tsx
@@ -17,6 +17,7 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
import { useRequest } from '@/web/common/hooks/useRequest';
import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
import MySelect from '@fastgpt/web/components/common/MySelect';
+import AIModelSelector from '@/components/Select/AIModelSelector';
const Info = ({ datasetId }: { datasetId: string }) => {
const { t } = useTranslation();
@@ -137,7 +138,7 @@ const Info = ({ datasetId }: { datasetId: string }) => {
{t('core.ai.model.Dataset Agent Model')}
- ({
diff --git a/projects/app/src/pages/dataset/detail/components/InputDataModal.tsx b/projects/app/src/pages/dataset/detail/components/InputDataModal.tsx
index d857cd80d..756440c92 100644
--- a/projects/app/src/pages/dataset/detail/components/InputDataModal.tsx
+++ b/projects/app/src/pages/dataset/detail/components/InputDataModal.tsx
@@ -10,7 +10,7 @@ import {
} from '@/web/core/dataset/api';
import { useToast } from '@fastgpt/web/hooks/useToast';
import MyIcon from '@fastgpt/web/components/common/Icon';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import MyTooltip from '@/components/MyTooltip';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import { useQuery } from '@tanstack/react-query';
@@ -250,7 +250,7 @@ const InputDataModal = ({
return openConfirm(onDeleteData)();
}
if (e === TabEnum.doc) {
- return window.open(getDocPath('/docs/use-cases/datasetengine'), '_blank');
+ return window.open(getDocPath('/docs/course/datasetengine'), '_blank');
}
setCurrentTab(e);
}}
diff --git a/projects/app/src/pages/dataset/detail/components/Test.tsx b/projects/app/src/pages/dataset/detail/components/Test.tsx
index 223dc27cb..bb72da369 100644
--- a/projects/app/src/pages/dataset/detail/components/Test.tsx
+++ b/projects/app/src/pages/dataset/detail/components/Test.tsx
@@ -54,7 +54,6 @@ type FormType = {
similarity?: number;
limit?: number;
usingReRank?: boolean;
- searchEmptyText?: string;
datasetSearchUsingExtensionQuery?: boolean;
datasetSearchExtensionModel?: string;
datasetSearchExtensionBg?: string;
diff --git a/projects/app/src/pages/dataset/list/component/CreateModal.tsx b/projects/app/src/pages/dataset/list/component/CreateModal.tsx
index f391c88a5..b7cb21a35 100644
--- a/projects/app/src/pages/dataset/list/component/CreateModal.tsx
+++ b/projects/app/src/pages/dataset/list/component/CreateModal.tsx
@@ -10,7 +10,7 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
import { useRequest } from '@/web/common/hooks/useRequest';
import Avatar from '@/components/Avatar';
import MyTooltip from '@/components/MyTooltip';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { postCreateDataset } from '@/web/core/dataset/api';
import type { CreateDatasetParams } from '@/global/core/dataset/api.d';
import { useTranslation } from 'next-i18next';
@@ -19,6 +19,7 @@ import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import MySelect from '@fastgpt/web/components/common/MySelect';
+import AIModelSelector from '@/components/Select/AIModelSelector';
const CreateModal = ({ onClose, parentId }: { onClose: () => void; parentId?: string }) => {
const { t } = useTranslation();
@@ -162,7 +163,7 @@ const CreateModal = ({ onClose, parentId }: { onClose: () => void; parentId?: st
- ({
@@ -181,7 +182,7 @@ const CreateModal = ({ onClose, parentId }: { onClose: () => void; parentId?: st
{t('core.ai.model.Dataset Agent Model')}
- ({
diff --git a/projects/app/src/pages/dataset/list/component/MoveModal.tsx b/projects/app/src/pages/dataset/list/component/MoveModal.tsx
index 95f5cf470..c81245688 100644
--- a/projects/app/src/pages/dataset/list/component/MoveModal.tsx
+++ b/projects/app/src/pages/dataset/list/component/MoveModal.tsx
@@ -12,7 +12,7 @@ import {
} from '@chakra-ui/react';
import Avatar from '@/components/Avatar';
import MyTooltip from '@/components/MyTooltip';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next';
diff --git a/projects/app/src/pages/dataset/list/index.tsx b/projects/app/src/pages/dataset/list/index.tsx
index ecae81d01..5e269e3af 100644
--- a/projects/app/src/pages/dataset/list/index.tsx
+++ b/projects/app/src/pages/dataset/list/index.tsx
@@ -28,12 +28,8 @@ import Avatar from '@/components/Avatar';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { serviceSideProps } from '@/web/common/utils/i18n';
import dynamic from 'next/dynamic';
-import {
- DatasetTypeEnum,
- DatasetTypeMap,
- FolderIcon,
- FolderImgUrl
-} from '@fastgpt/global/core/dataset/constants';
+import { DatasetTypeEnum, DatasetTypeMap } from '@fastgpt/global/core/dataset/constants';
+import { FolderImgUrl, FolderIcon } from '@fastgpt/global/common/file/image/constants';
import MyMenu from '@/components/MyMenu';
import { useRequest } from '@/web/common/hooks/useRequest';
import { useSystemStore } from '@/web/common/system/useSystemStore';
diff --git a/projects/app/src/pages/plugin/edit/Header.tsx b/projects/app/src/pages/plugin/edit/Header.tsx
index d0cc4f8d7..310fa179c 100644
--- a/projects/app/src/pages/plugin/edit/Header.tsx
+++ b/projects/app/src/pages/plugin/edit/Header.tsx
@@ -13,6 +13,7 @@ import { putUpdatePlugin } from '@/web/core/plugin/api';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
import { ModuleItemType } from '@fastgpt/global/core/module/type';
import { useToast } from '@fastgpt/web/hooks/useToast';
+import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
const ImportSettings = dynamic(() => import('@/components/core/module/Flow/ImportSettings'));
const PreviewPlugin = dynamic(() => import('./Preview'));
@@ -41,7 +42,12 @@ const Header = ({ plugin, onClose }: Props) => {
item.inputs.forEach((item) => {
item.connected = true;
});
- if (item.outputs.find((output) => output.targets.length === 0)) {
+ if (
+ item.outputs.find(
+ (output) =>
+ output.key !== ModuleOutputKeyEnum.pluginStart && output.targets.length === 0
+ )
+ ) {
toast({
status: 'warning',
title: t('module.Plugin input must connect')
diff --git a/projects/app/src/pages/plugin/edit/Preview.tsx b/projects/app/src/pages/plugin/edit/Preview.tsx
index f9e43d1b6..672b5bd1b 100644
--- a/projects/app/src/pages/plugin/edit/Preview.tsx
+++ b/projects/app/src/pages/plugin/edit/Preview.tsx
@@ -4,7 +4,7 @@ import { FlowModuleItemType, ModuleItemType } from '@fastgpt/global/core/module/
import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
import dynamic from 'next/dynamic';
import { plugin2ModuleIO } from '@fastgpt/global/core/module/utils';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { Box } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import { PluginItemSchema } from '@fastgpt/global/core/plugin/type';
diff --git a/projects/app/src/pages/plugin/edit/index.tsx b/projects/app/src/pages/plugin/edit/index.tsx
index c5470c3d8..af1f3f053 100644
--- a/projects/app/src/pages/plugin/edit/index.tsx
+++ b/projects/app/src/pages/plugin/edit/index.tsx
@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
import Header from './Header';
import Flow from '@/components/core/module/Flow';
import FlowProvider, { useFlowProviderStore } from '@/components/core/module/Flow/FlowProvider';
-import { FlowModuleTemplateType } from '@fastgpt/global/core/module/type.d';
+import { FlowNodeTemplateType } from '@fastgpt/global/core/module/type.d';
import { pluginSystemModuleTemplates } from '@fastgpt/global/core/module/template/constants';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
import { serviceSideProps } from '@/web/common/utils/i18n';
@@ -13,7 +13,7 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
import Loading from '@fastgpt/web/components/common/MyLoading';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { useTranslation } from 'next-i18next';
-import { usePluginStore } from '@/web/core/plugin/store/plugin';
+import { useWorkflowStore } from '@/web/core/workflow/store/workflow';
type Props = { pluginId: string };
@@ -22,13 +22,30 @@ const Render = ({ pluginId }: Props) => {
const router = useRouter();
const { toast } = useToast();
const { nodes, initData } = useFlowProviderStore();
- const { pluginModuleTemplates, loadPluginTemplates } = usePluginStore();
+ const { setBasicNodeTemplates } = useWorkflowStore();
- const moduleTemplates = useMemo(() => {
- const pluginTemplates = pluginModuleTemplates.filter((item) => item.id !== pluginId);
- const concatTemplates = [...pluginSystemModuleTemplates, ...pluginTemplates];
+ const { data: pluginDetail } = useQuery(
+ ['getOnePlugin', pluginId],
+ () => getOnePlugin(pluginId),
+ {
+ onError: (error) => {
+ toast({
+ status: 'warning',
+ title: getErrText(error, t('plugin.Load Plugin Failed'))
+ });
+ router.replace('/plugin/list');
+ }
+ }
+ );
- const copyTemplates: FlowModuleTemplateType[] = JSON.parse(JSON.stringify(concatTemplates));
+ useEffect(() => {
+ initData(JSON.parse(JSON.stringify(pluginDetail?.modules || [])));
+ }, [pluginDetail?.modules]);
+
+ useEffect(() => {
+ const concatTemplates = [...pluginSystemModuleTemplates];
+
+ const copyTemplates: FlowNodeTemplateType[] = JSON.parse(JSON.stringify(concatTemplates));
const filterType: Record = {
[FlowNodeTypeEnum.userGuide]: 1,
@@ -52,34 +69,11 @@ const Render = ({ pluginId }: Props) => {
template.inputs = template.inputs.filter((input) => !input.hideInPlugin);
});
- return copyTemplates;
- }, [nodes, pluginId, pluginModuleTemplates]);
-
- const { data: pluginDetail } = useQuery(
- ['getOnePlugin', pluginId],
- () => getOnePlugin(pluginId),
- {
- onError: (error) => {
- toast({
- status: 'warning',
- title: getErrText(error, t('plugin.Load Plugin Failed'))
- });
- router.replace('/plugin/list');
- }
- }
- );
-
- useQuery(['getPlugTemplates'], () => loadPluginTemplates());
-
- useEffect(() => {
- initData(JSON.parse(JSON.stringify(pluginDetail?.modules || [])));
- }, [pluginDetail?.modules]);
+ setBasicNodeTemplates(copyTemplates);
+ }, [nodes, setBasicNodeTemplates]);
return pluginDetail ? (
- router.back()} />}
- />
+ router.back()} />} />
) : (
);
diff --git a/projects/app/src/pages/plugin/list/component/EditModal.tsx b/projects/app/src/pages/plugin/list/component/EditModal.tsx
index f30ea0f8a..8767e4d26 100644
--- a/projects/app/src/pages/plugin/list/component/EditModal.tsx
+++ b/projects/app/src/pages/plugin/list/component/EditModal.tsx
@@ -11,22 +11,23 @@ import { useRequest } from '@/web/common/hooks/useRequest';
import { delOnePlugin, postCreatePlugin, putUpdatePlugin } from '@/web/core/plugin/api';
import Avatar from '@/components/Avatar';
import MyTooltip from '@/components/MyTooltip';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useConfirm } from '@/web/common/hooks/useConfirm';
import MyIcon from '@fastgpt/web/components/common/Icon';
-import { CreateOnePluginParams } from '@fastgpt/global/core/plugin/controller';
import { customAlphabet } from 'nanoid';
import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
+import { PluginTypeEnum } from '@fastgpt/global/core/plugin/constants';
+import { useWorkflowStore } from '@/web/core/workflow/store/workflow';
+import { EditFormType } from './type';
const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 12);
-export type FormType = CreateOnePluginParams & {
- id?: string;
-};
-export const defaultForm: FormType = {
+export const defaultForm: EditFormType = {
avatar: '/icon/logo.svg',
name: '',
intro: '',
+ parentId: null,
+ type: PluginTypeEnum.custom,
modules: [
{
moduleId: nanoid(),
@@ -63,7 +64,7 @@ const CreateModal = ({
onSuccess,
onDelete
}: {
- defaultValue?: FormType;
+ defaultValue?: EditFormType;
onClose: () => void;
onSuccess: () => void;
onDelete: () => void;
@@ -72,14 +73,17 @@ const CreateModal = ({
const [refresh, setRefresh] = useState(false);
const { toast } = useToast();
const router = useRouter();
+ const { parentId } = router.query as { parentId: string };
+
const { isPc } = useSystemStore();
+ const { loadTeamPluginNodeTemplates } = useWorkflowStore();
const { openConfirm, ConfirmModal } = useConfirm({
title: t('common.Delete Tip'),
content: t('plugin.Confirm Delete')
});
- const { register, setValue, getValues, handleSubmit } = useForm({
- defaultValues: defaultValue
+ const { register, setValue, getValues, handleSubmit } = useForm({
+ defaultValues: { ...defaultValue, parentId: parentId || null }
});
const { File, onOpen: onOpenSelectFile } = useSelectFile({
@@ -111,19 +115,20 @@ const CreateModal = ({
);
const { mutate: onclickCreate, isLoading: creating } = useRequest({
- mutationFn: async (data: FormType) => {
+ mutationFn: async (data: EditFormType) => {
return postCreatePlugin(data);
},
onSuccess(id: string) {
router.push(`/plugin/edit?pluginId=${id}`);
onSuccess();
onClose();
+ loadTeamPluginNodeTemplates();
},
successToast: t('common.Create Success'),
errorToast: t('common.Create Failed')
});
const { mutate: onclickUpdate, isLoading: updating } = useRequest({
- mutationFn: async (data: FormType) => {
+ mutationFn: async (data: EditFormType) => {
if (!data.id) return Promise.resolve('');
// @ts-ignore
return putUpdatePlugin(data);
@@ -163,34 +168,41 @@ const CreateModal = ({
isCentered={!isPc}
>
-
- {t('plugin.Set Name')}
-
-
-
-
+
+ {t('plugin.Set Name')}
+
+
+
+
+
+
-
-
-
+
+
{t('plugin.Intro')}
-
+
diff --git a/projects/app/src/pages/plugin/list/component/HttpPluginEditModal.tsx b/projects/app/src/pages/plugin/list/component/HttpPluginEditModal.tsx
new file mode 100644
index 000000000..edd33a951
--- /dev/null
+++ b/projects/app/src/pages/plugin/list/component/HttpPluginEditModal.tsx
@@ -0,0 +1,539 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import {
+ Box,
+ Flex,
+ Button,
+ ModalBody,
+ Input,
+ Textarea,
+ TableContainer,
+ Table,
+ Thead,
+ Th,
+ Tbody,
+ Tr,
+ Td,
+ IconButton,
+ useDisclosure
+} from '@chakra-ui/react';
+import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
+import { useForm } from 'react-hook-form';
+import { compressImgFileAndUpload } from '@/web/common/file/controller';
+import { getErrText } from '@fastgpt/global/common/error/utils';
+import { useToast } from '@fastgpt/web/hooks/useToast';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import Avatar from '@/components/Avatar';
+import MyTooltip from '@/components/MyTooltip';
+import { useTranslation } from 'next-i18next';
+import { CreateOnePluginParams } from '@fastgpt/global/core/plugin/controller';
+import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
+import { PluginTypeEnum } from '@fastgpt/global/core/plugin/constants';
+import {
+ delOnePlugin,
+ getApiSchemaByUrl,
+ postCreatePlugin,
+ putUpdatePlugin
+} from '@/web/core/plugin/api';
+import { str2OpenApiSchema } from '@fastgpt/global/core/plugin/httpPlugin/utils';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { AddIcon } from '@chakra-ui/icons';
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import { EditFormType } from './type';
+import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants';
+import HttpInput from '@fastgpt/web/components/common/Input/HttpInput';
+import { HttpHeaders } from '@/components/core/module/Flow/components/nodes/NodeHttp';
+
+export const defaultHttpPlugin: CreateOnePluginParams = {
+ avatar: FolderImgUrl,
+ name: '',
+ intro: '',
+ parentId: null,
+ type: PluginTypeEnum.folder,
+ modules: [],
+ metadata: {
+ apiSchemaStr: '',
+ customHeaders: ''
+ }
+};
+
+const HttpPluginEditModal = ({
+ defaultPlugin = defaultHttpPlugin,
+ onClose,
+ onSuccess,
+ onDelete
+}: {
+ defaultPlugin?: EditFormType;
+ onClose: () => void;
+ onSuccess: () => void;
+ onDelete: () => void;
+}) => {
+ const { t } = useTranslation();
+ const { toast } = useToast();
+ const isEdit = !!defaultPlugin.id;
+
+ const [refresh, setRefresh] = useState(false);
+
+ const [schemaUrl, setSchemaUrl] = useState('');
+ const [customHeaders, setCustomHeaders] = useState<{ key: string; value: string }[]>(() => {
+ const keyValue = JSON.parse(defaultPlugin.metadata?.customHeaders || '{}');
+ return Object.keys(keyValue).map((key) => ({ key, value: keyValue[key] }));
+ });
+ const [updateTrigger, setUpdateTrigger] = useState(false);
+
+ const { register, setValue, getValues, handleSubmit, watch } = useForm({
+ defaultValues: defaultPlugin
+ });
+ const apiSchemaStr = watch('metadata.apiSchemaStr');
+ const apiData = useMemo(() => {
+ if (!apiSchemaStr) {
+ return { pathData: [], serverPath: '' };
+ }
+ try {
+ return str2OpenApiSchema(apiSchemaStr);
+ } catch (err) {
+ toast({
+ status: 'warning',
+ title: t('plugin.Invalid Schema')
+ });
+ return { pathData: [], serverPath: '' };
+ }
+ }, [apiSchemaStr, t, toast]);
+
+ const {
+ isOpen: isOpenUrlImport,
+ onOpen: onOpenUrlImport,
+ onClose: onCloseUrlImport
+ } = useDisclosure();
+
+ const { mutate: onCreate, isLoading: isCreating } = useRequest({
+ mutationFn: async (data: CreateOnePluginParams) => {
+ return postCreatePlugin(data);
+ },
+ onSuccess() {
+ onSuccess();
+ onClose();
+ },
+ successToast: t('common.Create Success'),
+ errorToast: t('common.Create Failed')
+ });
+
+ const { mutate: updatePlugins, isLoading: isUpdating } = useRequest({
+ mutationFn: async (data: EditFormType) => {
+ if (!data.id) return Promise.resolve('');
+ return putUpdatePlugin({
+ id: data.id,
+ name: data.name,
+ avatar: data.avatar,
+ intro: data.intro,
+ metadata: data.metadata
+ });
+ },
+ onSuccess() {
+ onClose();
+ onSuccess();
+ },
+ successToast: t('common.Update Success'),
+ errorToast: t('common.Update Failed')
+ });
+
+ const { openConfirm, ConfirmModal } = useConfirm({
+ title: t('common.Delete Tip'),
+ content: t('core.plugin.Delete http plugin')
+ });
+
+ const { File, onOpen: onOpenSelectFile } = useSelectFile({
+ fileType: 'image/*',
+ multiple: false
+ });
+
+ const onSelectFile = useCallback(
+ async (e: File[]) => {
+ const file = e[0];
+ if (!file) return;
+ try {
+ const src = await compressImgFileAndUpload({
+ type: MongoImageTypeEnum.pluginAvatar,
+ file,
+ maxW: 300,
+ maxH: 300
+ });
+ setValue('avatar', src);
+ setRefresh((state) => !state);
+ } catch (err: any) {
+ toast({
+ title: getErrText(err, t('common.Select File Failed')),
+ status: 'warning'
+ });
+ }
+ },
+ [setValue, t, toast]
+ );
+
+ const { mutate: onclickDelPlugin, isLoading: isDeleting } = useRequest({
+ mutationFn: async () => {
+ if (!defaultPlugin.id) return;
+
+ await delOnePlugin(defaultPlugin.id);
+ onDelete();
+ onClose();
+ },
+ successToast: t('common.Delete Success'),
+ errorToast: t('common.Delete Failed')
+ });
+
+ /* load api from url */
+ const { mutate: onClickUrlLoadApi, isLoading: isLoadingUrlApi } = useRequest({
+ mutationFn: async () => {
+ if (!schemaUrl || !schemaUrl.startsWith('https://')) {
+ return toast({
+ title: t('plugin.Invalid URL'),
+ status: 'warning'
+ });
+ }
+
+ const schema = await getApiSchemaByUrl(schemaUrl);
+ setValue('metadata.apiSchemaStr', JSON.stringify(schema, null, 2));
+
+ onCloseUrlImport();
+ },
+ errorToast: t('plugin.Invalid Schema')
+ });
+
+ const leftVariables = useMemo(
+ () =>
+ HttpHeaders.filter((variable) => {
+ const existVariables = customHeaders.map((item) => item.key);
+ return !existVariables.includes(variable.key);
+ }),
+ [customHeaders]
+ );
+
+ return (
+ <>
+
+
+ <>
+
+ {t('plugin.Set Name')}
+
+
+
+
+
+
+
+
+ <>
+
+ {t('plugin.Intro')}
+
+
+
+
+
+ {'OpenAPI Schema'}
+
+
+ {isOpenUrlImport ? (
+
+ setSchemaUrl(e.target.value)}
+ />
+
+
+
+ ) : (
+ }
+ onClick={onOpenUrlImport}
+ >
+ {t('plugin.Import from URL')}
+
+ )}
+
+
+
@@ -122,9 +122,9 @@ fastgpt.run 域名会弃用。
## 🏘️ 社区交流群
-添加 wx 小助手加入：
+wx 扫一下加入：
-
+
diff --git a/docSite/assets/imgs/gapierTool1.png b/docSite/assets/imgs/gapierTool1.png
new file mode 100644
index 000000000..d9986a6d6
Binary files /dev/null and b/docSite/assets/imgs/gapierTool1.png differ
diff --git a/docSite/assets/imgs/gapierTool10.png b/docSite/assets/imgs/gapierTool10.png
new file mode 100644
index 000000000..4b3f97e06
Binary files /dev/null and b/docSite/assets/imgs/gapierTool10.png differ
diff --git a/docSite/assets/imgs/gapierTool11.png b/docSite/assets/imgs/gapierTool11.png
new file mode 100644
index 000000000..bcc8c633c
Binary files /dev/null and b/docSite/assets/imgs/gapierTool11.png differ
diff --git a/docSite/assets/imgs/gapierTool12.png b/docSite/assets/imgs/gapierTool12.png
new file mode 100644
index 000000000..a2be0bea1
Binary files /dev/null and b/docSite/assets/imgs/gapierTool12.png differ
diff --git a/docSite/assets/imgs/gapierTool13.png b/docSite/assets/imgs/gapierTool13.png
new file mode 100644
index 000000000..1109cfc5e
Binary files /dev/null and b/docSite/assets/imgs/gapierTool13.png differ
diff --git a/docSite/assets/imgs/gapierTool14.png b/docSite/assets/imgs/gapierTool14.png
new file mode 100644
index 000000000..ce8d27817
Binary files /dev/null and b/docSite/assets/imgs/gapierTool14.png differ
diff --git a/docSite/assets/imgs/gapierTool15.png b/docSite/assets/imgs/gapierTool15.png
new file mode 100644
index 000000000..4e9717643
Binary files /dev/null and b/docSite/assets/imgs/gapierTool15.png differ
diff --git a/docSite/assets/imgs/gapierTool16.png b/docSite/assets/imgs/gapierTool16.png
new file mode 100644
index 000000000..0ff1d38c0
Binary files /dev/null and b/docSite/assets/imgs/gapierTool16.png differ
diff --git a/docSite/assets/imgs/gapierTool17.png b/docSite/assets/imgs/gapierTool17.png
new file mode 100644
index 000000000..f57c988f2
Binary files /dev/null and b/docSite/assets/imgs/gapierTool17.png differ
diff --git a/docSite/assets/imgs/gapierTool2.png b/docSite/assets/imgs/gapierTool2.png
new file mode 100644
index 000000000..4aed354c7
Binary files /dev/null and b/docSite/assets/imgs/gapierTool2.png differ
diff --git a/docSite/assets/imgs/gapierTool3.png b/docSite/assets/imgs/gapierTool3.png
new file mode 100644
index 000000000..54b16374f
Binary files /dev/null and b/docSite/assets/imgs/gapierTool3.png differ
diff --git a/docSite/assets/imgs/gapierTool4.png b/docSite/assets/imgs/gapierTool4.png
new file mode 100644
index 000000000..a6f00cfbe
Binary files /dev/null and b/docSite/assets/imgs/gapierTool4.png differ
diff --git a/docSite/assets/imgs/gapierTool5.png b/docSite/assets/imgs/gapierTool5.png
new file mode 100644
index 000000000..635371b1a
Binary files /dev/null and b/docSite/assets/imgs/gapierTool5.png differ
diff --git a/docSite/assets/imgs/gapierTool6.png b/docSite/assets/imgs/gapierTool6.png
new file mode 100644
index 000000000..bcccfc366
Binary files /dev/null and b/docSite/assets/imgs/gapierTool6.png differ
diff --git a/docSite/assets/imgs/gapierTool7.png b/docSite/assets/imgs/gapierTool7.png
new file mode 100644
index 000000000..7c3720186
Binary files /dev/null and b/docSite/assets/imgs/gapierTool7.png differ
diff --git a/docSite/assets/imgs/gapierTool8.png b/docSite/assets/imgs/gapierTool8.png
new file mode 100644
index 000000000..c97f208c4
Binary files /dev/null and b/docSite/assets/imgs/gapierTool8.png differ
diff --git a/docSite/assets/imgs/gapierTool9.png b/docSite/assets/imgs/gapierTool9.png
new file mode 100644
index 000000000..cae83ba62
Binary files /dev/null and b/docSite/assets/imgs/gapierTool9.png differ
diff --git a/docSite/assets/imgs/gapierToolResult1.png b/docSite/assets/imgs/gapierToolResult1.png
new file mode 100644
index 000000000..a898f5832
Binary files /dev/null and b/docSite/assets/imgs/gapierToolResult1.png differ
diff --git a/docSite/content/docs/commercial/intro.md b/docSite/content/docs/commercial/intro.md
index cf9733d48..c1da9dd25 100644
--- a/docSite/content/docs/commercial/intro.md
+++ b/docSite/content/docs/commercial/intro.md
@@ -19,16 +19,17 @@ FastGPT 商业版是基于 FastGPT 开源版的增强版本，增加了一些独
| 应用管理与高级编排 | ✅ | ✅ | ✅ |
| 文档知识库 | ✅ | ✅ | ✅ |
| 外部使用 | ✅ | ✅ | ✅ |
-| 自定义版权信息 | ❌ | ✅ | ✅ |
+| 自定义版权信息 | ❌ | ✅ | 设计中 |
| 多租户与支付 | ❌ | ✅ | ✅ |
| 团队空间 | ❌ | ✅ | ✅ |
-| 外部使用限制 | ❌ | ✅ | ✅ |
+| 应用发布安全配置 | ❌ | ✅ | ✅ |
| 内容审核 | ❌ | ✅ | ✅ |
| web站点同步 | ❌ | ✅ | ✅ |
| 管理后台 | ❌ | ✅ | ✅ |
-| Saas服务商业授权 | ❌ | ✅ | ✅ |
+| 完整商业授权 | ❌ | ✅ | ✅ |
| 图片知识库 | ❌ | 设计中 | 设计中 |
| 自动规划召回 | ❌ | 设计中 | 设计中 |
+| 对话日志运营分析 | ❌ | 设计中 | 设计中 |
{{< /table >}}
## 商业版软件价格
diff --git a/docSite/content/docs/use-cases/ai_settings.md b/docSite/content/docs/course/ai_settings.md
similarity index 98%
rename from docSite/content/docs/use-cases/ai_settings.md
rename to docSite/content/docs/course/ai_settings.md
index 378de2eb2..ae3d8c1d7 100644
--- a/docSite/content/docs/use-cases/ai_settings.md
+++ b/docSite/content/docs/course/ai_settings.md
@@ -4,7 +4,7 @@ description: "FastGPT AI 高级配置说明"
icon: "sign_language"
draft: false
toc: true
-weight: 501
+weight: 102
---
在 FastGPT 的 AI 对话模块中，有一个 AI 高级配置，里面包含了 AI 模型的参数配置，本文详细介绍这些配置的含义。
@@ -48,7 +48,7 @@ Tips: 可以通过点击上下文按键查看完整的上下文组成，便于
FastGPT 知识库采用 QA 对(不一定都是问答格式，仅代表两个变量)的格式存储，在转义成字符串时候会根据**引用模板**来进行格式化。知识库包含多个可用变量： q, a, sourceId（数据的ID）, index(第n个数据), source(数据的集合名、文件名)，score(距离得分，0-1) 可以通过 {{q}} {{a}} {{sourceId}} {{index}} {{source}} {{score}} 按需引入。下面一个模板例子：
-可以通过 [知识库结构讲解](/docs/use-cases/datasetEngine/) 了解详细的知识库的结构。
+可以通过 [知识库结构讲解](/docs/course/datasetEngine/) 了解详细的知识库的结构。
#### 引用模板
diff --git a/docSite/content/docs/use-cases/datasetEngine.md b/docSite/content/docs/course/datasetEngine.md
similarity index 98%
rename from docSite/content/docs/use-cases/datasetEngine.md
rename to docSite/content/docs/course/datasetEngine.md
index 26f672381..9b867041e 100644
--- a/docSite/content/docs/use-cases/datasetEngine.md
+++ b/docSite/content/docs/course/datasetEngine.md
@@ -4,7 +4,7 @@ description: "本节会详细介绍 FastGPT 知识库结构设计，理解其 QA
icon: "dataset"
draft: false
toc: true
-weight: 502
+weight: 102
---
## 理解向量
@@ -90,4 +90,4 @@ FastGPT 采用了 `PostgresSQL` 的 `PG Vector` 插件作为向量检索器，
## QA的组合与引用提示词构建
-参考[引用模板与引用提示词示例](/docs/use-cases/ai_settings/#示例)
+参考[引用模板与引用提示词示例](/docs/course/ai_settings/#示例)
diff --git a/docSite/content/docs/use-cases/kb.md b/docSite/content/docs/course/kb.md
similarity index 99%
rename from docSite/content/docs/use-cases/kb.md
rename to docSite/content/docs/course/kb.md
index d76e3c312..dbbb16c21 100644
--- a/docSite/content/docs/use-cases/kb.md
+++ b/docSite/content/docs/course/kb.md
@@ -4,7 +4,7 @@ description: " 利用 FastGPT 打造高质量 AI 知识库"
icon: "school"
draft: false
toc: true
-weight: 699
+weight: 106
---
## 前言
diff --git a/docSite/content/docs/development/configuration.md b/docSite/content/docs/development/configuration.md
index 62088eb5f..847261d9f 100644
--- a/docSite/content/docs/development/configuration.md
+++ b/docSite/content/docs/development/configuration.md
@@ -11,7 +11,7 @@ weight: 708
**开发环境下**，你需要将示例配置文件 `config.json` 复制成 `config.local.json` 文件才会生效。
-这个配置文件中包含了系统参数和各个模型配置，使用时务必去掉注释。
+这个配置文件中包含了系统参数和各个模型配置，`使用时务必去掉注释!!!!!!!!!!!!!!`
## 4.6.8+ 版本新配置文件
@@ -28,6 +28,7 @@ llm模型全部合并
{
"model": "gpt-3.5-turbo", // 模型名
"name": "gpt-3.5-turbo", // 别名
+ "avatar": "/imgs/model/openai.svg", // 模型的logo
"maxContext": 16000, // 最大上下文
"maxResponse": 4000, // 最大回复
"quoteMaxToken": 13000, // 最大引用内容
@@ -35,7 +36,7 @@ llm模型全部合并
"charsPointsPrice": 0,
"censor": false,
"vision": false, // 是否支持图片输入
- "datasetProcess": false, // 是否设置为知识库处理模型（QA），务必保证至少有一个为true，否则知识库会报错
+ "datasetProcess": true, // 是否设置为知识库处理模型（QA），务必保证至少有一个为true，否则知识库会报错
"usedInClassify": true, // 是否用于问题分类（务必保证至少有一个为true）
"usedInExtractFields": true, // 是否用于内容提取（务必保证至少有一个为true）
"usedInToolCall": true, // 是否用于工具调用（务必保证至少有一个为true）
@@ -47,31 +48,10 @@ llm模型全部合并
"defaultSystemChatPrompt": "", // 对话默认携带的系统提示词
"defaultConfig":{} // LLM默认配置，可以针对不同模型设置特殊值（比如 GLM4 的 top_p
},
- {
- "model": "gpt-3.5-turbo-16k",
- "name": "gpt-3.5-turbo-16k",
- "maxContext": 16000,
- "maxResponse": 16000,
- "quoteMaxToken": 13000,
- "maxTemperature": 1.2,
- "charsPointsPrice": 0,
- "censor": false,
- "vision": false,
- "datasetProcess": true,
- "usedInClassify": true,
- "usedInExtractFields": true,
- "usedInToolCall": true,
- "usedInQueryExtension": true,
- "toolChoice": true,
- "functionCall": false,
- "customCQPrompt": "",
- "customExtractPrompt": "",
- "defaultSystemChatPrompt": "",
- "defaultConfig":{}
- },
{
"model": "gpt-4-0125-preview",
"name": "gpt-4-turbo",
+ "avatar": "/imgs/model/openai.svg",
"maxContext": 125000,
"maxResponse": 4000,
"quoteMaxToken": 100000,
@@ -94,6 +74,7 @@ llm模型全部合并
{
"model": "gpt-4-vision-preview",
"name": "gpt-4-vision",
+ "avatar": "/imgs/model/openai.svg",
"maxContext": 128000,
"maxResponse": 4000,
"quoteMaxToken": 100000,
@@ -118,6 +99,7 @@ llm模型全部合并
{
"model": "text-embedding-ada-002",
"name": "Embedding-2",
+ "avatar": "/imgs/model/openai.svg",
"charsPointsPrice": 0,
"defaultToken": 700,
"maxToken": 3000,
@@ -149,6 +131,20 @@ llm模型全部合并
}
```
+## 关于模型 logo
+
+统一放置在项目的`public/imgs/model/xxx`目录中，目前内置了以下几种，如果有需要，可以PR增加。
+
+- /imgs/model/baichuan.svg - 百川
+- /imgs/model/chatglm.svg - 智谱
+- /imgs/model/calude.svg - calude
+- /imgs/model/ernie.svg - 文心一言
+- /imgs/model/moonshot.svg - 月之暗面
+- /imgs/model/openai.svg - OpenAI GPT
+- /imgs/model/qwen.svg - 通义千问
+- /imgs/model/yi.svg - 零一万物
+-
+
## 特殊模型
### ReRank 接入
diff --git a/docSite/content/docs/development/faq.md b/docSite/content/docs/development/faq.md
index f1c6be3ed..12b22c2ba 100644
--- a/docSite/content/docs/development/faq.md
+++ b/docSite/content/docs/development/faq.md
@@ -1,13 +1,13 @@
---
weight: 749
-title: "常见开发 & 部署问题"
-description: "FastGPT 常见开发 & 部署问题"
+title: "私有部署常见问题"
+description: "FastGPT 私有部署常见问题"
icon: upgrade
draft: false
images: []
---
-## 错误排查方式
+## 一、错误排查方式
遇到问题先按下面方式排查。
@@ -17,7 +17,7 @@ images: []
4. 无法解决时，可以找找[Issue](https://github.com/labring/FastGPT/issues)，或新提 Issue，私有部署错误，务必提供详细的日志，否则很难排查。
-## 通用问题
+## 二、通用问题
### 能否纯本地运行
@@ -46,7 +46,7 @@ OneAPI 的 API Key 配置错误，需要修改`OPENAI_API_KEY`环境变量，并
### 页面崩溃
1. 关闭翻译
-2. 检查配置文件是否正常加载，如果没有正常加载会导致缺失系统信息，在某些操作下会导致空指针。（95%情况，可以F12打开控制台，看具体的空指针情况）
+2. 检查配置文件是否正常加载，如果没有正常加载会导致缺失系统信息，在某些操作下会导致空指针。（95%情况是配置文件不对，可以F12打开控制台，看具体的空指针情况）
3. 某些api不兼容问题（较少）
### 开启内容补全后，响应速度变慢
@@ -54,7 +54,11 @@ OneAPI 的 API Key 配置错误，需要修改`OPENAI_API_KEY`环境变量，并
1. 问题补全需要经过一轮AI生成。
2. 会进行3~5轮的查询，如果数据库性能不足，会有明显影响。
-## 私有部署问题
+### 模型响应为空
+
+1. 检查 key 问题。
+2. 如果是国内模型，可能是命中风控了。
+3. 查看模型请求日志，检查出入参数是否异常。
### 知识库索引没有进度
@@ -64,11 +68,7 @@ OneAPI 的 API Key 配置错误，需要修改`OPENAI_API_KEY`环境变量，并
2. 不能对话，也不能索引：API调用失败。可能是没连上OneAPI或OpenAI
3. 有进度，但是非常慢：api key不行，OpenAI的免费号，一分钟只有3次还是60次。一天上限200次。
-## Docker 部署常见问题
-
-### 首次部署，root用户提示未注册
-
-没有启动 Mongo 副本集模式。
+## 三、Docker 部署常见问题
### 如何更新？
@@ -133,14 +133,6 @@ mongo连接失败，检查
2. 环境变量（账号密码，注意host和port）
3. 副本集启动失败，一直在重启：没挂载mongo key；key没有权限；
-## 本地开发问题
+### 首次部署，root用户提示未注册
-### TypeError: Cannot read properties of null (reading 'useMemo' )
-
-删除所有的`node_modules`，用 Node18 重新 install 试试，可能最新的 Node 有问题。 本地开发流程：
-
-1. 根目录: `pnpm i`
-2. 复制 `config.json` -> `config.local.json`
-3. 复制 `.env.template` -> `.env.local`
-4. `cd projects/app`
-5. `pnpm dev`
+没有启动 Mongo 副本集模式。
diff --git a/docSite/content/docs/development/intro.md b/docSite/content/docs/development/intro.md
index 1fafe864f..635181c8d 100644
--- a/docSite/content/docs/development/intro.md
+++ b/docSite/content/docs/development/intro.md
@@ -48,7 +48,7 @@ git clone git@github.com: