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)
This commit is contained in:
chanx
2025-11-07 14:28:45 +08:00
committed by GitHub
parent b137de1def
commit edbc396bc6
13 changed files with 155 additions and 95 deletions

View File

@ -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;

View File

@ -107,9 +107,9 @@ export const getFileLogsTableColumns = (
meta: { cellClassName: 'max-w-[10vw]' },
cell: ({ row }) => (
<div className="text-text-primary">
{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')}
</div>

View File

@ -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: (
<div
className="text-sm text-text-secondary"
dangerouslySetInnerHTML={{
__html: t('dataflowParser.unlinkSourceModalContent'),
}}
></div>
),
onVisibleChange: () => {
Modal.hide();
},
footer: (
<div className="flex justify-end gap-2">
<Button variant={'outline'} onClick={() => Modal.hide()}>
{t('dataflowParser.changeStepModalCancelText')}
</Button>
<Button
variant={'secondary'}
className="!bg-state-error text-bg-base"
onClick={() => {
unbindFunc?.(props);
Modal.hide();
}}
>
{t('dataflowParser.unlinkSourceModalConfirmText')}
</Button>
</div>
),
});
};
return (
<div className="flex items-center justify-between gap-1 px-2 rounded-md border ">
<div className="flex items-center justify-between gap-1 px-2 h-10 rounded-md border group hover:bg-bg-card">
<div className="flex items-center gap-1">
<div className="w-6 h-6 flex-shrink-0">{icon}</div>
<div className="text-base text-text-primary">
{DataSourceInfo[source].name}
</div>
<div>{name}</div>
</div>
<div className="flex gap-1 items-center">
<div className="flex items-center">
<Tooltip>
<TooltipTrigger>
<Button
variant={'transparent'}
className="border-none hidden group-hover:block"
type="button"
onClick={() => {
handleRebuild({ source_id: id });
}}
>
{/* <Settings /> */}
<IconFontFill name="reparse" className="text-text-primary" />
</Button>
</TooltipTrigger>
<TooltipContent>
{t('knowledgeConfiguration.rebuildTip')}
</TooltipContent>
</Tooltip>
<Button
variant={'transparent'}
className="border-none"
className="border-none hidden group-hover:block"
type="button"
onClick={() => {
toDetail(id);
@ -93,7 +86,7 @@ const DataSourceItem = (props: DataSourceItemProps) => {
<Button
type="button"
variant={'transparent'}
className="border-none"
className="border-none hidden group-hover:block"
onClick={() => {
// openUnlinkModal();
delSourceModal({
@ -151,9 +144,12 @@ const LinkDataSource = (props: ILinkDataSourceProps) => {
return (
<div className="flex flex-col gap-2">
<section className="flex flex-col">
<div className="flex items-center gap-1 text-text-primary text-sm">
<div className="text-base font-medium text-text-primary">
{t('knowledgeConfiguration.dataSource')}
</div>
{/* <div className="flex items-center gap-1 text-text-primary text-sm">
{t('knowledgeConfiguration.dataSource')}
</div> */}
<div className="flex justify-between items-center">
<div className="text-center text-xs text-text-secondary">
{t('knowledgeConfiguration.linkSourceSetTip')}

View File

@ -219,9 +219,14 @@ export default function DatasetSettings() {
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6 ">
<div className="w-[768px] h-[calc(100vh-240px)] pr-1 overflow-y-auto scrollbar-auto">
<MainContainer className="text-text-secondary">
<div className="text-base font-medium text-text-primary">
{t('knowledgeConfiguration.baseInfo')}
</div>
<GeneralForm></GeneralForm>
<Divider />
<div className="text-base font-medium text-text-primary">
{t('knowledgeConfiguration.gobalIndex')}
</div>
<GraphRagItems
className="border-none p-0"
data={graphRagGenerateData as IGenerateLogButtonProps}
@ -235,6 +240,9 @@ export default function DatasetSettings() {
onDelete={() => handleDeletePipelineTask(GenerateType.Raptor)}
></RaptorFormFields>
<Divider />
<div className="text-base font-medium text-text-primary">
{t('knowledgeConfiguration.dataPipeline')}
</div>
<ParseTypeItem line={1} />
{parseType === 1 && (
<ChunkMethodItem line={1}></ChunkMethodItem>

View File

@ -66,7 +66,7 @@ const SourceDetailPage = () => {
render: (fieldProps: FormFieldConfig) => (
<div className="flex items-center gap-1 w-full relative">
<Input {...fieldProps} type={FormFieldType.Number} />
<span className="absolute right-0 -translate-x-12 text-text-secondary italic ">
<span className="absolute right-0 -translate-x-[58px] text-text-secondary italic ">
minutes
</span>
<button
@ -96,7 +96,7 @@ const SourceDetailPage = () => {
return (
<div className="flex items-center gap-1 w-full relative">
<Input {...fieldProps} type={FormFieldType.Number} />
<span className="absolute right-0 -translate-x-3 text-text-secondary italic ">
<span className="absolute right-0 -translate-x-6 text-text-secondary italic ">
hours
</span>
</div>
@ -111,7 +111,7 @@ const SourceDetailPage = () => {
render: (fieldProps: FormFieldConfig) => (
<div className="flex items-center gap-1 w-full relative">
<Input {...fieldProps} type={FormFieldType.Number} />
<span className="absolute right-0 -translate-x-3 text-text-secondary italic ">
<span className="absolute right-0 -translate-x-6 text-text-secondary italic ">
seconds
</span>
</div>
@ -183,7 +183,7 @@ const SourceDetailPage = () => {
</div>
<section className="flex flex-col gap-2 mt-6">
<div className="text-2xl text-text-primary">{t('setting.log')}</div>
<DataSourceLogsTable />
<DataSourceLogsTable refresh_freq={detail?.refresh_freq || false} />
</section>
</CardContent>
</Card>

View File

@ -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(
() => ({

View File

@ -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 };
};

View File

@ -58,7 +58,17 @@ const DataSource = () => {
icon,
}: IDataSorceInfo) => {
return (
<div className="p-[10px] border border-border-button rounded-lg relative group hover:bg-bg-card">
<div
className="p-[10px] border border-border-button rounded-lg relative group hover:bg-bg-card"
onClick={() =>
showAddingModal({
id,
name,
description,
icon,
})
}
>
<div className="flex gap-2">
<div className="w-6 h-6">{icon}</div>
<div className="flex flex-1 flex-col items-start gap-2">
@ -67,17 +77,7 @@ const DataSource = () => {
</div>
</div>
<div className=" absolute top-2 right-2">
<Button
onClick={() =>
showAddingModal({
id,
name,
description,
icon,
})
}
className=" rounded-md px-1 text-bg-base gap-1 bg-text-primary text-xs py-0 h-6 items-center hidden group-hover:flex"
>
<Button className=" rounded-md px-1 text-bg-base gap-1 bg-text-primary text-xs py-0 h-6 items-center hidden group-hover:flex">
<Plus size={12} />
{t('setting.add')}
</Button>