Merge branch 'feat/parent-child-retrieval' of https://github.com/langgenius/dify into feat/parent-child-retrieval

web/app/components/billing/priority-label/index.tsx

@@ -4,6 +4,7 @@ import {
   DocumentProcessingPriority,
   Plan,
 } from '../type'
+import cn from '@/utils/classnames'
 import { useProviderContext } from '@/context/provider-context'
 import {
   ZapFast,
@@ -11,7 +12,11 @@ import {
 } from '@/app/components/base/icons/src/vender/solid/general'
 import Tooltip from '@/app/components/base/tooltip'
 
-const PriorityLabel = () => {
+type PriorityLabelProps = {
+  className?: string
+}
+
+const PriorityLabel = ({ className }: PriorityLabelProps) => {
   const { t } = useTranslation()
   const { plan } = useProviderContext()
 
@@ -37,10 +42,10 @@ const PriorityLabel = () => {
         }
       </div>
     }>
-      <span className={`
+      <span className={cn(`
         shrink-0 flex items-center ml-1 px-1 h-[18px] rounded-[5px] border border-text-accent-secondary
         text-2xs font-medium text-text-accent-secondary
-      `}>
+      `, className)}>
         {
           plan.type === Plan.professional && (
             <ZapNarrow className='mr-0.5 size-3' />

web/app/components/datasets/common/retrieval-method-info/index.tsx

@@ -2,12 +2,11 @@
 import type { FC } from 'react'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
+import Image from 'next/image'
+import { retrievalIcon } from '../../create/icons'
 import type { RetrievalConfig } from '@/types/app'
 import { RETRIEVE_METHOD } from '@/types/app'
 import RadioCard from '@/app/components/base/radio-card'
-import { HighPriority } from '@/app/components/base/icons/src/vender/solid/arrows'
-import { PatternRecognition, Semantic } from '@/app/components/base/icons/src/vender/solid/development'
-import { FileSearch02 } from '@/app/components/base/icons/src/vender/solid/files'
 
 type Props = {
   value: RetrievalConfig
@@ -15,11 +14,12 @@ type Props = {
 
 export const getIcon = (type: RETRIEVE_METHOD) => {
   return ({
-    [RETRIEVE_METHOD.semantic]: Semantic,
+    [RETRIEVE_METHOD.semantic]: retrievalIcon.vector,
-    [RETRIEVE_METHOD.fullText]: FileSearch02,
+    [RETRIEVE_METHOD.fullText]: retrievalIcon.fullText,
-    [RETRIEVE_METHOD.hybrid]: PatternRecognition,
+    [RETRIEVE_METHOD.hybrid]: retrievalIcon.hybrid,
-    [RETRIEVE_METHOD.invertedIndex]: HighPriority,
+    [RETRIEVE_METHOD.invertedIndex]: retrievalIcon.vector,
-  })[type] || FileSearch02
+    [RETRIEVE_METHOD.keywordSearch]: retrievalIcon.vector,
+  })[type] || retrievalIcon.vector
 }
 
 const EconomicalRetrievalMethodConfig: FC<Props> = ({
@@ -28,11 +28,11 @@ const EconomicalRetrievalMethodConfig: FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   const type = value.search_method
-  const Icon = getIcon(type)
+  const icon = <Image className='size-3.5 text-util-colors-purple-purple-600' src={getIcon(type)} alt='' />
   return (
     <div className='space-y-2'>
       <RadioCard
-        icon={<Icon className='w-4 h-4 text-util-colors-purple-purple-600' />}
+        icon={icon}
         title={t(`dataset.retrieval.${type}.title`)}
         description={t(`dataset.retrieval.${type}.description`)}
         noRadio

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

@@ -29,6 +29,7 @@ import UpgradeBtn from '@/app/components/billing/upgrade-btn'
 import { useProviderContext } from '@/context/provider-context'
 import { sleep } from '@/utils'
 import { RETRIEVE_METHOD } from '@/types/app'
+import Tooltip from '@/app/components/base/tooltip'
 
 type Props = {
   datasetId: string
@@ -287,7 +288,7 @@ const EmbeddingProcess: FC<Props> = ({ datasetId, batchId, documents = [], index
                 </div>
                 {
                   enableBilling && (
-                    <PriorityLabel />
+                    <PriorityLabel className='ml-0' />
                   )
                 }
               </div>
@@ -295,12 +296,15 @@ const EmbeddingProcess: FC<Props> = ({ datasetId, batchId, documents = [], index
                 <div className="shrink-0 text-xs">{`${getSourcePercent(indexingStatusDetail)}%`}</div>
               )}
               {indexingStatusDetail.indexing_status === 'error' && (
-                <>
+                <Tooltip
-                  <span className="flex items-center max-w-[200px] text-xs text-text-destructive truncate" title={indexingStatusDetail.error || ''}>
+                  popupClassName='px-4 py-[14px] max-w-60 text-sm leading-4 text-text-secondary border-[0.5px] border-components-panel-border rounded-xl'
-                    {indexingStatusDetail.error || 'Error'}
+                  offset={4}
+                  popupContent={indexingStatusDetail.error}
+                >
+                  <span>
+                    <RiErrorWarningFill className='shrink-0 size-4 text-text-destructive' />
                   </span>
-                  <RiErrorWarningFill className='shrink-0 size-4 text-text-destructive' />
+                </Tooltip>
-                </>
               )}
               {indexingStatusDetail.indexing_status === 'completed' && (
                 <RiCheckboxCircleFill className='shrink-0 size-4 text-text-success' />

web/app/components/datasets/create/step-three/index.tsx

@@ -1,10 +1,9 @@
 'use client'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { RiBookOpenLine } from '@remixicon/react'
 import EmbeddingProcess from '../embedding-process'
 
-import s from './index.module.css'
-import cn from '@/utils/classnames'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import type { FullDocumentDetail, createDocumentResponse } from '@/models/datasets'
 import AppIcon from '@/app/components/base/app-icon'
@@ -58,13 +57,17 @@ const StepThree = ({ datasetId, datasetName, indexingType, creationCache, retrie
           />
         </div>
       </div>
-      {!isMobile && <div className={cn(s.sideTip)}>
+      {!isMobile && (
-        <div className={s.tipCard}>
+        <div className="shrink-0 pt-[88px] pr-8 text-xs">
-          <span className={s.icon} />
+          <div className="flex flex-col gap-3 w-[328px] p-6 text-text-tertiary bg-background-section rounded-xl">
-          <div className={s.title}>{t('datasetCreation.stepThree.sideTipTitle')}</div>
+            <div className="flex justify-center items-center size-10 bg-components-card-bg rounded-[10px] shadow-lg">
-          <div className={s.content}>{t('datasetCreation.stepThree.sideTipContent')}</div>
+              <RiBookOpenLine className="size-5 text-text-accent" />
+            </div>
+            <div className="text-base text-text-secondary">{t('datasetCreation.stepThree.sideTipTitle')}</div>
+            <div className="text-text-tertiary">{t('datasetCreation.stepThree.sideTipContent')}</div>
+          </div>
         </div>
-      </div>}
+      )}
     </div>
   )
 }

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

@@ -59,7 +59,7 @@ export const FieldInfo: FC<IFieldInfoProps> = ({
 
   return (
     <div className={cn('flex items-center gap-1 py-0.5 min-h-5 text-xs', editAlignTop && '!items-start', readAlignTop && '!items-start pt-1')}>
-      <div className={cn('w-[200px] text-text-tertiary font-medium overflow-hidden text-ellipsis whitespace-nowrap', editAlignTop && 'pt-1')}>{label}</div>
+      <div className={cn('w-[200px] text-text-tertiary overflow-hidden text-ellipsis whitespace-nowrap', editAlignTop && 'pt-1')}>{label}</div>
       <div className="grow flex items-center gap-1 text-text-secondary">
         {valueIcon}
         {!showEdit

web/app/components/datasets/hit-testing/style.module.css

@@ -29,10 +29,6 @@
   background-image: url(./assets/plugin.svg);
 }
 
-.wrapper {
-  @apply relative border border-primary-600 rounded-xl;
-}
-
 .cardWrapper {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(284px, auto));

web/app/components/datasets/hit-testing/textarea.tsx

@@ -3,10 +3,10 @@ import { useTranslation } from 'react-i18next'
 import {
   RiEqualizer2Line,
 } from '@remixicon/react'
+import Image from 'next/image'
 import Button from '../../base/button'
 import Tag from '../../base/tag'
 import { getIcon } from '../common/retrieval-method-info'
-import s from './style.module.css'
 import ModifyExternalRetrievalModal from './modify-external-retrieval-modal'
 import Tooltip from '@/app/components/base/tooltip'
 import cn from '@/utils/classnames'
@@ -14,6 +14,7 @@ import type { ExternalKnowledgeBaseHitTestingResponse, HitTestingResponse } from
 import { externalKnowledgeBaseHitTesting, hitTesting } from '@/service/datasets'
 import { asyncRunSafe } from '@/utils'
 import { RETRIEVE_METHOD, type RetrievalConfig } from '@/types/app'
+import promptS from '@/app/components/app/configuration/config-prompt/style.module.css'
 
 type TextAreaWithButtonIProps = {
   datasetId: string
@@ -103,13 +104,13 @@ const TextAreaWithButton = ({
   }
 
   const retrievalMethod = isEconomy ? RETRIEVE_METHOD.invertedIndex : retrievalConfig.search_method
-  const Icon = getIcon(retrievalMethod)
+  const icon = <Image className='size-3.5 text-util-colors-purple-purple-600' src={getIcon(retrievalMethod)} alt='' />
   return (
     <>
-      <div className={s.wrapper}>
+      <div className={cn('relative rounded-xl', promptS.gradientBorder)}>
-        <div className='relative pt-2 rounded-tl-xl rounded-tr-xl bg-[#EEF4FF]'>
+        <div className='relative pt-1.5 rounded-tl-xl rounded-tr-xl bg-background-section-burn'>
-          <div className="px-4 pb-2 flex justify-between h-8 items-center">
+          <div className="pl-4 pr-1.5 pb-1 flex justify-between h-8 items-center">
-            <span className="text-gray-800 font-semibold text-sm">
+            <span className="text-text-secondary font-semibold text-[13px] leading-4 uppercase">
               {t('datasetHitTesting.input.title')}
             </span>
             {isExternal
@@ -123,17 +124,14 @@ const TextAreaWithButton = ({
                   <span className='text-components-button-secondary-text system-xs-medium'>{t('datasetHitTesting.settingTitle')}</span>
                 </div>
               </Button>
-              : <Tooltip
+              : <div
-                popupContent={t('dataset.retrieval.changeRetrievalMethod')}
+                onClick={onClickRetrievalMethod}
+                className='flex px-1.5 h-7 items-center bg-components-button-secondary-bg hover:bg-components-button-secondary-bg-hover rounded-lg border-[0.5px] border-components-button-secondary-bg shadow-xs backdrop-blur-[5px] cursor-pointer space-x-0.5'
               >
-                <div
+                {icon}
-                  onClick={onClickRetrievalMethod}
+                <div className='text-text-secondary text-xs font-medium uppercase'>{t(`dataset.retrieval.${retrievalMethod}.title`)}</div>
-                  className='flex px-2 h-7 items-center space-x-1 bg-white hover:bg-[#ECE9FE] rounded-md shadow-sm cursor-pointer text-[#6927DA]'
+                <RiEqualizer2Line className='size-4 text-components-menu-item-text'></RiEqualizer2Line>
-                >
+              </div>
-                  <Icon className='w-3.5 h-3.5'></Icon>
-                  <div className='text-xs font-medium'>{t(`dataset.retrieval.${retrievalMethod}.title`)}</div>
-                </div>
-              </Tooltip>
             }
           </div>
           {

web/i18n/en-US/dataset-creation.ts

@@ -175,7 +175,7 @@ const translation = {
   },
   stepThree: {
     creationTitle: '🎉 Knowledge created',
-    creationContent: 'We automatically named the Knowledge, you can modify it at any time',
+    creationContent: 'We automatically named the Knowledge, you can modify it at any time.',
     label: 'Knowledge name',
     additionTitle: '🎉 Document uploaded',
     additionP1: 'The document has been uploaded to the Knowledge',