From b55d9533be8c8d22cc791acc08765f8cf51787c7 Mon Sep 17 00:00:00 2001
From: Soulter <905617992@qq.com>
Date: Mon, 5 Feb 2024 23:46:46 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B8=85=E7=90=86=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                         |   4 +-
 addons/dashboard/server.py        |   2 +-
 configs/session                   |   0
 configs/stat                      |   0
 cores/qqbot/core.py               |  45 +++----------
 main.py                           |  19 ++----
 model/command/command.py          |  28 +-------
 model/command/openai_official.py  |   8 ---
 model/command/rev_edgegpt.py      |  51 ---------------
 model/provider/openai_official.py |  67 ++-----------------
 model/provider/rev_edgegpt.py     | 104 ------------------------------
 util/cmd_config.py                |   6 +-
 util/webapp_replit.py             |  25 -------
 13 files changed, 21 insertions(+), 338 deletions(-)
 delete mode 100644 configs/session
 delete mode 100644 configs/stat
 delete mode 100644 model/command/rev_edgegpt.py
 delete mode 100644 model/provider/rev_edgegpt.py
 delete mode 100644 util/webapp_replit.py

diff --git a/README.md b/README.md
index 75fd6c4d3..9dcad6a9e 100644
--- a/README.md
+++ b/README.md
@@ -155,15 +155,13 @@
 - `/key` 动态添加key
 - `/set` 人格设置面板
 - `/keyword nihao 你好` 设置关键词回复。nihao->你好
-- `/bing` 切换为bing
 - `/revgpt` 切换为ChatGPT逆向库
 - `/画` 画画
 
 #### 逆向ChatGPT库语言模型
 - `/gpt` 切换为OpenAI官方API
-- `/bing` 切换为bing
 
-* 切换模型指令支持临时回复。如`/bing 你好`将会临时使用一次bing模型 -->
+* 切换模型指令支持临时回复。如`/a 你好`将会临时使用一次bing模型 -->
 <!--
 ## 🙇‍感谢
 
diff --git a/addons/dashboard/server.py b/addons/dashboard/server.py
index 42061bed4..c76979508 100644
--- a/addons/dashboard/server.py
+++ b/addons/dashboard/server.py
@@ -263,6 +263,6 @@ class AstrBotDashBoard():
         ip_address = gu.get_local_ip_addresses()
         ip_str = f"http://{ip_address}:6185\n\thttp://localhost:6185"
         self.logger.log(f"\n==================\n您可访问:\n\n\t{ip_str}\n\n来登录可视化面板，默认账号密码为空。\n注意: 所有配置项现已全量迁移至 cmd_config.json 文件下，可登录可视化面板在线修改配置。\n==================\n", tag="可视化面板")
-        http_server = make_server('0.0.0.0', 6185, self.dashboard_be, processes=10)
+        http_server = make_server('0.0.0.0', 6185, self.dashboard_be, threaded=True, processes=10)
         http_server.serve_forever()
 
diff --git a/configs/session b/configs/session
deleted file mode 100644
index e69de29bb..000000000
diff --git a/configs/stat b/configs/stat
deleted file mode 100644
index e69de29bb..000000000
diff --git a/cores/qqbot/core.py b/cores/qqbot/core.py
index 08fd991c1..a4fa6a571 100644
--- a/cores/qqbot/core.py
+++ b/cores/qqbot/core.py
@@ -43,13 +43,12 @@ frequency_time = 60
 frequency_count = 2
 
 # 版本
-version = '3.1.1'
+version = '3.1.2'
 
 # 语言模型
 REV_CHATGPT = 'rev_chatgpt'
 OPENAI_OFFICIAL = 'openai_official'
 REV_ERNIE = 'rev_ernie'
-REV_EDGEGPT = 'rev_edgegpt'
 NONE_LLM = 'none_llm'
 chosen_provider = None
 # 语言模型对象
@@ -77,7 +76,6 @@ def upload():
     while True:
         addr_ip = ''
         try:
-
             o = {
                 "cnt_total": _global_object.cnt_total,
                 "admin": _global_object.admin_qq, 
@@ -98,9 +96,8 @@ def upload():
                 ok = resp.json()
                 if ok['status'] == 'ok':
                     _global_object.cnt_total = 0
-                    
         except BaseException as e:
-            logger.log("上传统计信息时出现错误: " + str(e), gu.LEVEL_ERROR, tag="Uploader")
+            pass
         time.sleep(10*60)
 
 # 语言模型选择
@@ -108,10 +105,6 @@ def privider_chooser(cfg):
     l = []
     if 'rev_ChatGPT' in cfg and cfg['rev_ChatGPT']['enable']:
         l.append('rev_chatgpt')
-    if 'rev_ernie' in cfg and cfg['rev_ernie']['enable']:
-        l.append('rev_ernie')
-    if 'rev_edgegpt' in cfg and cfg['rev_edgegpt']['enable']:
-        l.append('rev_edgegpt')
     if 'openai' in cfg and len(cfg['openai']['key']) > 0 and cfg['openai']['key'][0] is not None:
         l.append('openai_official')
     return l
@@ -165,22 +158,7 @@ def initBot(cfg):
                 llm_command_instance[REV_CHATGPT] = CommandRevChatGPT(llm_instance[REV_CHATGPT], _global_object)
                 chosen_provider = REV_CHATGPT
             else:
-                input("请退出本程序, 然后在配置文件中填写rev_ChatGPT相关配置")    
-    if REV_EDGEGPT in prov:
-        logger.log("初始化：New Bing", gu.LEVEL_INFO)
-        if not os.path.exists('./cookies.json'):
-            input("导入Bing模型时发生错误, 没有找到cookies文件或者cookies文件放置位置错误。windows启动器启动的用户请把cookies.json文件放到和启动器相同的目录下。\n如何获取请看https://github.com/Soulter/QQChannelChatGPT仓库介绍。")
-        else:
-            if cfg['rev_edgegpt']['enable']:
-                try:
-                    from model.provider.rev_edgegpt import ProviderRevEdgeGPT
-                    from model.command.rev_edgegpt import CommandRevEdgeGPT
-                    llm_instance[REV_EDGEGPT] = ProviderRevEdgeGPT()
-                    llm_command_instance[REV_EDGEGPT] = CommandRevEdgeGPT(llm_instance[REV_EDGEGPT], _global_object)
-                    chosen_provider = REV_EDGEGPT
-                except BaseException as e:
-                    print(traceback.format_exc())
-                    logger.log("加载Bing模型时发生错误, 请检查1. cookies文件是否正确放置 2. 是否设置了代理（梯子）。", gu.LEVEL_ERROR)
+                input("请退出本程序, 然后在配置文件中填写rev_ChatGPT相关配置")
     if OPENAI_OFFICIAL in prov:
         logger.log("初始化：OpenAI官方", gu.LEVEL_INFO)
         if cfg['openai']['key'] is not None and cfg['openai']['key'] != [None]:
@@ -404,15 +382,14 @@ async def oper_msg(message: Union[GroupMessage, FriendMessage, GuildMessage, Nak
     role: member | admin
     platform: 平台(gocq, qqchan)
     """
-    global chosen_provider, keywords
-    global _global_object
+    global chosen_provider, keywords, _global_object
     message_str = ''
     session_id = session_id
     role = role
     hit = False # 是否命中指令
     command_result = () # 调用指令返回的结果
-    message_result = None # 消息返回结果
-
+    
+    # 统计数据，如频道消息量
     record_message(platform, session_id)
 
     for i in message.message:
@@ -444,11 +421,9 @@ async def oper_msg(message: Union[GroupMessage, FriendMessage, GuildMessage, Nak
     
     # 检查是否是更换语言模型的请求
     temp_switch = ""
-    if message_str.startswith('/bing') or message_str.startswith('/gpt') or message_str.startswith('/revgpt'):
+    if message_str.startswith('/gpt') or message_str.startswith('/revgpt'):
         target = chosen_provider
-        if message_str.startswith('/bing'):
-            target = REV_EDGEGPT
-        elif message_str.startswith('/gpt'):
+        if message_str.startswith('/gpt'):
             target = OPENAI_OFFICIAL
         elif message_str.startswith('/revgpt'):
             target = REV_CHATGPT
@@ -512,8 +487,6 @@ async def oper_msg(message: Union[GroupMessage, FriendMessage, GuildMessage, Nak
                     llm_result_str = gplugin.web_search(message_str, llm_instance[chosen_provider], session_id, official_fc)
                 else:
                     llm_result_str = str(llm_instance[chosen_provider].text_chat(message_str, session_id, image_url, default_personality = _global_object.default_personality))
-            elif chosen_provider == REV_EDGEGPT:
-                return MessageResult("AstrBot 不再默认支持 NewBing 模型。")
 
             llm_result_str = _global_object.reply_prefix + llm_result_str
         except BaseException as e:
@@ -526,7 +499,7 @@ async def oper_msg(message: Union[GroupMessage, FriendMessage, GuildMessage, Nak
         
     # 指令回复
     if hit:
-        # 检查指令。 command_result 是一个元组：(指令调用是否成功, 指令返回的文本结果, 指令类型)
+        # 检查指令。command_result 是一个元组：(指令调用是否成功, 指令返回的文本结果, 指令类型)
         if command_result == None:
             return
         command = command_result[2]
diff --git a/main.py b/main.py
index 5e7ff9315..3c0329752 100644
--- a/main.py
+++ b/main.py
@@ -12,7 +12,6 @@ def main():
     try:
         import cores.qqbot.core as qqBot
         import yaml
-        from yaml.scanner import ScannerError
         import util.general_utils as gu
         ymlfile =  open(abs_path+"configs/config.yaml", 'r', encoding='utf-8')
         cfg = yaml.safe_load(ymlfile)
@@ -23,17 +22,16 @@ def main():
     except FileNotFoundError as file_not_found:
         print(file_not_found)
         input("配置文件不存在，请检查是否已经下载配置文件。")
-    except ScannerError as e:
-        print(traceback.format_exc())
-        input("config.yaml 配置文件格式错误，请遵守 yaml 格式。")
-
+    except BaseException as e:
+        print(e)
+        
     # 设置代理
     if 'http_proxy' in cfg and cfg['http_proxy'] != '':
         os.environ['HTTP_PROXY'] = cfg['http_proxy']
     if 'https_proxy' in cfg and cfg['https_proxy'] != '':
         os.environ['HTTPS_PROXY'] = cfg['https_proxy']
     
-    os.environ['NO_PROXY'] = 'cn.bing.com,https://api.sgroup.qq.com'
+    os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
 
     # 检查并创建 temp 文件夹
     if not os.path.exists(abs_path + "temp"):
@@ -88,15 +86,6 @@ if __name__ == "__main__":
         check_env(True)
     else:
         check_env()
-
-    if '-replit' in args:
-        print("[System] 启动Replit Web保活服务...")
-        try:
-            from util.webapp_replit import keep_alive
-            keep_alive()
-        except BaseException as e:
-            print(e)
-            print(f"[System-err] Replit Web保活服务启动失败:{str(e)}")
     
     t = threading.Thread(target=main, daemon=False)
     t.start()
diff --git a/model/command/command.py b/model/command/command.py
index add4b607c..b4fb2f387 100644
--- a/model/command/command.py
+++ b/model/command/command.py
@@ -171,30 +171,6 @@ class Command:
                         return False, "未找到该插件", "plugin"
                 except BaseException as e:
                     return False, f"获取插件信息失败，原因: {str(e)}", "plugin"
-            # elif l[1] == "reload":
-            #     if role != "admin":
-            #         return False, f"你的身份组{role}没有权限重载插件", "plugin"
-            #     for plugin in cached_plugins:
-            #         try:
-            #             print(f"更新插件 {plugin} 依赖...")
-            #             plugin_path = os.path.join(ppath, cached_plugins[plugin]["root_dir_name"])
-            #             if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
-            #                 mm = pipmain(['install', '-r', os.path.join(plugin_path, "requirements.txt"), "--quiet"])
-            #                 if mm != 0:
-            #                     return False, "插件依赖安装失败，需要您手动pip安装对应插件的依赖。", "plugin"
-            #         except BaseException as e:
-            #             print(f"插件{plugin}依赖安装失败，原因: {str(e)}")
-            #     try:
-            #         ok, err = self.plugin_reload(cached_plugins, all = True)
-            #         if ok:
-            #             return True, "\n重载插件成功~", "plugin"
-            #         else:
-            #             # if os.path.exists(plugin_path):
-            #             #     shutil.rmtree(plugin_path)
-            #             return False, f"插件重载失败。\n跟踪: \n{err}", "plugin"
-            #     except BaseException as e:
-            #         return False, f"插件重载失败，原因: {str(e)}", "plugin"
-
             elif l[1] == "dev":
                 if role != "admin":
                     return False, f"你的身份组{role}没有权限开发者模式", "plugin"
@@ -229,7 +205,6 @@ class Command:
             "nick": "设置机器人昵称",
             "plugin": "插件安装、卸载和重载",
             "web on/off": "启动或关闭网页搜索能力",
-            "/bing": "切换到bing模型",
             "/gpt": "切换到OpenAI ChatGPT API",
             "/revgpt": "切换到网页版ChatGPT",
         }
@@ -288,8 +263,7 @@ class Command:
         l = plain_text.split(" ")
 
         if len(l) < 3 and image_url == "":
-            return True, """
-【设置关键词回复】示例：
+            return True, """【设置关键词回复】示例：
 1. keyword hi 你好
 当发送hi的时候会回复你好
 2. keyword /hi 你好
diff --git a/model/command/openai_official.py b/model/command/openai_official.py
index b53314f2c..fd036650b 100644
--- a/model/command/openai_official.py
+++ b/model/command/openai_official.py
@@ -38,8 +38,6 @@ class CommandOpenAIOfficial(Command):
             return True, self.gpt()
         elif self.command_start_with(message, "status"):
             return True, self.status()
-        elif self.command_start_with(message, "count"):
-            return True, self.count()
         elif self.command_start_with(message, "help", "帮助"):
             return True, self.help()
         elif self.command_start_with(message, "unset"):
@@ -131,12 +129,6 @@ class CommandOpenAIOfficial(Command):
             index += 1
         return True, f"⭐使用情况({str(gg_count)}个已用):\n{chatgpt_cfg_str}", "status"
 
-    def count(self):
-        if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型。", "reset"
-        guild_count, guild_msg_count, guild_direct_msg_count, session_count = self.provider.get_stat()
-        return True, f"【本指令部分统计可能已经过时】\n当前会话数: {len(self.provider.session_dict)}\n共有频道数: {guild_count} \n共有消息数: {guild_msg_count}\n私信数: {guild_direct_msg_count}\n历史会话数: {session_count}", "count"
-
     def key(self, message: str):
         if self.provider is None:
             return False, "未启动OpenAI ChatGPT语言模型.", "reset"
diff --git a/model/command/rev_edgegpt.py b/model/command/rev_edgegpt.py
deleted file mode 100644
index e5333faf7..000000000
--- a/model/command/rev_edgegpt.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from model.command.command import Command
-from model.provider.rev_edgegpt import ProviderRevEdgeGPT
-import asyncio
-from cores.qqbot.global_object import GlobalObject
-
-class CommandRevEdgeGPT(Command):
-    def __init__(self, provider: ProviderRevEdgeGPT, global_object: GlobalObject):
-        self.provider = provider
-        self.cached_plugins = {}
-        self.global_object = global_object
-        super().__init__(provider, global_object)
-
-    def check_command(self, 
-                      message: str, 
-                      session_id: str, 
-                      role: str, 
-                      platform: str,
-                      message_obj):
-        self.platform = platform
-
-        hit, res = super().check_command(
-            message,
-            session_id,
-            role,
-            platform,
-            message_obj
-        )
-        
-        if hit:
-            return True, res
-        if self.command_start_with(message, "reset"):
-            return True, self.reset()
-        elif self.command_start_with(message, "help"):
-            return True, self.help()
-        elif self.command_start_with(message, "update"):
-            return True, self.update(message, role)
-
-        return False, None
-    
-    def reset(self, loop = None):
-        if self.provider is None:
-            return False, "未启动Bing语言模型.", "reset"
-        res = asyncio.run_coroutine_threadsafe(self.provider.forget(), loop).result()
-        print(res)
-        if res:
-            return res, "重置成功", "reset"
-        else:
-            return res, "重置失败", "reset"
-    
-    def help(self):
-        return True, super().help_messager(super().general_commands(), self.platform, self.global_object.cached_plugins), "help"
diff --git a/model/provider/openai_official.py b/model/provider/openai_official.py
index 2a1ade62f..18fb5d2ce 100644
--- a/model/provider/openai_official.py
+++ b/model/provider/openai_official.py
@@ -23,7 +23,7 @@ class ProviderOpenAIOfficial(Provider):
         self.logger = Logger()
 
         self.key_list = []
-        # 如果 cfg['key']中有长度为1的字符串，那么是格式错误，直接报错
+        # 如果 cfg['key'] 中有长度为 1 的字符串，那么是格式错误，直接报错
         for key in cfg['key']:
             if len(key) == 1:
                 input("检查到了长度为 1 的Key。配置文件中的 openai.key 处的格式错误 (符号 - 的后面要加空格)，请退出程序并检查配置文件，按回车跳过。")
@@ -43,7 +43,8 @@ class ProviderOpenAIOfficial(Provider):
         if 'api_base' in cfg and cfg['api_base'] != 'none' and cfg['api_base'] != '':
             self.api_base = cfg['api_base']
             self.logger.log(f"设置 api_base 为: {self.api_base}", tag="OpenAI")
-        # openai client
+            
+        # 创建 OpenAI Client
         self.client = OpenAI(
             api_key=self.key_list[0],
             base_url=self.api_base
@@ -61,7 +62,7 @@ class ProviderOpenAIOfficial(Provider):
 
         self.enc = tiktoken.get_encoding("cl100k_base")
 
-        # 读取历史记录
+        # 从 SQLite DB 读取历史记录
         try:
             db1 = dbConn()
             for session in db1.get_all_session():
@@ -70,29 +71,12 @@ class ProviderOpenAIOfficial(Provider):
         except BaseException as e:
             self.logger.log("读取历史记录失败，但不影响使用。", level=gu.LEVEL_ERROR, tag="OpenAI")
 
-
-        # 读取统计信息
-        if not os.path.exists(abs_path+"configs/stat"):
-            with open(abs_path+"configs/stat", 'w', encoding='utf-8') as f:
-                    json.dump({}, f)
-        self.stat_file = open(abs_path+"configs/stat", 'r', encoding='utf-8')
-        global count
-        res = self.stat_file.read()
-        if res == '':
-            count = {}
-        else:
-            try: 
-                count = json.loads(res)
-            except BaseException:
-                pass
-
         # 创建转储定时器线程
         threading.Thread(target=self.dump_history, daemon=True).start()
 
         # 人格
         self.curr_personality = {}
 
-
     # 转储历史记录
     def dump_history(self):
         time.sleep(10)
@@ -101,7 +85,6 @@ class ProviderOpenAIOfficial(Provider):
             try:
                 # print("转储历史记录...")
                 for key in self.session_dict:
-                    # print("TEST: "+str(db.get_session(key)))
                     data = self.session_dict[key]
                     data_json = {
                         'data': data
@@ -146,20 +129,6 @@ class ProviderOpenAIOfficial(Provider):
         # 会话机制
         if session_id not in self.session_dict:
             self.session_dict[session_id] = []
-
-            fjson = {}
-            try:
-                f = open(abs_path+"configs/session", "r", encoding="utf-8")
-                fjson = json.loads(f.read())
-                f.close()
-            except:
-                pass
-            finally:
-                fjson[session_id] = 'true'
-                f = open(abs_path+"configs/session", "w", encoding="utf-8")
-                f.write(json.dumps(fjson))
-                f.flush()
-                f.close()
         
         if len(self.session_dict[session_id]) == 0:
             # 设置默认人格
@@ -362,34 +331,6 @@ class ProviderOpenAIOfficial(Provider):
             usage_tokens += int(item['single_tokens'])
         return usage_tokens
         
-    '''
-    获取统计信息
-    '''
-    def get_stat(self):
-        try:
-            f = open(abs_path+"configs/stat", "r", encoding="utf-8")
-            fjson = json.loads(f.read())
-            f.close()
-            guild_count = 0
-            guild_msg_count = 0
-            guild_direct_msg_count = 0
-
-            for k,v in fjson.items():
-                guild_count += 1
-                guild_msg_count += v['count']
-                guild_direct_msg_count += v['direct_count']
-            
-            session_count = 0
-
-            f = open(abs_path+"configs/session", "r", encoding="utf-8")
-            fjson = json.loads(f.read())
-            f.close()
-            for k,v in fjson.items():
-                session_count += 1
-            return guild_count, guild_msg_count, guild_direct_msg_count, session_count
-        except:
-            return -1, -1, -1, -1
-
     # 包装信息
     def wrap(self, prompt, session_id, image_url = None):
         if image_url is not None:
diff --git a/model/provider/rev_edgegpt.py b/model/provider/rev_edgegpt.py
deleted file mode 100644
index aadb81179..000000000
--- a/model/provider/rev_edgegpt.py
+++ /dev/null
@@ -1,104 +0,0 @@
-from model.provider.provider import Provider
-from EdgeGPT import Chatbot, ConversationStyle
-import json
-import os
-from util import general_utils as gu
-from util.cmd_config import CmdConfig as cc
-import time
-
-class ProviderRevEdgeGPT(Provider):
-    def __init__(self):
-        raise Exception("Bing 逆向已停止维护，不可用，请使用 ChatGPT 官方 API。")
-
-        self.busy = False
-        self.wait_stack = []
-        with open('./cookies.json', 'r') as f:
-            cookies = json.load(f)
-        proxy = cc.get("bing_proxy", None)
-        if proxy == "":
-            proxy = None
-        # q = Query("Hello, bing!", cookie_files="./cookies.json")
-        # print(q)
-        self.bot = EdgeChatbot(cookies=cookies, proxy = "http://127.0.0.1:7890")
-        ret = self.bot.ask_stream("Hello, bing!", conversation_style=ConversationStyle.creative, wss_link="wss://ai.nothingnessvoid.tech/sydney/ChatHub")
-        # self.bot = Chatbot(cookies=cookies, proxy = proxy)
-        for i in ret:
-            print(i, flush=True)
-
-    def is_busy(self):
-        return self.busy
-
-    async def forget(self, session_id = None):
-        try:
-            await self.bot.reset()
-            return True
-        except BaseException:
-            return False
-        
-    async def text_chat(self, prompt, platform = 'none', image_url=None, function_call=None):
-        while self.busy:
-            time.sleep(1)
-        self.busy = True
-        resp = 'err'
-        err_count = 0
-        retry_count = 5
-        
-        while err_count < retry_count:
-            try:
-                resp = await self.bot.ask(prompt=prompt, conversation_style=ConversationStyle.creative)
-                # print("[RevEdgeGPT] "+str(resp))
-                if 'messages' not in resp['item']:
-                    await self.bot.reset()
-                msj_obj = resp['item']['messages'][len(resp['item']['messages'])-1]
-                reply_msg = msj_obj['text']
-                if 'sourceAttributions' in msj_obj:
-                    reply_source = msj_obj['sourceAttributions']
-                else:
-                    reply_source = []
-                if 'throttling' in resp['item']:
-                    throttling = resp['item']['throttling']
-                    # print(throttling)
-                else:
-                    throttling = None
-                if 'I\'m sorry but I prefer not to continue this conversation. I\'m still learning so I appreciate your understanding and patience.' in reply_msg:
-                    self.busy = False
-                    return '', 0
-                if reply_msg == prompt:
-                    # resp += '\n\n如果你没有让我复述你的话，那代表我可能不想和你继续这个话题了，请输入reset重置会话😶'
-                    await self.forget()
-                    err_count += 1
-                    continue
-                if reply_source is None:
-                    # 不想答复
-                    return '', 0
-                else:
-                    if platform != 'qqchan':
-                        index = 1
-                        if len(reply_source) > 0:
-                            reply_msg += "\n\n信息来源:\n"
-                        for i in reply_source:
-                            reply_msg += f"[{str(index)}]: {i['seeMoreUrl']} | {i['providerDisplayName']}\n"
-                            index += 1
-                if throttling is not None:
-                    if throttling['numUserMessagesInConversation'] == throttling['maxNumUserMessagesInConversation']:
-                        # 达到上限，重置会话
-                        await self.forget()
-                    if throttling['numUserMessagesInConversation'] > throttling['maxNumUserMessagesInConversation']:
-                        await self.forget()
-                        err_count += 1
-                        continue
-                    reply_msg += f"\n[{throttling['numUserMessagesInConversation']}/{throttling['maxNumUserMessagesInConversation']}]"
-                break
-            except BaseException as e:
-                gu.log(str(e), level=gu.LEVEL_WARNING, tag="RevEdgeGPT")
-                err_count += 1
-                if err_count >= retry_count:
-                        gu.log(r"如果报错, 且您的机器在中国大陆内, 请确保您的电脑已经设置好代理软件(梯子), 并在配置文件设置了系统代理地址。详见https://github.com/Soulter/QQChannelChatGPT/wiki/%E4%BA%8C%E3%80%81%E9%A1%B9%E7%9B%AE%E9%85%8D%E7%BD%AE%E6%96%87%E4%BB%B6%E9%85%8D%E7%BD%AE", max_len=999)
-                        self.busy = False
-                        raise e
-                gu.log("请求出现了一些问题, 正在重试。次数"+str(err_count), level=gu.LEVEL_WARNING, tag="RevEdgeGPT")
-        self.busy = False
-        
-        # print("[RevEdgeGPT] "+str(reply_msg))
-        return reply_msg, 1
-    
diff --git a/util/cmd_config.py b/util/cmd_config.py
index bec7d373a..1d5d423d0 100644
--- a/util/cmd_config.py
+++ b/util/cmd_config.py
@@ -87,7 +87,6 @@ def init_astrbot_config_items():
     cc = CmdConfig()
     cc.init_attributes("qq_forward_threshold", 200)
     cc.init_attributes("qq_welcome", "欢迎加入本群！\n欢迎给https://github.com/Soulter/QQChannelChatGPT项目一个Star😊~\n输入help查看帮助~\n")
-    cc.init_attributes("bing_proxy", "")
     cc.init_attributes("qq_pic_mode", False)
     cc.init_attributes("rev_chatgpt_model", "")
     cc.init_attributes("rev_chatgpt_plugin_ids", [])
@@ -120,7 +119,4 @@ def init_astrbot_config_items():
     cc.init_attributes("http_proxy", "")
     cc.init_attributes("https_proxy", "")
     cc.init_attributes("dashboard_username", "")
-    cc.init_attributes("dashboard_password", "")
-    
-    
-    # cc.init_attributes(["qq_forward_mode"], False)
+    cc.init_attributes("dashboard_password", "")
\ No newline at end of file
diff --git a/util/webapp_replit.py b/util/webapp_replit.py
deleted file mode 100644
index d107c907a..000000000
--- a/util/webapp_replit.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from flask import Flask
-from threading import Thread
-import datetime
-
-app = Flask(__name__)
-
-
-@app.route('/')
-def main_func():
-  content = "<h1>QQChannelChatGPT Web APP</h1>"
-
-  content += "<p>" + "Online @ " + str(datetime.datetime.now()) + "</p>"
-  content += "<p>欢迎Star本项目！！！</p>"
-  return content
-
-
-def run():
-  app.run(host="0.0.0.0", port=8080)
-  
-
-
-
-def keep_alive():
-  server = Thread(target=run)
-  server.start()