From 414f7ad9a094af5c2301b6b40677bc9a8459c816 Mon Sep 17 00:00:00 2001 From: DrSmoothl <1787882683@qq.com> Date: Thu, 26 Mar 2026 23:08:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=E4=B8=AD=E6=96=87=E4=BB=A5=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/maisaka/llm_service.py | 12 +++++----- src/maisaka/runtime.py | 47 +++++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/maisaka/llm_service.py b/src/maisaka/llm_service.py index aca4b348..6ca0ed27 100644 --- a/src/maisaka/llm_service.py +++ b/src/maisaka/llm_service.py @@ -149,7 +149,7 @@ class MaiSakaLLMService: # 添加缺失的列 session.execute(text("ALTER TABLE llm_usage ADD COLUMN model_api_provider_name VARCHAR(255)")) session.commit() - logger.info("数据库 schema 已修复：添加 model_api_provider_name 列") + logger.info("数据库结构已修复：已添加 model_api_provider_name 列") except Exception: # 静默忽略任何错误，不影响正常流程 pass @@ -498,11 +498,11 @@ class MaiSakaLLMService: padding=(0, 1), ) ) - logger.info(f"chat_loop_step prompt display finished ({len(built_messages)} messages, {len(all_tools)} tools)") + logger.info(f"对话循环步骤的提示展示已完成（共 {len(built_messages)} 条消息，{len(all_tools)} 个工具）") request_started_at = perf_counter() - logger.info("chat_loop_step calling planner model generate_response_with_messages") + logger.info("对话循环步骤正在调用规划模型生成响应") generation_result = await self._llm_chat.generate_response_with_messages( message_factory=message_factory, options=LLMGenerationOptions( @@ -516,8 +516,8 @@ class MaiSakaLLMService: tool_calls = generation_result.tool_calls elapsed = perf_counter() - request_started_at logger.info( - f"chat_loop_step planner model returned in {elapsed:.2f}s " - f"(model={model}, tool_calls={len(tool_calls or [])}, response_len={len(response or '')})" + f"对话循环步骤中的规划模型已返回，耗时 {elapsed:.2f} 秒" + f"（模型={model}，工具调用数={len(tool_calls or [])}，回复长度={len(response or '')}）" ) raw_message = build_message( role=RoleType.Assistant.value, @@ -525,7 +525,7 @@ class MaiSakaLLMService: source="assistant", tool_calls=tool_calls or None, ) - logger.info("chat_loop_step converted planner response into MaiMessage") + logger.info("已将规划模型响应转换为 MaiMessage") return ChatResponse( content=response, diff --git a/src/maisaka/runtime.py b/src/maisaka/runtime.py index ed69964d..23962a9f 100644 --- a/src/maisaka/runtime.py +++ b/src/maisaka/runtime.py @@ -81,7 +81,7 @@ class MaisakaHeartFlowChatting: self._running = True self._loop_task = asyncio.create_task(self._main_loop()) - logger.info(f"{self.log_prefix} Maisaka runtime started") + logger.info(f"{self.log_prefix} MaiSaka 运行时已启动") async def stop(self) -> None: """Stop the runtime loop.""" @@ -104,7 +104,7 @@ class MaisakaHeartFlowChatting: await self._mcp_manager.close() self._mcp_manager = None - logger.info(f"{self.log_prefix} Maisaka runtime stopped") + logger.info(f"{self.log_prefix} MaiSaka 运行时已停止") def adjust_talk_frequency(self, frequency: float) -> None: """Compatibility shim for the existing manager API.""" @@ -129,7 +129,7 @@ class MaisakaHeartFlowChatting: await self._ingest_messages(pending_messages) await self._run_internal_loop(anchor_message=pending_messages[-1]) except asyncio.CancelledError: - logger.info(f"{self.log_prefix} Maisaka runtime loop cancelled") + logger.info(f"{self.log_prefix} MaiSaka 运行循环已取消") def _drain_pending_messages(self) -> list[SessionMessage]: drained_messages = list(self._pending_messages) @@ -141,17 +141,17 @@ class MaisakaHeartFlowChatting: config_path = Path(__file__).with_name("mcp_config.json") self._mcp_manager = await MCPManager.from_config(str(config_path)) if self._mcp_manager is None: - logger.info(f"{self.log_prefix} MCP not available for Maisaka runtime") + logger.info(f"{self.log_prefix} MaiSaka 运行时的 MCP 不可用") return mcp_tools = self._mcp_manager.get_openai_tools() if not mcp_tools: - logger.info(f"{self.log_prefix} MCP manager initialized without exposed tools") + logger.info(f"{self.log_prefix} MCP 管理器已初始化，但未暴露任何工具") return self._llm_service.set_extra_tools(mcp_tools) logger.info( - f"{self.log_prefix} Loaded {len(mcp_tools)} MCP tool(s) for Maisaka runtime:\n" + f"{self.log_prefix} 已为 MaiSaka 运行时加载 {len(mcp_tools)} 个 MCP 工具：\n" f"{self._mcp_manager.get_tool_summary()}" ) @@ -269,19 +269,19 @@ class MaisakaHeartFlowChatting: for round_index in range(self._max_internal_rounds): logger.info( - f"{self.log_prefix} Internal loop round {round_index + 1}/{self._max_internal_rounds} started " - f"(history={len(self._chat_history)})" + f"{self.log_prefix} 内部循环第 {round_index + 1}/{self._max_internal_rounds} 轮已开始" + f"（历史消息数={len(self._chat_history)}）" ) if last_had_tool_calls: - logger.info(f"{self.log_prefix} Building perception snapshot before planner call") + logger.info(f"{self.log_prefix} 调用规划器前正在构建感知快照") await self._append_perception_snapshot() - logger.info(f"{self.log_prefix} Perception snapshot step finished") + logger.info(f"{self.log_prefix} 感知快照步骤已完成") - logger.info(f"{self.log_prefix} Calling Maisaka chat_loop_step") + logger.info(f"{self.log_prefix} 正在调用 MaiSaka 对话循环步骤") response = await self._llm_service.chat_loop_step(self._chat_history) logger.info( - f"{self.log_prefix} chat_loop_step returned " - f"(content_len={len(response.content or '')}, tool_calls={len(response.tool_calls)})" + f"{self.log_prefix} 对话循环步骤已返回" + f"（内容长度={len(response.content or '')}，工具调用数={len(response.tool_calls)}）" ) response.raw_message.platform = anchor_message.platform response.raw_message.session_id = self.session_id @@ -290,23 +290,23 @@ class MaisakaHeartFlowChatting: self._last_assistant_response_time = datetime.now() if response.tool_calls: - logger.info(f"{self.log_prefix} Handling {len(response.tool_calls)} tool call(s)") + logger.info(f"{self.log_prefix} 正在处理 {len(response.tool_calls)} 个工具调用") should_pause = await self._handle_tool_calls(response.tool_calls, response.content or "", anchor_message) - logger.info(f"{self.log_prefix} Tool handling finished (should_pause={should_pause})") + logger.info(f"{self.log_prefix} 工具处理已完成（是否应暂停={should_pause}）") if should_pause: return last_had_tool_calls = True continue if response.content: - logger.info(f"{self.log_prefix} Planner returned content without tool calls; continuing inner loop") + logger.info(f"{self.log_prefix} 规划器返回了内容但没有工具调用，继续内部循环") last_had_tool_calls = False continue - logger.info(f"{self.log_prefix} Planner returned empty content and no tool calls; leaving inner loop") + logger.info(f"{self.log_prefix} 规划器返回空内容且没有工具调用，退出内部循环") return - logger.info(f"{self.log_prefix} Maisaka internal loop reached max rounds and paused") + logger.info(f"{self.log_prefix} MaiSaka 内部循环已达到最大轮次并暂停") def _trim_chat_history(self) -> None: """Trim the oldest history until the user-message count is below the configured limit.""" @@ -325,8 +325,8 @@ class MaisakaHeartFlowChatting: self._chat_history = trimmed_history logger.info( - f"{self.log_prefix} Trimmed Maisaka history by {removed_count} message(s); " - f"user-message count is now {user_message_count}." + f"{self.log_prefix} 已裁剪 MaiSaka 历史消息 {removed_count} 条；" + f"当前用户消息数为 {user_message_count}。" ) async def _append_perception_snapshot(self) -> None: @@ -346,7 +346,12 @@ class MaisakaHeartFlowChatting: perception_parts: list[str] = [] for (task_name, _), result in zip(tasks, results): if isinstance(result, Exception): - logger.warning(f"{self.log_prefix} Maisaka {task_name} analysis failed: {result}") + analysis_name = { + "emotion": "情绪", + "cognition": "认知", + "knowledge": "知识", + }.get(task_name, task_name) + logger.warning(f"{self.log_prefix} MaiSaka 的{analysis_name}分析失败: {result}") continue if result: perception_parts.append(f"{task_name.title()}\n{result}")