From b73829a25cbe38050a7911b1fdb5345629bb7dc9 Mon Sep 17 00:00:00 2001
From: archer <545436317@qq.com>
Date: Tue, 4 Apr 2023 22:12:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E5=A4=8D=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=90=91=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/api/model/data/pushModelDataInput.ts |  2 +-
 src/pages/api/model/data/pushModelDataJson.ts  |  2 +-
 src/service/events/generateQA.ts               | 12 +++++-------
 src/service/events/generateVector.ts           |  3 +--
 src/service/mongo.ts                           |  2 +-
 src/utils/tools.ts                             |  2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/api/model/data/pushModelDataInput.ts b/src/pages/api/model/data/pushModelDataInput.ts
index 65679fcf5..00de78edb 100644
--- a/src/pages/api/model/data/pushModelDataInput.ts
+++ b/src/pages/api/model/data/pushModelDataInput.ts
@@ -58,7 +58,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       })
     );
 
-    generateVector(true);
+    generateVector();
 
     jsonRes(res, {
       data: insertRes.filter((item) => item.status === 'rejected').length
diff --git a/src/pages/api/model/data/pushModelDataJson.ts b/src/pages/api/model/data/pushModelDataJson.ts
index 9f745c38e..39ec6ab2f 100644
--- a/src/pages/api/model/data/pushModelDataJson.ts
+++ b/src/pages/api/model/data/pushModelDataJson.ts
@@ -66,7 +66,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       })
     );
 
-    generateVector(true);
+    generateVector();
 
     jsonRes(res, {
       data: insertRedisRes.filter((item) => item.status === 'rejected').length
diff --git a/src/service/events/generateQA.ts b/src/service/events/generateQA.ts
index 9de713d35..fefd53663 100644
--- a/src/service/events/generateQA.ts
+++ b/src/service/events/generateQA.ts
@@ -17,11 +17,7 @@ export async function generateQA(): Promise<any> {
     console.log('QA 最多5个进程');
     return;
   }
-  global.generatingQA += 1;
-
-  setTimeout(() => {
-    generateQA();
-  }, 3000);
+  global.generatingQA++;
 
   try {
     const redis = await connectRedis();
@@ -136,17 +132,19 @@ export async function generateQA(): Promise<any> {
       text: systemPrompt.content + text + response.rawContent
     });
 
+    global.generatingQA--;
+
     generateQA();
-    generateVector(true);
+    generateVector();
   } catch (error: any) {
     console.log(error);
     console.log('生成QA错误:', error?.response);
 
     setTimeout(() => {
+      global.generatingQA--;
       generateQA();
     }, 5000);
   }
-  global.generatingQA--;
 }
 
 /**
diff --git a/src/service/events/generateVector.ts b/src/service/events/generateVector.ts
index f08d0933f..4dbaa1d9f 100644
--- a/src/service/events/generateVector.ts
+++ b/src/service/events/generateVector.ts
@@ -1,5 +1,3 @@
-import { getOpenAIApi } from '@/service/utils/chat';
-import { httpsAgent } from '@/service/utils/tools';
 import { connectRedis } from '../redis';
 import { VecModelDataIdx } from '@/constants/redis';
 import { vectorToBuffer } from '@/utils/tools';
@@ -88,6 +86,7 @@ export async function generateVector(next = false): Promise<any> {
       setTimeout(() => {
         generateVector(true);
       }, 60000);
+      return;
     }
 
     setTimeout(() => {
diff --git a/src/service/mongo.ts b/src/service/mongo.ts
index 3790c4743..f9a675db8 100644
--- a/src/service/mongo.ts
+++ b/src/service/mongo.ts
@@ -30,7 +30,7 @@ export async function connectToDatabase(): Promise<void> {
   global.generatingQA = 0;
   generateQA();
   // generateAbstract();
-  generateVector();
+  generateVector(true);
 }
 
 export * from './models/authCode';
diff --git a/src/utils/tools.ts b/src/utils/tools.ts
index 9b35e36c7..ca82592cc 100644
--- a/src/utils/tools.ts
+++ b/src/utils/tools.ts
@@ -75,7 +75,7 @@ export const readPdfContent = (file: File) =>
     const readPDFPage = async (doc: any, pageNo: number) => {
       const page = await doc.getPage(pageNo);
       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;
     };