test/dify
1
0
Fork 0
mirror of https://gitee.com/dify_ai/dify.git synced 2024-12-03 11:48:08 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: leave progress page still call indexing-status api (#3345)

Browse Source
This commit is contained in:
Joel 2024-04-11 15:38:38 +08:00 committed by GitHub
parent 0a7ea9d206
commit b98e363a5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
web/app/components/datasets/create/embedding-process/index.tsx
View File

@ -1,11 +1,10 @@
import type { FC } from 'react' import type { FC } from 'react'
import React, { useCallback, useEffect, useMemo } from 'react' import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import useSWR from 'swr' import useSWR from 'swr'
import { useRouter } from 'next/navigation' import { useRouter } from 'next/navigation'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { omit } from 'lodash-es' import { omit } from 'lodash-es'
import { ArrowRightIcon } from '@heroicons/react/24/solid' import { ArrowRightIcon } from '@heroicons/react/24/solid'
import { useGetState } from 'ahooks'
import cn from 'classnames' import cn from 'classnames'
import s from './index.module.css' import s from './index.module.css'
import { FieldInfo } from '@/app/components/datasets/documents/detail/metadata' import { FieldInfo } from '@/app/components/datasets/documents/detail/metadata'
@ -89,27 +88,35 @@ const EmbeddingProcess: FC<Props> = ({ datasetId, batchId, documents = [], index
const getFirstDocument = documents[0] const getFirstDocument = documents[0]
const [indexingStatusBatchDetail, setIndexingStatusDetail, getIndexingStatusDetail] = useGetState<IndexingStatusResponse[]>([]) const [indexingStatusBatchDetail, setIndexingStatusDetail] = useState<IndexingStatusResponse[]>([])
const fetchIndexingStatus = async () => { const fetchIndexingStatus = async () => {
const status = await doFetchIndexingStatus({ datasetId, batchId }) const status = await doFetchIndexingStatus({ datasetId, batchId })
setIndexingStatusDetail(status.data) setIndexingStatusDetail(status.data)
return status.data
} }
const [_, setRunId, getRunId] = useGetState<ReturnType<typeof setInterval>>() // const [_, setRunId, getRunId] = useGetState<ReturnType<typeof setInterval>>()
const [runId, setRunId] = useState<ReturnType<typeof setInterval>>()
const runIdRef = useRef(runId)
const getRunId = () => runIdRef.current
useEffect(() => {
runIdRef.current = runId
}, [runId])
const stopQueryStatus = () => { const stopQueryStatus = () => {
clearInterval(getRunId()) clearInterval(getRunId())
setRunId(undefined)
} }
const startQueryStatus = () => { const startQueryStatus = () => {
const runId = setInterval(() => { const runId = setInterval(async () => {
const indexingStatusBatchDetail = getIndexingStatusDetail() // It's so strange that the interval can't be cleared after the clearInterval called. And the runId is current.
const isCompleted = indexingStatusBatchDetail.every(indexingStatusDetail => ['completed', 'error'].includes(indexingStatusDetail.indexing_status)) if (!getRunId())
if (isCompleted) {
stopQueryStatus()
return return
}
fetchIndexingStatus() const indexingStatusBatchDetail = await fetchIndexingStatus()
const isCompleted = indexingStatusBatchDetail.every(indexingStatusDetail => ['completed', 'error'].includes(indexingStatusDetail.indexing_status))
if (isCompleted)
stopQueryStatus()
}, 2500) }, 2500)
setRunId(runId) setRunId(runId)
} }
@ -221,11 +228,11 @@ const EmbeddingProcess: FC<Props> = ({ datasetId, batchId, documents = [], index
indexingStatusDetail.indexing_status === 'completed' && s.success, indexingStatusDetail.indexing_status === 'completed' && s.success,
)}> )}>
{isSourceEmbedding(indexingStatusDetail) && ( {isSourceEmbedding(indexingStatusDetail) && (
<div className={s.progressbar} style={{ width: `${getSourcePercent(indexingStatusDetail)}%` }}/> <div className={s.progressbar} style={{ width: `${getSourcePercent(indexingStatusDetail)}%` }} />
)} )}
<div className={`${s.info} grow`}> <div className={`${s.info} grow`}>
{getSourceType(indexingStatusDetail.id) === DataSourceType.FILE && ( {getSourceType(indexingStatusDetail.id) === DataSourceType.FILE && (
<div className={cn(s.fileIcon, s[getFileType(getSourceName(indexingStatusDetail.id))])}/> <div className={cn(s.fileIcon, s[getFileType(getSourceName(indexingStatusDetail.id))])} />
)} )}
{getSourceType(indexingStatusDetail.id) === DataSourceType.NOTION && ( {getSourceType(indexingStatusDetail.id) === DataSourceType.NOTION && (
<NotionIcon <NotionIcon