Merge branch 'feat/parent-child-retrieval' into deploy/dev

web/app/components/app-sidebar/dataset-info.tsx

@@ -35,7 +35,7 @@ const DatasetInfo: FC<Props> = ({
             {name}
           </div>
           <div className='mt-1 text-text-tertiary system-2xs-medium-uppercase'>{isExternal ? t('dataset.externalTag') : t('dataset.localDocs')}</div>
-          <div className='my-3  system-xs-regular text-text-tertiary'>{description}</div>
+          <div className='my-3  system-xs-regular text-text-tertiary first-letter:capitalize'>{description}</div>
         </div>
       )}
       {extraInfo}

web/app/components/datasets/documents/detail/completed/child-segment-list.tsx

@@ -95,7 +95,7 @@ const ChildSegmentList: FC<IChildSegmentCardProps> = ({
       (isFullDocMode && isLoading) && 'overflow-y-hidden',
     )}>
       {isFullDocMode ? <Divider type='horizontal' className='h-[1px] bg-divider-subtle my-1' /> : null}
-      <div className={classNames('flex items-center justify-between', isFullDocMode ? 'pt-2 pb-3 sticky -top-2 left-0 bg-components-panel-bg' : '')}>
+      <div className={classNames('flex items-center justify-between', isFullDocMode ? 'pt-2 pb-3 sticky -top-2 left-0 bg-background-default' : '')}>
         <div className={classNames(
           'h-7 flex items-center pl-1 pr-3 rounded-lg',
           isParagraphMode && 'cursor-pointer',

web/app/components/datasets/documents/detail/completed/index.tsx

@@ -303,20 +303,20 @@ const Completed: FC<ICompletedProps> = ({
 
     eventEmitter?.emit('update-segment')
     await updateSegment({ datasetId, documentId, segmentId, body: params }, {
-      onSuccess(data) {
+      onSuccess(res) {
         notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
         if (!needRegenerate)
           onCloseSegmentDetail()
         for (const seg of segments) {
           if (seg.id === segmentId) {
-            seg.answer = data.data.answer
-            seg.content = data.data.content
-            seg.keywords = data.data.keywords
-            seg.word_count = data.data.word_count
-            seg.hit_count = data.data.hit_count
-            seg.enabled = data.data.enabled
-            seg.updated_at = data.data.updated_at
-            seg.child_chunks = data.data.child_chunks
+            seg.answer = res.data.answer
+            seg.content = res.data.content
+            seg.keywords = res.data.keywords
+            seg.word_count = res.data.word_count
+            seg.hit_count = res.data.hit_count
+            seg.enabled = res.data.enabled
+            seg.updated_at = res.data.updated_at
+            seg.child_chunks = res.data.child_chunks
           }
         }
         setSegments([...segments])
@@ -477,41 +477,42 @@ const Completed: FC<ICompletedProps> = ({
 
     params.content = content
 
-    try {
-      eventEmitter?.emit('update-child-segment')
-      const res = await updateChildSegment({ datasetId, documentId, segmentId, childChunkId, body: params })
-      notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
-      onCloseChildSegmentDetail()
-      if (parentMode === 'paragraph') {
-        for (const seg of segments) {
-          if (seg.id === segmentId) {
-            for (const childSeg of seg.child_chunks!) {
-              if (childSeg.id === childChunkId) {
-                childSeg.content = res.data.content
-                childSeg.type = res.data.type
-                childSeg.word_count = res.data.word_count
-                childSeg.updated_at = res.data.updated_at
+    eventEmitter?.emit('update-child-segment')
+    await updateChildSegment({ datasetId, documentId, segmentId, childChunkId, body: params }, {
+      onSuccess: (res) => {
+        notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
+        onCloseChildSegmentDetail()
+        if (parentMode === 'paragraph') {
+          for (const seg of segments) {
+            if (seg.id === segmentId) {
+              for (const childSeg of seg.child_chunks!) {
+                if (childSeg.id === childChunkId) {
+                  childSeg.content = res.data.content
+                  childSeg.type = res.data.type
+                  childSeg.word_count = res.data.word_count
+                  childSeg.updated_at = res.data.updated_at
+                }
               }
             }
           }
+          setSegments([...segments])
         }
-        setSegments([...segments])
-      }
-      else {
-        for (const childSeg of childSegments) {
-          if (childSeg.id === childChunkId) {
-            childSeg.content = res.data.content
-            childSeg.type = res.data.type
-            childSeg.word_count = res.data.word_count
-            childSeg.updated_at = res.data.updated_at
+        else {
+          for (const childSeg of childSegments) {
+            if (childSeg.id === childChunkId) {
+              childSeg.content = res.data.content
+              childSeg.type = res.data.type
+              childSeg.word_count = res.data.word_count
+              childSeg.updated_at = res.data.updated_at
+            }
           }
+          setChildSegments([...childSegments])
         }
-        setChildSegments([...childSegments])
-      }
-    }
-    finally {
-      eventEmitter?.emit('update-child-segment-done')
-    }
+      },
+      onSettled: () => {
+        eventEmitter?.emit('update-child-segment-done')
+      },
+    })
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [segments, childSegments, datasetId, documentId, parentMode])
 

web/app/components/datasets/documents/detail/completed/new-child-segment.tsx

@@ -83,7 +83,7 @@ const NewChildSegmentModal: FC<NewChildSegmentModalProps> = ({
 
     setLoading(true)
     await addChildSegment({ datasetId, documentId, segmentId: chunkId, body: params }, {
-      onSuccess(data) {
+      onSuccess(res) {
         notify({
           type: 'success',
           message: t('datasetDocuments.segment.childChunkAdded'),
@@ -98,7 +98,7 @@ const NewChildSegmentModal: FC<NewChildSegmentModalProps> = ({
           }, 3000)
         }
         else {
-          onSave(data.data)
+          onSave(res.data)
         }
       },
       onSettled() {

web/app/components/datasets/documents/detail/completed/segment-card.tsx

@@ -80,6 +80,10 @@ const SegmentCard: FC<ISegmentCardProps> = ({
     return mode === 'hierarchical'
   }, [mode])
 
+  const isParagraphMode = useMemo(() => {
+    return mode === 'hierarchical' && parentMode === 'paragraph'
+  }, [mode, parentMode])
+
   const isFullDocMode = useMemo(() => {
     return mode === 'hierarchical' && parentMode === 'full-doc'
   }, [mode, parentMode])
@@ -249,7 +253,7 @@ const SegmentCard: FC<ISegmentCardProps> = ({
           : null
       }
       {
-        child_chunks.length > 0
+        isParagraphMode && child_chunks.length > 0
           && <ChildSegmentList
             parentChunkId={id}
             childChunks={child_chunks}

web/app/components/datasets/documents/detail/index.tsx

@@ -1,11 +1,9 @@
 'use client'
 import type { FC } from 'react'
 import React, { useMemo, useState } from 'react'
-import useSWR from 'swr'
 import { createContext, useContext, useContextSelector } from 'use-context-selector'
 import { useTranslation } from 'react-i18next'
 import { useRouter } from 'next/navigation'
-import { omit } from 'lodash-es'
 import { RiArrowLeftLine, RiLayoutRight2Line } from '@remixicon/react'
 import { OperationAction, StatusItem } from '../list'
 import DocumentPicker from '../../common/document-picker'
@@ -18,14 +16,14 @@ import style from './style.module.css'
 import cn from '@/utils/classnames'
 import Divider from '@/app/components/base/divider'
 import Loading from '@/app/components/base/loading'
-import type { MetadataType } from '@/service/datasets'
-import { checkSegmentBatchImportProgress, fetchDocumentDetail, segmentBatchImport } from '@/service/datasets'
 import { ToastContext } from '@/app/components/base/toast'
 import type { ChunkingMode, ParentMode, ProcessMode } from '@/models/datasets'
 import { useDatasetDetailContext } from '@/context/dataset-detail'
 import FloatRightContainer from '@/app/components/base/float-right-container'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import { LayoutRight2LineMod } from '@/app/components/base/icons/src/public/knowledge'
+import { useCheckSegmentBatchImportProgress, useSegmentBatchImport } from '@/service/knowledge/use-segment'
+import { useDocumentDetail, useDocumentMetadata } from '@/service/knowledge/use-document'
 
 type DocumentContextValue = {
   datasetId?: string
@@ -95,49 +93,52 @@ const DocumentDetail: FC<Props> = ({ datasetId, documentId }) => {
   const showBatchModal = () => setBatchModalVisible(true)
   const hideBatchModal = () => setBatchModalVisible(false)
   const resetProcessStatus = () => setImportStatus('')
+
+  const { mutateAsync: checkSegmentBatchImportProgress } = useCheckSegmentBatchImportProgress()
   const checkProcess = async (jobID: string) => {
-    try {
-      const res = await checkSegmentBatchImportProgress({ jobID })
-      setImportStatus(res.job_status)
-      if (res.job_status === ProcessStatus.WAITING || res.job_status === ProcessStatus.PROCESSING)
-        setTimeout(() => checkProcess(res.job_id), 2500)
-      if (res.job_status === ProcessStatus.ERROR)
-        notify({ type: 'error', message: `${t('datasetDocuments.list.batchModal.runError')}` })
-    }
-    catch (e: any) {
-      notify({ type: 'error', message: `${t('datasetDocuments.list.batchModal.runError')}${'message' in e ? `: ${e.message}` : ''}` })
-    }
+    await checkSegmentBatchImportProgress({ jobID }, {
+      onSuccess: (res) => {
+        setImportStatus(res.job_status)
+        if (res.job_status === ProcessStatus.WAITING || res.job_status === ProcessStatus.PROCESSING)
+          setTimeout(() => checkProcess(res.job_id), 2500)
+        if (res.job_status === ProcessStatus.ERROR)
+          notify({ type: 'error', message: `${t('datasetDocuments.list.batchModal.runError')}` })
+      },
+      onError: (e) => {
+        notify({ type: 'error', message: `${t('datasetDocuments.list.batchModal.runError')}${'message' in e ? `: ${e.message}` : ''}` })
+      },
+    })
   }
+
+  const { mutateAsync: segmentBatchImport } = useSegmentBatchImport()
   const runBatch = async (csv: File) => {
     const formData = new FormData()
     formData.append('file', csv)
-    try {
-      const res = await segmentBatchImport({
-        url: `/datasets/${datasetId}/documents/${documentId}/segments/batch_import`,
-        body: formData,
-      })
-      setImportStatus(res.job_status)
-      checkProcess(res.job_id)
-    }
-    catch (e: any) {
-      notify({ type: 'error', message: `${t('datasetDocuments.list.batchModal.runError')}${'message' in e ? `: ${e.message}` : ''}` })
-    }
+    await segmentBatchImport({
+      url: `/datasets/${datasetId}/documents/${documentId}/segments/batch_import`,
+      body: formData,
+    }, {
+      onSuccess: (res) => {
+        setImportStatus(res.job_status)
+        checkProcess(res.job_id)
+      },
+      onError: (e) => {
+        notify({ type: 'error', message: `${t('datasetDocuments.list.batchModal.runError')}${'message' in e ? `: ${e.message}` : ''}` })
+      },
+    })
   }
 
-  const { data: documentDetail, error, mutate: detailMutate } = useSWR({
-    action: 'fetchDocumentDetail',
+  const { data: documentDetail, error, refetch: detailMutate } = useDocumentDetail({
     datasetId,
     documentId,
-    params: { metadata: 'without' as MetadataType },
-  }, apiParams => fetchDocumentDetail(omit(apiParams, 'action')))
+    params: { metadata: 'without' },
+  })
 
-  const { data: documentMetadata, error: metadataErr, mutate: metadataMutate } = useSWR({
-    action: 'fetchDocumentDetail',
+  const { data: documentMetadata, error: metadataErr, refetch: metadataMutate } = useDocumentMetadata({
     datasetId,
     documentId,
-    params: { metadata: 'only' as MetadataType },
-  }, apiParams => fetchDocumentDetail(omit(apiParams, 'action')),
-  )
+    params: { metadata: 'only' },
+  })
 
   const backToPrev = () => {
     router.push(`/datasets/${datasetId}/documents`)
@@ -156,12 +157,12 @@ const DocumentDetail: FC<Props> = ({ datasetId, documentId }) => {
   }
 
   const mode = useMemo(() => {
-    return documentDetail?.dataset_process_rule?.mode
-  }, [documentDetail?.dataset_process_rule])
+    return documentDetail?.document_process_rule?.mode
+  }, [documentDetail?.document_process_rule])
 
   const parentMode = useMemo(() => {
-    return documentDetail?.dataset_process_rule?.rules?.parent_mode
-  }, [documentDetail?.dataset_process_rule])
+    return documentDetail?.document_process_rule?.rules?.parent_mode
+  }, [documentDetail?.document_process_rule])
 
   const isFullDocMode = useMemo(() => {
     return mode === 'hierarchical' && parentMode === 'full-doc'
@@ -175,7 +176,7 @@ const DocumentDetail: FC<Props> = ({ datasetId, documentId }) => {
       mode,
       parentMode,
     }}>
-      <div className='flex flex-col h-full'>
+      <div className='flex flex-col h-full bg-background-default'>
         <div className='flex items-center justify-between flex-wrap min-h-16 pl-3 pr-4 py-2.5 border-b border-b-divider-subtle'>
           <div onClick={backToPrev} className={'shrink-0 rounded-full w-8 h-8 flex justify-center items-center cursor-pointer hover:bg-components-button-tertiary-bg'}>
             <RiArrowLeftLine className='text-components-button-ghost-text hover:text-text-tertiary w-4 h-4' />

web/app/components/datasets/documents/detail/settings/index.tsx

@@ -1,13 +1,11 @@
 'use client'
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useBoolean } from 'ahooks'
 import { useContext } from 'use-context-selector'
 import { useRouter } from 'next/navigation'
 import DatasetDetailContext from '@/context/dataset-detail'
-import type { CrawlOptions, CustomFile, FullDocumentDetail } from '@/models/datasets'
-import type { MetadataType } from '@/service/datasets'
-import { fetchDocumentDetail } from '@/service/datasets'
+import type { CrawlOptions, CustomFile } from '@/models/datasets'
 
 import Loading from '@/app/components/base/loading'
 import StepTwo from '@/app/components/datasets/create/step-two'
@@ -16,6 +14,7 @@ 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'
+import { useDocumentDetail, useInvalidDocumentDetailKey } from '@/service/knowledge/use-document'
 
 type DocumentSettingsProps = {
   datasetId: string
@@ -26,15 +25,23 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => {
   const { t } = useTranslation()
   const router = useRouter()
   const [isShowSetAPIKey, { setTrue: showSetAPIKey, setFalse: hideSetAPIkey }] = useBoolean()
-  const [hasError, setHasError] = useState(false)
   const { indexingTechnique, dataset } = useContext(DatasetDetailContext)
   const { data: embeddingsDefaultModel } = useDefaultModel(ModelTypeEnum.textEmbedding)
 
-  const saveHandler = () => router.push(`/datasets/${datasetId}/documents/${documentId}`)
+  const invalidDocumentDetail = useInvalidDocumentDetailKey()
+  const saveHandler = () => {
+    invalidDocumentDetail()
+    router.push(`/datasets/${datasetId}/documents/${documentId}`)
+  }
 
   const cancelHandler = () => router.back()
 
-  const [documentDetail, setDocumentDetail] = useState<FullDocumentDetail | null>(null)
+  const { data: documentDetail, error } = useDocumentDetail({
+    datasetId,
+    documentId,
+    params: { metadata: 'without' },
+  })
+
   const currentPage = useMemo(() => {
     return {
       workspace_id: documentDetail?.data_source_info.notion_workspace_id,
@@ -44,23 +51,8 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => {
       type: documentDetail?.data_source_type,
     }
   }, [documentDetail])
-  useEffect(() => {
-    (async () => {
-      try {
-        const detail = await fetchDocumentDetail({
-          datasetId,
-          documentId,
-          params: { metadata: 'without' as MetadataType },
-        })
-        setDocumentDetail(detail)
-      }
-      catch (e) {
-        setHasError(true)
-      }
-    })()
-  }, [datasetId, documentId])
 
-  if (hasError)
+  if (error)
     return <AppUnavailable code={500} unknownReason={t('datasetCreation.error.unavailable') as string} />
 
   return (
@@ -85,7 +77,7 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => {
             websiteCrawlProvider={documentDetail.data_source_info?.provider}
             websiteCrawlJobId={documentDetail.data_source_info?.job_id}
             crawlOptions={documentDetail.data_source_info as unknown as CrawlOptions}
-            indexingType={indexingTechnique || ''}
+            indexingType={indexingTechnique}
             isSetting
             documentDetail={documentDetail}
             files={[documentDetail.data_source_info.upload_file as CustomFile]}

web/context/dataset-detail.ts

@@ -1,7 +1,9 @@
 import { createContext, useContext, useContextSelector } from 'use-context-selector'
 import type { DataSet } from '@/models/datasets'
+import type { IndexingType } from '@/app/components/datasets/create/step-two'
+
 type DatasetDetailContextValue = {
-  indexingTechnique?: string
+  indexingTechnique?: IndexingType
   dataset?: DataSet
   mutateDatasetRes?: () => void
 }