From fd437ff4c59d9aa9b1e0ba7a5c3a71ef852623dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=9E=E6=B3=95=E6=93=8D=E4=BD=9C?= Date: Fri, 25 Oct 2024 16:58:50 +0800 Subject: [PATCH] fix: segement settings of documents raise error (#8971) --- .../datasets/documents/detail/settings/index.tsx | 14 ++++++++------ web/models/datasets.ts | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/web/app/components/datasets/documents/detail/settings/index.tsx b/web/app/components/datasets/documents/detail/settings/index.tsx index def00ad37b..b264665458 100644 --- a/web/app/components/datasets/documents/detail/settings/index.tsx +++ b/web/app/components/datasets/documents/detail/settings/index.tsx @@ -5,7 +5,7 @@ import { useBoolean } from 'ahooks' import { useContext } from 'use-context-selector' import { useRouter } from 'next/navigation' import DatasetDetailContext from '@/context/dataset-detail' -import type { FullDocumentDetail } from '@/models/datasets' +import type { CrawlOptions, CustomFile, FullDocumentDetail } from '@/models/datasets' import type { MetadataType } from '@/service/datasets' import { fetchDocumentDetail } from '@/service/datasets' @@ -15,6 +15,7 @@ import AccountSetting from '@/app/components/header/account-setting' import AppUnavailable from '@/app/components/base/app-unavailable' import { useDefaultModel } from '@/app/components/header/account-setting/model-provider-page/hooks' import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations' +import type { NotionPage } from '@/models/common' type DocumentSettingsProps = { datasetId: string @@ -40,7 +41,7 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => { page_id: documentDetail?.data_source_info.notion_page_id, page_name: documentDetail?.name, page_icon: documentDetail?.data_source_info.notion_page_icon, - type: documentDetail?.data_source_info.type, + type: documentDetail?.data_source_type, } }, [documentDetail]) useEffect(() => { @@ -72,7 +73,7 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => { onSetting={showSetAPIKey} datasetId={datasetId} dataSourceType={documentDetail.data_source_type} - notionPages={[currentPage]} + notionPages={[currentPage as unknown as NotionPage]} websitePages={[ { title: documentDetail.name, @@ -81,12 +82,13 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => { description: '', }, ]} - fireCrawlJobId={documentDetail.data_source_info?.job_id} - crawlOptions={documentDetail.data_source_info} + websiteCrawlProvider={documentDetail.data_source_info?.provider} + websiteCrawlJobId={documentDetail.data_source_info?.job_id} + crawlOptions={documentDetail.data_source_info as unknown as CrawlOptions} indexingType={indexingTechnique || ''} isSetting documentDetail={documentDetail} - files={[documentDetail.data_source_info.upload_file]} + files={[documentDetail.data_source_info.upload_file as CustomFile]} onSave={saveHandler} onCancel={cancelHandler} /> diff --git a/web/models/datasets.ts b/web/models/datasets.ts index 1ecaa3e10b..95c7ce45de 100644 --- a/web/models/datasets.ts +++ b/web/models/datasets.ts @@ -1,4 +1,4 @@ -import type { DataSourceNotionPage } from './common' +import type { DataSourceNotionPage, DataSourceProvider } from './common' import type { AppIconType, AppMode, RetrievalConfig } from '@/types/app' import type { Tag } from '@/app/components/base/tag-management/constant' @@ -230,6 +230,9 @@ export type DataSourceInfo = { extension: string } notion_page_icon?: string + notion_workspace_id?: string + notion_page_id?: string + provider?: DataSourceProvider job_id: string url: string }