From 4f0bd677f2e65ebf0bdf7376b750cdc3a507765d Mon Sep 17 00:00:00 2001
From: archer <545436317@qq.com>
Date: Sat, 27 May 2023 15:10:19 +0800
Subject: [PATCH] docs

---
 docs/deploy/fastgpt/docker-compose.yml | 5 ++++-
 docs/deploy/fastgpt/pg/init.sql        | 4 +---
 docs/dev/README.md                     | 2 +-
 src/service/events/generateQA.ts       | 8 --------
 src/service/events/generateVector.ts   | 8 --------
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/docs/deploy/fastgpt/docker-compose.yml b/docs/deploy/fastgpt/docker-compose.yml
index ce297bacb..bb13f8001 100644
--- a/docs/deploy/fastgpt/docker-compose.yml
+++ b/docs/deploy/fastgpt/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - /root/fastgpt/pg/data:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
   mongodb:
-    image: mongo:6.0.4
+    image: mongo:5.0.18
     container_name: mongo
     restart: always
     ports:
@@ -47,6 +47,9 @@ services:
       - aliAccessKeySecret=xxxx
       - aliSignName=xxxxx
       - aliTemplateCode=SMS_xxxx
+      # QA和向量生成最大进程数
+      - QA_MAX_PROCESS=10
+      - VECTOR_MAX_PROCESS=10
       # token加密凭证（随便填，作为登录凭证）
       - TOKEN_KEY=xxxx
       # root key, 最高权限，可以内部接口互相调用
diff --git a/docs/deploy/fastgpt/pg/init.sql b/docs/deploy/fastgpt/pg/init.sql
index ba0c97d28..294ffcf14 100644
--- a/docs/deploy/fastgpt/pg/init.sql
+++ b/docs/deploy/fastgpt/pg/init.sql
@@ -5,10 +5,9 @@ CREATE EXTENSION IF NOT EXISTS vector;
 -- init table
 CREATE TABLE IF NOT EXISTS modelData (
     id BIGSERIAL PRIMARY KEY,
-    vector VECTOR(1536),
+    vector VECTOR(1536) NOT NULL,
     status VARCHAR(50) NOT NULL,
     user_id VARCHAR(50) NOT NULL,
-    model_id VARCHAR(50),
     kb_id VARCHAR(50),
     q TEXT NOT NULL,
     a TEXT NOT NULL
@@ -16,6 +15,5 @@ CREATE TABLE IF NOT EXISTS modelData (
 -- create index
 CREATE INDEX IF NOT EXISTS modelData_status_index ON modelData USING HASH (status);
 CREATE INDEX IF NOT EXISTS modelData_userId_index ON modelData USING HASH (user_id);
-CREATE INDEX IF NOT EXISTS modelData_modelId_index ON modelData USING HASH (model_id);
 CREATE INDEX IF NOT EXISTS modelData_kbId_index ON modelData USING HASH (kb_id);
 EOSQL
diff --git a/docs/dev/README.md b/docs/dev/README.md
index 61aa1d9c7..95c4d25ec 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -2,7 +2,7 @@
 
 第一次开发，请先[部署教程](../deploy/docker.md)，需要部署数据库.
 
-## 环境变量配置
+## 环境变量配置 (可能更新不及时，以 docker-compose 里的变量为准)
 
 复制.env.template 文件，生成一个.env.local 环境变量文件夹，修改.env.local 里内容。
 
diff --git a/src/service/events/generateQA.ts b/src/service/events/generateQA.ts
index 6227f3d0e..ce75e7f51 100644
--- a/src/service/events/generateQA.ts
+++ b/src/service/events/generateQA.ts
@@ -149,14 +149,6 @@ A2:
       lockTime: new Date('2000/1/1')
     });
 
-    // 频率限制
-    if (err?.response?.statusText === 'Too Many Requests') {
-      console.log('生成向量次数限制，20s后尝试');
-      return setTimeout(() => {
-        generateQA();
-      }, 20000);
-    }
-
     setTimeout(() => {
       generateQA();
     }, 1000);
diff --git a/src/service/events/generateVector.ts b/src/service/events/generateVector.ts
index 1861c8191..6463cf829 100644
--- a/src/service/events/generateVector.ts
+++ b/src/service/events/generateVector.ts
@@ -130,14 +130,6 @@ export async function generateVector(): Promise<any> {
       lockTime: new Date('2000/1/1')
     });
 
-    // 频率限制
-    if (err?.response?.statusText === 'Too Many Requests') {
-      console.log('生成向量次数限制，20s后尝试');
-      return setTimeout(() => {
-        generateVector();
-      }, 20000);
-    }
-
     setTimeout(() => {
       generateVector();
     }, 1000);