diff --git a/web/app/components/datasets/documents/create-from-pipeline/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/index.tsx index bd4122f49d..23952fcebd 100644 --- a/web/app/components/datasets/documents/create-from-pipeline/index.tsx +++ b/web/app/components/datasets/documents/create-from-pipeline/index.tsx @@ -23,6 +23,7 @@ import WebsitePreview from './preview/web-preview' import ProcessDocuments from './process-documents' import ChunkPreview from './preview/chunk-preview' import Processing from './processing' +import type { PublishedPipelineRunPreviewResponse } from '@/models/pipeline' import { DatasourceType } from '@/models/pipeline' import { TransferMethod } from '@/types/app' import { useAddDocumentsSteps, useLocalFile, useNotionsPages, useWebsiteCrawl } from './hooks' @@ -137,7 +138,7 @@ const CreateFormPipeline = () => { is_preview: true, }, { onSuccess: (res) => { - setEstimateData(res.data.outputs as FileIndexingEstimateResponse) + setEstimateData((res as PublishedPipelineRunPreviewResponse).data.outputs) }, }) }, [datasource, pipelineId, previewFile, previewNotionPage, previewWebsitePage, runPublishedPipeline, websiteCrawlJobId]) @@ -187,7 +188,8 @@ const CreateFormPipeline = () => { datasource_info_list: datasourceInfoList, is_preview: false, }, { - onSuccess: () => { + onSuccess: (res) => { + console.log('🚀 ~ handleProcess ~ res:', res) handleNextStep() }, }) @@ -332,8 +334,8 @@ const CreateFormPipeline = () => { files={fileList.map(file => file.file)} notionPages={notionPages} websitePages={websitePages} - isIdle={isIdle} - isPending={isPending} + isIdle={isIdle && isPreview.current} + isPending={isPending && isPreview.current} estimateData={estimateData} onPreview={onClickPreview} handlePreviewFileChange={handlePreviewFileChange} diff --git a/web/app/components/rag-pipeline/store/index.ts b/web/app/components/rag-pipeline/store/index.ts index c430f1fee0..cdda5b52f9 100644 --- a/web/app/components/rag-pipeline/store/index.ts +++ b/web/app/components/rag-pipeline/store/index.ts @@ -29,7 +29,7 @@ export const createRagPipelineSliceSlice: StateCreator = setRagPipelineVariables: (ragPipelineVariables: RAGPipelineVariables) => set(() => ({ ragPipelineVariables })), dataSourceList: [], setDataSourceList: (dataSourceList: DataSourceItem[]) => { - const formatedDataSourceList = dataSourceList.map(item => transformDataSourceToTool(item)) - set(() => ({ dataSourceList: formatedDataSourceList })) + const formattedDataSourceList = dataSourceList.map(item => transformDataSourceToTool(item)) + set(() => ({ dataSourceList: formattedDataSourceList })) }, }) diff --git a/web/models/pipeline.ts b/web/models/pipeline.ts index beccc8348e..5d08942055 100644 --- a/web/models/pipeline.ts +++ b/web/models/pipeline.ts @@ -1,6 +1,6 @@ import type { Edge, EnvironmentVariable, Node, SupportUploadFileTypes } from '@/app/components/workflow/types' import type { DSLImportMode, DSLImportStatus } from './app' -import type { ChunkingMode, DatasetPermission, IconInfo } from './datasets' +import type { ChunkingMode, DatasetPermission, FileIndexingEstimateResponse, IconInfo } from './datasets' import type { Dependency } from '@/app/components/plugins/types' import type { AppIconSelection } from '@/app/components/base/app-icon-picker' import type { Viewport } from 'reactflow' @@ -183,5 +183,14 @@ export type PublishedPipelineRunRequest = { start_node_id: string datasource_type: DatasourceType datasource_info_list: Array> - is_preview?: boolean + is_preview: boolean +} + +export type PublishedPipelineRunPreviewResponse = { + data: { + outputs: FileIndexingEstimateResponse + } +} + +export type PublishedPipelineRunResponse = { } diff --git a/web/service/use-pipeline.ts b/web/service/use-pipeline.ts index ca2c09e595..5ef35d30ed 100644 --- a/web/service/use-pipeline.ts +++ b/web/service/use-pipeline.ts @@ -16,7 +16,9 @@ import type { PipelineTemplateListParams, PipelineTemplateListResponse, PublishedPipelineInfoResponse, + PublishedPipelineRunPreviewResponse, PublishedPipelineRunRequest, + PublishedPipelineRunResponse, UpdateTemplateInfoRequest, UpdateTemplateInfoResponse, } from '@/models/pipeline' @@ -187,15 +189,16 @@ export const usePublishedPipelineInfo = (pipelineId: string) => { } export const useRunPublishedPipeline = ( - mutationOptions: MutationOptions = {}, + mutationOptions: MutationOptions = {}, ) => { return useMutation({ mutationKey: [NAME_SPACE, 'run-published-pipeline'], mutationFn: (request: PublishedPipelineRunRequest) => { - const { pipeline_id: pipelineId, ...rest } = request - return post(`/rag/pipelines/${pipelineId}/workflows/published/run`, { + const { pipeline_id: pipelineId, is_preview, ...rest } = request + return post(`/rag/pipelines/${pipelineId}/workflows/published/run`, { body: { ...rest, + is_preview, response_mode: 'blocking', }, })