From edbc396bc61da648960c511d424194bb30628a12 Mon Sep 17 00:00:00 2001 From: chanx <1243304602@qq.com> Date: Fri, 7 Nov 2025 14:28:45 +0800 Subject: [PATCH] Fix: Added some prompts and polling functionality to retrieve data source logs. #10703 (#11103) ### What problem does this PR solve? Fix: Added some prompts and polling functionality to retrieve data source logs. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --- web/src/components/ui/input.tsx | 63 +++++++++------ web/src/locales/en.ts | 8 +- web/src/locales/zh.ts | 8 +- .../dataset/dataset-overview/interface.ts | 3 +- .../dataset-overview/overview-table.tsx | 4 +- .../components/link-data-source.tsx | 80 +++++++++---------- .../pages/dataset/dataset-setting/index.tsx | 10 ++- .../data-source-detail-page/index.tsx | 8 +- .../data-source-detail-page/log-table.tsx | 9 ++- .../pages/user-setting/data-source/hooks.ts | 27 ++++++- .../pages/user-setting/data-source/index.tsx | 24 +++--- web/src/services/data-source-service.ts | 5 +- web/src/utils/api.ts | 1 + 13 files changed, 155 insertions(+), 95 deletions(-) diff --git a/web/src/components/ui/input.tsx b/web/src/components/ui/input.tsx index c90235bb1..a8a0d2962 100644 --- a/web/src/components/ui/input.tsx +++ b/web/src/components/ui/input.tsx @@ -30,32 +30,47 @@ const Input = React.forwardRef( } }; return ( -
- - {type === 'password' && ( -
+ {type === 'password' && ( +
+ + +
+ )} + ); }, ); diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts index d5e77e637..b64dda2c9 100644 --- a/web/src/locales/en.ts +++ b/web/src/locales/en.ts @@ -274,6 +274,10 @@ export default { reRankModelWaring: 'Re-rank model is very time consuming.', }, knowledgeConfiguration: { + rebuildTip: + 'Re-downloads files from the linked data source and parses them again.', + baseInfo: 'Basic Info', + gobalIndex: 'Global Index', dataSource: 'Data Source', linkSourceSetTip: 'Manage data source linkage with this dataset', linkDataSource: 'Link Data Source', @@ -304,7 +308,7 @@ export default { dataFlowPlaceholder: 'Please select a pipeline.', buildItFromScratch: 'Build it from scratch', dataFlow: 'Pipeline', - parseType: 'Ingestion pipeline', + parseType: 'Parse Type', manualSetup: 'Choose pipeline', builtIn: 'Built-in', titleDescription: @@ -692,6 +696,8 @@ This auto-tagging feature enhances retrieval by adding another layer of domain-s newDocs: 'New Docs', timeStarted: 'Time started', log: 'Log', + confluenceDescription: + 'Integrate your Confluence workspace to search documentation.', s3Description: 'Connect to your AWS S3 bucket to import and sync stored files.', discordDescription: diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts index a28f17b4e..1b3dabd00 100644 --- a/web/src/locales/zh.ts +++ b/web/src/locales/zh.ts @@ -260,6 +260,9 @@ export default { theDocumentBeingParsedCannotBeDeleted: '正在解析的文档不能被删除', }, knowledgeConfiguration: { + rebuildTip: '从所有已关联的数据源重新下载文件并再次解析。', + baseInfo: '基础信息', + gobalIndex: '全局索引', dataSource: '数据源', linkSourceSetTip: '管理与此数据集的数据源链接', linkDataSource: '链接数据源', @@ -282,14 +285,14 @@ export default { eidtLinkDataPipeline: '编辑pipeline', linkPipelineSetTip: '管理与此数据集的数据管道链接', default: '默认', - dataPipeline: 'pipeline', + dataPipeline: 'Ingestion pipeline', linkDataPipeline: '关联pipeline', enableAutoGenerate: '是否启用自动生成', teamPlaceholder: '请选择团队', dataFlowPlaceholder: '请选择pipeline', buildItFromScratch: '去Scratch构建', dataFlow: 'pipeline', - parseType: 'Ingestion pipeline', + parseType: '解析方法', manualSetup: '选择pipeline', builtIn: '内置', titleDescription: '在这里更新您的知识库详细信息，尤其是切片方法。', @@ -683,6 +686,7 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于 newDocs: '新文档', timeStarted: '开始时间', log: '日志', + confluenceDescription: '连接你的 Confluence 工作区以搜索文档内容。', s3Description: ' 连接你的 AWS S3 存储桶以导入和同步文件。', discordDescription: ' 连接你的 Discord 服务器以访问和分析聊天数据。', notionDescription: ' 同步 Notion 页面与数据库，用于知识检索。', diff --git a/web/src/pages/dataset/dataset-overview/interface.ts b/web/src/pages/dataset/dataset-overview/interface.ts index 1a4e41342..72991e4ac 100644 --- a/web/src/pages/dataset/dataset-overview/interface.ts +++ b/web/src/pages/dataset/dataset-overview/interface.ts @@ -49,7 +49,8 @@ export interface IFileLogItem { process_duration: number; progress: number; progress_msg: string; - source_type: string; + source_type?: string; + source_from?: string; status: string; task_type: string; tenant_id: string; diff --git a/web/src/pages/dataset/dataset-overview/overview-table.tsx b/web/src/pages/dataset/dataset-overview/overview-table.tsx index 58391845c..05e9465b0 100644 --- a/web/src/pages/dataset/dataset-overview/overview-table.tsx +++ b/web/src/pages/dataset/dataset-overview/overview-table.tsx @@ -107,9 +107,9 @@ export const getFileLogsTableColumns = ( meta: { cellClassName: 'max-w-[10vw]' }, cell: ({ row }) => (
- {row.original.source_type + {row.original.source_from ? DataSourceInfo[ - row.original.source_type as keyof typeof DataSourceInfo + row.original.source_from as keyof typeof DataSourceInfo ].icon : t('localUpload')}
diff --git a/web/src/pages/dataset/dataset-setting/components/link-data-source.tsx b/web/src/pages/dataset/dataset-setting/components/link-data-source.tsx index 99526b2b1..4b7c87f79 100644 --- a/web/src/pages/dataset/dataset-setting/components/link-data-source.tsx +++ b/web/src/pages/dataset/dataset-setting/components/link-data-source.tsx @@ -1,9 +1,15 @@ +import { IconFontFill } from '@/components/icon-font'; import { Button } from '@/components/ui/button'; -import { Modal } from '@/components/ui/modal/modal'; +import { + Tooltip, + TooltipContent, + TooltipTrigger, +} from '@/components/ui/tooltip'; import { useNavigatePage } from '@/hooks/logic-hooks/navigate-hooks'; import { IConnector } from '@/interfaces/database/knowledge'; import { delSourceModal } from '@/pages/user-setting/data-source/component/delete-source-modal'; import { DataSourceInfo } from '@/pages/user-setting/data-source/contant'; +import { useDataSourceRebuild } from '@/pages/user-setting/data-source/hooks'; import { IDataSourceBase } from '@/pages/user-setting/data-source/interface'; import { Link, Settings, Unlink } from 'lucide-react'; import { useMemo, useState } from 'react'; @@ -27,58 +33,45 @@ interface DataSourceItemProps extends IDataSourceNodeProps { const DataSourceItem = (props: DataSourceItemProps) => { const { t } = useTranslation(); - const { id, name, icon, unbindFunc } = props; + const { id, name, icon, source, unbindFunc } = props; const { navigateToDataSourceDetail } = useNavigatePage(); + const { handleRebuild } = useDataSourceRebuild(); const toDetail = (id: string) => { navigateToDataSourceDetail(id); }; - const openUnlinkModal = () => { - Modal.show({ - visible: true, - className: '!w-[560px]', - title: t('dataflowParser.unlinkSourceModalTitle'), - children: ( -
- ), - onVisibleChange: () => { - Modal.hide(); - }, - footer: ( -
- - -
- ), - }); - }; return ( -
+
{icon}
+
+ {DataSourceInfo[source].name} +
{name}
-
+
+ + + + + + {t('knowledgeConfiguration.rebuildTip')} + +
{t('setting.log')}
- +
diff --git a/web/src/pages/user-setting/data-source/data-source-detail-page/log-table.tsx b/web/src/pages/user-setting/data-source/data-source-detail-page/log-table.tsx index 5ecd0e71d..82a4333aa 100644 --- a/web/src/pages/user-setting/data-source/data-source-detail-page/log-table.tsx +++ b/web/src/pages/user-setting/data-source/data-source-detail-page/log-table.tsx @@ -130,9 +130,14 @@ const columns = ({ // pageSize: 10, // total: 0, // }; -export const DataSourceLogsTable = () => { +export const DataSourceLogsTable = ({ + refresh_freq, +}: { + refresh_freq: number | false; +}) => { // const [pagination, setPagination] = useState(paginationInit); - const { data, pagination, setPagination } = useLogListDataSource(); + const { data, pagination, setPagination } = + useLogListDataSource(refresh_freq); const navigate = useNavigate(); const currentPagination = useMemo( () => ({ diff --git a/web/src/pages/user-setting/data-source/hooks.ts b/web/src/pages/user-setting/data-source/hooks.ts index 846d61724..966b2b8c4 100644 --- a/web/src/pages/user-setting/data-source/hooks.ts +++ b/web/src/pages/user-setting/data-source/hooks.ts @@ -2,6 +2,7 @@ import message from '@/components/ui/message'; import { useSetModalState } from '@/hooks/common-hooks'; import { useGetPaginationWithRouter } from '@/hooks/logic-hooks'; import dataSourceService, { + dataSourceRebuild, dataSourceResume, deleteDataSource, featchDataSourceDetail, @@ -10,7 +11,7 @@ import dataSourceService, { import { useQuery, useQueryClient } from '@tanstack/react-query'; import { t } from 'i18next'; import { useCallback, useMemo, useState } from 'react'; -import { useSearchParams } from 'umi'; +import { useParams, useSearchParams } from 'umi'; import { DataSourceInfo, DataSourceKey } from './contant'; import { IDataSorceInfo, IDataSource, IDataSourceBase } from './interface'; @@ -109,14 +110,15 @@ export const useAddDataSource = () => { }; }; -export const useLogListDataSource = () => { +export const useLogListDataSource = (refresh_freq: number | false) => { const { pagination, setPagination } = useGetPaginationWithRouter(); const [currentQueryParameters] = useSearchParams(); const id = currentQueryParameters.get('id'); const { data, isFetching } = useQuery<{ logs: IDataSource[]; total: number }>( { - queryKey: ['data-source-logs', id, pagination], + queryKey: ['data-source-logs', id, pagination, refresh_freq], + refetchInterval: refresh_freq ? refresh_freq * 60 * 1000 : false, queryFn: async () => { const { data } = await getDataSourceLogs(id as string, { page_size: pagination.pageSize, @@ -186,3 +188,22 @@ export const useDataSourceResume = () => { ); return { handleResume }; }; + +export const useDataSourceRebuild = () => { + const { id } = useParams(); + // const [currentQueryParameters] = useSearchParams(); + // const id = currentQueryParameters.get('id'); + const handleRebuild = useCallback( + async (param: { source_id: string }) => { + const { data } = await dataSourceRebuild(param.source_id as string, { + kb_id: id as string, + }); + if (data.code === 0) { + // queryClient.invalidateQueries({ queryKey: ['data-source-detail', id] }); + message.success(t(`message.operated`)); + } + }, + [id], + ); + return { handleRebuild }; +}; diff --git a/web/src/pages/user-setting/data-source/index.tsx b/web/src/pages/user-setting/data-source/index.tsx index c945640e2..815edd2b9 100644 --- a/web/src/pages/user-setting/data-source/index.tsx +++ b/web/src/pages/user-setting/data-source/index.tsx @@ -58,7 +58,17 @@ const DataSource = () => { icon, }: IDataSorceInfo) => { return ( -
+
+ showAddingModal({ + id, + name, + description, + icon, + }) + } + >
{icon}
@@ -67,17 +77,7 @@ const DataSource = () => {
- diff --git a/web/src/services/data-source-service.ts b/web/src/services/data-source-service.ts index 23fc68b9f..6433233e1 100644 --- a/web/src/services/data-source-service.ts +++ b/web/src/services/data-source-service.ts @@ -21,10 +21,13 @@ const dataSourceService = registerServer( export const deleteDataSource = (id: string) => request.post(api.dataSourceDel(id)); export const dataSourceResume = (id: string, data: { resume: boolean }) => { - console.log('api.dataSourceResume(id)', data); return request.put(api.dataSourceResume(id), { data }); }; +export const dataSourceRebuild = (id: string, data: { kb_id: string }) => { + return request.put(api.dataSourceRebuild(id), { data }); +}; + export const getDataSourceLogs = (id: string, params?: any) => request.get(api.dataSourceLogs(id), { params }); export const featchDataSourceDetail = (id: string) => diff --git a/web/src/utils/api.ts b/web/src/utils/api.ts index 8e8f8f5d3..cb4e238da 100644 --- a/web/src/utils/api.ts +++ b/web/src/utils/api.ts @@ -39,6 +39,7 @@ export default { dataSourceList: `${api_host}/connector/list`, dataSourceDel: (id: string) => `${api_host}/connector/${id}/rm`, dataSourceResume: (id: string) => `${api_host}/connector/${id}/resume`, + dataSourceRebuild: (id: string) => `${api_host}/connector/${id}/rebuild`, dataSourceLogs: (id: string) => `${api_host}/connector/${id}/logs`, dataSourceDetail: (id: string) => `${api_host}/connector/${id}`,