diff --git a/web/src/interfaces/database/knowledge.ts b/web/src/interfaces/database/knowledge.ts index d768d8e5e..b6939d1c4 100644 --- a/web/src/interfaces/database/knowledge.ts +++ b/web/src/interfaces/database/knowledge.ts @@ -33,6 +33,8 @@ export interface IKnowledge { raptor_task_id?: string; mindmap_task_finish_at?: string; mindmap_task_id?: string; + graphrag_task_finish_at: string; + graphrag_task_id: string; } export interface IKnowledgeResult { diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts index 76081af84..549dd5dfb 100644 --- a/web/src/locales/en.ts +++ b/web/src/locales/en.ts @@ -96,17 +96,18 @@ export default { description: 'Which knowledge bases will you use today?', createKnowledgeBase: 'Create Dataset', name: 'Name', - namePlaceholder: 'Please input name!', + namePlaceholder: 'Please input name.', doc: 'Docs', searchKnowledgePlaceholder: 'Search', noMoreData: `That's all. Nothing more.`, }, knowledgeDetails: { + localUpload: 'Local Upload', fileSize: 'File Size', fileType: 'File Type', uploadedBy: 'Uploaded by', notGenerated: 'Not generated', - generatedOn: 'Generated on', + generatedOn: 'Generated on ', subbarFiles: 'Files', generateKnowledgeGraph: 'This will extract entities and relationships from all your documents in this dataset. The process may take a while to complete.', diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts index 97291de81..d13f3db6c 100644 --- a/web/src/locales/zh.ts +++ b/web/src/locales/zh.ts @@ -94,6 +94,7 @@ export default { noMoreData: '没有更多数据了', }, knowledgeDetails: { + localUpload: '本地上传', fileSize: '文件大小', fileType: '文件类型', uploadedBy: '创建者', diff --git a/web/src/pages/dataflow-result/index.tsx b/web/src/pages/dataflow-result/index.tsx index 9da4a910e..a2d2fe913 100644 --- a/web/src/pages/dataflow-result/index.tsx +++ b/web/src/pages/dataflow-result/index.tsx @@ -187,7 +187,9 @@ const Chunk = () => { - {documentInfo?.name} + + {knowledgeId ? documentInfo?.name : t('dataflow.viewResult')} + diff --git a/web/src/pages/dataset/dataset-overview/overview-table.tsx b/web/src/pages/dataset/dataset-overview/overview-table.tsx index 993d39dbf..677d3ea92 100644 --- a/web/src/pages/dataset/dataset-overview/overview-table.tsx +++ b/web/src/pages/dataset/dataset-overview/overview-table.tsx @@ -94,7 +94,9 @@ export const getFileLogsTableColumns = ( accessorKey: 'source_from', header: t('source'), cell: ({ row }) => ( -
{row.original.source_from}
+
+ {row.original.source_from || t('localUpload')} +
), }, { diff --git a/web/src/pages/dataset/dataset-setting/index.tsx b/web/src/pages/dataset/dataset-setting/index.tsx index c13fcb6b1..25d8fd7ea 100644 --- a/web/src/pages/dataset/dataset-setting/index.tsx +++ b/web/src/pages/dataset/dataset-setting/index.tsx @@ -95,8 +95,8 @@ export default function DatasetSettings() { }; setPipelineData(data); setGraphRagGenerateData({ - finish_at: knowledgeDetails.mindmap_task_finish_at, - task_id: knowledgeDetails.mindmap_task_id, + finish_at: knowledgeDetails.graphrag_task_finish_at, + task_id: knowledgeDetails.graphrag_task_id, } as IGenerateLogButtonProps); setRaptorGenerateData({ finish_at: knowledgeDetails.raptor_task_finish_at, diff --git a/web/src/pages/dataset/dataset/generate-button/generate.tsx b/web/src/pages/dataset/dataset/generate-button/generate.tsx index b9d16e016..a488966cf 100644 --- a/web/src/pages/dataset/dataset/generate-button/generate.tsx +++ b/web/src/pages/dataset/dataset/generate-button/generate.tsx @@ -116,7 +116,8 @@ const MenuItem: React.FC<{ /> {t(`knowledgeDetails.${lowerFirst(type)}`)} - {status === generateStatus.start && ( + {(status === generateStatus.start || + status === generateStatus.completed) && (
{t(`knowledgeDetails.generate${type}`)}
@@ -165,9 +166,12 @@ const MenuItem: React.FC<{ )} )} -
- {replaceText(data?.progress_msg || '')} -
+ {status !== generateStatus.start && + status !== generateStatus.completed && ( +
+ {replaceText(data?.progress_msg || '')} +
+ )} ); diff --git a/web/src/pages/dataset/dataset/parsing-status-cell.tsx b/web/src/pages/dataset/dataset/parsing-status-cell.tsx index b029ceed7..102b6db54 100644 --- a/web/src/pages/dataset/dataset/parsing-status-cell.tsx +++ b/web/src/pages/dataset/dataset/parsing-status-cell.tsx @@ -1,6 +1,5 @@ import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog'; import { IconFontFill } from '@/components/icon-font'; -import { Button } from '@/components/ui/button'; import { DropdownMenu, DropdownMenuContent, @@ -9,6 +8,11 @@ import { } from '@/components/ui/dropdown-menu'; import { Progress } from '@/components/ui/progress'; import { Separator } from '@/components/ui/separator'; +import { + Tooltip, + TooltipContent, + TooltipTrigger, +} from '@/components/ui/tooltip'; import { IDocumentInfo } from '@/interfaces/database/document'; import { CircleX } from 'lucide-react'; import { useCallback, useMemo } from 'react'; @@ -86,16 +90,29 @@ export function ParsingStatusCell({ }; return (
-
+
- - + + + +
+ {pipeline_id + ? pipeline_name || pipeline_id + : parser_id === 'naive' + ? 'general' + : parser_id} +
+
+ +

+ {pipeline_id + ? pipeline_name || pipeline_id + : parser_id === 'naive' + ? 'general' + : parser_id} +

+
+
@@ -107,6 +124,7 @@ export function ParsingStatusCell({
+ {showParse && (