From 596ae80fea3f08d5fd1d314b21cf4d9a85348998 Mon Sep 17 00:00:00 2001
From: Soulter <37870767+Soulter@users.noreply.github.com>
Date: Mon, 22 May 2023 18:22:34 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cores/qqbot/core.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/cores/qqbot/core.py b/cores/qqbot/core.py
index 2c7172b15..affa97abe 100644
--- a/cores/qqbot/core.py
+++ b/cores/qqbot/core.py
@@ -23,12 +23,15 @@ from nakuru import (
 )
 from nakuru.entities.components import Plain,At
 from model.command.command import Command
+from model.command.command_rev_chatgpt import CommandRevChatGPT
+from model.command.command_rev_edgegpt import CommandRevEdgeGPT
+from model.command.command_openai_official import CommandOpenAIOfficial
 from util import general_utils as gu
 
+
+
 # QQBotClient实例
 client = ''
-# ChatGPT实例
-global chatgpt
 # 缓存的会话
 session_dict = {}
 # 最大缓存token（在配置里改 configs/config.yaml）
@@ -74,8 +77,10 @@ REV_EDGEGPT = 'rev_edgegpt'
 provider = None
 chosen_provider = None
 
-# 逆向库对象
+# 语言模型对象
 rev_chatgpt = None
+rev_edgegpt = None
+chatgpt = None
 # gpt配置信息
 gpt_config = {}
 # 百度内容审核实例
@@ -183,14 +188,13 @@ def initBot(cfg, prov):
 
     # 语言模型提供商
     gu.log("--------加载语言模型--------", gu.LEVEL_INFO, fg=gu.FG_COLORS['yellow'])
+
     if REV_CHATGPT in prov:
         gu.log("- 逆向ChatGPT库 -", gu.LEVEL_INFO)
         if cfg['rev_ChatGPT']['enable']:
             if 'account' in cfg['rev_ChatGPT']:
                 from model.provider.provider_rev_chatgpt import ProviderRevChatGPT
-                from model.command.command_rev_chatgpt import CommandRevChatGPT
                 rev_chatgpt = ProviderRevChatGPT(cfg['rev_ChatGPT'])
-                command_rev_chatgpt = CommandRevChatGPT(cfg['rev_ChatGPT'])
                 chosen_provider = REV_CHATGPT
             else:
                 input("[System-err] 请退出本程序, 然后在配置文件中填写rev_ChatGPT相关配置")
@@ -204,9 +208,7 @@ def initBot(cfg, prov):
             if cfg['rev_edgegpt']['enable']:
                 try:
                     from model.provider.provider_rev_edgegpt import ProviderRevEdgeGPT
-                    from model.command.command_rev_edgegpt import CommandRevEdgeGPT
                     rev_edgegpt = ProviderRevEdgeGPT()
-                    command_rev_edgegpt = CommandRevEdgeGPT(rev_edgegpt)
                     chosen_provider = REV_EDGEGPT
                 except BaseException as e:
                     gu.log("加载Bing模型时发生错误, 请检查1. cookies文件是否正确放置 2. 是否设置了代理（梯子）。", gu.LEVEL_ERROR, max_len=60)
@@ -214,11 +216,13 @@ def initBot(cfg, prov):
         gu.log("- OpenAI官方 -", gu.LEVEL_INFO)
         if cfg['openai']['key'] is not None:
             from model.provider.provider_openai_official import ProviderOpenAIOfficial
-            from model.command.command_openai_official import CommandOpenAIOfficial
             chatgpt = ProviderOpenAIOfficial(cfg['openai'])
-            command_openai_official = CommandOpenAIOfficial(chatgpt)
             chosen_provider = OPENAI_OFFICIAL
 
+    command_rev_edgegpt = CommandRevEdgeGPT(rev_edgegpt)
+    command_rev_chatgpt = CommandRevChatGPT(rev_chatgpt)
+    command_openai_official = CommandOpenAIOfficial(chatgpt)
+
     gu.log("--------加载个性化配置--------", gu.LEVEL_INFO, fg=gu.FG_COLORS['yellow'])
     # 得到关键词
     if os.path.exists("keyword.json"):