浏览代码

refactor: update dataset handling to use runtime_mode instead of pipeline_id

tags/2.0.0-beta.1
twwu 4 个月前
父节点
当前提交
6f17200dec

+ 3
- 3
web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx 查看文件

return true return true
if (datasetRes.provider === 'external') if (datasetRes.provider === 'external')
return false return false
if (!datasetRes.pipeline_id)
if (datasetRes.runtime_mode === 'general')
return false return false
return !datasetRes.is_published return !datasetRes.is_published
}, [datasetRes]) }, [datasetRes])
] ]


if (datasetRes?.provider !== 'external') { if (datasetRes?.provider !== 'external') {
if (datasetRes?.pipeline_id) {
if (datasetRes?.runtime_mode === 'rag_pipeline') {
baseNavigation.unshift({ baseNavigation.unshift({
name: t('common.datasetMenus.pipeline'), name: t('common.datasetMenus.pipeline'),
href: `/datasets/${datasetId}/pipeline`, href: `/datasets/${datasetId}/pipeline`,
} }


return baseNavigation return baseNavigation
}, [t, datasetId, isButtonDisabledWithPipeline, datasetRes?.provider, datasetRes?.pipeline_id])
}, [t, datasetId, isButtonDisabledWithPipeline, datasetRes?.provider, datasetRes?.runtime_mode])


useDocumentTitle(datasetRes?.name || t('common.menus.datasets')) useDocumentTitle(datasetRes?.name || t('common.menus.datasets'))



+ 3
- 2
web/app/components/datasets/documents/detail/settings/index.tsx 查看文件

datasetId, datasetId,
documentId, documentId,
}: SettingsProps) => { }: SettingsProps) => {
const pipelineId = useDatasetDetailContextWithSelector(s => s.dataset?.pipeline_id)
const runtimeMode = useDatasetDetailContextWithSelector(s => s.dataset?.runtime_mode)
const isGeneralDataset = runtimeMode === 'general'


if (!pipelineId) {
if (isGeneralDataset) {
return ( return (
<DocumentSettings <DocumentSettings
datasetId={datasetId} datasetId={datasetId}

+ 1
- 1
web/app/components/datasets/documents/index.tsx 查看文件



const routeToDocCreate = () => { const routeToDocCreate = () => {
// if dataset is create from pipeline, redirect to create from pipeline page // if dataset is create from pipeline, redirect to create from pipeline page
if (dataset?.pipeline_id) {
if (dataset?.runtime_mode === 'rag_pipeline') {
router.push(`/datasets/${datasetId}/documents/create-from-pipeline`) router.push(`/datasets/${datasetId}/documents/create-from-pipeline`)
return return
} }

+ 2
- 2
web/app/components/datasets/list/dataset-card/index.tsx 查看文件

return dataset.provider === EXTERNAL_PROVIDER return dataset.provider === EXTERNAL_PROVIDER
}, [dataset.provider]) }, [dataset.provider])
const isPipelineUnpublished = useMemo(() => { const isPipelineUnpublished = useMemo(() => {
return !!dataset.pipeline_id && !dataset.is_published
}, [dataset.pipeline_id, dataset.is_published])
return dataset.runtime_mode === 'rag_pipeline' && !dataset.is_published
}, [dataset.runtime_mode, dataset.is_published])
const chunkingModeIcon = dataset.doc_form ? DOC_FORM_ICON_WITH_BG[dataset.doc_form] : React.Fragment const chunkingModeIcon = dataset.doc_form ? DOC_FORM_ICON_WITH_BG[dataset.doc_form] : React.Fragment
const Icon = isExternalProvider ? DOC_FORM_ICON_WITH_BG.external : chunkingModeIcon const Icon = isExternalProvider ? DOC_FORM_ICON_WITH_BG.external : chunkingModeIcon
const iconInfo = dataset.icon_info || { const iconInfo = dataset.icon_info || {

+ 1
- 1
web/app/components/rag-pipeline/components/panel/test-run/data-source/online-documents/online-document-selector.tsx 查看文件

datasource_type: DatasourceType.onlineDocument, datasource_type: DatasourceType.onlineDocument,
}, { }, {
onSuccess(documentsData) { onSuccess(documentsData) {
setDocumentsData(documentsData as DataSourceNotionWorkspace[])
setDocumentsData(documentsData.result as DataSourceNotionWorkspace[])
}, },
}) })
} }

+ 1
- 0
web/models/datasets.ts 查看文件

keyword_number?: number keyword_number?: number
pipeline_id?: string pipeline_id?: string
is_published?: boolean // Indicates if the pipeline is published is_published?: boolean // Indicates if the pipeline is published
runtime_mode: 'rag_pipeline' | 'general'
} }


export type ExternalAPIItem = { export type ExternalAPIItem = {

+ 1
- 1
web/models/pipeline.ts 查看文件

export type PipelineDatasourceNodeRunResponse = { export type PipelineDatasourceNodeRunResponse = {
job_id?: string job_id?: string
status: 'processing' | 'completed' status: 'processing' | 'completed'
result: Record<string, any>
result: any
provider_type: DatasourceType provider_type: DatasourceType
} }



正在加载...
取消
保存