Merge branch 'feat/parent-child-retrieval' of https://github.com/langgenius/dify into feat/parent-child-retrieval
AkaraChen
1 year ago
commit
1b150d31a9
@ -0,0 +1,118 @@
|
|||||||
|
import React, { type FC, useState } from 'react'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import {
|
||||||
|
RiCloseLine,
|
||||||
|
RiExpandDiagonalLine,
|
||||||
|
} from '@remixicon/react'
|
||||||
|
import ActionButtons from './common/action-buttons'
|
||||||
|
import ChunkContent from './common/chunk-content'
|
||||||
|
import Dot from './common/dot'
|
||||||
|
import { SegmentIndexTag } from './common/segment-index-tag'
|
||||||
|
import { useSegmentListContext } from './index'
|
||||||
|
import type { ChildChunkDetail } from '@/models/datasets'
|
||||||
|
import { useEventEmitterContextContext } from '@/context/event-emitter'
|
||||||
|
import { formatNumber } from '@/utils/format'
|
||||||
|
import classNames from '@/utils/classnames'
|
||||||
|
import Divider from '@/app/components/base/divider'
|
||||||
|
import { formatTime } from '@/utils/time'
|
||||||
|
|
||||||
|
type IChildSegmentDetailProps = {
|
||||||
|
chunkId: string
|
||||||
|
childChunkInfo?: Partial<ChildChunkDetail> & { id: string }
|
||||||
|
onUpdate: (segmentId: string, childChunkId: string, content: string) => void
|
||||||
|
onCancel: () => void
|
||||||
|
docForm: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show all the contents of the segment
|
||||||
|
*/
|
||||||
|
const ChildSegmentDetail: FC<IChildSegmentDetailProps> = ({
|
||||||
|
chunkId,
|
||||||
|
childChunkInfo,
|
||||||
|
onUpdate,
|
||||||
|
onCancel,
|
||||||
|
docForm,
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation()
|
||||||
|
const [content, setContent] = useState(childChunkInfo?.content || '')
|
||||||
|
const { eventEmitter } = useEventEmitterContextContext()
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [fullScreen, toggleFullScreen] = useSegmentListContext(s => [s.fullScreen, s.toggleFullScreen])
|
||||||
|
|
||||||
|
eventEmitter?.useSubscription((v) => {
|
||||||
|
if (v === 'update-child-segment')
|
||||||
|
setLoading(true)
|
||||||
|
if (v === 'update-child-segment-done')
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
const handleCancel = () => {
|
||||||
|
onCancel()
|
||||||
|
setContent(childChunkInfo?.content || '')
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleSave = () => {
|
||||||
|
onUpdate(chunkId, childChunkInfo?.id || '', content)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={'flex flex-col h-full'}>
|
||||||
|
<div className={classNames('flex items-center justify-between', fullScreen ? 'py-3 pr-4 pl-6 border border-divider-subtle' : 'pt-3 pr-3 pl-4')}>
|
||||||
|
<div className='flex flex-col'>
|
||||||
|
<div className='text-text-primary system-xl-semibold'>{'Edit Child Chunk'}</div>
|
||||||
|
<div className='flex items-center gap-x-2'>
|
||||||
|
<SegmentIndexTag positionId={childChunkInfo?.position || ''} labelPrefix='Child-Chunk' />
|
||||||
|
<Dot />
|
||||||
|
<span className='text-text-tertiary system-xs-medium'>{formatNumber(content.length)} {t('datasetDocuments.segment.characters')}</span>
|
||||||
|
<Dot />
|
||||||
|
<span className='text-text-tertiary system-xs-medium'>
|
||||||
|
{`Edited at ${formatTime({ date: (childChunkInfo?.created_at ?? 0) * 1000, dateFormat: 'MM/DD/YYYY h:mm:ss' })}`}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className='flex items-center'>
|
||||||
|
{fullScreen && (
|
||||||
|
<>
|
||||||
|
<ActionButtons
|
||||||
|
handleCancel={handleCancel}
|
||||||
|
handleSave={handleSave}
|
||||||
|
loading={loading}
|
||||||
|
isChildChunk={true}
|
||||||
|
/>
|
||||||
|
<Divider type='vertical' className='h-3.5 bg-divider-regular ml-4 mr-2' />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<div className='w-8 h-8 flex justify-center items-center p-1.5 cursor-pointer mr-1' onClick={toggleFullScreen}>
|
||||||
|
<RiExpandDiagonalLine className='w-4 h-4 text-text-tertiary' />
|
||||||
|
</div>
|
||||||
|
<div className='w-8 h-8 flex justify-center items-center p-1.5 cursor-pointer' onClick={onCancel}>
|
||||||
|
<RiCloseLine className='w-4 h-4 text-text-tertiary' />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className={classNames('flex grow overflow-hidden', fullScreen ? 'w-full flex-row justify-center px-6 pt-6 gap-x-8 mx-auto' : 'flex-col gap-y-1 py-3 px-4')}>
|
||||||
|
<div className={classNames('break-all overflow-y-auto whitespace-pre-line', fullScreen ? 'w-1/2' : 'grow')}>
|
||||||
|
<ChunkContent
|
||||||
|
docForm={docForm}
|
||||||
|
question={content}
|
||||||
|
onQuestionChange={content => setContent(content)}
|
||||||
|
isEditMode={true}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{!fullScreen && (
|
||||||
|
<div className='flex items-center justify-end p-4 pt-3 border-t-[1px] border-t-divider-subtle'>
|
||||||
|
<ActionButtons
|
||||||
|
handleCancel={handleCancel}
|
||||||
|
handleSave={handleSave}
|
||||||
|
loading={loading}
|
||||||
|
isChildChunk={true}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default React.memo(ChildSegmentDetail)
|
||||||
@ -0,0 +1,166 @@
|
|||||||
|
import { memo, useMemo, useRef, useState } from 'react'
|
||||||
|
import type { FC } from 'react'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import { useContext } from 'use-context-selector'
|
||||||
|
import { useParams } from 'next/navigation'
|
||||||
|
import { RiCloseLine, RiExpandDiagonalLine } from '@remixicon/react'
|
||||||
|
import { useShallow } from 'zustand/react/shallow'
|
||||||
|
import { useDocumentContext } from '../index'
|
||||||
|
import { SegmentIndexTag } from './common/segment-index-tag'
|
||||||
|
import ActionButtons from './common/action-buttons'
|
||||||
|
import ChunkContent from './common/chunk-content'
|
||||||
|
import AddAnother from './common/add-another'
|
||||||
|
import Dot from './common/dot'
|
||||||
|
import { useSegmentListContext } from './index'
|
||||||
|
import { useStore as useAppStore } from '@/app/components/app/store'
|
||||||
|
import { ToastContext } from '@/app/components/base/toast'
|
||||||
|
import type { ChildChunkDetail, SegmentUpdater } from '@/models/datasets'
|
||||||
|
import classNames from '@/utils/classnames'
|
||||||
|
import { formatNumber } from '@/utils/format'
|
||||||
|
import Divider from '@/app/components/base/divider'
|
||||||
|
import { useAddChildSegment } from '@/service/knowledge/use-segment'
|
||||||
|
|
||||||
|
type NewChildSegmentModalProps = {
|
||||||
|
chunkId: string
|
||||||
|
onCancel: () => void
|
||||||
|
onSave: (ChildChunk?: ChildChunkDetail) => void
|
||||||
|
viewNewlyAddedChildChunk?: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const NewChildSegmentModal: FC<NewChildSegmentModalProps> = ({
|
||||||
|
chunkId,
|
||||||
|
onCancel,
|
||||||
|
onSave,
|
||||||
|
viewNewlyAddedChildChunk,
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation()
|
||||||
|
const { notify } = useContext(ToastContext)
|
||||||
|
const [content, setContent] = useState('')
|
||||||
|
const { datasetId, documentId } = useParams<{ datasetId: string; documentId: string }>()
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [addAnother, setAddAnother] = useState(true)
|
||||||
|
const [fullScreen, toggleFullScreen] = useSegmentListContext(s => [s.fullScreen, s.toggleFullScreen])
|
||||||
|
const { appSidebarExpand } = useAppStore(useShallow(state => ({
|
||||||
|
appSidebarExpand: state.appSidebarExpand,
|
||||||
|
})))
|
||||||
|
const parentMode = useDocumentContext(s => s.parentMode)
|
||||||
|
|
||||||
|
const refreshTimer = useRef<any>(null)
|
||||||
|
|
||||||
|
const isFullDocMode = useMemo(() => {
|
||||||
|
return parentMode === 'full-doc'
|
||||||
|
}, [parentMode])
|
||||||
|
|
||||||
|
const CustomButton = <>
|
||||||
|
<Divider type='vertical' className='h-3 mx-1 bg-divider-regular' />
|
||||||
|
<button className='text-text-accent system-xs-semibold' onClick={() => {
|
||||||
|
clearTimeout(refreshTimer.current)
|
||||||
|
viewNewlyAddedChildChunk?.()
|
||||||
|
}}>
|
||||||
|
{t('common.operation.view')}
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
|
||||||
|
const handleCancel = (actionType: 'esc' | 'add' = 'esc') => {
|
||||||
|
if (actionType === 'esc' || !addAnother)
|
||||||
|
onCancel()
|
||||||
|
setContent('')
|
||||||
|
}
|
||||||
|
|
||||||
|
const { mutateAsync: addChildSegment } = useAddChildSegment()
|
||||||
|
|
||||||
|
const handleSave = async () => {
|
||||||
|
const params: SegmentUpdater = { content: '' }
|
||||||
|
|
||||||
|
if (!content.trim())
|
||||||
|
return notify({ type: 'error', message: t('datasetDocuments.segment.contentEmpty') })
|
||||||
|
|
||||||
|
params.content = content
|
||||||
|
|
||||||
|
setLoading(true)
|
||||||
|
try {
|
||||||
|
const res = await addChildSegment({ datasetId, documentId, segmentId: chunkId, body: params })
|
||||||
|
notify({
|
||||||
|
type: 'success',
|
||||||
|
message: t('datasetDocuments.segment.childChunkAdded'),
|
||||||
|
className: `!w-[296px] !bottom-0 ${appSidebarExpand === 'expand' ? '!left-[216px]' : '!left-14'}
|
||||||
|
!top-auto !right-auto !mb-[52px] !ml-11`,
|
||||||
|
customComponent: isFullDocMode && CustomButton,
|
||||||
|
})
|
||||||
|
handleCancel('add')
|
||||||
|
if (isFullDocMode) {
|
||||||
|
refreshTimer.current = setTimeout(() => {
|
||||||
|
onSave()
|
||||||
|
}, 3000)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
onSave(res.data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={'flex flex-col h-full'}>
|
||||||
|
<div className={classNames('flex items-center justify-between', fullScreen ? 'py-3 pr-4 pl-6 border border-divider-subtle' : 'pt-3 pr-3 pl-4')}>
|
||||||
|
<div className='flex flex-col'>
|
||||||
|
<div className='text-text-primary system-xl-semibold'>{
|
||||||
|
t('datasetDocuments.segment.addChildChunk')
|
||||||
|
}</div>
|
||||||
|
<div className='flex items-center gap-x-2'>
|
||||||
|
<SegmentIndexTag label={'New Child Chunk'} />
|
||||||
|
<Dot />
|
||||||
|
<span className='text-text-tertiary system-xs-medium'>{formatNumber(content.length)} {t('datasetDocuments.segment.characters')}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className='flex items-center'>
|
||||||
|
{fullScreen && (
|
||||||
|
<>
|
||||||
|
<AddAnother className='mr-3' isChecked={addAnother} onCheck={() => setAddAnother(!addAnother)} />
|
||||||
|
<ActionButtons
|
||||||
|
handleCancel={handleCancel.bind(null, 'esc')}
|
||||||
|
handleSave={handleSave}
|
||||||
|
loading={loading}
|
||||||
|
actionType='add'
|
||||||
|
isChildChunk={true}
|
||||||
|
/>
|
||||||
|
<Divider type='vertical' className='h-3.5 bg-divider-regular ml-4 mr-2' />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<div className='w-8 h-8 flex justify-center items-center p-1.5 cursor-pointer mr-1' onClick={toggleFullScreen}>
|
||||||
|
<RiExpandDiagonalLine className='w-4 h-4 text-text-tertiary' />
|
||||||
|
</div>
|
||||||
|
<div className='w-8 h-8 flex justify-center items-center p-1.5 cursor-pointer' onClick={handleCancel.bind(null, 'esc')}>
|
||||||
|
<RiCloseLine className='w-4 h-4 text-text-tertiary' />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className={classNames('flex grow overflow-hidden', fullScreen ? 'w-full flex-row justify-center px-6 pt-6 gap-x-8' : 'flex-col gap-y-1 py-3 px-4')}>
|
||||||
|
<div className={classNames('break-all overflow-y-auto whitespace-pre-line', fullScreen ? 'w-1/2' : 'grow')}>
|
||||||
|
<ChunkContent
|
||||||
|
docForm=''
|
||||||
|
question={content}
|
||||||
|
onQuestionChange={content => setContent(content)}
|
||||||
|
isEditMode={true}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{!fullScreen && (
|
||||||
|
<div className='flex items-center justify-between p-4 pt-3 border-t-[1px] border-t-divider-subtle'>
|
||||||
|
<AddAnother isChecked={addAnother} onCheck={() => setAddAnother(!addAnother)} />
|
||||||
|
<ActionButtons
|
||||||
|
handleCancel={handleCancel.bind(null, 'esc')}
|
||||||
|
handleSave={handleSave}
|
||||||
|
loading={loading}
|
||||||
|
actionType='add'
|
||||||
|
isChildChunk={true}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default memo(NewChildSegmentModal)
|
||||||
@ -1,5 +1,12 @@
|
|||||||
import dayjs, { type ConfigType } from 'dayjs'
|
import dayjs, { type ConfigType } from 'dayjs'
|
||||||
|
import utc from 'dayjs/plugin/utc'
|
||||||
|
|
||||||
|
dayjs.extend(utc)
|
||||||
|
|
||||||
export const isAfter = (date: ConfigType, compare: ConfigType) => {
|
export const isAfter = (date: ConfigType, compare: ConfigType) => {
|
||||||
return dayjs(date).isAfter(dayjs(compare))
|
return dayjs(date).isAfter(dayjs(compare))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const formatTime = ({ date, dateFormat }: { date: ConfigType; dateFormat: string }) => {
|
||||||
|
return dayjs(date).format(dateFormat)
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue