;
+ showValueType?: boolean;
} & SpecificProps &
BoxProps) => {
const { control } = variablesForm;
@@ -48,7 +50,7 @@ const LabelAndFormRender = ({
return (
- {label}
+ {typeof label === 'string' ? {label} : label}
{placeholder && }
diff --git a/projects/app/src/components/core/app/formRender/index.tsx b/projects/app/src/components/core/app/formRender/index.tsx
index 00a2dc126..da78160e4 100644
--- a/projects/app/src/components/core/app/formRender/index.tsx
+++ b/projects/app/src/components/core/app/formRender/index.tsx
@@ -11,7 +11,7 @@ import MultipleSelect, {
import JSONEditor from '@fastgpt/web/components/common/Textarea/JsonEditor';
import AIModelSelector from '../../../Select/AIModelSelector';
import FileSelector from '../../../Select/FileSelector';
-import { useTranslation } from '@fastgpt/web/hooks/useSafeTranslation';
+import { useSafeTranslation } from '@fastgpt/web/hooks/useSafeTranslation';
const InputRender = (props: InputRenderProps) => {
const {
@@ -28,7 +28,7 @@ const InputRender = (props: InputRenderProps) => {
return <>{customRender(props)};
}
- const { t } = useTranslation();
+ const { t } = useSafeTranslation();
const {
value: selectedValue,
setValue,
@@ -81,6 +81,7 @@ const InputRender = (props: InputRenderProps) => {
return (
) => {
+ e.stopPropagation();
if (e.key.toLowerCase() !== 'enter') return;
handleSubmit(onSubmit, onError)();
};
diff --git a/projects/app/src/global/core/api/appReq.d.ts b/projects/app/src/global/core/api/appReq.d.ts
index 7eec8793c..699030c51 100644
--- a/projects/app/src/global/core/api/appReq.d.ts
+++ b/projects/app/src/global/core/api/appReq.d.ts
@@ -7,7 +7,8 @@ export type GetAppChatLogsProps = {
dateStart: Date;
dateEnd: Date;
sources?: ChatSourceEnum[];
- logTitle?: string;
+ tmbIds?: string[];
+ chatSearch?: string;
};
export type GetAppChatLogsParams = PaginationProps;
diff --git a/projects/app/src/pageComponents/account/model/Log/index.tsx b/projects/app/src/pageComponents/account/model/Log/index.tsx
index 717d335cc..fe72b63dd 100644
--- a/projects/app/src/pageComponents/account/model/Log/index.tsx
+++ b/projects/app/src/pageComponents/account/model/Log/index.tsx
@@ -185,7 +185,6 @@ const ChannelLog = ({ Tab }: { Tab: React.ReactNode }) => {
setFilterProps({ ...filterProps, dateRange: e })}
/>
diff --git a/projects/app/src/pageComponents/account/model/ModelDashboard/index.tsx b/projects/app/src/pageComponents/account/model/ModelDashboard/index.tsx
index f5080edf7..51e5ed504 100644
--- a/projects/app/src/pageComponents/account/model/ModelDashboard/index.tsx
+++ b/projects/app/src/pageComponents/account/model/ModelDashboard/index.tsx
@@ -374,7 +374,6 @@ const ModelDashboard = ({ Tab }: { Tab: React.ReactNode }) => {
diff --git a/projects/app/src/pageComponents/account/usage/UsageDetail.tsx b/projects/app/src/pageComponents/account/usage/UsageDetail.tsx
index b3fe4c8d9..ca9b28780 100644
--- a/projects/app/src/pageComponents/account/usage/UsageDetail.tsx
+++ b/projects/app/src/pageComponents/account/usage/UsageDetail.tsx
@@ -15,12 +15,12 @@ import { type 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 '@fastgpt/web/components/common/MyModal';
-import { useTranslation } from 'next-i18next';
import { formatNumber } from '@fastgpt/global/common/math/tools';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
+import { useSafeTranslation } from '@fastgpt/web/hooks/useSafeTranslation';
const UsageDetail = ({ usage, onClose }: { usage: UsageItemType; onClose: () => void }) => {
- const { t } = useTranslation();
+ const { t } = useSafeTranslation();
const filterBillList = useMemo(
() => usage.list.filter((item) => item && item.moduleName),
[usage.list]
diff --git a/projects/app/src/pageComponents/account/usage/UsageTable.tsx b/projects/app/src/pageComponents/account/usage/UsageTable.tsx
index 1c9f658b4..355a01a5d 100644
--- a/projects/app/src/pageComponents/account/usage/UsageTable.tsx
+++ b/projects/app/src/pageComponents/account/usage/UsageTable.tsx
@@ -27,6 +27,7 @@ import { type UsageFilterParams } from './type';
import PopoverConfirm from '@fastgpt/web/components/common/MyPopover/PopoverConfirm';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { downloadFetch } from '@/web/common/system/utils';
+import { useSafeTranslation } from '@fastgpt/web/hooks/useSafeTranslation';
const UsageDetail = dynamic(() => import('./UsageDetail'));
@@ -39,7 +40,7 @@ const UsageTableList = ({
Selectors: React.ReactNode;
filterParams: UsageFilterParams;
}) => {
- const { t } = useTranslation();
+ const { t } = useSafeTranslation();
const { dateRange, selectTmbIds, isSelectAllTmb, usageSources, isSelectAllSource, projectName } =
filterParams;
@@ -147,7 +148,9 @@ const UsageTableList = ({
| {t(UsageSourceMap[item.source]?.label as any) || '-'} |
- {t(item.appName as any) || '-'} |
+
+ {t(item.appName as any) || '-'}
+ |
{formatNumber(item.totalPoints) || 0} |
+ }
+ >
+ {({ onClose }) => {
+ return (
+
+
+ onDragEndCb={setLogKeysList}
+ dataList={logKeysList}
+ renderClone={(provided, snapshot, rubric) => (
+
+ )}
+ >
+ {({ provided }) => (
+
+ {logKeysList.map((item, index) => (
+
+ {(provided, snapshot) => (
+ <>
+
+ {index !== logKeysList.length - 1 && }
+
+ )}
+
+ ))}
+
+ )}
+
+
+ );
+ }}
+
+ );
+};
+
+export default LogKeysConfigPopover;
+
+const DragItem = ({
+ item,
+ provided,
+ snapshot,
+ logKeys,
+ setLogKeys
+}: {
+ item: AppLogKeysType;
+ provided: DraggableProvided;
+ snapshot: DraggableStateSnapshot;
+ logKeys: AppLogKeysType[];
+ setLogKeys: (logKeys: AppLogKeysType[]) => void;
+}) => {
+ const { t } = useTranslation();
+
+ return (
+
+
+
+
+
+ {t(AppLogKeysEnumMap[item.key])}
+
+
+ {item.enable ? (
+ {
+ setLogKeys(
+ logKeys.map((key) => (key.key === item.key ? { ...key, enable: false } : key))
+ );
+ }}
+ />
+ ) : (
+ {
+ setLogKeys(
+ logKeys.map((key) => (key.key === item.key ? { ...key, enable: true } : key))
+ );
+ }}
+ />
+ )}
+
+ );
+};
diff --git a/projects/app/src/pageComponents/app/detail/Logs/SyncLogKeysPopover.tsx b/projects/app/src/pageComponents/app/detail/Logs/SyncLogKeysPopover.tsx
new file mode 100644
index 000000000..7a9d8379c
--- /dev/null
+++ b/projects/app/src/pageComponents/app/detail/Logs/SyncLogKeysPopover.tsx
@@ -0,0 +1,88 @@
+import MyPopover from '@fastgpt/web/components/common/MyPopover';
+import { Box, Button, Flex } from '@chakra-ui/react';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useTranslation } from 'next-i18next';
+import React from 'react';
+import type { updateLogKeysBody } from '@/pages/api/core/app/logs/updateLogKeys';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import { updateLogKeys } from '@/web/core/app/api/log';
+import { useContextSelector } from 'use-context-selector';
+import { AppContext } from '../context';
+import type { AppLogKeysType } from '@fastgpt/global/core/app/logs/type';
+
+const SyncLogKeysPopover = ({
+ logKeys,
+ setLogKeys,
+ teamLogKeys,
+ fetchLogKeys
+}: {
+ logKeys: AppLogKeysType[];
+ setLogKeys: (logKeys: AppLogKeysType[]) => void;
+ teamLogKeys: AppLogKeysType[];
+ fetchLogKeys: () => Promise;
+}) => {
+ const { t } = useTranslation();
+ const appId = useContextSelector(AppContext, (v) => v.appId);
+
+ const { runAsync: updateList, loading: updateLoading } = useRequest2(
+ async (data: updateLogKeysBody) => {
+ await updateLogKeys(data);
+ },
+ {
+ manual: true,
+ onSuccess: async () => {
+ await fetchLogKeys();
+ }
+ }
+ );
+
+ return (
+
+
+
+ }
+ >
+ {({ onClose }) => {
+ return (
+
+ {t('app:sync_log_keys_popover_text')}
+
+
+
+
+
+
+ );
+ }}
+
+ );
+};
+
+export default SyncLogKeysPopover;
diff --git a/projects/app/src/pageComponents/app/detail/Logs/index.tsx b/projects/app/src/pageComponents/app/detail/Logs/index.tsx
index c68f3cbce..34c55c14c 100644
--- a/projects/app/src/pageComponents/app/detail/Logs/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/Logs/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
import {
Flex,
Box,
@@ -10,12 +10,13 @@ import {
Td,
Tbody,
HStack,
- Button
+ Button,
+ Input
} from '@chakra-ui/react';
import UserBox from '@fastgpt/web/components/common/UserBox';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { useTranslation } from 'next-i18next';
-import { getAppChatLogs } from '@/web/core/app/api';
+import { getAppChatLogs } from '@/web/core/app/api/log';
import dayjs from 'dayjs';
import { ChatSourceEnum, ChatSourceMap } from '@fastgpt/global/core/chat/constants';
import { addDays } from 'date-fns';
@@ -27,16 +28,26 @@ import EmptyTip from '@fastgpt/web/components/common/EmptyTip';
import { useContextSelector } from 'use-context-selector';
import { AppContext } from '../context';
import { cardStyles } from '../constants';
-
import dynamic from 'next/dynamic';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import MultipleSelect, {
useMultipleSelect
} from '@fastgpt/web/components/common/MySelect/MultipleSelect';
-import SearchInput from '@fastgpt/web/components/common/Input/SearchInput';
import PopoverConfirm from '@fastgpt/web/components/common/MyPopover/PopoverConfirm';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { downloadFetch } from '@/web/common/system/utils';
+import LogKeysConfigPopover from './LogKeysConfigPopover';
+import { getLogKeys } from '@/web/core/app/api/log';
+import { AppLogKeysEnum } from '@fastgpt/global/core/app/logs/constants';
+import { DefaultAppLogKeys } from '@fastgpt/global/core/app/logs/constants';
+import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
+import { getTeamMembers } from '@/web/support/user/team/api';
+import Avatar from '@fastgpt/web/components/common/Avatar';
+import { useLocalStorageState } from 'ahooks';
+import type { AppLogKeysType } from '@fastgpt/global/core/app/logs/type';
+import type { AppLogsListItemType } from '@/types/app';
+import SyncLogKeysPopover from './SyncLogKeysPopover';
+import { isEqual } from 'lodash';
const DetailLogsModal = dynamic(() => import('./DetailLogsModal'));
@@ -51,7 +62,105 @@ const Logs = () => {
});
const [detailLogsId, setDetailLogsId] = useState();
- const [logTitle, setLogTitle] = useState();
+ const [tmbInputValue, setTmbInputValue] = useState('');
+ const [chatSearch, setChatSearch] = useState('');
+
+ const getCellRenderMap = (item: AppLogsListItemType) => ({
+ [AppLogKeysEnum.SOURCE]: (
+ |
+ {/* @ts-ignore */}
+ {item.sourceName || t(ChatSourceMap[item.source]?.name) || item.source}
+ |
+ ),
+ [AppLogKeysEnum.CREATED_TIME]: (
+ {dayjs(item.createTime).format('YYYY/MM/DD HH:mm')} |
+ ),
+ [AppLogKeysEnum.LAST_CONVERSATION_TIME]: (
+
+ {dayjs(item.updateTime).format('YYYY/MM/DD HH:mm')}
+ |
+ ),
+ [AppLogKeysEnum.USER]: (
+
+
+ {!!item.outLinkUid ? item.outLinkUid : }
+
+ |
+ ),
+ [AppLogKeysEnum.TITLE]: (
+
+ {item.customTitle || item.title}
+ |
+ ),
+ [AppLogKeysEnum.SESSION_ID]: (
+
+ {item.id || '-'}
+ |
+ ),
+ [AppLogKeysEnum.MESSAGE_COUNT]: {item.messageCount} | ,
+ [AppLogKeysEnum.FEEDBACK]: (
+
+ {!!item?.userGoodFeedbackCount && (
+
+
+ {item.userGoodFeedbackCount}
+
+ )}
+ {!!item?.userBadFeedbackCount && (
+
+
+ {item.userBadFeedbackCount}
+
+ )}
+ {!item?.userGoodFeedbackCount && !item?.userBadFeedbackCount && <>-}
+ |
+ ),
+ [AppLogKeysEnum.CUSTOM_FEEDBACK]: (
+ {item.customFeedbacksCount || '-'} |
+ ),
+ [AppLogKeysEnum.ANNOTATED_COUNT]: (
+ {item.markCount} |
+ ),
+ [AppLogKeysEnum.RESPONSE_TIME]: (
+
+ {item.averageResponseTime ? `${item.averageResponseTime.toFixed(2)}s` : '-'}
+ |
+ ),
+ [AppLogKeysEnum.ERROR_COUNT]: (
+ {item.errorCount || '-'} |
+ ),
+ [AppLogKeysEnum.POINTS]: (
+
+ {item.totalPoints ? `${item.totalPoints.toFixed(2)}` : '-'}
+ |
+ )
+ });
+
+ const {
+ value: selectTmbIds,
+ setValue: setSelectTmbIds,
+ isSelectAll: isSelectAllTmb,
+ setIsSelectAll: setIsSelectAllTmb
+ } = useMultipleSelect([], true);
const {
value: chatSources,
@@ -75,9 +184,19 @@ const Logs = () => {
dateStart: dateRange.from!,
dateEnd: dateRange.to!,
sources: isSelectAllSource ? undefined : chatSources,
- logTitle
+ tmbIds: isSelectAllTmb ? undefined : selectTmbIds,
+ chatSearch
}),
- [appId, chatSources, dateRange.from, dateRange.to, isSelectAllSource, logTitle]
+ [
+ appId,
+ chatSources,
+ dateRange.from,
+ dateRange.to,
+ isSelectAllSource,
+ selectTmbIds,
+ isSelectAllTmb,
+ chatSearch
+ ]
);
const {
data: logs,
@@ -92,6 +211,66 @@ const Logs = () => {
refreshDeps: [params]
});
+ const [logKeys = DefaultAppLogKeys, setLogKeys] = useLocalStorageState(
+ `app_log_keys_${appId}`
+ );
+ const { runAsync: fetchLogKeys, data: teamLogKeys = [] } = useRequest2(
+ async () => {
+ const res = await getLogKeys({ appId });
+ const keys = res.logKeys.length > 0 ? res.logKeys : DefaultAppLogKeys;
+ setLogKeys(keys);
+ return keys;
+ },
+ {
+ manual: false,
+ refreshDeps: [appId]
+ }
+ );
+
+ const HeaderRenderMap = useMemo(
+ () => ({
+ [AppLogKeysEnum.SOURCE]: {t('app:logs_keys_source')} | ,
+ [AppLogKeysEnum.CREATED_TIME]: (
+ {t('app:logs_keys_createdTime')} |
+ ),
+ [AppLogKeysEnum.LAST_CONVERSATION_TIME]: (
+
+ {t('app:logs_keys_lastConversationTime')}
+ |
+ ),
+ [AppLogKeysEnum.USER]: {t('app:logs_chat_user')} | ,
+ [AppLogKeysEnum.TITLE]: {t('app:logs_title')} | ,
+ [AppLogKeysEnum.SESSION_ID]: (
+ {t('app:logs_keys_sessionId')} |
+ ),
+ [AppLogKeysEnum.MESSAGE_COUNT]: (
+ {t('app:logs_message_total')} |
+ ),
+ [AppLogKeysEnum.FEEDBACK]: {t('app:feedback_count')} | ,
+ [AppLogKeysEnum.CUSTOM_FEEDBACK]: (
+
+ {t('common:core.app.feedback.Custom feedback')}
+ |
+ ),
+ [AppLogKeysEnum.ANNOTATED_COUNT]: (
+
+
+ {t('app:mark_count')}
+
+
+ |
+ ),
+ [AppLogKeysEnum.RESPONSE_TIME]: (
+ {t('app:logs_response_time')} |
+ ),
+ [AppLogKeysEnum.ERROR_COUNT]: (
+ {t('app:logs_error_count')} |
+ ),
+ [AppLogKeysEnum.POINTS]: {t('app:logs_points')} |
+ }),
+ [t]
+ );
+
const { runAsync: exportLogs } = useRequest2(
async () => {
await downloadFetch({
@@ -102,7 +281,8 @@ const Logs = () => {
dateStart: dateRange.from || new Date(),
dateEnd: addDays(dateRange.to || new Date(), 1),
sources: isSelectAllSource ? undefined : chatSources,
- logTitle,
+ tmbIds: isSelectAllTmb ? undefined : selectTmbIds,
+ chatSearch,
title: t('app:logs_export_title'),
sourcesMap: Object.fromEntries(
@@ -117,10 +297,36 @@ const Logs = () => {
});
},
{
- refreshDeps: [chatSources, logTitle]
+ refreshDeps: [chatSources]
}
);
+ const { data: members, ScrollData: TmbScrollData } = useScrollPagination(getTeamMembers, {
+ params: { searchKey: tmbInputValue },
+ refreshDeps: [tmbInputValue]
+ });
+ const tmbList = useMemo(
+ () =>
+ members.map((item) => ({
+ label: (
+
+
+
+ {item.memberName}
+
+
+ ),
+ value: item.tmbId
+ })),
+ [members]
+ );
+
+ const showSyncPopover = useMemo(() => {
+ const teamLogKeysList = teamLogKeys.filter((item) => item.enable);
+ const personalLogKeysList = logKeys.filter((item) => item.enable);
+ return !isEqual(teamLogKeysList, personalLogKeysList);
+ }, [teamLogKeys, logKeys]);
+
return (
{
py={[4, 6]}
flex={'1 0 0'}
>
-
-
-
- {t('app:logs_source')}
-
-
-
- list={sourceList}
- value={chatSources}
- onSelect={setChatSources}
- isSelectAll={isSelectAllSource}
- setIsSelectAll={setIsSelectAllSource}
- itemWrap={false}
- height={'32px'}
- bg={'myGray.50'}
- w={'160px'}
- />
-
+
+
+
+ list={sourceList}
+ value={chatSources}
+ onSelect={setChatSources}
+ isSelectAll={isSelectAllSource}
+ setIsSelectAll={setIsSelectAllSource}
+ h={9}
+ w={'226px'}
+ rounded={'8px'}
+ tagStyle={{
+ px: 1,
+ py: 1,
+ borderRadius: 'sm',
+ bg: 'myGray.100',
+ color: 'myGray.900'
+ }}
+ borderColor={'myGray.200'}
+ formLabel={t('app:logs_source')}
+ />
-
-
- {t('common:user.Time')}
-
+
{
setDateRange(date);
}}
+ bg={'white'}
+ h={9}
+ w={'240px'}
+ rounded={'8px'}
+ borderColor={'myGray.200'}
+ formLabel={t('app:logs_date')}
+ _hover={{
+ borderColor: 'primary.300'
+ }}
/>
-
-
- {t('app:logs_title')}
+
+
+ list={tmbList}
+ value={selectTmbIds}
+ onSelect={(val) => {
+ setSelectTmbIds(val as string[]);
+ }}
+ ScrollData={TmbScrollData}
+ isSelectAll={isSelectAllTmb}
+ setIsSelectAll={setIsSelectAllTmb}
+ h={9}
+ w={'226px'}
+ rounded={'8px'}
+ formLabel={t('common:member')}
+ tagStyle={{
+ px: 1,
+ borderRadius: 'sm',
+ bg: 'myGray.100',
+ w: '76px'
+ }}
+ inputValue={tmbInputValue}
+ setInputValue={setTmbInputValue}
+ />
+
+
+
+ {t('common:chat')}
- setLogTitle(e.target.value)}
+
+ setChatSearch(e.target.value)}
+ fontSize={'sm'}
+ border={'none'}
+ pl={0}
+ _focus={{
+ boxShadow: 'none'
+ }}
+ _placeholder={{
+ fontSize: 'sm'
+ }}
/>
+ {showSyncPopover && (
+
+ )}
+
+
{t('common:Export')}}
showCancel
@@ -186,95 +458,28 @@ const Logs = () => {
- | {t('common:core.app.logs.Source And Time')} |
- {t('app:logs_chat_user')} |
- {t('app:logs_title')} |
- {t('app:logs_message_total')} |
- {t('app:feedback_count')} |
- {t('common:core.app.feedback.Custom feedback')} |
-
-
- {t('app:mark_count')}
-
-
- |
+ {(logKeys || DefaultAppLogKeys)
+ .filter((logKey) => logKey.enable)
+ .map((logKey) => HeaderRenderMap[logKey.key])}
- {logs.map((item) => (
- setDetailLogsId(item.id)}
- >
- |
- {/* @ts-ignore */}
- {item.sourceName || t(ChatSourceMap[item.source]?.name) || item.source}
- {dayjs(item.time).format('YYYY/MM/DD HH:mm')}
- |
-
-
- {!!item.outLinkUid ? (
- item.outLinkUid
- ) : (
-
- )}
-
- |
-
- {item.customTitle || item.title}
- |
- {item.messageCount} |
-
- {!!item?.userGoodFeedbackCount && (
-
-
- {item.userGoodFeedbackCount}
-
- )}
- {!!item?.userBadFeedbackCount && (
-
-
- {item.userBadFeedbackCount}
-
- )}
- {!item?.userGoodFeedbackCount && !item?.userBadFeedbackCount && <>-}
- |
- {item.customFeedbacksCount || '-'} |
- {item.markCount} |
-
- ))}
+ {logs.map((item) => {
+ const cellRenderMap = getCellRenderMap(item);
+ return (
+ setDetailLogsId(item.id)}
+ >
+ {(logKeys || DefaultAppLogKeys)
+ .filter((logKey) => logKey.enable)
+ .map((logKey) => cellRenderMap[logKey.key])}
+
+ );
+ })}
{logs.length === 0 && !isLoading && }
diff --git a/projects/app/src/pageComponents/app/detail/MCPTools/ChatTest.tsx b/projects/app/src/pageComponents/app/detail/MCPTools/ChatTest.tsx
index 425ecf793..295c32876 100644
--- a/projects/app/src/pageComponents/app/detail/MCPTools/ChatTest.tsx
+++ b/projects/app/src/pageComponents/app/detail/MCPTools/ChatTest.tsx
@@ -4,20 +4,21 @@ import { useContextSelector } from 'use-context-selector';
import { AppContext } from '../context';
import ChatItemContextProvider from '@/web/core/chat/context/chatItemContext';
import ChatRecordContextProvider from '@/web/core/chat/context/chatRecordContext';
-import { Box, Button, Flex } from '@chakra-ui/react';
+import { Box, Button, Flex, HStack } from '@chakra-ui/react';
import { cardStyles } from '../constants';
import { useTranslation } from 'react-i18next';
import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
-import { Controller, useForm } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import Markdown from '@/components/Markdown';
import { postRunMCPTool } from '@/web/core/app/api/plugin';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
-import InputRender from '@/components/core/app/formRender';
-import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
-import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import { valueTypeToInputType } from '@/components/core/app/formRender/utils';
import { getNodeInputTypeFromSchemaInputType } from '@fastgpt/global/core/app/jsonschema';
+import LabelAndFormRender from '@/components/core/app/formRender/LabelAndForm';
+import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
+import ValueTypeLabel from '../WorkflowComponents/Flow/nodes/render/ValueTypeLabel';
+import { valueTypeFormat } from '@fastgpt/global/core/workflow/runtime/utils';
const ChatTest = ({
currentTool,
@@ -32,7 +33,8 @@ const ChatTest = ({
const [output, setOutput] = useState('');
- const { control, handleSubmit, reset } = useForm();
+ const form = useForm();
+ const { handleSubmit, reset } = form;
useEffect(() => {
reset({});
@@ -42,6 +44,20 @@ const ChatTest = ({
const { runAsync: runTool, loading: isRunning } = useRequest2(
async (data: Record) => {
if (!currentTool) return;
+
+ // Format type
+ Object.entries(currentTool?.inputSchema.properties || {}).forEach(
+ ([paramName, paramInfo]) => {
+ const valueType = getNodeInputTypeFromSchemaInputType({
+ type: paramInfo.type,
+ arrayItems: paramInfo.items
+ });
+ if (data[paramName] !== undefined) {
+ data[paramName] = valueTypeFormat(data[paramName], valueType);
+ }
+ }
+ );
+
return await postRunMCPTool({
params: data,
url,
@@ -89,48 +105,35 @@ const ChatTest = ({
{Object.entries(currentTool?.inputSchema.properties || {}).map(
- ([paramName, paramInfo]) => (
- {
- if (!currentTool?.inputSchema.required?.includes(paramName)) return true;
- return !!value;
- }
- }}
- render={({ field: { onChange, value }, fieldState: { error } }) => {
- const inputType = valueTypeToInputType(
- getNodeInputTypeFromSchemaInputType({ type: paramInfo.type })
- );
+ ([paramName, paramInfo]) => {
+ const inputType = valueTypeToInputType(
+ getNodeInputTypeFromSchemaInputType({ type: paramInfo.type })
+ );
+ const required = currentTool?.inputSchema.required?.includes(paramName);
- return (
-
-
- {currentTool?.inputSchema.required?.includes(paramName) && (
-
- *
-
- )}
-
- {paramName}
-
-
-
-
-
+ {paramName}
+
-
- );
- }}
- />
- )
+
+ }
+ required={required}
+ key={paramName}
+ inputType={inputType}
+ formKey={paramName}
+ variablesForm={form}
+ placeholder={paramInfo.description}
+ />
+ );
+ }
)}
diff --git a/projects/app/src/pageComponents/app/detail/MCPTools/index.tsx b/projects/app/src/pageComponents/app/detail/MCPTools/index.tsx
index 4db4ace7a..81fe6709c 100644
--- a/projects/app/src/pageComponents/app/detail/MCPTools/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/MCPTools/index.tsx
@@ -6,7 +6,6 @@ import { useContextSelector } from 'use-context-selector';
import { AppContext } from '../context';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
-import { type MCPToolSetData } from '@/pageComponents/dashboard/apps/MCPToolsEditModal';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
const MCPTools = () => {
@@ -15,13 +14,15 @@ const MCPTools = () => {
const toolSetNode = appDetail.modules.find(
(item) => item.flowNodeType === FlowNodeTypeEnum.toolSet
);
- return toolSetNode?.inputs[0].value as MCPToolSetData;
+ return toolSetNode?.toolConfig?.mcpToolSet ?? toolSetNode?.inputs[0].value;
}, [appDetail.modules]);
const [url, setUrl] = useState(toolSetData?.url || '');
const [toolList, setToolList] = useState(toolSetData?.toolList || []);
- const [headerSecret, setHeaderSecret] = useState(toolSetData?.headerSecret);
- const [currentTool, setCurrentTool] = useState(toolSetData?.toolList[0]);
+ const [headerSecret, setHeaderSecret] = useState(
+ toolSetData?.headerSecret ?? {}
+ );
+ const [currentTool, setCurrentTool] = useState(toolSetData.toolList[0]);
return (
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx
index 9a1bb2067..6b726ae37 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx
@@ -22,18 +22,21 @@ import { useChatStore } from '@/web/core/chat/context/useChatStore';
import MyBox from '@fastgpt/web/components/common/MyBox';
import ChatQuoteList from '@/pageComponents/chat/ChatQuoteList';
import VariablePopover from '@/components/core/chat/ChatContainer/ChatBox/components/VariablePopover';
+import { useCopyData } from '@fastgpt/web/hooks/useCopyData';
type Props = {
isOpen: boolean;
nodes?: StoreNodeItemType[];
edges?: StoreEdgeItemType[];
onClose: () => void;
+ chatId: string;
};
-const ChatTest = ({ isOpen, nodes = [], edges = [], onClose }: Props) => {
+const ChatTest = ({ isOpen, nodes = [], edges = [], onClose, chatId }: Props) => {
const { t } = useTranslation();
const { appDetail } = useContextSelector(AppContext, (v) => v);
const isPlugin = appDetail.type === AppTypeEnum.plugin;
+ const { copyData } = useCopyData();
const { restartChat, ChatContainer, loading } = useChatTest({
nodes,
@@ -118,7 +121,16 @@ const ChatTest = ({ isOpen, nodes = [], edges = [], onClose }: Props) => {
>
- {t('common:core.chat.Run test')}
+
+ {
+ copyData(chatId);
+ }}
+ >
+ {t('common:core.chat.Run test')}
+
+
{!isVariableVisible && }
@@ -199,7 +211,7 @@ const Render = (Props: Props) => {
showNodeStatus
>
-
+
);
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx
index aa80d09cf..f686df642 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx
@@ -25,7 +25,7 @@ export type NodeTemplateListHeaderProps = {
parentId?: string;
type?: TemplateTypeEnum;
searchVal?: string;
- }) => Promise;
+ }) => Promise;
onUpdateParentId: (parentId: string) => void;
};
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/list.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/list.tsx
index d23761419..684a5f58a 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/list.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/list.tsx
@@ -56,7 +56,6 @@ export type TemplateListProps = {
const NodeTemplateListItem = ({
template,
- templateType,
handleAddNode,
isPopover,
onUpdateParentId
@@ -128,11 +127,6 @@ const NodeTemplateListItem = ({
});
}}
onClick={() => {
- if (template.isFolder && template.flowNodeType !== FlowNodeTypeEnum.toolSet) {
- onUpdateParentId(template.id);
- return;
- }
-
const position =
isPopover && handleParams
? handleParams.addNodePosition
@@ -219,10 +213,6 @@ const NodeTemplateList = ({
template: NodeTemplateListItemType;
position: { x: number; y: number };
}) => {
- if (template.isFolder && template.flowNodeType !== FlowNodeTypeEnum.toolSet) {
- return;
- }
-
try {
const templateNode = await (async () => {
try {
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/useNodeTemplates.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/useNodeTemplates.tsx
index 50892ba1b..eefe37784 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/useNodeTemplates.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/useNodeTemplates.tsx
@@ -69,7 +69,7 @@ export const useNodeTemplates = () => {
const {
data: teamAndSystemApps,
loading: templatesIsLoading,
- runAsync
+ runAsync: loadNodeTemplates
} = useRequest2(
async ({
parentId = '',
@@ -81,12 +81,13 @@ export const useNodeTemplates = () => {
searchVal?: string;
}) => {
if (type === TemplateTypeEnum.teamPlugin) {
+ // app, workflow-plugin, mcp
return getTeamPlugTemplates({
- parentId,
- searchKey: searchVal
+ parentId
}).then((res) => res.filter((app) => app.id !== appId));
}
if (type === TemplateTypeEnum.systemPlugin) {
+ // systemTool
return getSystemPlugTemplates({
searchKey: searchVal,
parentId
@@ -102,13 +103,6 @@ export const useNodeTemplates = () => {
}
);
- const loadNodeTemplates = useCallback(
- async (params: { parentId?: ParentIdType; type?: TemplateTypeEnum; searchVal?: string }) => {
- await runAsync(params);
- },
- [runAsync]
- );
-
const onUpdateParentId = useCallback(
(parentId: ParentIdType) => {
loadNodeTemplates({
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/hooks/useUtils.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/hooks/useUtils.tsx
index 125cb5966..a983d3112 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/hooks/useUtils.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/hooks/useUtils.tsx
@@ -20,7 +20,14 @@ export const useWorkflowUtils = () => {
}) => {
const nodeLength = nodeList.filter((node) => {
if (node.flowNodeType === flowNodeType) {
- if (node.flowNodeType === FlowNodeTypeEnum.pluginModule) {
+ if (
+ [
+ FlowNodeTypeEnum.pluginModule,
+ FlowNodeTypeEnum.appModule,
+ FlowNodeTypeEnum.toolSet,
+ FlowNodeTypeEnum.tool
+ ].includes(flowNodeType)
+ ) {
return node.pluginId === pluginId;
} else {
return true;
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolSet.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolSet.tsx
index efd263456..86230a3f0 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolSet.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolSet.tsx
@@ -5,18 +5,17 @@ import NodeCard from './render/NodeCard';
import IOTitle from '../components/IOTitle';
import Container from '../components/Container';
import { useTranslation } from 'react-i18next';
-import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
import { Box, Flex } from '@chakra-ui/react';
const NodeToolSet = ({ data, selected }: NodeProps) => {
const { t } = useTranslation();
- const { inputs } = data;
- const toolList: McpToolConfigType[] = inputs[0]?.value?.toolList;
+ const { toolConfig } = data;
+ const toolList = toolConfig?.mcpToolSet?.toolList ?? toolConfig?.systemToolSet?.toolList ?? [];
return (
-
+
{toolList?.map((tool, index) => (
{
}, [nodeList, nodeId]);
const isAppNode = node && AppNodeFlowNodeTypeMap[node?.flowNodeType];
const showVersion = useMemo(() => {
- // 1. Team app/System commercial plugin
+ // 1. MCP tool set do not have version
+ if (isAppNode && node.toolConfig?.mcpToolSet) return false;
+ // 2. Team app/System commercial plugin
if (isAppNode && node?.pluginId && !node?.pluginData?.error) return true;
- // 2. System tool
- if (isAppNode && node.toolConfig) return true;
+ // 3. System tool
+ if (isAppNode && node?.toolConfig?.systemTool) return true;
return false;
}, [isAppNode, node]);
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/ValueTypeLabel.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/ValueTypeLabel.tsx
index 4a2b96916..ebe4fe21c 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/ValueTypeLabel.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/ValueTypeLabel.tsx
@@ -1,4 +1,5 @@
import { FlowValueTypeMap } from '@fastgpt/global/core/workflow/node/constant';
+import type { BoxProps } from '@chakra-ui/react';
import { Box } from '@chakra-ui/react';
import type { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
@@ -7,11 +8,12 @@ import { useTranslation } from 'next-i18next';
const ValueTypeLabel = ({
valueType,
- valueDesc
+ valueDesc,
+ ...props
}: {
valueType?: WorkflowIOValueTypeEnum;
valueDesc?: string;
-}) => {
+} & BoxProps) => {
const valueTypeData = valueType ? FlowValueTypeMap[valueType] : undefined;
const { t } = useTranslation();
const label = valueTypeData?.label || '';
@@ -30,6 +32,7 @@ const ValueTypeLabel = ({
display={'flex'}
alignItems={'center'}
fontSize={'11px'}
+ {...props}
>
{t(label as any)}
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/context/index.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/context/index.tsx
index 5787b9cb8..d99351255 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/context/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/context/index.tsx
@@ -59,6 +59,7 @@ import WorkflowStatusContextProvider from './workflowStatusContext';
import { type ChatItemType, type UserChatItemValueItemType } from '@fastgpt/global/core/chat/type';
import { type WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
import { FlowNodeOutputTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
+import { useChatStore } from '@/web/core/chat/context/useChatStore';
/*
Context
@@ -413,6 +414,8 @@ const WorkflowContextProvider = ({
const { t } = useTranslation();
const { toast } = useToast();
+ const { chatId } = useChatStore();
+
const appDetail = useContextSelector(AppContext, (v) => v.appDetail);
const setAppDetail = useContextSelector(AppContext, (v) => v.setAppDetail);
const appId = appDetail._id;
@@ -1091,7 +1094,7 @@ const WorkflowContextProvider = ({
return (
{children}
-
+
);
};
diff --git a/projects/app/src/pageComponents/app/detail/context.tsx b/projects/app/src/pageComponents/app/detail/context.tsx
index 4bbe40671..272a4c0af 100644
--- a/projects/app/src/pageComponents/app/detail/context.tsx
+++ b/projects/app/src/pageComponents/app/detail/context.tsx
@@ -186,7 +186,11 @@ const AppContextProvider = ({ children }: { children: ReactNode }) => {
return delAppById(appDetail._id);
},
{
- onSuccess() {
+ onSuccess(data) {
+ data.forEach((appId) => {
+ localStorage.removeItem(`app_log_keys_${appId}`);
+ });
+
router.replace(`/dashboard/apps`);
},
successToast: t('common:delete_success'),
diff --git a/projects/app/src/pageComponents/chat/ChatHeader.tsx b/projects/app/src/pageComponents/chat/ChatHeader.tsx
index cd48ccd73..8ac25e39b 100644
--- a/projects/app/src/pageComponents/chat/ChatHeader.tsx
+++ b/projects/app/src/pageComponents/chat/ChatHeader.tsx
@@ -23,6 +23,7 @@ import { getMyApps } from '@/web/core/app/api';
import SelectOneResource from '@/components/common/folder/SelectOneResource';
import { ChatItemContext } from '@/web/core/chat/context/chatItemContext';
import VariablePopover from '@/components/core/chat/ChatContainer/ChatBox/components/VariablePopover';
+import { useCopyData } from '@fastgpt/web/hooks/useCopyData';
const ChatHeader = ({
history,
@@ -59,6 +60,7 @@ const ChatHeader = ({
totalRecordsCount={totalRecordsCount}
title={chatData.title || t('common:core.chat.New Chat')}
chatModels={chatData.app.chatModels}
+ chatId={chatData.chatId || ''}
/>
@@ -261,19 +263,33 @@ const MobileHeader = ({
export const PcHeader = ({
title,
chatModels,
- totalRecordsCount
+ totalRecordsCount,
+ chatId
}: {
title: string;
chatModels?: string[];
totalRecordsCount: number;
+ chatId: string;
}) => {
const { t } = useTranslation();
+ const { copyData } = useCopyData();
return (
<>
-
- {title}
-
+
+ {
+ copyData(chatId);
+ }}
+ >
+ {title}
+
+
diff --git a/projects/app/src/pageComponents/dashboard/apps/List.tsx b/projects/app/src/pageComponents/dashboard/apps/List.tsx
index 895d05e59..3cac28d76 100644
--- a/projects/app/src/pageComponents/dashboard/apps/List.tsx
+++ b/projects/app/src/pageComponents/dashboard/apps/List.tsx
@@ -98,7 +98,10 @@ const ListItem = () => {
return delAppById(id);
},
{
- onSuccess() {
+ onSuccess(data) {
+ data.forEach((appId) => {
+ localStorage.removeItem(`app_log_keys_${appId}`);
+ });
loadMyApps();
},
successToast: t('common:delete_success'),
diff --git a/projects/app/src/pageComponents/login/RegisterForm.tsx b/projects/app/src/pageComponents/login/RegisterForm.tsx
index de9ba27af..7aa0c36d4 100644
--- a/projects/app/src/pageComponents/login/RegisterForm.tsx
+++ b/projects/app/src/pageComponents/login/RegisterForm.tsx
@@ -50,7 +50,7 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
});
const username = watch('username');
- const { SendCodeBox } = useSendCode({ type: 'register' });
+ const { SendCodeBox, openCodeAuthModal } = useSendCode({ type: 'register' });
const { runAsync: onclickRegister, loading: requesting } = useRequest2(
async ({ username, password, code }: RegisterType) => {
@@ -122,7 +122,7 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
{
- if (e.key === 'Enter' && !e.shiftKey && !requesting) {
+ if (!openCodeAuthModal && e.key === 'Enter' && !e.shiftKey && !requesting) {
handleSubmit(onclickRegister, onSubmitErr)();
}
}}
diff --git a/projects/app/src/pageComponents/login/index.tsx b/projects/app/src/pageComponents/login/index.tsx
index a88196a11..96832049e 100644
--- a/projects/app/src/pageComponents/login/index.tsx
+++ b/projects/app/src/pageComponents/login/index.tsx
@@ -242,7 +242,7 @@ export const LoginContainer = ({
/>
)}
-
+
{/* main content area */}
{pageType && DynamicComponent ? DynamicComponent : }
@@ -270,7 +270,7 @@ export const LoginContainer = ({
{t('common:support.user.login.can_not_login')}
)}
-
+
diff --git a/projects/app/src/pages/account/usage/index.tsx b/projects/app/src/pages/account/usage/index.tsx
index ba9800ce1..609f2d70c 100644
--- a/projects/app/src/pages/account/usage/index.tsx
+++ b/projects/app/src/pages/account/usage/index.tsx
@@ -111,12 +111,7 @@ const UsageTable = () => {
{t('common:user.Time')}
-
+
{/* {usageTab === UsageTabEnum.dashboard && (
bg={'myGray.50'}
@@ -146,7 +141,7 @@ const UsageTable = () => {
setSelectTmbIds(val as string[]);
}}
itemWrap={false}
- height={'32px'}
+ h={'32px'}
bg={'myGray.50'}
w={'160px'}
ScrollData={ScrollData}
diff --git a/projects/app/src/pages/api/core/ai/model/delete.ts b/projects/app/src/pages/api/core/ai/model/delete.ts
index 4f0c344db..66c613c56 100644
--- a/projects/app/src/pages/api/core/ai/model/delete.ts
+++ b/projects/app/src/pages/api/core/ai/model/delete.ts
@@ -3,8 +3,7 @@ import { NextAPI } from '@/service/middleware/entry';
import { MongoSystemModel } from '@fastgpt/service/core/ai/config/schema';
import { authSystemAdmin } from '@fastgpt/service/support/permission/user/auth';
import { findModelFromAlldata } from '@fastgpt/service/core/ai/model';
-import { updateFastGPTConfigBuffer } from '@fastgpt/service/common/system/config/controller';
-import { loadSystemModels, updatedReloadSystemModel } from '@fastgpt/service/core/ai/config/utils';
+import { updatedReloadSystemModel } from '@fastgpt/service/core/ai/config/utils';
export type deleteQuery = {
model: string;
diff --git a/projects/app/src/pages/api/core/ai/model/updateDefault.ts b/projects/app/src/pages/api/core/ai/model/updateDefault.ts
index d1e735aeb..74e754216 100644
--- a/projects/app/src/pages/api/core/ai/model/updateDefault.ts
+++ b/projects/app/src/pages/api/core/ai/model/updateDefault.ts
@@ -2,8 +2,7 @@ import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/nex
import { NextAPI } from '@/service/middleware/entry';
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
import { MongoSystemModel } from '@fastgpt/service/core/ai/config/schema';
-import { loadSystemModels, updatedReloadSystemModel } from '@fastgpt/service/core/ai/config/utils';
-import { updateFastGPTConfigBuffer } from '@fastgpt/service/common/system/config/controller';
+import { updatedReloadSystemModel } from '@fastgpt/service/core/ai/config/utils';
import type { ModelTypeEnum } from '@fastgpt/global/core/ai/model';
import { authSystemAdmin } from '@fastgpt/service/support/permission/user/auth';
diff --git a/projects/app/src/pages/api/core/app/del.ts b/projects/app/src/pages/api/core/app/del.ts
index 3d2db7e02..f99ac011b 100644
--- a/projects/app/src/pages/api/core/app/del.ts
+++ b/projects/app/src/pages/api/core/app/del.ts
@@ -8,7 +8,7 @@ import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
-async function handler(req: NextApiRequest, res: NextApiResponse) {
+async function handler(req: NextApiRequest, res: NextApiResponse) {
const { appId } = req.query as { appId: string };
if (!appId) {
@@ -23,7 +23,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
per: OwnerPermissionVal
});
- await onDelOneApp({
+ const deletedAppIds = await onDelOneApp({
teamId,
appId
});
@@ -42,6 +42,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
// Tracks
pushTrack.countAppNodes({ teamId, tmbId, uid: userId, appId });
+
+ return deletedAppIds;
}
export default NextAPI(handler);
diff --git a/projects/app/src/pages/api/core/app/detail.ts b/projects/app/src/pages/api/core/app/detail.ts
index f383fab9b..2d56ffc87 100644
--- a/projects/app/src/pages/api/core/app/detail.ts
+++ b/projects/app/src/pages/api/core/app/detail.ts
@@ -4,6 +4,7 @@ import { NextAPI } from '@/service/middleware/entry';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { rewriteAppWorkflowToDetail } from '@fastgpt/service/core/app/utils';
+import { getLocale } from '@fastgpt/service/common/middle/i18n';
/* 获取应用详情 */
async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -24,7 +25,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
nodes: app.modules,
teamId,
ownerTmbId: app.tmbId,
- isRoot
+ isRoot,
+ lang: getLocale(req)
});
if (!app.permission.hasWritePer) {
diff --git a/projects/app/src/pages/api/core/app/exportChatLogs.ts b/projects/app/src/pages/api/core/app/exportChatLogs.ts
index 360769ed1..d5ab5b7f8 100644
--- a/projects/app/src/pages/api/core/app/exportChatLogs.ts
+++ b/projects/app/src/pages/api/core/app/exportChatLogs.ts
@@ -37,8 +37,8 @@ async function handler(req: ApiRequestProps, res: NextAp
dateStart = addDays(new Date(), -7),
dateEnd = new Date(),
sources,
- logTitle,
-
+ tmbIds,
+ chatSearch,
title,
sourcesMap
} = req.body;
@@ -80,10 +80,12 @@ async function handler(req: ApiRequestProps, res: NextAp
$lte: new Date(dateEnd)
},
...(sources && { source: { $in: sources } }),
- ...(logTitle && {
+ ...(tmbIds && { tmbId: { $in: tmbIds } }),
+ ...(chatSearch && {
$or: [
- { title: { $regex: new RegExp(`${replaceRegChars(logTitle)}`, 'i') } },
- { customTitle: { $regex: new RegExp(`${replaceRegChars(logTitle)}`, 'i') } }
+ { chatId: { $regex: new RegExp(`${replaceRegChars(chatSearch)}`, 'i') } },
+ { title: { $regex: new RegExp(`${replaceRegChars(chatSearch)}`, 'i') } },
+ { customTitle: { $regex: new RegExp(`${replaceRegChars(chatSearch)}`, 'i') } }
]
})
};
diff --git a/projects/app/src/pages/api/core/app/getChatLogs.ts b/projects/app/src/pages/api/core/app/getChatLogs.ts
index 00396e684..24c75c715 100644
--- a/projects/app/src/pages/api/core/app/getChatLogs.ts
+++ b/projects/app/src/pages/api/core/app/getChatLogs.ts
@@ -12,10 +12,10 @@ import { readFromSecondary } from '@fastgpt/service/common/mongo/utils';
import { parsePaginationRequest } from '@fastgpt/service/common/api/pagination';
import { type PaginationResponse } from '@fastgpt/web/common/fetch/type';
import { addSourceMember } from '@fastgpt/service/support/user/utils';
-import { replaceRegChars } from '@fastgpt/global/common/string/tools';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
+import { replaceRegChars } from '@fastgpt/global/common/string/tools';
async function handler(
req: NextApiRequest,
@@ -26,7 +26,8 @@ async function handler(
dateStart = addDays(new Date(), -7),
dateEnd = new Date(),
sources,
- logTitle
+ tmbIds,
+ chatSearch
} = req.body as GetAppChatLogsParams;
const { pageSize = 20, offset } = parsePaginationRequest(req);
@@ -51,10 +52,12 @@ async function handler(
$lte: new Date(dateEnd)
},
...(sources && { source: { $in: sources } }),
- ...(logTitle && {
+ ...(tmbIds && { tmbId: { $in: tmbIds.map((item) => new Types.ObjectId(item)) } }),
+ ...(chatSearch && {
$or: [
- { title: { $regex: new RegExp(`${replaceRegChars(logTitle)}`, 'i') } },
- { customTitle: { $regex: new RegExp(`${replaceRegChars(logTitle)}`, 'i') } }
+ { chatId: { $regex: new RegExp(`${replaceRegChars(chatSearch)}`, 'i') } },
+ { title: { $regex: new RegExp(`${replaceRegChars(chatSearch)}`, 'i') } },
+ { customTitle: { $regex: new RegExp(`${replaceRegChars(chatSearch)}`, 'i') } }
]
})
};
@@ -123,6 +126,49 @@ async function handler(
0
]
}
+ },
+ totalResponseTime: {
+ $sum: {
+ $cond: [{ $eq: ['$obj', 'AI'] }, { $ifNull: ['$durationSeconds', 0] }, 0]
+ }
+ },
+ aiMessageCount: {
+ $sum: {
+ $cond: [{ $eq: ['$obj', 'AI'] }, 1, 0]
+ }
+ },
+ errorCount: {
+ $sum: {
+ $cond: [
+ {
+ $gt: [
+ {
+ $size: {
+ $filter: {
+ input: { $ifNull: ['$responseData', []] },
+ as: 'item',
+ cond: { $ne: [{ $ifNull: ['$$item.errorText', null] }, null] }
+ }
+ }
+ },
+ 0
+ ]
+ },
+ 1,
+ 0
+ ]
+ }
+ },
+ totalPoints: {
+ $sum: {
+ $reduce: {
+ input: { $ifNull: ['$responseData', []] },
+ initialValue: 0,
+ in: {
+ $add: ['$$value', { $ifNull: ['$$this.totalPoints', 0] }]
+ }
+ }
+ }
}
}
}
@@ -142,7 +188,23 @@ async function handler(
customFeedbacksCount: {
$ifNull: [{ $arrayElemAt: ['$chatItemsData.customFeedback', 0] }, 0]
},
- markCount: { $ifNull: [{ $arrayElemAt: ['$chatItemsData.adminMark', 0] }, 0] }
+ markCount: { $ifNull: [{ $arrayElemAt: ['$chatItemsData.adminMark', 0] }, 0] },
+ averageResponseTime: {
+ $cond: [
+ {
+ $gt: [{ $ifNull: [{ $arrayElemAt: ['$chatItemsData.aiMessageCount', 0] }, 0] }, 0]
+ },
+ {
+ $divide: [
+ { $ifNull: [{ $arrayElemAt: ['$chatItemsData.totalResponseTime', 0] }, 0] },
+ { $ifNull: [{ $arrayElemAt: ['$chatItemsData.aiMessageCount', 0] }, 1] }
+ ]
+ },
+ 0
+ ]
+ },
+ errorCount: { $ifNull: [{ $arrayElemAt: ['$chatItemsData.errorCount', 0] }, 0] },
+ totalPoints: { $ifNull: [{ $arrayElemAt: ['$chatItemsData.totalPoints', 0] }, 0] }
}
},
{
@@ -153,12 +215,16 @@ async function handler(
customTitle: 1,
source: 1,
sourceName: 1,
- time: '$updateTime',
+ updateTime: 1,
+ createTime: 1,
messageCount: 1,
userGoodFeedbackCount: 1,
userBadFeedbackCount: 1,
customFeedbacksCount: 1,
markCount: 1,
+ averageResponseTime: 1,
+ errorCount: 1,
+ totalPoints: 1,
outLinkUid: 1,
tmbId: 1
}
diff --git a/projects/app/src/pages/api/core/app/logs/getLogKeys.ts b/projects/app/src/pages/api/core/app/logs/getLogKeys.ts
new file mode 100644
index 000000000..f516fc27b
--- /dev/null
+++ b/projects/app/src/pages/api/core/app/logs/getLogKeys.ts
@@ -0,0 +1,36 @@
+import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
+import { NextAPI } from '@/service/middleware/entry';
+import { MongoAppLogKeys } from '@fastgpt/service/core/app/logs/logkeysSchema';
+import type { AppLogKeysSchemaType } from '@fastgpt/global/core/app/logs/type';
+import { authApp } from '@fastgpt/service/support/permission/app/auth';
+import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
+
+export type getLogKeysQuery = {
+ appId: string;
+};
+
+export type getLogKeysBody = {};
+
+export type getLogKeysResponse = {
+ logKeys: AppLogKeysSchemaType['logKeys'];
+};
+
+async function handler(
+ req: ApiRequestProps,
+ res: ApiResponseType
+): Promise {
+ const { appId } = req.query;
+
+ const { teamId } = await authApp({
+ req,
+ authToken: true,
+ appId,
+ per: WritePermissionVal
+ });
+
+ const result = await MongoAppLogKeys.findOne({ teamId, appId });
+
+ return { logKeys: result?.logKeys || [] };
+}
+
+export default NextAPI(handler);
diff --git a/projects/app/src/pages/api/core/app/logs/updateLogKeys.ts b/projects/app/src/pages/api/core/app/logs/updateLogKeys.ts
new file mode 100644
index 000000000..da2367990
--- /dev/null
+++ b/projects/app/src/pages/api/core/app/logs/updateLogKeys.ts
@@ -0,0 +1,34 @@
+import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
+import { NextAPI } from '@/service/middleware/entry';
+import { MongoAppLogKeys } from '@fastgpt/service/core/app/logs/logkeysSchema';
+import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
+import { authApp } from '@fastgpt/service/support/permission/app/auth';
+import type { AppLogKeysType } from '@fastgpt/global/core/app/logs/type';
+
+export type updateLogKeysQuery = {};
+
+export type updateLogKeysBody = {
+ appId: string;
+ logKeys: AppLogKeysType[];
+};
+
+export type updateLogKeysResponse = {};
+
+async function handler(
+ req: ApiRequestProps,
+ res: ApiResponseType
+): Promise {
+ const { appId, logKeys } = req.body;
+ const { teamId } = await authApp({
+ req,
+ authToken: true,
+ appId,
+ per: WritePermissionVal
+ });
+
+ await MongoAppLogKeys.findOneAndUpdate({ teamId, appId }, { logKeys }, { upsert: true });
+
+ return {};
+}
+
+export default NextAPI(handler);
diff --git a/projects/app/src/pages/api/core/app/mcpTools/create.ts b/projects/app/src/pages/api/core/app/mcpTools/create.ts
index 7b287f7a4..22d2ed00f 100644
--- a/projects/app/src/pages/api/core/app/mcpTools/create.ts
+++ b/projects/app/src/pages/api/core/app/mcpTools/create.ts
@@ -7,10 +7,7 @@ import { type CreateAppBody, onCreateApp } from '../create';
import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import {
- getMCPToolRuntimeNode,
- getMCPToolSetRuntimeNode
-} from '@fastgpt/global/core/app/mcpTools/utils';
+import { getMCPToolSetRuntimeNode } from '@fastgpt/global/core/app/mcpTools/utils';
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
@@ -58,32 +55,13 @@ async function handler(
toolList,
name,
avatar,
- headerSecret: formatedHeaderAuth
+ headerSecret: formatedHeaderAuth,
+ toolId: ''
})
],
session
});
- for (const tool of toolList) {
- await onCreateApp({
- name: tool.name,
- avatar,
- parentId: mcpToolsId,
- teamId,
- tmbId,
- type: AppTypeEnum.tool,
- intro: tool.description,
- modules: [
- getMCPToolRuntimeNode({
- tool,
- url,
- headerSecret: formatedHeaderAuth
- })
- ],
- session
- });
- }
-
return mcpToolsId;
});
diff --git a/projects/app/src/pages/api/core/app/mcpTools/getChildren.ts b/projects/app/src/pages/api/core/app/mcpTools/getChildren.ts
new file mode 100644
index 000000000..1e4c152bc
--- /dev/null
+++ b/projects/app/src/pages/api/core/app/mcpTools/getChildren.ts
@@ -0,0 +1,33 @@
+import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
+import { NextAPI } from '@/service/middleware/entry';
+import { MongoApp } from '@fastgpt/service/core/app/schema';
+import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
+import type { McpToolConfigType } from '@fastgpt/global/core/app/type';
+import { UserError } from '@fastgpt/global/common/error/utils';
+import { getMCPChildren } from '@fastgpt/service/core/app/mcp';
+
+export type McpGetChildrenmQuery = {
+ id: string;
+};
+export type McpGetChildrenmBody = {};
+export type McpGetChildrenmResponse = (McpToolConfigType & {
+ id: string;
+ avatar: string;
+})[];
+
+async function handler(
+ req: ApiRequestProps,
+ _res: ApiResponseType
+): Promise {
+ const { id } = req.query;
+
+ const app = await MongoApp.findOne({ _id: id }).lean();
+
+ if (!app) return Promise.reject(new UserError('No Mcp Toolset found'));
+
+ if (app.type !== AppTypeEnum.toolSet)
+ return Promise.reject(new UserError('the parent is not a mcp toolset'));
+
+ return getMCPChildren(app);
+}
+export default NextAPI(handler);
diff --git a/projects/app/src/pages/api/core/app/mcpTools/update.ts b/projects/app/src/pages/api/core/app/mcpTools/update.ts
index 89ecc3068..092c46b32 100644
--- a/projects/app/src/pages/api/core/app/mcpTools/update.ts
+++ b/projects/app/src/pages/api/core/app/mcpTools/update.ts
@@ -1,22 +1,12 @@
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
import { NextAPI } from '@/service/middleware/entry';
-import { type AppDetailType, type McpToolConfigType } from '@fastgpt/global/core/app/type';
+import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
import { authApp } from '@fastgpt/service/support/permission/app/auth';
import { ManagePermissionVal } from '@fastgpt/global/support/permission/constant';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
-import { isEqual } from 'lodash';
-import { type ClientSession } from 'mongoose';
import { MongoApp } from '@fastgpt/service/core/app/schema';
-import { onDelOneApp } from '@fastgpt/service/core/app/controller';
-import { onCreateApp } from '../create';
-import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import {
- getMCPToolRuntimeNode,
- getMCPToolSetRuntimeNode
-} from '@fastgpt/global/core/app/mcpTools/utils';
-import { type MCPToolSetData } from '@/pageComponents/dashboard/apps/MCPToolsEditModal';
+import { getMCPToolSetRuntimeNode } from '@fastgpt/global/core/app/mcpTools/utils';
import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
import { storeSecretValue } from '@fastgpt/service/common/secret/utils';
@@ -39,149 +29,40 @@ async function handler(
const { appId, url, toolList, headerSecret } = req.body;
const { app } = await authApp({ req, authToken: true, appId, per: ManagePermissionVal });
- const toolSetNode = app.modules.find((item) => item.flowNodeType === FlowNodeTypeEnum.toolSet);
- const toolSetData = toolSetNode?.inputs[0].value as MCPToolSetData;
-
const formatedHeaderAuth = storeSecretValue(headerSecret);
+ // create tool set node
+ const toolSetRuntimeNode = getMCPToolSetRuntimeNode({
+ url,
+ toolList,
+ headerSecret: formatedHeaderAuth,
+ name: app.name,
+ avatar: app.avatar,
+ toolId: ''
+ });
+
await mongoSessionRun(async (session) => {
- if (
- !isEqual(toolSetData, {
- url,
- toolList
- })
- ) {
- await updateMCPChildrenTool({
- parentApp: app,
- toolSetData: {
- url,
- toolList,
- headerSecret: formatedHeaderAuth
- },
- session
- });
- }
-
- // create tool set node
- const toolSetRuntimeNode = getMCPToolSetRuntimeNode({
- url,
- toolList,
- headerSecret: formatedHeaderAuth,
- name: app.name,
- avatar: app.avatar
- });
-
// update app and app version
- await Promise.all([
- MongoApp.updateOne(
- { _id: appId },
- {
- modules: [toolSetRuntimeNode],
- updateTime: new Date()
- },
- { session }
- ),
-
- MongoAppVersion.updateOne(
- { appId },
- {
- $set: {
- nodes: [toolSetRuntimeNode]
- }
- },
- { session }
- )
- ]);
+ await MongoApp.updateOne(
+ { _id: appId },
+ {
+ modules: [toolSetRuntimeNode],
+ updateTime: new Date()
+ },
+ { session }
+ );
+ await MongoAppVersion.updateOne(
+ { appId },
+ {
+ $set: {
+ nodes: [toolSetRuntimeNode]
+ }
+ },
+ { session }
+ );
});
return {};
}
export default NextAPI(handler);
-
-const updateMCPChildrenTool = async ({
- parentApp,
- toolSetData,
- session
-}: {
- parentApp: AppDetailType;
- toolSetData: {
- url: string;
- toolList: McpToolConfigType[];
- headerSecret: StoreSecretValueType;
- };
- session: ClientSession;
-}) => {
- const { teamId, tmbId } = parentApp;
- const dbTools = await MongoApp.find({
- parentId: parentApp._id,
- teamId
- });
-
- // 删除 DB 里有，新的工具列表里没有的工具
- for await (const tool of dbTools) {
- if (!toolSetData.toolList.find((t) => t.name === tool.name)) {
- await onDelOneApp({
- teamId,
- appId: tool._id,
- session
- });
- }
- }
-
- // 创建 DB 里没有，新的工具列表里有的工具
- for await (const tool of toolSetData.toolList) {
- if (!dbTools.find((t) => t.name === tool.name)) {
- await onCreateApp({
- name: tool.name,
- avatar: parentApp.avatar,
- parentId: parentApp._id,
- teamId,
- tmbId,
- type: AppTypeEnum.tool,
- intro: tool.description,
- modules: [
- getMCPToolRuntimeNode({
- tool,
- url: toolSetData.url,
- headerSecret: toolSetData.headerSecret
- })
- ],
- session
- });
- }
- }
-
- // 更新 DB 里有的工具
- for await (const tool of toolSetData.toolList) {
- const dbTool = dbTools.find((t) => t.name === tool.name);
- if (dbTool) {
- await MongoApp.updateOne(
- { _id: dbTool._id },
- {
- modules: [
- getMCPToolRuntimeNode({
- tool,
- url: toolSetData.url,
- headerSecret: toolSetData.headerSecret
- })
- ]
- },
- { session }
- );
- await MongoAppVersion.updateOne(
- { appId: dbTool._id },
- {
- nodes: [
- getMCPToolRuntimeNode({
- tool,
- url: toolSetData.url,
- headerSecret: toolSetData.headerSecret
- })
- ]
- },
- { session }
- );
- }
- }
-};
diff --git a/projects/app/src/pages/api/core/app/plugin/getPreviewNode.ts b/projects/app/src/pages/api/core/app/plugin/getPreviewNode.ts
index a0cbccbc2..9bb01cab1 100644
--- a/projects/app/src/pages/api/core/app/plugin/getPreviewNode.ts
+++ b/projects/app/src/pages/api/core/app/plugin/getPreviewNode.ts
@@ -3,16 +3,14 @@
*/
import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
-import {
- getChildAppPreviewNode,
- splitCombinePluginId
-} from '@fastgpt/service/core/app/plugin/controller';
+import { getChildAppPreviewNode } from '@fastgpt/service/core/app/plugin/controller';
import { type FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d';
import { NextAPI } from '@/service/middleware/entry';
import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { authApp } from '@fastgpt/service/support/permission/app/auth';
import type { NextApiResponse } from 'next';
import { getLocale } from '@fastgpt/service/common/middle/i18n';
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
export type GetPreviewNodeQuery = { appId: string; versionId?: string };
@@ -27,8 +25,7 @@ async function handler(
if (source === PluginSourceEnum.personal) {
await authApp({ req, authToken: true, appId: pluginId, per: ReadPermissionVal });
}
-
- return getChildAppPreviewNode({ appId: pluginId, versionId, lang: getLocale(req) });
+ return getChildAppPreviewNode({ appId, versionId, lang: getLocale(req) });
}
export default NextAPI(handler);
diff --git a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts
index 7b72ae76b..5e12dbad5 100644
--- a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts
+++ b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts
@@ -9,7 +9,7 @@ import { getLocale } from '@fastgpt/service/common/middle/i18n';
import { authCert } from '@fastgpt/service/support/permission/auth/common';
import type { NextApiResponse } from 'next';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
-import { getSystemPlugins } from '@fastgpt/service/core/app/plugin/controller';
+import { getSystemTools } from '@fastgpt/service/core/app/plugin/controller';
export type GetSystemPluginTemplatesBody = {
searchKey?: string;
@@ -25,7 +25,7 @@ async function handler(
const formatParentId = parentId || null;
const lang = getLocale(req);
- const plugins = await getSystemPlugins();
+ const plugins = await getSystemTools();
return plugins // Just show the active plugins
.filter((item) => item.isActive)
@@ -33,7 +33,7 @@ async function handler(
...plugin,
parentId: plugin.parentId === undefined ? null : plugin.parentId,
templateType: plugin.templateType ?? FlowNodeTemplateTypeEnum.other,
- flowNodeType: FlowNodeTypeEnum.tool,
+ flowNodeType: plugin.isFolder ? FlowNodeTypeEnum.toolSet : FlowNodeTypeEnum.tool,
name: parseI18nString(plugin.name, lang),
intro: parseI18nString(plugin.intro ?? '', lang)
}))
diff --git a/projects/app/src/pages/api/core/app/plugin/getVersionList.ts b/projects/app/src/pages/api/core/app/plugin/getVersionList.ts
index b774c3a47..2007fefdf 100644
--- a/projects/app/src/pages/api/core/app/plugin/getVersionList.ts
+++ b/projects/app/src/pages/api/core/app/plugin/getVersionList.ts
@@ -6,13 +6,12 @@ import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { authApp } from '@fastgpt/service/support/permission/app/auth';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
import { parsePaginationRequest } from '@fastgpt/service/common/api/pagination';
-import {
- getSystemPluginByIdAndVersionId,
- splitCombinePluginId
-} from '@fastgpt/service/core/app/plugin/controller';
+import { getSystemPluginByIdAndVersionId } from '@fastgpt/service/core/app/plugin/controller';
import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
import { PluginErrEnum } from '@fastgpt/global/common/error/code/plugin';
import { Types } from '@fastgpt/service/common/mongo';
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
+import { getMCPParentId } from '@fastgpt/global/core/app/mcpTools/utils';
export type getToolVersionListProps = PaginationProps<{
pluginId?: string;
@@ -36,6 +35,7 @@ async function handler(
list: []
};
}
+
const { source, pluginId: formatPluginId } = splitCombinePluginId(pluginId);
// System tool plugin
@@ -54,9 +54,10 @@ async function handler(
// Workflow plugin
const appId = await (async () => {
- if (source === PluginSourceEnum.personal) {
+ if (source === PluginSourceEnum.personal || source === PluginSourceEnum.mcp) {
+ const appId = getMCPParentId(formatPluginId);
const { app } = await authApp({
- appId: formatPluginId,
+ appId,
req,
per: ReadPermissionVal,
authToken: true
diff --git a/projects/app/src/pages/api/core/app/plugin/path.ts b/projects/app/src/pages/api/core/app/plugin/path.ts
index b61423bfb..082a8f445 100644
--- a/projects/app/src/pages/api/core/app/plugin/path.ts
+++ b/projects/app/src/pages/api/core/app/plugin/path.ts
@@ -6,7 +6,7 @@ import {
} from '@fastgpt/global/common/parentFolder/type';
import { parseI18nString } from '@fastgpt/global/common/i18n/utils';
import { getLocale } from '@fastgpt/service/common/middle/i18n';
-import { getSystemPlugins } from '@fastgpt/service/core/app/plugin/controller';
+import { getSystemTools } from '@fastgpt/service/core/app/plugin/controller';
export type pathQuery = GetPathProps;
@@ -23,7 +23,7 @@ async function handler(
if (!pluginId) return [];
- const plugins = await getSystemPlugins();
+ const plugins = await getSystemTools();
const plugin = plugins.find((item) => item.id === pluginId);
if (!plugin) return [];
diff --git a/projects/app/src/pages/api/support/mcp/client/getTools.ts b/projects/app/src/pages/api/support/mcp/client/getTools.ts
index 0b2371848..48eeda8fe 100644
--- a/projects/app/src/pages/api/support/mcp/client/getTools.ts
+++ b/projects/app/src/pages/api/support/mcp/client/getTools.ts
@@ -24,7 +24,8 @@ async function handler(
})
});
- return mcpClient.getTools();
+ const result = await mcpClient.getTools();
+ return result;
}
export default NextAPI(handler);
diff --git a/projects/app/src/pages/api/support/mcp/client/runTool.ts b/projects/app/src/pages/api/support/mcp/client/runTool.ts
index 3e4ccb9f4..bb94126ff 100644
--- a/projects/app/src/pages/api/support/mcp/client/runTool.ts
+++ b/projects/app/src/pages/api/support/mcp/client/runTool.ts
@@ -20,7 +20,6 @@ async function handler(
res: ApiResponseType
): Promise {
const { url, toolName, headerSecret, params } = req.body;
-
const mcpClient = new MCPClient({
url,
headers: getSecretValue({
diff --git a/projects/app/src/pages/api/support/user/team/plan/getTeamPlanStatus.ts b/projects/app/src/pages/api/support/user/team/plan/getTeamPlanStatus.ts
index 5004c5bcf..bd0afd446 100644
--- a/projects/app/src/pages/api/support/user/team/plan/getTeamPlanStatus.ts
+++ b/projects/app/src/pages/api/support/user/team/plan/getTeamPlanStatus.ts
@@ -33,7 +33,7 @@ async function handler(
MongoApp.countDocuments({
teamId,
type: {
- $in: [AppTypeEnum.simple, AppTypeEnum.workflow, AppTypeEnum.plugin, AppTypeEnum.tool]
+ $in: [AppTypeEnum.simple, AppTypeEnum.workflow, AppTypeEnum.plugin, AppTypeEnum.toolSet]
}
}),
MongoDataset.countDocuments({
diff --git a/projects/app/src/pages/dashboard/apps/index.tsx b/projects/app/src/pages/dashboard/apps/index.tsx
index dda87dbb8..d58fd2e1e 100644
--- a/projects/app/src/pages/dashboard/apps/index.tsx
+++ b/projects/app/src/pages/dashboard/apps/index.tsx
@@ -95,7 +95,11 @@ const MyApps = ({ MenuIcon }: { MenuIcon: JSX.Element }) => {
errorToast: 'Error'
});
const { runAsync: onDeleFolder } = useRequest2(delAppById, {
- onSuccess() {
+ onSuccess(data) {
+ data.forEach((appId) => {
+ localStorage.removeItem(`app_log_keys_${appId}`);
+ });
+
router.replace({
query: {
parentId: folderDetail?.parentId
diff --git a/projects/app/src/service/common/system/cron.ts b/projects/app/src/service/common/system/cron.ts
index c2c450c29..70127a395 100644
--- a/projects/app/src/service/common/system/cron.ts
+++ b/projects/app/src/service/common/system/cron.ts
@@ -13,6 +13,7 @@ import { addHours } from 'date-fns';
import { getScheduleTriggerApp } from '@/service/core/app/utils';
import { clearExpiredRawTextBufferCron } from '@fastgpt/service/common/buffer/rawText/controller';
import { clearExpiredDatasetImageCron } from '@fastgpt/service/core/dataset/image/controller';
+import { cronRefreshModels } from '@fastgpt/service/core/ai/config/utils';
// Try to run train every minute
const setTrainingQueueCron = () => {
@@ -88,4 +89,5 @@ export const startCron = () => {
scheduleTriggerAppCron();
clearExpiredRawTextBufferCron();
clearExpiredDatasetImageCron();
+ cronRefreshModels();
};
diff --git a/projects/app/src/types/app.d.ts b/projects/app/src/types/app.d.ts
index d24dbcc16..9669c4e29 100644
--- a/projects/app/src/types/app.d.ts
+++ b/projects/app/src/types/app.d.ts
@@ -38,7 +38,8 @@ export type AppLogsListItemType = {
_id: string;
id: string;
source: string;
- time: Date;
+ createTime: Date;
+ updateTime: Date;
title: string;
customTitle: string;
messageCount: number;
@@ -46,6 +47,9 @@ export type AppLogsListItemType = {
userBadFeedbackCount: number;
customFeedbacksCount: number;
markCount: number;
+ averageResponseTime: number;
+ errorCount: number;
+ totalPoints: number;
outLinkUid?: string;
tmbId: string;
sourceMember: SourceMember;
diff --git a/projects/app/src/web/core/app/api.ts b/projects/app/src/web/core/app/api.ts
index fabf8da4d..fa31ec5d2 100644
--- a/projects/app/src/web/core/app/api.ts
+++ b/projects/app/src/web/core/app/api.ts
@@ -1,11 +1,9 @@
import { GET, POST, DELETE, PUT } from '@/web/common/api/request';
import type { AppDetailType, AppListItemType } from '@fastgpt/global/core/app/type.d';
-import type { GetAppChatLogsParams } from '@/global/core/api/appReq.d';
import type { AppUpdateParams, AppChangeOwnerBody } from '@/global/core/app/api';
import type { CreateAppBody } from '@/pages/api/core/app/create';
import type { ListAppBody } from '@/pages/api/core/app/list';
-import type { AppLogsListItemType } from '@/types/app';
-import type { PaginationResponse } from '@fastgpt/web/common/fetch/type';
+
import type { getBasicInfoResponse } from '@/pages/api/core/app/getBasicInfo';
/**
@@ -25,7 +23,7 @@ export const getMyAppsByTags = (data: {}) => POST(`/proApi/core/chat/team/getApp
/**
* 根据 ID 删除应用
*/
-export const delAppById = (id: string) => DELETE(`/core/app/del?appId=${id}`);
+export const delAppById = (id: string) => DELETE(`/core/app/del?appId=${id}`);
/**
* 根据 ID 获取应用
@@ -44,10 +42,6 @@ export const putAppById = (id: string, data: AppUpdateParams) =>
export const getAppBasicInfoByIds = (ids: string[]) =>
POST(`/core/app/getBasicInfo`, { ids });
-// =================== chat logs
-export const getAppChatLogs = (data: GetAppChatLogsParams) =>
- POST>(`/core/app/getChatLogs`, data, { maxQuantity: 1 });
-
export const resumeInheritPer = (appId: string) =>
GET(`/core/app/resumeInheritPermission`, { appId });
diff --git a/projects/app/src/web/core/app/api/log.ts b/projects/app/src/web/core/app/api/log.ts
new file mode 100644
index 000000000..4ab3412f0
--- /dev/null
+++ b/projects/app/src/web/core/app/api/log.ts
@@ -0,0 +1,15 @@
+import type { getLogKeysQuery, getLogKeysResponse } from '@/pages/api/core/app/logs/getLogKeys';
+import type { updateLogKeysBody } from '@/pages/api/core/app/logs/updateLogKeys';
+import { GET, POST } from '@/web/common/api/request';
+import type { AppLogsListItemType } from '@/types/app';
+import type { PaginationResponse } from '@fastgpt/web/common/fetch/type';
+import type { GetAppChatLogsParams } from '@/global/core/api/appReq';
+
+export const updateLogKeys = (data: updateLogKeysBody) =>
+ POST('/core/app/logs/updateLogKeys', data);
+
+export const getLogKeys = (data: getLogKeysQuery) =>
+ GET('/core/app/logs/getLogKeys', data);
+
+export const getAppChatLogs = (data: GetAppChatLogsParams) =>
+ POST>(`/core/app/getChatLogs`, data, { maxQuantity: 1 });
diff --git a/projects/app/src/web/core/app/api/plugin.ts b/projects/app/src/web/core/app/api/plugin.ts
index 5359a65b1..703435017 100644
--- a/projects/app/src/web/core/app/api/plugin.ts
+++ b/projects/app/src/web/core/app/api/plugin.ts
@@ -5,7 +5,7 @@ import type {
FlowNodeTemplateType,
NodeTemplateListItemType
} from '@fastgpt/global/core/workflow/type/node';
-import { getMyApps } from '../api';
+import { getAppDetailById, getMyApps } from '../api';
import type { ListAppBody } from '@/pages/api/core/app/list';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
@@ -13,6 +13,7 @@ import type { GetPreviewNodeQuery } from '@/pages/api/core/app/plugin/getPreview
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import type {
GetPathProps,
+ ParentIdType,
ParentTreePathItemType
} from '@fastgpt/global/common/parentFolder/type';
import type { GetSystemPluginTemplatesBody } from '@/pages/api/core/app/plugin/getSystemPluginTemplates';
@@ -28,10 +29,26 @@ import type {
getToolVersionListProps,
getToolVersionResponse
} from '@/pages/api/core/app/plugin/getVersionList';
+import type { McpGetChildrenmResponse } from '@/pages/api/core/app/mcpTools/getChildren';
/* ============ team plugin ============== */
-export const getTeamPlugTemplates = (data?: ListAppBody) =>
- getMyApps(data).then((res) =>
+export const getTeamPlugTemplates = async (data?: {
+ parentId?: ParentIdType;
+ searchKey?: string;
+}) => {
+ if (data?.parentId) {
+ // handle get mcptools
+ const app = await getAppDetailById(data.parentId);
+ if (app.type === AppTypeEnum.toolSet) {
+ const children = await getMcpChildren(data.parentId);
+ return children.map((item) => ({
+ ...item,
+ flowNodeType: FlowNodeTypeEnum.tool,
+ templateType: FlowNodeTemplateTypeEnum.teamApp
+ }));
+ }
+ }
+ return getMyApps(data).then((res) =>
res.map((app) => ({
tmbId: app.tmbId,
id: app._id,
@@ -56,6 +73,7 @@ export const getTeamPlugTemplates = (data?: ListAppBody) =>
sourceMember: app.sourceMember
}))
);
+};
/* ============ system plugin ============== */
export const getSystemPlugTemplates = (data: GetSystemPluginTemplatesBody) =>
@@ -91,6 +109,9 @@ export const getMCPTools = (data: getMCPToolsBody) =>
export const postRunMCPTool = (data: RunMCPToolBody) =>
POST('/support/mcp/client/runTool', data, { timeout: 300000 });
+export const getMcpChildren = (id: string) =>
+ GET('/core/app/mcpTools/getChildren', { id });
+
/* ============ http plugin ============== */
export const postCreateHttpPlugin = (data: createHttpPluginBody) =>
POST('/core/app/httpPlugin/create', data);
diff --git a/projects/app/src/web/core/chat/context/chatItemContext.tsx b/projects/app/src/web/core/chat/context/chatItemContext.tsx
index d3b1fae89..2da897362 100644
--- a/projects/app/src/web/core/chat/context/chatItemContext.tsx
+++ b/projects/app/src/web/core/chat/context/chatItemContext.tsx
@@ -19,6 +19,7 @@ type ContextProps = {
showNodeStatus: boolean;
};
type ChatBoxDataType = {
+ chatId?: string;
appId: string;
title?: string;
userAvatar?: string;
diff --git a/projects/app/src/web/core/workflow/utils.ts b/projects/app/src/web/core/workflow/utils.ts
index bdd67c3ab..3a8550939 100644
--- a/projects/app/src/web/core/workflow/utils.ts
+++ b/projects/app/src/web/core/workflow/utils.ts
@@ -181,6 +181,11 @@ export const filterSensitiveNodesData = (nodes: StoreNodeItemType[]) => {
});
}
+ for (const input of node.inputs) {
+ if (input.key === NodeInputKeyEnum.systemInputConfig) {
+ input.value = undefined;
+ }
+ }
return node;
});
return cloneNodes;
diff --git a/projects/app/src/web/support/user/hooks/useSendCode.tsx b/projects/app/src/web/support/user/hooks/useSendCode.tsx
index 6e428df27..1035bf0a8 100644
--- a/projects/app/src/web/support/user/hooks/useSendCode.tsx
+++ b/projects/app/src/web/support/user/hooks/useSendCode.tsx
@@ -105,7 +105,8 @@ export const useSendCode = ({ type }: { type: `${UserAuthTypeEnum}` }) => {
sendCode,
sendCodeText,
codeCountDown,
- SendCodeBox
+ SendCodeBox,
+ openCodeAuthModal
};
};
diff --git a/test/cases/function/packages/global/common/string/textSplitter.test.ts b/test/cases/function/packages/global/common/string/textSplitter.test.ts
index ba01a3041..1f79a70bc 100644
--- a/test/cases/function/packages/global/common/string/textSplitter.test.ts
+++ b/test/cases/function/packages/global/common/string/textSplitter.test.ts
@@ -559,9 +559,8 @@ FastGPT AI 相关参数配置说明
it(`Test splitText2Chunks 9`, () => {
const mock = {
text: `测试的呀,第一个表格
-
| 序号 | 姓名 | 年龄 | 职业 | 城市 |
-|------|------|------|------|------|
+| --- | --- | --- | --- | --- |
| 1 | 张三 | 25 | 工程师 | 北京 |
| 2 | 李四 | 30 | 教师 | 上海 |
| 3 | 王五 | 28 | 医生 | 广州 |
@@ -600,7 +599,7 @@ it(`Test splitText2Chunks 9`, () => {
这是第二段了，第二表格
| 序号 | 姓名 | 年龄 | 职业 | 城市 |
-|------|------|------|------|------|
+| --- | --- | --- | --- | --- |
| 1 | 张三 | 25 | 工程师 | 北京 |
| 6 | 周八 | 32 | 会计 | 成都 |
| 2 | 李四 | 30 | 教师 | 上海 |
@@ -615,11 +614,10 @@ it(`Test splitText2Chunks 9`, () => {
| 10004 | 黄末 | 28 | 作家 | 厦门 |
| 10013 | 杨一 | 34 | 程序员 | 厦门 |
-
结束了
| 序号22 | 姓名 | 年龄 | 职业 | 城市 |
-|------|------|------|------|------|
+| --- | --- | --- | --- | --- |
| 1 | 张三 | 25 | 工程师 | 北京 |
| 2 | 李四 | 30 | 教师 | 上海 |
| 3 | 王五 | 28 | 医生 | 广州 |
@@ -636,7 +634,6 @@ it(`Test splitText2Chunks 9`, () => {
`,
result: [
`测试的呀,第一个表格
-
| 序号 | 姓名 | 年龄 | 职业 | 城市 |
| --- | --- | --- | --- | --- |
| 1 | 张三 | 25 | 工程师 | 北京 |
@@ -655,9 +652,7 @@ it(`Test splitText2Chunks 9`, () => {
| 1001 | 杨一 | 34 | 程序员 | 厦门 |
| 1002 | 杨二 | 34 | 程序员 | 厦门 |
| 1003 | 杨三 | 34 | 程序员 | 厦门 |`,
- `| 序号 | 姓名 | 年龄 | 职业 | 城市 |
-| --- | --- | --- | --- | --- |
-| 6 | 周八 | 32 | 会计 | 成都 |
+ `| 6 | 周八 | 32 | 会计 | 成都 |
| 1004 | 杨四 | 34 | 程序员 | 厦门 |
| 1005 | 杨五 | 34 | 程序员 | 厦门 |
| 1000 | 黄末 | 28 | 作家 | 厦门 |
@@ -670,15 +665,11 @@ it(`Test splitText2Chunks 9`, () => {
| 1002 | 杨二 | 34 | 程序员 | 厦门 |
| 1003 | 杨三 | 34 | 程序员 | 厦门 |
| 1004 | 杨四 | 34 | 程序员 | 厦门 |
-| 1005 | 杨五 | 34 | 程序员 | 厦门 |`,
- `| 序号 | 姓名 | 年龄 | 职业 | 城市 |
-| --- | --- | --- | --- | --- |
+| 1005 | 杨五 | 34 | 程序员 | 厦门 |
| 6 | 周八 | 32 | 会计 | 成都 |
| 1000 | 黄末 | 28 | 作家 | 厦门 |
-| 1000 | 黄末 | 28 | 作家 | 厦门 |
-| 1000 | 黄末 | 28 | 作家 | 厦门 |
-
-这是第二段了，第二表格
+| 1000 | 黄末 | 28 | 作家 | 厦门 |`,
+ `这是第二段了，第二表格
| 序号 | 姓名 | 年龄 | 职业 | 城市 |
| --- | --- | --- | --- | --- |
@@ -807,3 +798,154 @@ af da da fda a a`,
const { chunks } = splitText2Chunks({ text: mock.text, chunkSize: 2000, paragraphChunkDeep: 2 });
expect(chunks).toEqual(mock.result);
});
+
+// 表格合并测试
+it(`Test splitText2Chunks 13 - Table split with empty lastText`, () => {
+ const mock = {
+ text: `
+## 4.1、关键假设及盈利预测
+
+公司医药工业产品线按治疗领域分心血管类、补益类、清热类、妇科类和其他药品,商业分部包含自有产品销售,相应有分部间抵消,我们分别给予营收增速和毛利率假设, 如下:
+
+1)心脑血管类：心脑血管类为公司核心优势产品,产品包括安宫牛黄丸、牛黄清心丸、同仁堂大活络丸等,2021-2023 年心脑血管类产品营收增速逐年下滑, 毛利率受主要原材料牛黄和麝香价格涨幅较大影响,毛利率承压。我们分别假设 2024-2026 年,心脑血管类产品营收增速分别为 0%、8%和 10%,2025 年受消费上升带动开始恢复性增长,毛利率分别为 47%、50%和 52%,毛利率逐年提升,反映牛黄进口试点后,牛黄原料成本压力缓解。
+
+2)补益类：补益类是公司第二大产品线,包括六味地黄丸、五子衍宗丸等。 我们分别假设 2024-2026 年补益类产品营收年增长 8%、10%和 12%,毛利率均保持稳定为 37.5%。
+
+3)妇科类：妇科类产品包括乌鸡白凤丸、坤宝丸等,历年销售比较平稳。我们假设 2024-2026 年妇科类产品年增长 5%,毛利率维持稳定在 42%。
+
+4)清热类：清热类产品与流行性疾病相关,2023 年为流感大年,感冒清热类产品销售相对旺盛,基数较高。我们假设 2024-2026 年清热类产品年增长-15%、8% 和 10%, 2024 年负增长, 反映上 2023 年基数较高和 2024 年流行性疾病小年影响, 毛利率稳定为 35.0%。
+
+5)其他产品：我们假设 2024-2026 年其他中药品种营收年增长 5%、10%和 15%, 毛利率稳定保持 41%。
+
+6)医药商业：医药商业营收增长主要是旗下同仁堂商业零售门店带动, 2023-2024H1 门店新开显著提速,2024 年上半年新开 116 家门店。我们假设 2024-2026 年医药商业年均增长 9%,毛利率保持 31%水平不变。
+
+7)分部抵消：公司医药商业销售自产药品比例逐年提升,2023 年分部抵消 34.6 亿元,占医药工业营收 31.3%左右,我们假设 2024-2026 年,分部间抵消占医药工业营收分别为 33%、34%和 35%,毛利率为 -2%。
+
+
+
+表 4：同仁堂主营业务关键假设及营收拆分
+
+| 同仁堂经营拆分： | 单位 | 2021A | 2022A | 2023A | 2024E | 2025E | 2026E |
+| --- | --- | --- | --- | --- | --- | --- | --- |
+| 合并营业收入 | 亿元 | 146.03 | 153.72 | 178.61 | 187.68 | 203.30 | 222.68 |
+| 同比 | % | 13.86% | 5.27% | 16.19% | 5.08% | 8.33% | 9.53% |
+| 毛利率 | % | 47.62% | 48.80% | 47.29% | 44.53% | 45.50% | 46.46% |
+| | | | | | | | |
+| 分产品 | | | | | | | |
+| 一、医药工业分部 | 亿元 | 88.76 | 98.40 | 110.79 | 113.42 | 123.59 | 138.44 |
+| 同比 | % | 15.99% | 10.86% | 12.59% | 2.38% | 8.96% | 12.02% |
+| 毛利率 | % | 48.13% | 48.95% | 46.96% | 42.50% | 43.63% | 44.32% |
+| 分细分产品: | | | | | | | |
+| 1、母公司生产：心脑血管类(安宫、清心、大活络等) | 亿元 | 36.29 | 40.63 | 43.88 | 43.88 | 47.39 | 52.13 |
+| 同比 | % | 20.80% | 11.97% | 8.00% | 0.00% | 8.00% | 10.00% |
+| 毛利率 | $ \% $ | 59.96% | 61.20% | 57.62% | 47.00% | 50.00% | 52.00% |
+| | | | | | | | |
+| 2、补益类(六味、金匮、五子衍宗) | | 14.56 | 15.67 | 17.30 | 18.68 | 20.55 | 23.02 |
+| 同比 | % | 2.86% | 7.62% | 10.40% | 8.00% | 10.00% | 12.00% |
+| 毛利率 | $ \% $ | 42.45% | 43.00% | 37.39% | 37.50% | 37.50% | 37.50% |
+| | | | | | | | |
+| 3、妇科类(乌鸡白凤丸、坤宝丸) | | 3.80 | 3.48 | 3.77 | 3.96 | 4.15 | 4.36 |
+| 同比 | % | 23.83% | -8.38% | 8.28% | 5.00% | 5.00% | 5.00% |
+| 毛利率 | % | 40.16% | 38.12% | 42.38% | 42.00% | 42.00% | 42.00% |
+| | | | | | | | |
+| 4、清热类(感冒清热颗粒、牛黄解毒) | 亿元 | 5.24 | 5.29 | 6.14 | 5.22 | 5.64 | 6.20 |
+| 同比 | % | 5.19% | 0.86% | 16.07% | -15.00% | 8.00% | 10.00% |
+| 毛利率 | $ \% $ | 36.09% | 34.39% | 34.97% | 35.00% | 35.00% | 35.00% |
+| | | | | | | | |
+| 5、其他中药品种 | 亿元 | 28.87 | 33.33 | 39.70 | 41.69 | 45.85 | 52.73 |
+| 同比 | % | 18.90% | 15.45% | 19.11% | 5.00% | 10.00% | 15.00% |
+| 毛利率 | $ \% $ | 39.36% | 40.25% | 41.65% | 41.00% | 41.00% | 41.00% |
+| | | | | | | | |
+| 二、商业分部(同仁堂商业) | 亿元 | 82.41 | 84.80 | 102.5 | 111.7 | 121.7 | 132.7 |
+| 同比 | % | 12.64% | 2.90% | 20.83% | 9.00% | 9.00% | 9.00% |
+| 毛利率 | % | 31.51% | 30.95% | 31.11% | 31.00% | 31.00% | 31.00% |
+| | | | | | | | |
+| 三、分部间抵消 | 亿元 | -25.14 | (29.48) | (34.64) | (37.43) | (42.02) | (48.45) |
+| 同比 | % | 17.32% | 17.27% | 17.50% | 8.06% | 12.26% | 15.31% |
+| 毛利率 | % | -3.39% | -2.05% | -1.61% | -2.0% | -2.0% | -2.0% |
+| 分部抵消营收占工业比例 | % | 28.32% | 29.96% | 31.27% | 33.0% | 34.0% | 35.0% |
+
+资料来源：Wind, 诚通证券研究所
+
+
+
+综上,我们预测公司 2024-2026 年,营业收入分别为 187.7/203.3/222.7 亿元, 分别同比增 5.1%/8.3%/9.5%；归母净利润分别为 16.7/19.4/22.6 亿元,分别同比增 $ {0.3}\% /{15.8}\% /{16.7}\% $ ; 每股 EPS 分别为 1.22/1.41/1.65 元; 毛利率分别为 44.5%/45.5%/46.5%。`,
+ result: [
+ `## 4.1、关键假设及盈利预测
+
+公司医药工业产品线按治疗领域分心血管类、补益类、清热类、妇科类和其他药品,商业分部包含自有产品销售,相应有分部间抵消,我们分别给予营收增速和毛利率假设, 如下:
+
+1)心脑血管类：心脑血管类为公司核心优势产品,产品包括安宫牛黄丸、牛黄清心丸、同仁堂大活络丸等,2021-2023 年心脑血管类产品营收增速逐年下滑, 毛利率受主要原材料牛黄和麝香价格涨幅较大影响,毛利率承压。我们分别假设 2024-2026 年,心脑血管类产品营收增速分别为 0%、8%和 10%,2025 年受消费上升带动开始恢复性增长,毛利率分别为 47%、50%和 52%,毛利率逐年提升,反映牛黄进口试点后,牛黄原料成本压力缓解。
+
+2)补益类：补益类是公司第二大产品线,包括六味地黄丸、五子衍宗丸等。 我们分别假设 2024-2026 年补益类产品营收年增长 8%、10%和 12%,毛利率均保持稳定为 37.5%。
+
+3)妇科类：妇科类产品包括乌鸡白凤丸、坤宝丸等,历年销售比较平稳。我们假设 2024-2026 年妇科类产品年增长 5%,毛利率维持稳定在 42%。
+
+4)清热类：清热类产品与流行性疾病相关,2023 年为流感大年,感冒清热类产品销售相对旺盛,基数较高。我们假设 2024-2026 年清热类产品年增长-15%、8% 和 10%, 2024 年负增长, 反映上 2023 年基数较高和 2024 年流行性疾病小年影响, 毛利率稳定为 35.0%。
+
+5)其他产品：我们假设 2024-2026 年其他中药品种营收年增长 5%、10%和 15%, 毛利率稳定保持 41%。
+
+6)医药商业：医药商业营收增长主要是旗下同仁堂商业零售门店带动, 2023-2024H1 门店新开显著提速,2024 年上半年新开 116 家门店。我们假设 2024-2026 年医药商业年均增长 9%,毛利率保持 31%水平不变。
+
+7)分部抵消：公司医药商业销售自产药品比例逐年提升,2023 年分部抵消 34.6 亿元,占医药工业营收 31.3%左右,我们假设 2024-2026 年,分部间抵消占医药工业营收分别为 33%、34%和 35%,毛利率为 -2%。
+
+表 4：同仁堂主营业务关键假设及营收拆分`,
+
+ `## 4.1、关键假设及盈利预测
+| 同仁堂经营拆分： | 单位 | 2021A | 2022A | 2023A | 2024E | 2025E | 2026E |
+| --- | --- | --- | --- | --- | --- | --- | --- |
+| 合并营业收入 | 亿元 | 146.03 | 153.72 | 178.61 | 187.68 | 203.30 | 222.68 |
+| 同比 | % | 13.86% | 5.27% | 16.19% | 5.08% | 8.33% | 9.53% |
+| 毛利率 | % | 47.62% | 48.80% | 47.29% | 44.53% | 45.50% | 46.46% |
+| | | | | | | | |
+| 分产品 | | | | | | | |
+| 一、医药工业分部 | 亿元 | 88.76 | 98.40 | 110.79 | 113.42 | 123.59 | 138.44 |
+| 同比 | % | 15.99% | 10.86% | 12.59% | 2.38% | 8.96% | 12.02% |
+| 毛利率 | % | 48.13% | 48.95% | 46.96% | 42.50% | 43.63% | 44.32% |
+| 分细分产品: | | | | | | | |
+| 1、母公司生产：心脑血管类(安宫、清心、大活络等) | 亿元 | 36.29 | 40.63 | 43.88 | 43.88 | 47.39 | 52.13 |
+| 同比 | % | 20.80% | 11.97% | 8.00% | 0.00% | 8.00% | 10.00% |
+| 毛利率 | $ \% $ | 59.96% | 61.20% | 57.62% | 47.00% | 50.00% | 52.00% |
+| | | | | | | | |
+| 2、补益类(六味、金匮、五子衍宗) | | 14.56 | 15.67 | 17.30 | 18.68 | 20.55 | 23.02 |
+| 同比 | % | 2.86% | 7.62% | 10.40% | 8.00% | 10.00% | 12.00% |
+| 毛利率 | $ \% $ | 42.45% | 43.00% | 37.39% | 37.50% | 37.50% | 37.50% |
+| | | | | | | | |
+| 3、妇科类(乌鸡白凤丸、坤宝丸) | | 3.80 | 3.48 | 3.77 | 3.96 | 4.15 | 4.36 |
+| 同比 | % | 23.83% | -8.38% | 8.28% | 5.00% | 5.00% | 5.00% |
+| 毛利率 | % | 40.16% | 38.12% | 42.38% | 42.00% | 42.00% | 42.00% |
+| | | | | | | | |
+| 4、清热类(感冒清热颗粒、牛黄解毒) | 亿元 | 5.24 | 5.29 | 6.14 | 5.22 | 5.64 | 6.20 |
+| 同比 | % | 5.19% | 0.86% | 16.07% | -15.00% | 8.00% | 10.00% |
+| 毛利率 | $ \% $ | 36.09% | 34.39% | 34.97% | 35.00% | 35.00% | 35.00% |
+| | | | | | | | |
+| 5、其他中药品种 | 亿元 | 28.87 | 33.33 | 39.70 | 41.69 | 45.85 | 52.73 |
+| 同比 | % | 18.90% | 15.45% | 19.11% | 5.00% | 10.00% | 15.00% |`,
+
+ `## 4.1、关键假设及盈利预测
+| 同仁堂经营拆分： | 单位 | 2021A | 2022A | 2023A | 2024E | 2025E | 2026E |
+| --- | --- | --- | --- | --- | --- | --- | --- |
+| 毛利率 | $ \% $ | 39.36% | 40.25% | 41.65% | 41.00% | 41.00% | 41.00% |
+| | | | | | | | |
+| 二、商业分部(同仁堂商业) | 亿元 | 82.41 | 84.80 | 102.5 | 111.7 | 121.7 | 132.7 |
+| 同比 | % | 12.64% | 2.90% | 20.83% | 9.00% | 9.00% | 9.00% |
+| 毛利率 | % | 31.51% | 30.95% | 31.11% | 31.00% | 31.00% | 31.00% |
+| | | | | | | | |
+| 三、分部间抵消 | 亿元 | -25.14 | (29.48) | (34.64) | (37.43) | (42.02) | (48.45) |
+| 同比 | % | 17.32% | 17.27% | 17.50% | 8.06% | 12.26% | 15.31% |
+| 毛利率 | % | -3.39% | -2.05% | -1.61% | -2.0% | -2.0% | -2.0% |
+| 分部抵消营收占工业比例 | % | 28.32% | 29.96% | 31.27% | 33.0% | 34.0% | 35.0% |
+
+资料来源：Wind, 诚通证券研究所
+
+综上,我们预测公司 2024-2026 年,营业收入分别为 187.7/203.3/222.7 亿元, 分别同比增 5.1%/8.3%/9.5%；归母净利润分别为 16.7/19.4/22.6 亿元,分别同比增 $ {0.3}\% /{15.8}\% /{16.7}\% $ ; 每股 EPS 分别为 1.22/1.41/1.65 元; 毛利率分别为 44.5%/45.5%/46.5%。`
+ ]
+ };
+
+ const { chunks } = splitText2Chunks({
+ text: mock.text,
+ chunkSize: 1000
+ });
+
+ expect(chunks).toEqual(mock.result);
+});
diff --git a/test/cases/global/core/app/jsonschema.test.ts b/test/cases/global/core/app/jsonschema.test.ts
index e16e20fa2..6a4c3e90b 100644
--- a/test/cases/global/core/app/jsonschema.test.ts
+++ b/test/cases/global/core/app/jsonschema.test.ts
@@ -27,7 +27,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'string',
toolDescription: 'name',
required: true,
- renderTypeList: ['input']
+ renderTypeList: ['input', 'reference']
},
{
key: 'select',
@@ -54,7 +54,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'number',
toolDescription: 'age',
required: true,
- renderTypeList: ['numberInput'],
+ renderTypeList: ['numberInput', 'reference'],
max: 100,
min: 0
},
@@ -72,7 +72,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'object',
toolDescription: 'object',
required: false,
- renderTypeList: ['JSONEditor']
+ renderTypeList: ['JSONEditor', 'reference']
},
{
key: 'strArr',
@@ -80,7 +80,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'arrayString',
toolDescription: 'strArr',
required: false,
- renderTypeList: ['JSONEditor']
+ renderTypeList: ['JSONEditor', 'reference']
},
{
key: 'numArr',
@@ -88,7 +88,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'arrayNumber',
toolDescription: 'numArr',
required: false,
- renderTypeList: ['JSONEditor']
+ renderTypeList: ['JSONEditor', 'reference']
},
{
key: 'boolArr',
@@ -96,7 +96,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'arrayBoolean',
toolDescription: 'boolArr',
required: false,
- renderTypeList: ['JSONEditor']
+ renderTypeList: ['JSONEditor', 'reference']
},
{
key: 'objArr',
@@ -104,7 +104,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'arrayObject',
toolDescription: 'objArr',
required: false,
- renderTypeList: ['JSONEditor']
+ renderTypeList: ['JSONEditor', 'reference']
},
{
key: 'anyArr',
@@ -112,7 +112,7 @@ describe('jsonSchema2NodeInput', () => {
valueType: 'arrayAny',
toolDescription: 'anyArr',
required: false,
- renderTypeList: ['JSONEditor']
+ renderTypeList: ['JSONEditor', 'reference']
}
];
const result = jsonSchema2NodeInput(jsonSchema);
|