Knowledge optimization (#3755)

Co-authored-by: crazywoola <427733928@qq.com> Co-authored-by: JzoNg <jzongcode@gmail.com>
2024-04-24 15:02:29 +08:00
parent 3cd8e6f5c6
commit f257f2c396
75 changed files with 2756 additions and 266 deletions
--- a/web/app/components/datasets/documents/index.tsx
+++ b/web/app/components/datasets/documents/index.tsx
@@ -5,7 +5,6 @@ import useSWR from 'swr'
 import { useTranslation } from 'react-i18next'
 import { useRouter } from 'next/navigation'
 import { debounce, groupBy, omit } from 'lodash-es'
-// import Link from 'next/link'
 import { PlusIcon } from '@heroicons/react/24/solid'
 import List from './list'
 import s from './style.module.css'
@@ -20,7 +19,7 @@ import { NotionPageSelectorModal } from '@/app/components/base/notion-page-selec
 import type { NotionPage } from '@/models/common'
 import type { CreateDocumentReq } from '@/models/datasets'
 import { DataSourceType } from '@/models/datasets'
-
+import RetryButton from '@/app/components/base/retry-button'
 // Custom page count is not currently supported.
 const limit = 15

@@ -198,7 +197,7 @@ const Documents: FC<IDocumentsProps> = ({ datasetId }) => {
        <p className={s.desc}>{t('datasetDocuments.list.desc')}</p>
      </div>
      <div className='flex flex-col px-6 py-4 flex-1'>
-        <div className='flex items-center justify-between flex-wrap gap-y-2 '>
+        <div className='flex items-center justify-between flex-wrap'>
          <Input
            showPrefix
            wrapperClassName='!w-[200px]'
@@ -206,13 +205,16 @@ const Documents: FC<IDocumentsProps> = ({ datasetId }) => {
            onChange={debounce(setSearchValue, 500)}
            value={searchValue}
          />
-          {embeddingAvailable && (
-            <Button type='primary' onClick={routeToDocCreate} className='!h-8 !text-[13px] !shrink-0'>
-              <PlusIcon className='h-4 w-4 mr-2 stroke-current' />
-              {isDataSourceNotion && t('datasetDocuments.list.addPages')}
-              {!isDataSourceNotion && t('datasetDocuments.list.addFile')}
-            </Button>
-          )}
+          <div className='flex gap-2 justify-center items-center !h-8'>
+            <RetryButton datasetId={datasetId} />
+            {embeddingAvailable && (
+              <Button type='primary' onClick={routeToDocCreate} className='!h-8 !text-[13px] !shrink-0'>
+                <PlusIcon className='h-4 w-4 mr-2 stroke-current' />
+                {isDataSourceNotion && t('datasetDocuments.list.addPages')}
+                {!isDataSourceNotion && t('datasetDocuments.list.addFile')}
+              </Button>
+            )}
+          </div>
        </div>
        {isLoading
          ? <Loading type='app' />
--- a/web/app/components/datasets/documents/list.tsx
+++ b/web/app/components/datasets/documents/list.tsx
@@ -332,7 +332,7 @@ const DocumentList: FC<IDocumentListProps> = ({ embeddingAvailable, documents =
            <td className='w-12'>#</td>
            <td>{t('datasetDocuments.list.table.header.fileName')}</td>
            <td className='w-24'>{t('datasetDocuments.list.table.header.words')}</td>
-            <td className='w-24'>{t('datasetDocuments.list.table.header.hitCount')}</td>
+            <td className='w-44'>{t('datasetDocuments.list.table.header.hitCount')}</td>
            <td className='w-44'>
              <div className='flex justify-between items-center'>
                {t('datasetDocuments.list.table.header.uploadTime')}
--- a/web/app/components/datasets/rename-modal/index.tsx
+++ b/web/app/components/datasets/rename-modal/index.tsx
@@ -0,0 +1,106 @@
+'use client'
+
+import type { MouseEventHandler } from 'react'
+import cn from 'classnames'
+import { useState } from 'react'
+import { BookOpenIcon } from '@heroicons/react/24/outline'
+import { useContext } from 'use-context-selector'
+import { useTranslation } from 'react-i18next'
+import Button from '@/app/components/base/button'
+import Modal from '@/app/components/base/modal'
+import { ToastContext } from '@/app/components/base/toast'
+import { XClose } from '@/app/components/base/icons/src/vender/line/general'
+import type { DataSet } from '@/models/datasets'
+import { updateDatasetSetting } from '@/service/datasets'
+
+type RenameDatasetModalProps = {
+  show: boolean
+  dataset: DataSet
+  onSuccess?: () => void
+  onClose: () => void
+}
+
+const RenameDatasetModal = ({ show, dataset, onSuccess, onClose }: RenameDatasetModalProps) => {
+  const { t } = useTranslation()
+  const { notify } = useContext(ToastContext)
+  const [loading, setLoading] = useState(false)
+  const [name, setName] = useState<string>(dataset.name)
+  const [description, setDescription] = useState<string>(dataset.description)
+
+  const onConfirm: MouseEventHandler = async () => {
+    if (!name.trim()) {
+      notify({ type: 'error', message: t('datasetSettings.form.nameError') })
+      return
+    }
+    try {
+      setLoading(true)
+      await updateDatasetSetting({
+        datasetId: dataset.id,
+        body: {
+          name,
+          description,
+        },
+      })
+      notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
+      if (onSuccess)
+        onSuccess()
+      onClose()
+    }
+    catch (e) {
+      notify({ type: 'error', message: t('common.actionMsg.modifiedUnsuccessfully') })
+    }
+    finally {
+      setLoading(false)
+    }
+  }
+
+  return (
+    <Modal
+      wrapperClassName='z-20'
+      className='px-8 py-6 max-w-[520px] w-[520px] rounded-xl'
+      isShow={show}
+      onClose={() => {}}
+    >
+      <div className='relative pb-2 text-xl font-medium leading-[30px] text-gray-900'>{t('datasetSettings.title')}</div>
+      <div className='absolute right-4 top-4 p-2 cursor-pointer' onClick={onClose}>
+        <XClose className='w-4 h-4 text-gray-500' />
+      </div>
+      <div>
+        <div className={cn('flex justify-between py-4 flex-wrap items-center')}>
+          <div className='shrink-0 py-2 text-sm font-medium leading-[20px] text-gray-900'>
+            {t('datasetSettings.form.name')}
+          </div>
+          <input
+            value={name}
+            onChange={e => setName(e.target.value)}
+            className='block px-3 w-full h-9 bg-gray-100 rounded-lg text-sm text-gray-900 outline-none appearance-none'
+            placeholder={t('datasetSettings.form.namePlaceholder') || ''}
+          />
+        </div>
+        <div className={cn('flex justify-between py-4 flex-wrap items-center')}>
+          <div className='shrink-0 py-2 text-sm font-medium leading-[20px] text-gray-900'>
+            {t('datasetSettings.form.desc')}
+          </div>
+          <div className='w-full'>
+            <textarea
+              value={description}
+              onChange={e => setDescription(e.target.value)}
+              className='block px-3 py-2 w-full h-[88px] rounded-lg bg-gray-100 text-sm outline-none appearance-none resize-none'
+              placeholder={t('datasetSettings.form.descPlaceholder') || ''}
+            />
+            <a className='mt-2 flex items-center h-[18px] px-3 text-xs text-gray-500 hover:text-primary-600' href="https://docs.dify.ai/features/datasets#how-to-write-a-good-dataset-description" target='_blank' rel='noopener noreferrer'>
+              <BookOpenIcon className='w-3 h-[18px] mr-1' />
+              {t('datasetSettings.form.descWrite')}
+            </a>
+          </div>
+        </div>
+      </div>
+      <div className='pt-6 flex justify-end'>
+        <Button className='mr-2 text-gray-700 text-sm font-medium' onClick={onClose}>{t('common.operation.cancel')}</Button>
+        <Button className='text-sm font-medium' disabled={loading} type="primary" onClick={onConfirm}>{t('common.operation.save')}</Button>
+      </div>
+    </Modal>
+  )
+}
+
+export default RenameDatasetModal
--- a/web/app/components/datasets/settings/form/index.tsx
+++ b/web/app/components/datasets/settings/form/index.tsx
@@ -59,7 +59,17 @@ const Form = () => {
  const [permission, setPermission] = useState(currentDataset?.permission)
  const [indexMethod, setIndexMethod] = useState(currentDataset?.indexing_technique)
  const [retrievalConfig, setRetrievalConfig] = useState(currentDataset?.retrieval_model_dict as RetrievalConfig)
-
+  const [embeddingModel, setEmbeddingModel] = useState<DefaultModel>(
+    currentDataset?.embedding_model
+      ? {
+        provider: currentDataset.embedding_model_provider,
+        model: currentDataset.embedding_model,
+      }
+      : {
+        provider: '',
+        model: '',
+      },
+  )
  const {
    modelList: rerankModelList,
    defaultModel: rerankDefaultModel,
@@ -101,6 +111,8 @@ const Form = () => {
          permission,
          indexing_technique: indexMethod,
          retrieval_model: postRetrievalConfig,
+          embedding_model: embeddingModel.model,
+          embedding_model_provider: embeddingModel.provider,
        },
      })
      notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
@@ -189,18 +201,13 @@ const Form = () => {
          </div>
          <div className='w-[480px]'>
            <ModelSelector
-              readonly
-              triggerClassName='!h-9 !cursor-not-allowed opacity-60'
-              defaultModel={{
-                provider: currentDataset.embedding_model_provider,
-                model: currentDataset.embedding_model,
-              }}
+              triggerClassName=''
+              defaultModel={embeddingModel}
              modelList={embeddingModelList}
+              onSelect={(model: DefaultModel) => {
+                setEmbeddingModel(model)
+              }}
            />
-            <div className='mt-2 w-full text-xs leading-6 text-gray-500'>
-              {t('datasetSettings.form.embeddingModelTip')}
-              <span className='text-[#155eef] cursor-pointer' onClick={() => setShowAccountSettingModal({ payload: 'provider' })}>{t('datasetSettings.form.embeddingModelTipLink')}</span>
-            </div>
          </div>
        </div>
      )}