初步追加通过json导入messages数组的方式进行情景预设

main.py

@@ -45,9 +45,7 @@ def init_db():
 
 def ensure_dependencies():
     import pkg.utils.pkgmgr as pkgmgr
-    pkgmgr.run_pip(["install", "openai", "Pillow", "--upgrade",
-                    "-i", "https://pypi.douban.com/simple/",
-                    "--trusted-host", "pypi.douban.com"])
+    pkgmgr.run_pip(["install", "openai", "Pillow", "--upgrade"])
 
 
 known_exception_caught = False
@@ -107,8 +105,6 @@ def reset_logging():
 
 
 def main(first_time_init=False):
-    """启动流程，reload之后会被执行"""
-
     global known_exception_caught
 
     import config
@@ -131,26 +127,13 @@ def main(first_time_init=False):
 
         config = importlib.import_module('config')
 
+        import pkg.utils.context
+        pkg.utils.context.set_config(config)
+
         init_runtime_log_file()
 
         sh = reset_logging()
 
-        # 配置完整性校验
-        is_integrity = True
-        config_template = importlib.import_module('config-template')
-        for key in dir(config_template):
-            if not key.startswith("__") and not hasattr(config, key):
-                setattr(config, key, getattr(config_template, key))
-                logging.warning("[{}]不存在".format(key))
-                is_integrity = False
-        if not is_integrity:
-            logging.warning("配置文件不完整，请依据config-template.py检查config.py")
-            logging.warning("以上配置已被设为默认值，将在5秒后继续启动... ")
-            time.sleep(5)
-
-        import pkg.utils.context
-        pkg.utils.context.set_config(config)
-
         # 检查是否设置了管理员
         if not (hasattr(config, 'admin_qq') and config.admin_qq != 0):
             # logging.warning("未设置管理员QQ,管理员权限指令及运行告警将无法使用,如需设置请修改config.py中的admin_qq字段")
@@ -197,7 +180,7 @@ def main(first_time_init=False):
         # 初始化qq机器人
         qqbot = pkg.qqbot.manager.QQBotManager(mirai_http_api_config=config.mirai_http_api_config,
                                                timeout=config.process_message_timeout, retry=config.retry_times,
-                                               first_time_init=first_time_init, pool_num=config.pool_num)
+                                               first_time_init=first_time_init)
 
         # 加载插件
         import pkg.plugin.host
@@ -205,7 +188,7 @@ def main(first_time_init=False):
 
         pkg.plugin.host.initialize_plugins()
 
-        if first_time_init:  # 不是热重载之后的启动,则启动新的bot线程
+        if first_time_init:  # 不是热重载之后的启动,则不启动新的bot线程
 
             import mirai.exceptions
 
@@ -294,7 +277,17 @@ def main(first_time_init=False):
     except Exception as e:
         logging.warning("检查更新失败:{}".format(e))
 
-    return qqbot
+    while True:
+        try:
+            time.sleep(10)
+            if qqbot != pkg.utils.context.get_qqbot_manager():  # 已经reload了
+                logging.info("以前的main流程由于reload退出")
+                break
+        except KeyboardInterrupt:
+            stop()
+
+            print("程序退出")
+            sys.exit(0)
 
 
 def stop():
@@ -347,9 +340,19 @@ if __name__ == '__main__':
         sys.exit(0)
 
     elif len(sys.argv) > 1 and sys.argv[1] == 'update':
-        print("正在进行程序更新...")
-        import pkg.utils.updater as updater
-        updater.update_all(cli=True)
+        try:
+            try:
+                import pkg.utils.pkgmgr
+                pkg.utils.pkgmgr.ensure_dulwich()
+            except:
+                pass
+
+            from dulwich import porcelain
+
+            repo = porcelain.open_repo('.')
+            porcelain.pull(repo)
+        except ModuleNotFoundError:
+            print("dulwich模块未安装,请查看 https://github.com/RockChinQ/QChatGPT/issues/77")
         sys.exit(0)
 
     # import pkg.utils.configmgr
@@ -357,14 +360,4 @@ if __name__ == '__main__':
     # pkg.utils.configmgr.set_config_and_reload("quote_origin", False)
     requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
-    qqbot = main(True)
-
-    import pkg.utils.context
-    while True:
-        try:
-            time.sleep(10)
-        except KeyboardInterrupt:
-            stop()
-
-            print("程序退出")
-            sys.exit(0)
+    main(True)