From 967032fe0fd69c36e25afc41f311bc551c8da89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E6=A2=93=E6=9F=92?= <1787882683@qq.com> Date: Thu, 5 Jun 2025 21:18:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0requirements.txt?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | Bin 826 -> 864 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0e60bc192a2a0d16e882738151b07046307b08ff..122a868e68dc0a0422f7431c7f61a23cf6d2272d 100644 GIT binary patch delta 46 qcmdnR_JD1J6|-6qLn=c7Lq0 Date: Thu, 5 Jun 2025 23:18:46 +0800 Subject: [PATCH 2/3] Update docker-compose.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 不再需要mongodb --- docker-compose.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 67750d4c1..62ac20fdd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,6 @@ services: volumes: - ./docker-config/adapters/config.toml:/adapters/config.toml restart: always - depends_on: - - mongodb networks: - maim_bot core: @@ -32,23 +30,6 @@ services: - ./docker-config/mmc:/MaiMBot/config # 持久化bot配置文件 - ./data/MaiMBot:/MaiMBot/data # NapCat 和 NoneBot 共享此卷，否则发送图片会有问题 restart: always - depends_on: - - mongodb - networks: - - maim_bot - mongodb: - container_name: maim-bot-mongo - environment: - - TZ=Asia/Shanghai -# - MONGO_INITDB_ROOT_USERNAME=your_username # 此处配置mongo用户 -# - MONGO_INITDB_ROOT_PASSWORD=your_password # 此处配置mongo密码 -# ports: -# - "27017:27017" - restart: always - volumes: - - mongodb:/data/db # 持久化mongodb数据 - - mongodbCONFIG:/data/configdb # 持久化mongodb配置文件 - image: mongo:latest networks: - maim_bot napcat: @@ -70,6 +51,3 @@ services: networks: maim_bot: driver: bridge -volumes: - mongodb: - mongodbCONFIG: \ No newline at end of file From 6eec3e9f08f6e349490606f96b7d1344184388a3 Mon Sep 17 00:00:00 2001 From: UnCLAS-Prommer Date: Fri, 6 Jun 2025 11:49:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?plugin=5Faction=E7=B1=BB=E5=9E=8B=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../planners/actions/plugin_action.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/chat/focus_chat/planners/actions/plugin_action.py b/src/chat/focus_chat/planners/actions/plugin_action.py index e43cfb6e5..fc0d399d0 100644 --- a/src/chat/focus_chat/planners/actions/plugin_action.py +++ b/src/chat/focus_chat/planners/actions/plugin_action.py @@ -14,6 +14,12 @@ import toml # 导入 toml 库 from src.common.database.database_model import ActionRecords import time +# 以下为类型注解需要 +from src.chat.message_receive.chat_stream import ChatStream +from src.chat.focus_chat.expressors.default_expressor import DefaultExpressor +from src.chat.focus_chat.replyer.default_replyer import DefaultReplyer +from src.chat.focus_chat.info.obs_info import ObsInfo + logger = get_logger("plugin_action") @@ -125,8 +131,8 @@ class PluginAction(BaseAction): bool: 是否发送成功 """ try: - expressor = self._services.get("expressor") - chat_stream = self._services.get("chat_stream") + expressor: DefaultExpressor = self._services.get("expressor") + chat_stream: ChatStream = self._services.get("chat_stream") if not expressor or not chat_stream: logger.error(f"{self.log_prefix} 无法发送消息：缺少必要的内部服务") @@ -183,8 +189,8 @@ class PluginAction(BaseAction): Returns: bool: 是否发送成功 """ - expressor = self._services.get("expressor") - chat_stream = self._services.get("chat_stream") + expressor: DefaultExpressor = self._services.get("expressor") + chat_stream: ChatStream = self._services.get("chat_stream") if not expressor or not chat_stream: logger.error(f"{self.log_prefix} 无法发送消息：缺少必要的内部服务") @@ -239,8 +245,8 @@ class PluginAction(BaseAction): Returns: bool: 是否发送成功 """ - replyer = self._services.get("replyer") - chat_stream = self._services.get("chat_stream") + replyer: DefaultReplyer = self._services.get("replyer") + chat_stream: ChatStream = self._services.get("chat_stream") if not replyer or not chat_stream: logger.error(f"{self.log_prefix} 无法发送消息：缺少必要的内部服务") @@ -291,7 +297,7 @@ class PluginAction(BaseAction): Returns: str: 聊天类型 ("group" 或 "private") """ - chat_stream = self._services.get("chat_stream") + chat_stream: ChatStream = self._services.get("chat_stream") if chat_stream and hasattr(chat_stream, "group_info"): return "group" if chat_stream.group_info else "private" return "unknown" @@ -311,6 +317,7 @@ class PluginAction(BaseAction): if observations and len(observations) > 0: obs = observations[0] if hasattr(obs, "get_talking_message"): + obs: ObsInfo raw_messages = obs.get_talking_message() # 转换为简化格式 for msg in raw_messages[-count:]: @@ -402,7 +409,7 @@ class PluginAction(BaseAction): action_prompt_display: 动作显示内容 """ try: - chat_stream = self._services.get("chat_stream") + chat_stream: ChatStream = self._services.get("chat_stream") if not chat_stream: logger.error(f"{self.log_prefix} 无法存储action信息：缺少chat_stream服务") return