fix: 修复配置文件没有有效迁移的问题

/models 指令优化

addons/dashboard/helper.py

@@ -119,14 +119,14 @@ class DashBoardHelper():
             )
             qq_gocq_platform_group = DashBoardConfig(
                 config_type="group",
-                name="OneBot协议平台配置",
+                name="go-cqhttp",
                 description="",
                 body=[
                     DashBoardConfig(
                         config_type="item",
                         val_type="bool",
                         name="启用",
-                        description="支持cq-http、shamrock等（目前仅支持QQ平台）",
+                        description="",
                         value=config['gocqbot']['enable'],
                         path="gocqbot.enable",
                     ),

addons/dashboard/server.py

@@ -390,13 +390,13 @@ class AstrBotDashBoard():
                     },
                     {
                         "title": "QQ_OFFICIAL",
-                        "desc": "QQ官方API，仅支持频道",
+                        "desc": "QQ官方API。支持频道、群（需获得群权限）",
                         "namespace": "internal_platform_qq_official",
                         "tag": ""
                     },
                     {
-                        "title": "OneBot协议",
-                        "desc": "支持cq-http、shamrock等（目前仅支持QQ平台）",
+                        "title": "go-cqhttp",
+                        "desc": "第三方 QQ 协议实现。支持频道、群",
                         "namespace": "internal_platform_qq_gocq",
                         "tag": ""
                     }

astrbot/core.py

@@ -22,6 +22,7 @@ from util.cmd_config import init_astrbot_config_items
 from type.types import GlobalObject
 from type.register import *
 from type.message import AstrBotMessage
+from type.config import *
 from addons.dashboard.helper import DashBoardHelper
 from addons.dashboard.server import DashBoardData
 from persist.session import dbConn
@@ -38,9 +39,6 @@ frequency_time = 60
 # 计数默认值
 frequency_count = 10
 
-# 版本
-version = '3.1.13'
-
 # 语言模型
 OPENAI_OFFICIAL = 'openai_official'
 NONE_LLM = 'none_llm'
@@ -56,13 +54,9 @@ baidu_judge = None
 # CLI
 PLATFORM_CLI = 'cli'
 
-init_astrbot_config_items()
-
 # 全局对象
 _global_object: GlobalObject = None
 
-# 语言模型选择
-
 
 def privider_chooser(cfg):
     l = []
@@ -70,21 +64,16 @@ def privider_chooser(cfg):
         l.append('openai_official')
     return l
 
-
-'''
-初始化机器人
-'''
-
-
 def init():
+    '''
+    初始化机器人
+    '''
     global llm_instance, llm_command_instance
     global baidu_judge, chosen_provider
     global frequency_count, frequency_time
     global _global_object
 
-    # 迁移旧配置
-    gu.try_migrate_config()
-    # 使用新配置
+    init_astrbot_config_items()
     cfg = cc.get_all()
 
     _event_loop = asyncio.new_event_loop()
@@ -92,9 +81,9 @@ def init():
 
     # 初始化 global_object
     _global_object = GlobalObject()
-    _global_object.version = version
+    _global_object.version = VERSION
     _global_object.base_config = cfg
-    logger.info("AstrBot v"+version)
+    logger.info("AstrBot v" + VERSION)
 
     if 'reply_prefix' in cfg:
         # 适配旧版配置
@@ -319,7 +308,6 @@ async def record_message(platform: str, session_id: str):
     db_inst.increment_stat_session(platform, session_id, 1)
     db_inst.increment_stat_message(curr_ts, 1)
     db_inst.increment_stat_platform(curr_ts, platform, 1)
-    _global_object.cnt_total += 1
 
 
 async def oper_msg(message: AstrBotMessage,

main.py

@@ -4,8 +4,8 @@ import sys
 import warnings
 import traceback
 import threading
-from SparkleLogging.utils.core import LogManager
 from logging import Formatter, Logger
+from util.cmd_config import CmdConfig, try_migrate_config
 
 warnings.filterwarnings("ignore")
 abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
@@ -78,26 +78,27 @@ def check_env():
         exit()
 
 if __name__ == "__main__":
+    update_dept()
+    
+    try_migrate_config()
+    cc = CmdConfig()
+    http_proxy = cc.get("http_proxy")
+    https_proxy = cc.get("https_proxy")
+    if http_proxy:
+        os.environ['HTTP_PROXY'] = http_proxy
+    if https_proxy:
+        os.environ['HTTPS_PROXY'] = https_proxy
+    os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
+    
+    from SparkleLogging.utils.core import LogManager
     logger = LogManager.GetLogger(
     log_name='astrbot-core',
         out_to_console=True,
         custom_formatter=Formatter('[%(asctime)s| %(name)s - %(levelname)s|%(filename)s:%(lineno)d]: %(message)s', datefmt="%H:%M:%S")
     )
     logger.info(logo_tmpl)
-    
-    # 设置代理
-    from util.cmd_config import CmdConfig
-    cc = CmdConfig()
-    http_proxy = cc.get("http_proxy")
-    https_proxy = cc.get("https_proxy")
     logger.info(f"使用代理: {http_proxy}, {https_proxy}")
-    if http_proxy:
-        os.environ['HTTP_PROXY'] = http_proxy
-    if https_proxy:
-        os.environ['HTTPS_PROXY'] = https_proxy
-    os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
-
-    update_dept()
+    
     check_env()
     t = threading.Thread(target=main, daemon=True)
     t.start()

model/command/command.py

@@ -64,6 +64,8 @@ class Command:
                     result = await plugin.plugin_instance.run(ame)
                 else:
                     result = await asyncio.to_thread(plugin.plugin_instance.run, ame)
+                if not result:
+                    continue
                 if isinstance(result, CommandResult):
                     hit = result.hit
                     res = result._result_tuple()
@@ -73,6 +75,7 @@ class Command:
                 else:
                     raise TypeError("插件返回值格式错误。")
                 if hit:
+                    plugin.trig()
                     logger.debug("hit plugin: " + plugin.metadata.plugin_name)
                     return True, res
             except TypeError as e:
@@ -217,7 +220,7 @@ class Command:
             "help": "帮助",
             "keyword": "设置关键词/关键指令回复",
             "update": "更新项目",
-            "nick": "设置机器人昵称",
+            "nick": "设置机器人唤醒词",
             "plugin": "插件安装、卸载和重载",
             "web on/off": "LLM 网页搜索能力",
         }

model/command/openai_official.py

@@ -84,6 +84,7 @@ class CommandOpenAIOfficial(Command):
         for model in models:
             ret += f"\n{i}. {model.id}"
             i += 1
+        ret += "\nTips: 使用 /model 模型名/编号，即可实时更换模型。如目标模型不存在于上表，请输入模型名。"
         logger.debug(ret)
         return True, ret, "models"
 
@@ -97,14 +98,6 @@ class CommandOpenAIOfficial(Command):
         models = list(models)
         if model.isdigit() and int(model) <= len(models) and int(model) >= 1:
             model = models[int(model)-1]
-        else:
-            f = False
-            for m in models:
-                if model == m.id:
-                    f = True
-                    break
-            if not f:
-                return True, "模型不存在或输入非法", "model"
 
         self.provider.set_model(model.id)
         return True, f"模型已设置为 {model.id}", "model"
@@ -113,11 +106,13 @@ class CommandOpenAIOfficial(Command):
     async def help(self):
         commands = super().general_commands()
         commands['画'] = '调用 OpenAI DallE 模型生成图片'
-        commands['set'] = '人格设置面板'
-        commands['status'] = '查看 Api Key 状态和配置信息'
-        commands['token'] = '查看本轮会话 token'
-        commands['reset'] = '重置当前与 LLM 的会话，但保留人格（system prompt）'
-        commands['reset p'] = '重置当前与 LLM 的会话，并清除人格。'
+        commands['/set'] = '人格设置面板'
+        commands['/status'] = '查看 Api Key 状态和配置信息'
+        commands['/token'] = '查看本轮会话 token'
+        commands['/reset'] = '重置当前与 LLM 的会话，但保留人格（system prompt）'
+        commands['/reset p'] = '重置当前与 LLM 的会话，并清除人格。'
+        commands['/models'] = '获取当前可用的模型'
+        commands['/model'] = '更换模型'
         
         return True, await super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"
 
@@ -248,9 +243,6 @@ class CommandOpenAIOfficial(Command):
     async def draw(self, message: str):
         if self.provider is None:
             return False, "未启用 OpenAI 官方 API", "draw"
-        if message.startswith("/画"):
-            message = message[2:]
-        elif message.startswith("画"):
-            message = message[1:]
+        message = message.removeprefix("/").removeprefix("画")
         img_url = await self.provider.image_generate(message)
         return True, img_url, "draw"

model/platform/_platfrom.py

@@ -14,34 +14,40 @@ class Platform():
         初始化平台的各种接口
         '''
         self.message_handler = message_handler
+        self.cnt_receive = 0
+        self.cnt_reply = 0
         pass
 
     @abc.abstractmethod
-    async def handle_msg():
+    async def handle_msg(self):
         '''
         处理到来的消息
         '''
+        self.cnt_receive += 1
         pass
 
     @abc.abstractmethod
-    async def reply_msg():
+    async def reply_msg(self):
         '''
         回复消息（被动发送）
         '''
+        self.cnt_reply += 1
         pass
 
     @abc.abstractmethod
-    async def send_msg(target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
+    async def send_msg(self, target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
         '''
         发送消息（主动发送）
         '''
+        self.cnt_reply += 1
         pass
 
     @abc.abstractmethod
-    async def send(target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
+    async def send(self, target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
         '''
         发送消息（主动发送）同 send_msg()
         '''
+        self.cnt_reply += 1
         pass
 
     def parse_message_outline(self, message: Union[GuildMessage, GroupMessage, FriendMessage, str, list]) -> str:

model/platform/qq_gocq.py

@@ -11,6 +11,7 @@ from nakuru import (
     Notify
 )
 from typing import Union
+from type.types import GlobalObject
 import time
 
 from ._platfrom import Platform
@@ -29,7 +30,7 @@ class FakeSource:
 
 
 class QQGOCQ(Platform):
-    def __init__(self, cfg: dict, message_handler: callable, global_object) -> None:
+    def __init__(self, cfg: dict, message_handler: callable, global_object: GlobalObject) -> None:
         super().__init__(message_handler)
 
         self.loop = asyncio.new_event_loop()
@@ -38,14 +39,8 @@ class QQGOCQ(Platform):
         self.waiting = {}
         self.cc = CmdConfig()
         self.cfg = cfg
-
-        try:
-            self.nick_qq = cfg['nick_qq']
-        except:
-            self.nick_qq = ["ai", "!", "！"]
-        nick_qq = self.nick_qq
-        if isinstance(nick_qq, str):
-            nick_qq = [nick_qq]
+        
+        self.context = global_object
 
         self.unique_session = cfg['uniqueSessionMode']
         self.pic_mode = cfg['qq_pic_mode']
@@ -109,6 +104,7 @@ class QQGOCQ(Platform):
         self.client.run()
 
     async def handle_msg(self, message: AstrBotMessage):
+        await super().handle_msg()
         logger.info(
             f"{message.sender.nickname}/{message.sender.user_id} -> {self.parse_message_outline(message)}")
 
@@ -132,8 +128,8 @@ class QQGOCQ(Platform):
                     if message.type.value == "GroupMessage":
                         if str(i.qq) == str(message.self_id):
                             resp = True
-                elif isinstance(i, Plain):
-                    for nick in self.nick_qq:
+                elif isinstance(i, Plain) and self.context.nick:
+                    for nick in self.context.nick:
                         if nick != '' and i.text.strip().startswith(nick):
                             resp = True
                             break
@@ -181,6 +177,7 @@ class QQGOCQ(Platform):
     async def reply_msg(self,
                         message: Union[AstrBotMessage, GuildMessage, GroupMessage, FriendMessage],
                         result_message: list):
+        await super().reply_msg()
         """
         插件开发者请使用send方法, 可以不用直接调用这个方法。
         """
@@ -259,6 +256,7 @@ class QQGOCQ(Platform):
         提供给插件的发送QQ消息接口。
         参数说明：第一个参数可以是消息对象，也可以是QQ群号。第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
         '''
+        await super().reply_msg()
         try:
             await self.reply_msg(message, result_message)
         except BaseException as e:
@@ -270,6 +268,7 @@ class QQGOCQ(Platform):
         '''
         同 send_msg()
         '''
+        await super().reply_msg()
         await self.reply_msg(to, res)
 
     def create_text_image(title: str, text: str, max_width=30, font_size=20):

model/platform/qq_official.py

@@ -102,6 +102,7 @@ class QQOfficial(Platform):
             )
 
     async def handle_msg(self, message: AstrBotMessage):
+        await super().handle_msg()
         assert isinstance(message.raw_message, (botpy.message.Message,
                           botpy.message.GroupMessage, botpy.message.DirectMessage))
         is_group = message.type != MessageType.FRIEND_MESSAGE
@@ -154,6 +155,7 @@ class QQOfficial(Platform):
         '''
         回复频道消息
         '''
+        await super().reply_msg()
         if isinstance(message, AstrBotMessage):
             source = message.raw_message
         else:

model/provider/openai_official.py

@@ -73,6 +73,7 @@ class ProviderOpenAIOfficial(Provider):
             base_url=self.base_url
         )
         self.model_configs: Dict = cfg['chatGPTConfigs']
+        super().set_curr_model(self.model_configs['model'])
         self.image_generator_model_configs: Dict = self.cc.get('openai_image_generate', None)
         self.session_memory: Dict[str, List]  = {} # 会话记忆
         self.session_memory_lock = threading.Lock()
@@ -289,6 +290,7 @@ class ProviderOpenAIOfficial(Provider):
                         extra_conf: Dict = None,
                         **kwargs
                     ) -> str:
+        super().accu_model_stat()
         if not session_id:
             session_id = "unknown"
             if "unknown" in self.session_memory:
@@ -415,12 +417,13 @@ class ProviderOpenAIOfficial(Provider):
 
         return False
     
-    async def image_generate(self, prompt, session_id, **kwargs) -> str:
+    async def image_generate(self, prompt: str, session_id: str = None, **kwargs) -> str:
         '''
         生成图片
         '''
         retry = 0
         conf = self.image_generator_model_configs
+        super().accu_model_stat(model=conf['model'])
         if not conf:
             logger.error("OpenAI 图片生成模型配置不存在。")
             raise Exception("OpenAI 图片生成模型配置不存在。")
@@ -481,6 +484,8 @@ class ProviderOpenAIOfficial(Provider):
 
     def set_model(self, model: str):
         self.model_configs['model'] = model
+        self.cc.put_by_dot_str("openai.chatGPTConfigs.model", model)
+        super().set_curr_model(model)
     
     def get_configs(self):
         return self.model_configs

model/provider/provider.py

@@ -1,4 +1,27 @@
+from collections import defaultdict
+
 class Provider:
+    def __init__(self) -> None:
+        self.model_stat = defaultdict(int) # 用于记录 LLM Model 使用数据
+        self.curr_model_name = "unknown"
+        
+    def reset_model_stat(self):
+        self.model_stat.clear()
+        
+    def set_curr_model(self, model_name: str):
+        self.curr_model_name = model_name
+    
+    def get_curr_model(self):
+        '''
+        返回当前正在使用的 LLM
+        '''
+        return self.curr_model_name
+    
+    def accu_model_stat(self, model: str = None):
+        if not model:
+            model = self.get_curr_model()
+        self.model_stat[model] += 1
+        
     async def text_chat(self,
                         prompt: str,
                         session_id: str,
@@ -18,7 +41,7 @@ class Provider:
         extra_conf: 额外配置
         default_personality: 默认人格
         '''
-        raise NotImplementedError
+        raise NotImplementedError()
 
     async def image_generate(self, prompt, session_id, **kwargs) -> str:
         '''
@@ -26,10 +49,10 @@ class Provider:
         prompt: 提示词
         session_id: 会话id
         '''
-        raise NotImplementedError
+        raise NotImplementedError()
 
     async def forget(self, session_id=None) -> bool:
         '''
         重置会话
         '''
-        raise NotImplementedError
+        raise NotImplementedError()

type/command.py

@@ -18,7 +18,7 @@ class CommandResult():
     用于在Command中返回多个值
     '''
 
-    def __init__(self, hit: bool, success: bool, message_chain: list, command_name: str = "unknown_command") -> None:
+    def __init__(self, hit: bool, success: bool = False, message_chain: list = [], command_name: str = "unknown_command") -> None:
         self.hit = hit
         self.success = success
         self.message_chain = message_chain

type/config.py

@@ -0,0 +1 @@
+VERSION = '3.1.13'

type/register.py

@@ -15,6 +15,13 @@ class RegisteredPlugin:
     module_path: str
     module: ModuleType
     root_dir_name: str
+    trig_cnt: int = 0
+    
+    def reset_trig_cnt(self):
+        self.trig_cnt = 0
+    
+    def trig(self):
+        self.trig_cnt += 1
 
     def __str__(self) -> str:
         return f"RegisteredPlugin({self.metadata}, {self.module_path}, {self.root_dir_name})"

type/types.py

@@ -15,7 +15,6 @@ class GlobalObject:
     web_search: bool  # 是否开启了网页搜索
     reply_prefix: str  # 回复前缀
     unique_session: bool  # 是否开启了独立会话
-    cnt_total: int  # 总消息数
     default_personality: dict
     dashboard_data = None
 
@@ -26,7 +25,6 @@ class GlobalObject:
         self.web_search = False  # 是否开启了网页搜索
         self.reply_prefix = None
         self.unique_session = False
-        self.cnt_total = 0
         self.platforms = []
         self.llms = []
         self.default_personality = None

util/cmd_config.py

@@ -1,5 +1,6 @@
 import os
 import json
+import yaml
 from typing import Union
 
 cpath = "data/cmd_config.json"
@@ -117,3 +118,28 @@ def init_astrbot_config_items():
     cc.init_attributes("https_proxy", "")
     cc.init_attributes("dashboard_username", "")
     cc.init_attributes("dashboard_password", "")
+
+
+
+def try_migrate_config():
+    '''
+    将 cmd_config.json 迁移至 data/cmd_config.json
+    '''
+    print("try migrate configs")
+    if os.path.exists("cmd_config.json"):
+        with open("cmd_config.json", "r", encoding="utf-8-sig") as f:
+            data = json.load(f)
+        with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
+            json.dump(data, f, indent=2, ensure_ascii=False)
+        try:
+            os.remove("cmd_config.json")
+        except Exception as e:
+            pass
+    if not os.path.exists("cmd_config.json") and not os.path.exists("data/cmd_config.json"):
+        # 从 configs/config.yaml 上拿数据
+        configs_pth = os.path.abspath(os.path.join(os.path.abspath(__file__), "../../configs/config.yaml"))
+        with open(configs_pth, encoding='utf-8') as f:
+            data = yaml.load(f, Loader=yaml.Loader)
+            print(data)
+            with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
+                json.dump(data, f, indent=2, ensure_ascii=False)

util/general_utils.py

@@ -422,21 +422,6 @@ def create_markdown_image(text: str):
         raise e
 
 
-def try_migrate_config():
-    '''
-    将 cmd_config.json 迁移至 data/cmd_config.json
-    '''
-    if os.path.exists("cmd_config.json"):
-        with open("cmd_config.json", "r", encoding="utf-8-sig") as f:
-            data = json.load(f)
-        with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
-            json.dump(data, f, indent=2, ensure_ascii=False)
-        try:
-            os.remove("cmd_config.json")
-        except Exception as e:
-            pass
-
-
 def get_local_ip_addresses():
     ip = ''
     try:
@@ -466,15 +451,41 @@ def get_sys_info(global_object: GlobalObject):
 
 
 def upload(_global_object: GlobalObject):
+    '''
+    上传相关非敏感统计数据
+    '''
+    time.sleep(10)
     while True:
-        addr_ip = ''
+        platform_stats = {}
+        llm_stats = {}
+        plugin_stats = {}
+        for platform in _global_object.platforms:
+            platform_stats[platform.platform_name] = {
+                "cnt_receive": platform.platform_instance.cnt_receive,
+                "cnt_reply": platform.platform_instance.cnt_reply
+            }
+            
+        for llm in _global_object.llms:
+            stat = llm.llm_instance.model_stat
+            for k in stat:
+                llm_stats[llm.llm_name + "#" + k] = stat[k]
+            llm.llm_instance.reset_model_stat()
+            
+        for plugin in _global_object.cached_plugins:
+            plugin_stats[plugin.metadata.plugin_name] = {
+                "metadata": plugin.metadata,
+                "trig_cnt": plugin.trig_cnt
+            }
+            plugin.reset_trig_cnt()
+        
         try:
             res = {
-                "version": _global_object.version,
-                "count": _global_object.cnt_total,
-                "ip": addr_ip,
-                "sys": sys.platform,
-                "admin": "null",
+                "stat_version": "moon",
+                "version": _global_object.version, # 版本号
+                "platform_stats": platform_stats, # 过去 30 分钟各消息平台交互消息数
+                "llm_stats": llm_stats,
+                "plugin_stats": plugin_stats,
+                "sys": sys.platform, # 系统版本
             }
             resp = requests.post(
                 'https://api.soulter.top/upload', data=json.dumps(res), timeout=5)
@@ -484,7 +495,7 @@ def upload(_global_object: GlobalObject):
                     _global_object.cnt_total = 0
         except BaseException as e:
             pass
-        time.sleep(10*60)
+        time.sleep(30*60)
 
 def retry(n: int = 3):
     '''

util/updator.py

@@ -6,6 +6,7 @@ except BaseException as e:
     has_git = False
 import sys, os
 import requests
+from type.config import VERSION
 
 def _reboot():
     py = sys.executable
@@ -78,11 +79,11 @@ def check_update() -> str:
     print(f"当前版本: {curr_commit}")
     print(f"最新版本: {new_commit}")
     if curr_commit.startswith(new_commit):
-        return "当前已经是最新版本。"
+        return f"当前已经是最新版本: v{VERSION}"
     else:
         update_info = f"""有新版本可用。
 === 当前版本 ===
-{curr_commit}
+v{VERSION}
 
 === 新版本 ===
 {update_data[0]['version']}