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
b73829a2
authored
Apr 04, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 重复生成向量
parent
a7c5d3cc
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
13 deletions
+10
-13
src/pages/api/model/data/pushModelDataInput.ts
+1
-1
src/pages/api/model/data/pushModelDataJson.ts
+1
-1
src/service/events/generateQA.ts
+5
-7
src/service/events/generateVector.ts
+1
-2
src/service/mongo.ts
+1
-1
src/utils/tools.ts
+1
-1
No files found.
src/pages/api/model/data/pushModelDataInput.ts
View file @
b73829a2
...
@@ -58,7 +58,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
...
@@ -58,7 +58,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
})
})
);
);
generateVector
(
true
);
generateVector
();
jsonRes
(
res
,
{
jsonRes
(
res
,
{
data
:
insertRes
.
filter
((
item
)
=>
item
.
status
===
'rejected'
).
length
data
:
insertRes
.
filter
((
item
)
=>
item
.
status
===
'rejected'
).
length
...
...
src/pages/api/model/data/pushModelDataJson.ts
View file @
b73829a2
...
@@ -66,7 +66,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
...
@@ -66,7 +66,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
})
})
);
);
generateVector
(
true
);
generateVector
();
jsonRes
(
res
,
{
jsonRes
(
res
,
{
data
:
insertRedisRes
.
filter
((
item
)
=>
item
.
status
===
'rejected'
).
length
data
:
insertRedisRes
.
filter
((
item
)
=>
item
.
status
===
'rejected'
).
length
...
...
src/service/events/generateQA.ts
View file @
b73829a2
...
@@ -17,11 +17,7 @@ export async function generateQA(): Promise<any> {
...
@@ -17,11 +17,7 @@ export async function generateQA(): Promise<any> {
console
.
log
(
'QA 最多5个进程'
);
console
.
log
(
'QA 最多5个进程'
);
return
;
return
;
}
}
global
.
generatingQA
+=
1
;
global
.
generatingQA
++
;
setTimeout
(()
=>
{
generateQA
();
},
3000
);
try
{
try
{
const
redis
=
await
connectRedis
();
const
redis
=
await
connectRedis
();
...
@@ -136,17 +132,19 @@ export async function generateQA(): Promise<any> {
...
@@ -136,17 +132,19 @@ export async function generateQA(): Promise<any> {
text
:
systemPrompt
.
content
+
text
+
response
.
rawContent
text
:
systemPrompt
.
content
+
text
+
response
.
rawContent
});
});
global
.
generatingQA
--
;
generateQA
();
generateQA
();
generateVector
(
true
);
generateVector
();
}
catch
(
error
:
any
)
{
}
catch
(
error
:
any
)
{
console
.
log
(
error
);
console
.
log
(
error
);
console
.
log
(
'生成QA错误:'
,
error
?.
response
);
console
.
log
(
'生成QA错误:'
,
error
?.
response
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
global
.
generatingQA
--
;
generateQA
();
generateQA
();
},
5000
);
},
5000
);
}
}
global
.
generatingQA
--
;
}
}
/**
/**
...
...
src/service/events/generateVector.ts
View file @
b73829a2
import
{
getOpenAIApi
}
from
'@/service/utils/chat'
;
import
{
httpsAgent
}
from
'@/service/utils/tools'
;
import
{
connectRedis
}
from
'../redis'
;
import
{
connectRedis
}
from
'../redis'
;
import
{
VecModelDataIdx
}
from
'@/constants/redis'
;
import
{
VecModelDataIdx
}
from
'@/constants/redis'
;
import
{
vectorToBuffer
}
from
'@/utils/tools'
;
import
{
vectorToBuffer
}
from
'@/utils/tools'
;
...
@@ -88,6 +86,7 @@ export async function generateVector(next = false): Promise<any> {
...
@@ -88,6 +86,7 @@ export async function generateVector(next = false): Promise<any> {
setTimeout
(()
=>
{
setTimeout
(()
=>
{
generateVector
(
true
);
generateVector
(
true
);
},
60000
);
},
60000
);
return
;
}
}
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
...
src/service/mongo.ts
View file @
b73829a2
...
@@ -30,7 +30,7 @@ export async function connectToDatabase(): Promise<void> {
...
@@ -30,7 +30,7 @@ export async function connectToDatabase(): Promise<void> {
global
.
generatingQA
=
0
;
global
.
generatingQA
=
0
;
generateQA
();
generateQA
();
// generateAbstract();
// generateAbstract();
generateVector
();
generateVector
(
true
);
}
}
export
*
from
'./models/authCode'
;
export
*
from
'./models/authCode'
;
...
...
src/utils/tools.ts
View file @
b73829a2
...
@@ -75,7 +75,7 @@ export const readPdfContent = (file: File) =>
...
@@ -75,7 +75,7 @@ export const readPdfContent = (file: File) =>
const
readPDFPage
=
async
(
doc
:
any
,
pageNo
:
number
)
=>
{
const
readPDFPage
=
async
(
doc
:
any
,
pageNo
:
number
)
=>
{
const
page
=
await
doc
.
getPage
(
pageNo
);
const
page
=
await
doc
.
getPage
(
pageNo
);
const
tokenizedText
=
await
page
.
getTextContent
();
const
tokenizedText
=
await
page
.
getTextContent
();
const
pageText
=
tokenizedText
.
items
.
map
((
token
:
any
)
=>
token
.
str
).
join
(
''
);
const
pageText
=
tokenizedText
.
items
.
map
((
token
:
any
)
=>
token
.
str
).
join
(
'
'
);
return
pageText
;
return
pageText
;
};
};
...
...
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