Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
16a31de1
authored
Apr 03, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 数据集导出
parent
05b2e9e9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
35 additions
and
17 deletions
+35
-17
src/api/model.ts
+1
-3
src/pages/api/chat/vectorGpt.ts
+1
-1
src/pages/api/model/data/exportModelData.ts
+12
-4
src/pages/api/model/data/pushModelDataJson.ts
+3
-1
src/pages/api/model/data/splitData.ts
+11
-3
src/pages/model/detail/components/ModelDataCard.tsx
+3
-3
src/pages/model/detail/components/SelectJsonModal.tsx
+1
-1
src/service/events/generateQA.ts
+1
-1
src/service/events/generateVector.ts
+2
-0
No files found.
src/api/model.ts
View file @
16a31de1
...
...
@@ -39,9 +39,7 @@ export const getModelDataList = (props: GetModelDataListProps) =>
GET
(
`/model/data/getModelData?
${
Obj2Query
(
props
)}
`
);
export
const
getExportDataList
=
(
modelId
:
string
)
=>
GET
<
{
prompt
:
string
;
completion
:
string
;
vector
:
number
[]
}
>
(
`/model/data/exportModelData?modelId=
${
modelId
}
`
);
GET
<
string
>
(
`/model/data/exportModelData?modelId=
${
modelId
}
`
);
export
const
getModelSplitDataList
=
(
modelId
:
string
)
=>
GET
<
ModelSplitDataSchema
[]
>
(
`/model/data/getSplitData?modelId=
${
modelId
}
`
);
...
...
src/pages/api/chat/vectorGpt.ts
View file @
16a31de1
...
...
@@ -118,7 +118,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
prompts
.
unshift
({
obj
:
'SYSTEM'
,
value
:
`
${
model
.
systemPrompt
}
我的知识库
: "
${
systemPrompt
}
"`
value
:
`
${
model
.
systemPrompt
}
知识库内容
: "
${
systemPrompt
}
"`
});
// 控制在 tokens 数量,防止超出
...
...
src/pages/api/model/data/exportModelData.ts
View file @
16a31de1
...
...
@@ -33,7 +33,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
VecModelDataIdx
,
`@modelId:{
${
modelId
}
} @userId:{
${
userId
}
}`
,
{
RETURN
:
[
'q'
,
'text'
,
'
v
ector'
],
RETURN
:
[
'q'
,
'text'
,
'
rawV
ector'
],
LIMIT
:
{
from
:
0
,
size
:
10000
...
...
@@ -42,15 +42,23 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
);
const
data
=
searchRes
.
documents
.
filter
((
item
)
=>
item
?.
value
?.
vector
)
.
filter
((
item
)
=>
{
if
(
!
item
?.
value
?.
rawVector
)
return
false
;
try
{
JSON
.
parse
(
item
.
value
.
rawVector
as
string
);
return
true
;
}
catch
(
error
)
{
return
false
;
}
})
.
map
((
item
:
any
)
=>
({
prompt
:
item
.
value
.
q
,
completion
:
item
.
value
.
text
,
vector
:
BufferToVector
(
item
.
value
.
v
ector
)
vector
:
JSON
.
parse
(
item
.
value
.
rawV
ector
)
}));
jsonRes
(
res
,
{
data
data
:
JSON
.
stringify
(
data
)
});
}
catch
(
err
)
{
jsonRes
(
res
,
{
...
...
src/pages/api/model/data/pushModelDataJson.ts
View file @
16a31de1
...
...
@@ -53,7 +53,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
userId
,
'modelId'
,
String
(
modelId
),
...(
vector
?
[
'vector'
,
vectorToBuffer
(
formatVector
(
vector
))]
:
[]),
...(
vector
?
[
'vector'
,
vectorToBuffer
(
formatVector
(
vector
)),
'rawVector'
,
JSON
.
stringify
(
vector
)]
:
[]),
'q'
,
item
.
prompt
,
'text'
,
...
...
src/pages/api/model/data/splitData.ts
View file @
16a31de1
...
...
@@ -36,12 +36,20 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const
textList
:
string
[]
=
[];
let
splitText
=
''
;
/* 取 3k ~ 4K tokens 内容 */
chunks
.
forEach
((
chunk
)
=>
{
splitText
+=
chunk
;
const
tokens
=
encode
(
splitText
).
length
;
if
(
tokens
>=
980
)
{
const
tokens
=
encode
(
splitText
+
chunk
).
length
;
if
(
tokens
>=
4000
)
{
// 超过 4000,不要这块内容
textList
.
push
(
splitText
);
splitText
=
chunk
;
}
else
if
(
tokens
>=
3000
)
{
// 超过 3000,取内容
textList
.
push
(
splitText
+
chunk
);
splitText
=
''
;
}
else
{
//没超过 3000,继续添加
splitText
+=
chunk
;
}
});
...
...
src/pages/model/detail/components/ModelDataCard.tsx
View file @
16a31de1
...
...
@@ -105,7 +105,7 @@ const ModelDataCard = ({ model }: { model: ModelSchema }) => {
mutationFn
:
()
=>
getExportDataList
(
model
.
_id
),
onSuccess
(
res
)
{
// 导出为文件
const
blob
=
new
Blob
([
JSON
.
stringify
(
res
)
],
{
type
:
'application/json;charset=utf-8'
});
const
blob
=
new
Blob
([
res
],
{
type
:
'application/json;charset=utf-8'
});
// 创建下载链接
const
downloadLink
=
document
.
createElement
(
'a'
);
...
...
@@ -136,7 +136,7 @@ const ModelDataCard = ({ model }: { model: ModelSchema }) => {
size=
{
'sm'
}
onClick=
{
()
=>
refetchData
(
pageNum
)
}
/>
{
/*
<Button
<
Button
variant=
{
'outline'
}
mr=
{
2
}
size=
{
'sm'
}
...
...
@@ -144,7 +144,7 @@ const ModelDataCard = ({ model }: { model: ModelSchema }) => {
onClick=
{
()
=>
onclickExport
()
}
>
导出
</Button>
*/
}
</
Button
>
<
Menu
>
<
MenuButton
as=
{
Button
}
size=
{
'sm'
}
>
导入
...
...
src/pages/model/detail/components/SelectJsonModal.tsx
View file @
16a31de1
...
...
@@ -70,7 +70,7 @@ const SelectJsonModal = ({
const
res
=
await
postModelDataJsonData
(
modelId
,
fileData
);
console
.
log
(
res
);
toast
({
title
:
'导入数据成功,需要一段
拆解和
训练'
,
title
:
'导入数据成功,需要一段
时间
训练'
,
status
:
'success'
});
onClose
();
...
...
src/service/events/generateQA.ts
View file @
16a31de1
...
...
@@ -16,7 +16,7 @@ export async function generateQA(next = false): Promise<any> {
const
systemPrompt
:
ChatCompletionRequestMessage
=
{
role
:
'system'
,
content
:
`总结助手。我会向你发送一段长文本,请从中总结出5至
15
个问题和答案,答案请尽量详细,并按以下格式返回: Q1:\nA1:\nQ2:\nA2:\n`
content
:
`总结助手。我会向你发送一段长文本,请从中总结出5至
30
个问题和答案,答案请尽量详细,并按以下格式返回: Q1:\nA1:\nQ2:\nA2:\n`
};
try
{
...
...
src/service/events/generateVector.ts
View file @
16a31de1
...
...
@@ -62,6 +62,8 @@ export async function generateVector(next = false): Promise<any> {
dataItem
.
id
,
'vector'
,
vectorToBuffer
(
vector
),
'rawVector'
,
JSON
.
stringify
(
vector
),
'status'
,
ModelDataStatusEnum
.
ready
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment