Merge branch 'master' of https://github.com/MaiBot-Plus/MaiMbot-Pro-Max

src/common/remote.py

@@ -1,165 +0,0 @@
-import asyncio
-
-import aiohttp
-import platform
-
-from src.common.logger import get_logger
-from src.common.tcp_connector import get_tcp_connector
-from src.config.config import global_config
-from src.manager.async_task_manager import AsyncTask
-from src.manager.local_store_manager import local_storage
-
-logger = get_logger("remote")
-
-TELEMETRY_SERVER_URL = "http://hyybuth.xyz:10058"
-"""遥测服务地址"""
-
-
-class TelemetryHeartBeatTask(AsyncTask):
-    HEARTBEAT_INTERVAL = 300
-
-    def __init__(self):
-        super().__init__(task_name="Telemetry Heart Beat Task", run_interval=self.HEARTBEAT_INTERVAL)
-        self.server_url = TELEMETRY_SERVER_URL
-        """遥测服务地址"""
-
-        self.client_uuid: str | None = local_storage["mmc_uuid"] if "mmc_uuid" in local_storage else None  # type: ignore
-        """客户端UUID"""
-
-        self.info_dict = self._get_sys_info()
-        """系统信息字典"""
-
-    @staticmethod
-    def _get_sys_info() -> dict[str, str]:
-        """获取系统信息"""
-        info_dict = {
-            "os_type": "Unknown",
-            "py_version": platform.python_version(),
-            "mmc_version": global_config.MMC_VERSION,
-        }
-
-        match platform.system():
-            case "Windows":
-                info_dict["os_type"] = "Windows"
-            case "Linux":
-                info_dict["os_type"] = "Linux"
-            case "Darwin":
-                info_dict["os_type"] = "macOS"
-            case _:
-                info_dict["os_type"] = "Unknown"
-
-        return info_dict
-
-    async def _req_uuid(self) -> bool:
-        """
-        向服务端请求UUID（不应在已存在UUID的情况下调用，会覆盖原有的UUID）
-        """
-
-        if "deploy_time" not in local_storage:
-            logger.error("本地存储中缺少部署时间，无法请求UUID")
-            return False
-
-        try_count: int = 0
-        while True:
-            # 如果不存在，则向服务端请求一个新的UUID（注册客户端）
-            logger.info("正在向遥测服务端请求UUID...")
-
-            try:
-                async with aiohttp.ClientSession(connector=await get_tcp_connector()) as session:
-                    async with session.post(
-                        f"{TELEMETRY_SERVER_URL}/stat/reg_client",
-                        json={"deploy_time": local_storage["deploy_time"]},
-                        timeout=aiohttp.ClientTimeout(total=5),  # 设置超时时间为5秒
-                    ) as response:
-                        logger.debug(f"{TELEMETRY_SERVER_URL}/stat/reg_client")
-                        logger.debug(local_storage["deploy_time"])  # type: ignore
-                        logger.debug(f"Response status: {response.status}")
-
-                        if response.status == 200:
-                            data = await response.json()
-                            if client_id := data.get("mmc_uuid"):
-                                # 将UUID存储到本地
-                                local_storage["mmc_uuid"] = client_id
-                                self.client_uuid = client_id
-                                logger.info(f"成功获取UUID: {self.client_uuid}")
-                                return True  # 成功获取UUID，返回True
-                            else:
-                                logger.error("无效的服务端响应")
-                        else:
-                            response_text = await response.text()
-                            logger.error(
-                                f"请求UUID失败，不过你还是可以正常使用麦麦，状态码: {response.status}, 响应内容: {response_text}"
-                            )
-            except Exception as e:
-                import traceback
-
-                error_msg = str(e) or "未知错误"
-                logger.warning(
-                    f"请求UUID出错，不过你还是可以正常使用麦麦: {type(e).__name__}: {error_msg}"
-                )  # 可能是网络问题
-                logger.debug(f"完整错误信息: {traceback.format_exc()}")
-
-            # 请求失败，重试次数+1
-            try_count += 1
-            if try_count > 3:
-                # 如果超过3次仍然失败，则退出
-                logger.error("获取UUID失败，请检查网络连接或服务端状态")
-                return False
-            else:
-                # 如果可以重试，等待后继续（指数退避）
-                logger.info(f"获取UUID失败，将于 {4**try_count} 秒后重试...")
-                await asyncio.sleep(4**try_count)
-
-    async def _send_heartbeat(self):
-        """向服务器发送心跳"""
-        headers = {
-            "Client-UUID": self.client_uuid,
-            "User-Agent": f"HeartbeatClient/{self.client_uuid[:8]}",  # type: ignore
-        }
-
-        logger.debug(f"正在发送心跳到服务器: {self.server_url}")
-        logger.debug(str(headers))
-
-        try:
-            async with aiohttp.ClientSession(connector=await get_tcp_connector()) as session:
-                async with session.post(
-                    f"{self.server_url}/stat/client_heartbeat",
-                    headers=headers,
-                    json=self.info_dict,
-                    timeout=aiohttp.ClientTimeout(total=5),  # 设置超时时间为5秒
-                ) as response:
-                    logger.debug(f"Response status: {response.status}")
-
-                    # 处理响应
-                    if 200 <= response.status < 300:
-                        # 成功
-                        logger.debug(f"心跳发送成功，状态码: {response.status}")
-                    elif response.status == 403:
-                        # 403 Forbidden
-                        logger.warning(
-                            "（此消息不会影响正常使用）心跳发送失败，403 Forbidden: 可能是UUID无效或未注册。"
-                            "处理措施：重置UUID，下次发送心跳时将尝试重新注册。"
-                        )
-                        self.client_uuid = None
-                        del local_storage["mmc_uuid"]  # 删除本地存储的UUID
-                    else:
-                        # 其他错误
-                        response_text = await response.text()
-                        logger.warning(
-                            f"（此消息不会影响正常使用）状态未发送，状态码: {response.status}, 响应内容: {response_text}"
-                        )
-        except Exception as e:
-            import traceback
-
-            error_msg = str(e) or "未知错误"
-            logger.warning(f"（此消息不会影响正常使用）状态未发生: {type(e).__name__}: {error_msg}")
-            logger.debug(f"完整错误信息: {traceback.format_exc()}")
-
-    async def run(self):
-        # 发送心跳
-        if global_config.telemetry.enable:
-            if self.client_uuid is None and not await self._req_uuid():
-                logger.warning("获取UUID失败，跳过此次心跳")
-                return
-
-            await self._send_heartbeat()

src/config/api_ada_configs.py

@@ -114,6 +114,9 @@ class ModelTaskConfig(ConfigBase):
     replyer_2: TaskConfig
     """normal_chat次要回复模型配置"""
 
+    maizone : TaskConfig
+    """maizone专用模型"""
+
     emotion: TaskConfig
     """情绪模型配置"""
 

src/main.py

@@ -4,7 +4,6 @@ import signal
 import sys
 from maim_message import MessageServer
 
-from src.common.remote import TelemetryHeartBeatTask
 from src.manager.async_task_manager import async_task_manager
 from src.chat.utils.statistic import OnlineTimeRecordTask, StatisticOutputTask
 from src.chat.emoji_system.emoji_manager import get_emoji_manager
@@ -107,9 +106,6 @@ MaiMbot-Pro-Max(第三方改版)
         # 添加统计信息输出任务
         await async_task_manager.add_task(StatisticOutputTask())
 
-        # 添加遥测心跳任务
-        await async_task_manager.add_task(TelemetryHeartBeatTask())
-
         # 启动API服务器
         # start_api_server()
         # logger.info("API服务器启动成功")

src/plugins/built_in/maizone_refactored/plugin.py

@@ -42,7 +42,7 @@ class MaiZoneRefactoredPlugin(BasePlugin):
     config_schema: dict = {
         "plugin": {"enable": ConfigField(type=bool, default=True, description="是否启用插件")},
         "models": {
-            "text_model": ConfigField(type=str, default="replyer_1", description="生成文本的模型名称"),
+            "text_model": ConfigField(type=str, default="maizone", description="生成文本的模型名称"),
             "siliconflow_apikey": ConfigField(type=str, default="", description="硅基流动AI生图API密钥"),
         },
         "send": {

template/model_config_template.toml

@@ -1,5 +1,5 @@
 [inner]
-version = "1.2.3"
+version = "1.2.4"
 
 # 配置文件版本号迭代规则同bot_config.toml
 
@@ -145,6 +145,11 @@ model_list = ["siliconflow-deepseek-v3"]
 temperature = 0.3
 max_tokens = 800
 
+[model_task_config.maizone] # maizone模型
+model_list = ["siliconflow-deepseek-v3"]
+temperature = 0.7
+max_tokens = 800
+
 [model_task_config.vlm] # 图像识别模型
 model_list = ["qwen2.5-vl-72b"]
 max_tokens = 800