Merge remote-tracking branch 'refs/remotes/origin/master'

cores/qqbot/core.py

@@ -25,9 +25,6 @@ from nakuru import (
 from nakuru.entities.components import Plain,At,Image
 from model.provider.provider import Provider
 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
 from util.cmd_config import CmdConfig as cc
 import util.gplugin as gplugin
@@ -235,6 +232,7 @@ def initBot(cfg, prov):
         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
                 llm_instance[REV_CHATGPT] = ProviderRevChatGPT(cfg['rev_ChatGPT'], base_url=cc.get("CHATGPT_BASE_URL", None))
                 llm_command_instance[REV_CHATGPT] = CommandRevChatGPT(llm_instance[REV_CHATGPT], _global_object)
                 chosen_provider = REV_CHATGPT
@@ -249,6 +247,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
                     llm_instance[REV_EDGEGPT] = ProviderRevEdgeGPT()
                     llm_command_instance[REV_EDGEGPT] = CommandRevEdgeGPT(llm_instance[REV_EDGEGPT], _global_object)
                     chosen_provider = REV_EDGEGPT
@@ -259,6 +258,7 @@ 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
             llm_instance[OPENAI_OFFICIAL] = ProviderOpenAIOfficial(cfg['openai'])
             llm_command_instance[OPENAI_OFFICIAL] = CommandOpenAIOfficial(llm_instance[OPENAI_OFFICIAL], _global_object)
             chosen_provider = OPENAI_OFFICIAL

main.py

@@ -1,7 +1,9 @@
 import os, sys
 from pip._internal import main as pipmain
+import warnings
 import traceback
 
+warnings.filterwarnings("ignore")
 abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
 
 def main():
@@ -58,10 +60,9 @@ def privider_chooser(cfg):
         l.append('openai_official')
     return l
 
-# 检查并安装环境
-def check_env():
-    if not (sys.version_info.major == 3 and sys.version_info.minor >= 8):
-        print("请使用Python3.8运行本项目")
+def check_env(ch_mirror=False):
+    if not (sys.version_info.major == 3 and sys.version_info.minor >= 9):
+        print("请使用Python3.9+运行本项目")
         input("按任意键退出...")
         exit()
     
@@ -71,7 +72,11 @@ def check_env():
         pth = 'QQChannelChatGPT'+ os.sep +'requirements.txt'
     print("正在检查更新第三方库...")
     try:
-        pipmain(['install', '-r', pth, '--quiet'])
+        if ch_mirror:
+            print("使用阿里云镜像")
+            pipmain(['install', '-r', pth, '-i', 'https://mirrors.aliyun.com/pypi/simple/', '--quiet'])
+        else:
+            pipmain(['install', '-r', pth, '--quiet'])
     except BaseException as e:
         print(e)
         while True:
@@ -107,17 +112,20 @@ def get_platform():
         print("other")
 
 if __name__ == "__main__":
-    check_env()
 
-    # 获取参数
     args = sys.argv
-    if len(args) > 1:
-        if args[1] == '-replit':
-            print("[System] 启动Replit Web保活服务...")
-            try:
-                from webapp_replit import keep_alive
-                keep_alive()
-            except BaseException as e:
-                print(e)
-                print(f"[System-err] Replit Web保活服务启动失败:{str(e)}")
+
+    if '-cn' in args:
+        check_env(True)
+    else:
+        check_env()
+
+    if '-replit' in args:
+        print("[System] 启动Replit Web保活服务...")
+        try:
+            from webapp_replit import keep_alive
+            keep_alive()
+        except BaseException as e:
+            print(e)
+            print(f"[System-err] Replit Web保活服务启动失败:{str(e)}")
     main()

model/command/command.py

@@ -1,6 +1,13 @@
 import json
-import git.exc
-from git.repo import Repo
+
+has_git = True
+try:
+    import git.exc
+    from git.repo import Repo
+except BaseException as e:
+    print("你正运行在无Git环境下，暂时将无法使用插件、热更新功能。")
+    has_git = False
+
 import os
 import sys
 import requests
@@ -142,6 +149,8 @@ class Command:
     插件指令
     '''
     def plugin_oper(self, message: str, role: str, cached_plugins: dict, platform: str):
+        if not has_git:
+            return False, "你正在运行在无Git环境下，暂时将无法使用插件、热更新功能。", "plugin"
         l = message.split(" ")
         if len(l) < 2:
             p = gu.create_text_image("【插件指令面板】", "安装插件: \nplugin i 插件Github地址\n卸载插件: \nplugin d 插件名 \n重载插件: \nplugin reload\n查看插件列表：\nplugin l\n更新插件: plugin u 插件名\n")
@@ -418,6 +427,8 @@ class Command:
             return False, "设置失败: "+str(e), "keyword"
     
     def update(self, message: str, role: str):
+        if not has_git:
+            return False, "你正在运行在无Git环境下，暂时将无法使用插件、热更新功能。", "update"
         if role != "admin":
             return True, "你没有权限使用该指令", "keyword"
         l = message.split(" ")

model/provider/provider_openai_official.py

@@ -9,7 +9,7 @@ import threading
 from util import general_utils as gu
 
 abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
-key_record_path = abs_path+'chatgpt_key_record'
+key_record_path = abs_path + 'chatgpt_key_record'
 
 class ProviderOpenAIOfficial(Provider):
     def __init__(self, cfg):