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
943abbe0
authored
Apr 04, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: 5进程同时进行
parent
b13c3c4d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
9 deletions
+19
-9
src/service/events/generateQA.ts
+15
-6
src/service/mongo.ts
+1
-0
src/service/utils/sendEmail.ts
+2
-2
src/types/index.d.ts
+1
-1
No files found.
src/service/events/generateQA.ts
View file @
943abbe0
...
@@ -11,9 +11,17 @@ import { VecModelDataPrefix } from '@/constants/redis';
...
@@ -11,9 +11,17 @@ import { VecModelDataPrefix } from '@/constants/redis';
import
{
customAlphabet
}
from
'nanoid'
;
import
{
customAlphabet
}
from
'nanoid'
;
const
nanoid
=
customAlphabet
(
'abcdefghijklmnopqrstuvwxyz1234567890'
,
12
);
const
nanoid
=
customAlphabet
(
'abcdefghijklmnopqrstuvwxyz1234567890'
,
12
);
export
async
function
generateQA
(
next
=
false
):
Promise
<
any
>
{
export
async
function
generateQA
():
Promise
<
any
>
{
if
(
global
.
generatingQA
&&
!
next
)
return
;
// 最多 5 个进程
global
.
generatingQA
=
true
;
if
(
global
.
generatingQA
>=
5
)
{
console
.
log
(
'QA 最多5个进程'
);
return
;
}
global
.
generatingQA
+=
1
;
setTimeout
(()
=>
{
generateQA
();
},
3000
);
try
{
try
{
const
redis
=
await
connectRedis
();
const
redis
=
await
connectRedis
();
...
@@ -24,7 +32,7 @@ export async function generateQA(next = false): Promise<any> {
...
@@ -24,7 +32,7 @@ export async function generateQA(next = false): Promise<any> {
if
(
!
dataItem
)
{
if
(
!
dataItem
)
{
console
.
log
(
'没有需要生成 QA 的数据'
);
console
.
log
(
'没有需要生成 QA 的数据'
);
global
.
generatingQA
=
false
;
global
.
generatingQA
=
0
;
return
;
return
;
}
}
...
@@ -128,16 +136,17 @@ export async function generateQA(next = false): Promise<any> {
...
@@ -128,16 +136,17 @@ export async function generateQA(next = false): Promise<any> {
text
:
systemPrompt
.
content
+
text
+
response
.
rawContent
text
:
systemPrompt
.
content
+
text
+
response
.
rawContent
});
});
generateQA
(
true
);
generateQA
();
generateVector
(
true
);
generateVector
(
true
);
}
catch
(
error
:
any
)
{
}
catch
(
error
:
any
)
{
console
.
log
(
error
);
console
.
log
(
error
);
console
.
log
(
'生成QA错误:'
,
error
?.
response
);
console
.
log
(
'生成QA错误:'
,
error
?.
response
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
generateQA
(
true
);
generateQA
();
},
5000
);
},
5000
);
}
}
global
.
generatingQA
--
;
}
}
/**
/**
...
...
src/service/mongo.ts
View file @
943abbe0
...
@@ -27,6 +27,7 @@ export async function connectToDatabase(): Promise<void> {
...
@@ -27,6 +27,7 @@ export async function connectToDatabase(): Promise<void> {
global
.
mongodb
=
null
;
global
.
mongodb
=
null
;
}
}
global
.
generatingQA
=
0
;
generateQA
();
generateQA
();
// generateAbstract();
// generateAbstract();
generateVector
();
generateVector
();
...
...
src/service/utils/sendEmail.ts
View file @
943abbe0
...
@@ -34,7 +34,7 @@ export const sendCode = (email: string, code: string, type: `${EmailTypeEnum}`)
...
@@ -34,7 +34,7 @@ export const sendCode = (email: string, code: string, type: `${EmailTypeEnum}`)
};
};
mailTransport
.
sendMail
(
options
,
function
(
err
,
msg
)
{
mailTransport
.
sendMail
(
options
,
function
(
err
,
msg
)
{
if
(
err
)
{
if
(
err
)
{
console
.
log
(
'error->'
,
err
);
console
.
log
(
'
send email
error->'
,
err
);
reject
(
'邮箱异常'
);
reject
(
'邮箱异常'
);
}
else
{
}
else
{
resolve
(
''
);
resolve
(
''
);
...
@@ -53,7 +53,7 @@ export const sendTrainSucceed = (email: string, modelName: string) => {
...
@@ -53,7 +53,7 @@ export const sendTrainSucceed = (email: string, modelName: string) => {
};
};
mailTransport
.
sendMail
(
options
,
function
(
err
,
msg
)
{
mailTransport
.
sendMail
(
options
,
function
(
err
,
msg
)
{
if
(
err
)
{
if
(
err
)
{
console
.
log
(
'error->'
,
err
);
console
.
log
(
'
send email
error->'
,
err
);
reject
(
'邮箱异常'
);
reject
(
'邮箱异常'
);
}
else
{
}
else
{
resolve
(
''
);
resolve
(
''
);
...
...
src/types/index.d.ts
View file @
943abbe0
...
@@ -4,7 +4,7 @@ import type { RedisClientType } from 'redis';
...
@@ -4,7 +4,7 @@ import type { RedisClientType } from 'redis';
declare
global
{
declare
global
{
var
mongodb
:
Mongoose
|
string
|
null
;
var
mongodb
:
Mongoose
|
string
|
null
;
var
redisClient
:
RedisClientType
|
null
;
var
redisClient
:
RedisClientType
|
null
;
var
generatingQA
:
boolean
;
var
generatingQA
:
number
;
var
generatingAbstract
:
boolean
;
var
generatingAbstract
:
boolean
;
var
generatingVector
:
boolean
;
var
generatingVector
:
boolean
;
var
QRCode
:
any
;
var
QRCode
:
any
;
...
...
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