Merge remote-tracking branch 'origin/new-page-framework' into dev_ty_06_end

This commit is contained in:
aries_ckt 2023-07-05 14:59:56 +08:00
commit 92b1ab212d
3 changed files with 220 additions and 122 deletions

View File

@ -11,7 +11,7 @@ import {
Link
} from '@/lib/mui'
import { Popover, Pagination } from 'antd'
import { sendSpaceGetRequest, sendSpacePostRequest, sendSpaceUploadPostRequest } from '@/utils/request';
import { sendSpacePostRequest } from '@/utils/request'
const page_size = 20
const ChunkList = () => {
@ -24,11 +24,14 @@ const ChunkList = () => {
const [chunkList, setChunkList] = useState<any>([])
useEffect(() => {
async function fetchChunks() {
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/chunk/list`, {
document_id: documentId,
page: 1,
page_size
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/chunk/list`,
{
document_id: documentId,
page: 1,
page_size
}
)
if (data.success) {
setChunkList(data.data.data)
setTotal(data.data.total)
@ -141,11 +144,14 @@ const ChunkList = () => {
current={current}
total={total}
onChange={async (page) => {
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/chunk/list`, {
document_id: documentId,
page,
page_size
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/chunk/list`,
{
document_id: documentId,
page,
page_size
}
)
if (data.success) {
setChunkList(data.data.data)
setTotal(data.data.total)

View File

@ -21,11 +21,14 @@ import {
} from '@/lib/mui'
import moment from 'moment'
import { InboxOutlined } from '@ant-design/icons'
import CheckCircleOutlinedIcon from '@mui/icons-material/CheckCircleOutlined';
import CachedIcon from '@mui/icons-material/Cached';
import CheckCircleOutlinedIcon from '@mui/icons-material/CheckCircleOutlined'
import CachedIcon from '@mui/icons-material/Cached'
import type { UploadProps } from 'antd'
import { Upload, Pagination, Popover, message } from 'antd'
import { sendSpaceGetRequest, sendSpacePostRequest, sendSpaceUploadPostRequest } from '@/utils/request';
import {
sendSpacePostRequest,
sendSpaceUploadPostRequest
} from '@/utils/request'
const { Dragger } = Upload
const Item = styled(Sheet)(({ theme }) => ({
@ -95,10 +98,13 @@ const Documents = () => {
}
useEffect(() => {
async function fetchDocuments() {
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/list`, {
page: 1,
page_size
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/list`,
{
page: 1,
page_size
}
)
if (data.success) {
setDocuments(data.data.data)
setTotal(data.data.total)
@ -235,9 +241,12 @@ const Documents = () => {
marginRight: '20px'
}}
onClick={async () => {
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/sync`, {
doc_ids: [row.id]
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/sync`,
{
doc_ids: [row.id]
}
)
if (data.success) {
message.success('success')
} else {
@ -245,7 +254,8 @@ const Documents = () => {
}
}}
>
Synch<CachedIcon />
Synch
<CachedIcon />
</Button>
<Button
variant="outlined"
@ -278,10 +288,13 @@ const Documents = () => {
current={current}
total={total}
onChange={async (page) => {
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/list`, {
page,
page_size
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/list`,
{
page,
page_size
}
)
if (data.success) {
setDocuments(data.data.data)
setTotal(data.data.total)
@ -324,7 +337,11 @@ const Documents = () => {
color: activeStep === index ? '#2AA3FF' : ''
}}
>
{index < activeStep ? <CheckCircleOutlinedIcon /> : `${index + 1}.`}
{index < activeStep ? (
<CheckCircleOutlinedIcon />
) : (
`${index + 1}.`
)}
{`${item}`}
</Item>
))}
@ -455,23 +472,32 @@ const Documents = () => {
message.error('Please input the Web Page URL')
return
}
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/add`, {
doc_name: documentName,
content: webPageUrl,
doc_type: 'URL'
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/add`,
{
doc_name: documentName,
content: webPageUrl,
doc_type: 'URL'
}
)
data.success &&
synchChecked &&
sendSpacePostRequest(`/knowledge/${spaceName}/document/sync`, {
doc_ids: [data.data]
})
sendSpacePostRequest(
`/knowledge/${spaceName}/document/sync`,
{
doc_ids: [data.data]
}
)
if (data.success) {
message.success('success')
setIsAddDocumentModalShow(false)
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/list`, {
page: current,
page_size
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/list`,
{
page: current,
page_size
}
)
if (data.success) {
setDocuments(data.data.data)
setTotal(data.data.total)
@ -489,19 +515,28 @@ const Documents = () => {
formData.append('doc_name', documentName)
formData.append('doc_file', originFileObj)
formData.append('doc_type', 'DOCUMENT')
const data = await sendSpaceUploadPostRequest(`/knowledge/${spaceName}/document/upload`, formData);
const data = await sendSpaceUploadPostRequest(
`/knowledge/${spaceName}/document/upload`,
formData
)
data.success &&
synchChecked &&
sendSpacePostRequest(`/knowledge/${spaceName}/document/sync`, {
doc_ids: [data.data]
})
sendSpacePostRequest(
`/knowledge/${spaceName}/document/sync`,
{
doc_ids: [data.data]
}
)
if (data.success) {
message.success('success')
setIsAddDocumentModalShow(false)
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/list`, {
page: current,
page_size
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/list`,
{
page: current,
page_size
}
)
if (data.success) {
setDocuments(data.data.data)
setTotal(data.data.total)
@ -515,24 +550,33 @@ const Documents = () => {
message.error('Please input the text')
return
}
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/add`, {
doc_name: documentName,
source: textSource,
content: text,
doc_type: 'TEXT'
})
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/add`,
{
doc_name: documentName,
source: textSource,
content: text,
doc_type: 'TEXT'
}
)
data.success &&
synchChecked &&
sendSpacePostRequest(`/knowledge/${spaceName}/document/sync`, {
doc_ids: [data.data]
})
sendSpacePostRequest(
`/knowledge/${spaceName}/document/sync`,
{
doc_ids: [data.data]
}
)
if (data.success) {
message.success('success')
setIsAddDocumentModalShow(false)
const data = await sendSpacePostRequest(`/knowledge/${spaceName}/document/list`, {
page: current,
page_size
});
const data = await sendSpacePostRequest(
`/knowledge/${spaceName}/document/list`,
{
page: current,
page_size
}
)
if (data.success) {
setDocuments(data.data.data)
setTotal(data.data.total)

View File

@ -4,25 +4,26 @@ import { useRouter } from 'next/navigation'
import React, { useState, useEffect } from 'react'
import { InboxOutlined } from '@ant-design/icons'
import CheckCircleOutlinedIcon from '@mui/icons-material/CheckCircleOutlined'
import ContentPasteSearchOutlinedIcon from '@mui/icons-material/ContentPasteSearchOutlined';
import ContentPasteSearchOutlinedIcon from '@mui/icons-material/ContentPasteSearchOutlined'
import type { UploadProps } from 'antd'
import { message, Upload } from 'antd'
import {
useColorScheme,
Modal,
Button,
Table,
Sheet,
Stack,
Box,
Input,
Textarea,
Chip,
Switch,
Typography,
styled
} from '@/lib/mui'
import { sendSpaceGetRequest, sendSpacePostRequest, sendSpaceUploadPostRequest } from '@/utils/request';
import {
sendSpacePostRequest,
sendSpaceUploadPostRequest
} from '@/utils/request'
const { Dragger } = Upload
@ -94,7 +95,7 @@ const Index = () => {
}
useEffect(() => {
async function fetchData() {
const data = await sendSpacePostRequest('/knowledge/space/list')
const data = await sendSpacePostRequest('/knowledge/space/list', {})
if (data.success) {
setKnowledgeSpaceList(data.data)
}
@ -105,19 +106,22 @@ const Index = () => {
<Box
sx={{
width: '100%',
height: '100%',
height: '100%'
}}
className='bg-[#F1F2F5] dark:bg-[#212121]'
className="bg-[#F1F2F5] dark:bg-[#212121]"
>
<Box className="page-body p-4" sx={{
'&': {
height: '90%',
overflow: 'auto',
},
'&::-webkit-scrollbar': {
display: 'none'
}
}}>
<Box
className="page-body p-4"
sx={{
'&': {
height: '90%',
overflow: 'auto'
},
'&::-webkit-scrollbar': {
display: 'none'
}
}}
>
<Stack
direction="row"
justifyContent="space-between"
@ -134,7 +138,7 @@ const Index = () => {
sx={{
display: 'flex',
alignContent: 'start',
boxSizing: "content-box",
boxSizing: 'content-box',
width: '390px',
height: '79px',
padding: '33px 20px 40px',
@ -148,11 +152,12 @@ const Index = () => {
cursor: 'pointer',
borderRadius: '16px',
'&: hover': {
boxShadow: '0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);'
boxShadow:
'0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);'
}
}}
onClick={() => setIsAddKnowledgeSpaceModalShow(true)}
className='bg-[#E9EBEE] dark:bg-[#484848]'
className="bg-[#E9EBEE] dark:bg-[#484848]"
>
<Box
sx={{
@ -166,12 +171,16 @@ const Index = () => {
fontWeight: '300',
color: '#2AA3FF'
}}
>+</Box>
>
+
</Box>
<Box
sx={{
fontSize: '16px',
fontSize: '16px'
}}
>space</Box>
>
space
</Box>
</Box>
{knowledgeSpaceList.map((item: any, index: number) => (
<Box
@ -186,24 +195,32 @@ const Index = () => {
cursor: 'pointer',
borderRadius: '10px',
'&: hover': {
boxShadow: '0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);'
boxShadow:
'0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);'
}
}}
onClick={() => {
router.push(`/datastores/documents?name=${item.name}`);
router.push(`/datastores/documents?name=${item.name}`)
}}
className='bg-[#FFFFFF] dark:bg-[#484848]'
className="bg-[#FFFFFF] dark:bg-[#484848]"
>
<Box sx={{
fontSize: '18px',
marginBottom: '10px',
fontWeight: 'bold',
color: 'black'
}}><ContentPasteSearchOutlinedIcon sx={{ marginRight: '5px', color: '#2AA3FF' }}/>{item.name}</Box>
<Box
sx={{
fontSize: '18px',
marginBottom: '10px',
fontWeight: 'bold',
color: 'black'
}}
>
<ContentPasteSearchOutlinedIcon
sx={{ marginRight: '5px', color: '#2AA3FF' }}
/>
{item.name}
</Box>
<Box
sx={{
display: 'flex',
justifyContent: 'flex-start',
justifyContent: 'flex-start'
}}
>
<Box
@ -217,7 +234,9 @@ const Index = () => {
sx={{
color: '#2AA3FF'
}}
>{item.vector_type}</Box>
>
{item.vector_type}
</Box>
<Box sx={{ fontSize: '12px', color: 'black' }}>Vector</Box>
</Box>
<Box
@ -231,7 +250,9 @@ const Index = () => {
sx={{
color: '#2AA3FF'
}}
>{item.owner}</Box>
>
{item.owner}
</Box>
<Box sx={{ fontSize: '12px', color: 'black' }}>Owner</Box>
</Box>
<Box
@ -245,13 +266,19 @@ const Index = () => {
sx={{
color: '#2AA3FF'
}}
>{item.docs || 0}</Box>
>
{item.docs || 0}
</Box>
<Box sx={{ fontSize: '12px', color: 'black' }}>Docs</Box>
</Box>
</Box>
</Box>
))}
<i></i><i></i><i></i><i></i><i></i>
<i></i>
<i></i>
<i></i>
<i></i>
<i></i>
</Stack>
</Box>
<Modal
@ -333,16 +360,19 @@ const Index = () => {
const data = await sendSpacePostRequest(
`/knowledge/space/add`,
{
name: knowledgeSpaceName,
vector_type: 'Chroma',
owner,
desc: description
name: knowledgeSpaceName,
vector_type: 'Chroma',
owner,
desc: description
}
)
if (data.success) {
message.success('success')
setActiveStep(1)
const data = await sendSpacePostRequest('/knowledge/space/list')
const data = await sendSpacePostRequest(
'/knowledge/space/list',
{}
)
if (data.success) {
setKnowledgeSpaceList(data.data)
}
@ -479,18 +509,24 @@ const Index = () => {
message.error('Please input the Web Page URL')
return
}
const data = await sendSpacePostRequest(`/knowledge/${knowledgeSpaceName}/document/add`, {
doc_name: documentName,
content: webPageUrl,
doc_type: 'URL'
})
const data = await sendSpacePostRequest(
`/knowledge/${knowledgeSpaceName}/document/add`,
{
doc_name: documentName,
content: webPageUrl,
doc_type: 'URL'
}
)
if (data.success) {
message.success('success')
setIsAddKnowledgeSpaceModalShow(false)
synchChecked &&
sendSpacePostRequest(`/knowledge/${knowledgeSpaceName}/document/sync`, {
doc_ids: [data.data]
})
sendSpacePostRequest(
`/knowledge/${knowledgeSpaceName}/document/sync`,
{
doc_ids: [data.data]
}
)
} else {
message.error(data.err_msg || 'failed')
}
@ -504,14 +540,20 @@ const Index = () => {
formData.append('doc_file', originFileObj)
formData.append('doc_type', 'DOCUMENT')
const data = await sendSpaceUploadPostRequest(`/knowledge/${knowledgeSpaceName}/document/upload`, formData);
const data = await sendSpaceUploadPostRequest(
`/knowledge/${knowledgeSpaceName}/document/upload`,
formData
)
if (data.success) {
message.success('success')
setIsAddKnowledgeSpaceModalShow(false)
synchChecked &&
sendSpacePostRequest(`/knowledge/${knowledgeSpaceName}/document/sync`, {
doc_ids: [data.data]
});
sendSpacePostRequest(
`/knowledge/${knowledgeSpaceName}/document/sync`,
{
doc_ids: [data.data]
}
)
} else {
message.error(data.err_msg || 'failed')
}
@ -520,19 +562,25 @@ const Index = () => {
message.error('Please input the text')
return
}
const data = await sendSpacePostRequest(`/knowledge/${knowledgeSpaceName}/document/add`, {
doc_name: documentName,
source: textSource,
content: text,
doc_type: 'TEXT'
})
const data = await sendSpacePostRequest(
`/knowledge/${knowledgeSpaceName}/document/add`,
{
doc_name: documentName,
source: textSource,
content: text,
doc_type: 'TEXT'
}
)
if (data.success) {
message.success('success')
setIsAddKnowledgeSpaceModalShow(false)
synchChecked &&
sendSpacePostRequest(`/knowledge/${knowledgeSpaceName}/document/sync`, {
doc_ids: [data.data]
})
sendSpacePostRequest(
`/knowledge/${knowledgeSpaceName}/document/sync`,
{
doc_ids: [data.data]
}
)
} else {
message.error(data.err_msg || 'failed')
}