perf: 强化ltm异常处理

long_term_memory.py, line 69

README.md

@@ -1,6 +1,6 @@
 <p align="center">
     
-![](https://github.com/user-attachments/assets/04f22f63-4dcf-4a6c-981e-b33f45c23f3e)
+![logo](https://github.com/user-attachments/assets/07649e07-3b8e-4feb-9aa9-bf13af4f3476)
 
 
 </p>

astrbot/api/provider/__init__.py

@@ -1,2 +1,2 @@
 from astrbot.core.provider import Provider, STTProvider, Personality
-from astrbot.core.provider.entites import ProviderRequest, ProviderType, ProviderMetaData
+from astrbot.core.provider.entites import ProviderRequest, ProviderType, ProviderMetaData, LLMResponse

astrbot/core/config/default.py

@@ -2,7 +2,7 @@
 如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。
 """
 
-VERSION = "3.4.13"
+VERSION = "3.4.14"
 DB_PATH = "data/data_v3.db"
 
 # 默认配置
@@ -50,6 +50,12 @@ DEFAULT_CONFIG = {
         "enable": False,
         "provider_id": "",
     },
+    "provider_ltm_settings": {
+        "group_icl_enable": False,
+        "group_message_max_cnt": 300,
+        "image_caption": False,
+        "image_caption_prompt": "Please describe the image using Chinese.",
+    },
     "content_safety": {
         "internal_keywords": {"enable": True, "extra_keywords": []},
         "baidu_aip": {"enable": False, "app_id": "", "api_key": "", "secret_key": ""},
@@ -630,6 +636,34 @@ CONFIG_METADATA_2 = {
                     },
                 },
             },
+            "provider_ltm_settings": {
+                "description": "聊天记忆增强(Beta)",
+                "type": "object",
+                "items": {
+                    "group_icl_enable": {
+                        "description": "群聊内记录各群员对话",
+                        "type": "bool",
+                        "obvious-hint": True,
+                        "hint": "启用后，会记录群聊内各群员的对话。使用 /reset 命令清除记录。推荐使用 gpt-4o-mini 模型。",
+                    },
+                    "group_message_max_cnt": {
+                        "description": "群聊消息最大数量",
+                        "type": "int",
+                        "obvious-hint": True,
+                        "hint": "群聊消息最大数量。超过此数量后，会自动清除旧消息。",
+                    },
+                    "image_caption": {
+                        "description": "启用图像转述(需要模型支持)",
+                        "type": "bool",
+                        "obvious-hint": True,
+                        "hint": "启用后，当接收到图片消息时，会使用模型先将图片转述为文字再进行后续处理。推荐使用 gpt-4o-mini 模型。",
+                    },
+                    "image_caption_prompt": {
+                        "description": "图像转述提示词",
+                        "type": "string"
+                    },
+                },
+            },
         },
     },
     "misc_config_group": {
@@ -639,7 +673,8 @@ CONFIG_METADATA_2 = {
                 "description": "机器人唤醒前缀",
                 "type": "list",
                 "items": {"type": "string"},
-                "hint": "在不 @ 机器人的情况下，可以通过外加消息前缀来唤醒机器人。",
+                "obvious_hint": True,
+                "hint": "在不 @ 机器人的情况下，可以通过外加消息前缀来唤醒机器人。更改此配置将影响整个 Bot 的功能唤醒，包括所有指令。如果您不保留 `/`，则内置指令（help等）将需要通过您的唤醒前缀来触发。",
             },
             "t2i": {
                 "description": "文本转图像",

astrbot/core/message/message_event_result.py

@@ -140,5 +140,10 @@ class MessageEventResult(MessageChain):
         '''
         return self.result_content_type == ResultContentType.LLM_RESULT
     
+    def get_plain_text(self) -> str:
+        '''获取纯文本消息。这个方法将获取所有 Plain 组件的文本并拼接成一条消息。空格分隔。
+        '''
+        return " ".join([comp.text for comp in self.chain if isinstance(comp, Plain)])
+    
     
 CommandResult = MessageEventResult

astrbot/core/pipeline/process_stage/method/star_request.py

@@ -39,8 +39,11 @@ class StarRequestSubStage(Stage):
             except Exception as e:
                 logger.error(traceback.format_exc())
                 logger.error(f"Star {handler.handler_full_name} handle error: {e}")
-                ret = f":(\n\n在调用插件 {star_map.get(handler.handler_module_path).name} 的处理函数 {handler.handler_name} 时出现异常：{e}"
-                event.set_result(MessageEventResult().message(ret))
-                yield
-                event.clear_result()
+                
+                if event.is_at_or_wake_command:
+                    ret = f":(\n\n在调用插件 {star_map.get(handler.handler_module_path).name} 的处理函数 {handler.handler_name} 时出现异常：{e}"
+                    event.set_result(MessageEventResult().message(ret))
+                    yield
+                    event.clear_result()
+                
                 event.stop_event()

astrbot/core/pipeline/result_decorate/stage.py

@@ -19,7 +19,6 @@ class ResultDecorateStage:
         self.reply_with_mention = ctx.astrbot_config['platform_settings']['reply_with_mention']
         self.reply_with_quote = ctx.astrbot_config['platform_settings']['reply_with_quote']
         self.use_tts = ctx.astrbot_config['provider_tts_settings']['enable']
-        self.t2i = ctx.astrbot_config['t2i']
         
         # 分段回复
         self.enable_segmented_reply = ctx.astrbot_config['platform_settings']['segmented_reply']['enable']
@@ -68,8 +67,8 @@ class ResultDecorateStage:
                 for comp in result.chain:
                     if isinstance(comp, Plain) and len(comp.text) > 1:
                         try:
-                            logger.info("TTS 请求: " + plain_str)
-                            audio_path = await tts_provider.get_audio(plain_str)
+                            logger.info("TTS 请求: " + comp.text)
+                            audio_path = await tts_provider.get_audio(comp.text)
                             logger.info("TTS 结果: " + audio_path)
                             if audio_path:
                                 new_chain.append(Record(file=audio_path, url=audio_path))
@@ -85,7 +84,7 @@ class ResultDecorateStage:
                 result.chain = new_chain
             
             # 文本转图片
-            elif (result.use_t2i_ is None and self.t2i) or result.use_t2i_:
+            elif (result.use_t2i_ is None and self.ctx.astrbot_config['t2i']) or result.use_t2i_:
                 plain_str = ""
                 for comp in result.chain:
                     if isinstance(comp, Plain):

astrbot/core/platform/sources/gewechat/client.py

@@ -66,6 +66,7 @@ class SimpleGewechatClient():
         if type_name == "Offline":
             logger.critical("收到 gewechat 下线通知。")
             return
+        
         abm = AstrBotMessage()
         d = data['Data']
     
@@ -102,7 +103,7 @@ class SimpleGewechatClient():
         if at_me:
             abm.message.insert(0, At(qq=abm.self_id))
         
-        user_real_name = d['PushContent'].split(' : ')[0] \
+        user_real_name = d.get('PushContent', 'unknown : ').split(' : ')[0] \
             .replace('在群聊中@了你', '') \
             .replace('在群聊中发了一段语音', '') # 真实昵称
         abm.sender = MessageMember(user_id, user_real_name)
@@ -153,13 +154,17 @@ class SimpleGewechatClient():
         if data.get('testMsg', None):
             return quart.jsonify({"r": "AstrBot ACK"})
         
-        abm = await self._convert(data)
-        
+        abm = None
+        try:
+            abm = await self._convert(data)
+        except BaseException as e:
+            logger.warning(f"尝试解析 GeweChat 下发的消息时遇到问题: {e}。下发消息内容: {data}。")
+            
         if abm:
             coro = getattr(self, "on_event_received")
             if coro:
                 await coro(abm)
-            
+        
         return quart.jsonify({"r": "AstrBot ACK"})
     
     async def handle_file(self, file_id):

astrbot/core/provider/sources/openai_source.py

@@ -1,5 +1,6 @@
 import base64
 import json
+import re
 
 from openai import AsyncOpenAI, NOT_GIVEN
 from openai.types.chat.chat_completion import ChatCompletion
@@ -103,10 +104,20 @@ class ProviderOpenAIOfficial(Provider):
             if tool_list:
                 payloads['tools'] = tool_list
         
-        completion = await self.client.chat.completions.create(
-            **payloads,
-            stream=False
-        )
+        try:
+            completion = await self.client.chat.completions.create(
+                **payloads,
+                stream=False
+            )
+        except BaseException as e:
+            if 'does not support Function Calling' \
+                or 'does not support tools' in e: # ollama 
+                    del payloads['tools']
+                    logger.debug(f"模型 {self.model_name} 不支持 tools，已自动移除")
+                    completion = await self.client.chat.completions.create(
+                        **payloads,
+                        stream=False
+                    )
         
         assert isinstance(completion, ChatCompletion)
         logger.debug(f"completion: {completion}")
@@ -118,6 +129,12 @@ class ProviderOpenAIOfficial(Provider):
         if choice.message.content:
             # text completion
             completion_text = str(choice.message.content).strip()
+            
+            # 适配 deepseek-r1 模型
+            if r'<think>' in completion_text:
+                completion_text = re.sub(r'<think>.*?<think/>', '', completion_text).strip()
+                completion_text = completion_text.replace(r'<think>', '').replace(r'</think>', '').strip()
+            
             return LLMResponse("assistant", completion_text)
         elif choice.message.tool_calls:
             # tools call (function calling)
@@ -163,7 +180,8 @@ class ProviderOpenAIOfficial(Provider):
 
         try:
             llm_response = await self._query(payloads, func_tool)
-            await self.save_history(contexts, new_record, session_id, llm_response)
+            if kwargs.get("persist", True):
+                await self.save_history(contexts, new_record, session_id, llm_response)
             return llm_response
         except Exception as e:
             if "maximum context length" in str(e):

changelogs/v3.4.14.md

@@ -0,0 +1,8 @@
+# What's Changed
+
+- 修复: TTS 问题
+- 新增: **支持记录非唤醒状态下群聊历史记录(beta)**
+- 优化: 自动删除 deepseek-r1 模型自带的 think 标签
+- 优化: 自动移除 ollama 不支持 tool 的模型的 tool 请求
+- 优化: /t2i 即时生效
+- 优化: gewechat 消息下发异常处理

packages/astrbot/long_term_memory.py

@@ -0,0 +1,88 @@
+import datetime
+import uuid
+import astrbot.api.star as star
+from astrbot.api.event import AstrMessageEvent
+from astrbot.api.platform import MessageType
+from astrbot.api.provider import ProviderRequest
+from astrbot.api.message_components import Plain, Image
+from astrbot import logger
+from collections import defaultdict
+
+
+class LongTermMemory:
+    def __init__(self, config: dict, context: star.Context):
+        self.config = config
+        self.context = context
+        self.session_chats = defaultdict(list)
+        """记录群成员的群聊记录"""
+        try:
+            self.max_cnt = int(self.config["group_message_max_cnt"])
+        except BaseException as e:
+            logger.error(e)
+            self.max_cnt = 300
+        self.image_caption = self.config["image_caption"]
+        self.image_caption_prompt = self.config["image_caption_prompt"]
+        
+    async def remove_session(self, event: AstrMessageEvent) -> int:
+        cnt = 0
+        if event.unified_msg_origin in self.session_chats:
+            cnt = len(self.session_chats[event.unified_msg_origin])
+            del self.session_chats[event.unified_msg_origin]
+        return cnt
+
+    async def get_image_caption(self, image_url: str) -> str:
+        provider = self.context.get_using_provider()
+        response = await provider.text_chat(
+            prompt=self.image_caption_prompt,
+            session_id=uuid.uuid4().hex,
+            image_urls=[image_url],
+            persist=False,
+        )
+        return response.completion_text
+
+    async def handle_message(self, event: AstrMessageEvent):
+        if event.get_message_type() == MessageType.GROUP_MESSAGE:
+            datetime_str = datetime.datetime.now().strftime("%H:%M:%S")
+
+            final_message = f"[{event.message_obj.sender.nickname}/{datetime_str}]: "
+
+            for comp in event.get_messages():
+                if isinstance(comp, Plain):
+                    final_message += f" {comp.text}"
+                elif isinstance(comp, Image):
+                    # image_urls.append(comp.url if comp.url else comp.file)
+                    if self.image_caption:
+                        try:
+                            caption = await self.get_image_caption(
+                                comp.url if comp.url else comp.file
+                            )
+                            final_message += f" [Image: {caption}]"
+                        except Exception as e:
+                            logger.error(f"获取图片描述失败: {e}")
+            logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}")
+            self.session_chats[event.unified_msg_origin].append(final_message)
+            if len(self.session_chats[event.unified_msg_origin]) > self.max_cnt:
+                self.session_chats[event.unified_msg_origin].pop(0)
+
+    async def on_req_llm(self, event: AstrMessageEvent, req: ProviderRequest):
+        if event.unified_msg_origin not in self.session_chats:
+            return
+        
+        chats_str = '\n---\n'.join(self.session_chats[event.unified_msg_origin])
+        req.system_prompt += "You are now in a chatroom. The chat history is as follows: \n"
+        req.system_prompt += chats_str
+        if self.image_caption:
+            req.system_prompt += (
+                "The images sent by the members are displayed in text form above."
+            )
+
+    async def after_req_llm(self, event: AstrMessageEvent):
+        if event.unified_msg_origin not in self.session_chats:
+            return
+
+        if event.get_result() and event.get_result().is_llm_result():
+            final_message = f"[AstrBot/{datetime.datetime.now().strftime('%H:%M:%S')}]: {event.get_result().get_plain_text()}"
+            logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}")
+            self.session_chats[event.unified_msg_origin].append(final_message)
+            if len(self.session_chats[event.unified_msg_origin]) > self.max_cnt:
+                self.session_chats[event.unified_msg_origin].pop(0)

packages/astrbot/main.py

@@ -6,12 +6,16 @@ import astrbot.api.event.filter as filter
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 from astrbot.api import sp
 from astrbot.api.provider import Personality, ProviderRequest
+from astrbot.api.platform import MessageType
 from astrbot.core.utils.io import download_dashboard, get_dashboard_version
 from astrbot.core.config.default import VERSION
+from collections import defaultdict
+from .long_term_memory import LongTermMemory
+from astrbot.core import logger
 
 from typing import Union
 
-@star.register(name="astrbot", desc="AstrBot 基础指令集合", author="Soulter", version="4.0.0")
+@star.register(name="astrbot", desc="AstrBot 基础指令结合 + 拓展功能", author="Soulter", version="4.0.0")
 class Main(star.Star):
     def __init__(self, context: star.Context) -> None:
         self.context = context
@@ -20,7 +24,12 @@ class Main(star.Star):
         self.identifier = cfg['provider_settings']['identifier']
         self.enable_datetime = cfg['provider_settings']["datetime_system_prompt"]
         
-        self.kdb_enabled = False
+        self.ltm = None
+        if self.context.get_config()['provider_ltm_settings']['group_icl_enable']:
+            try:
+                self.ltm = LongTermMemory(self.context.get_config()['provider_ltm_settings'], self.context)
+            except BaseException as e:
+                logger.error(f"聊天增强 err: {e}")
     
     async def _query_astrbot_notice(self):
         try:
@@ -219,7 +228,12 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
     @filter.command("reset")
     async def reset(self, message: AstrMessageEvent):
         await self.context.get_using_provider().forget(message.session_id)
-        message.set_result(MessageEventResult().message("重置成功"))
+        ret = "清除会话 LLM 聊天历史成功。"
+        if self.ltm:
+            cnt = await self.ltm.remove_session(event=message)
+            ret += f"\n聊天增强: 已清除 {cnt} 条聊天记录。"
+        
+        message.set_result(MessageEventResult().message(ret))
 
     @filter.command("model")
     async def model_ls(self, message: AstrMessageEvent, idx_or_name: Union[int, str] = None):
@@ -355,9 +369,9 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
                 self.context.provider_manager.personas
             ), None):
                 self.context.get_using_provider().curr_personality = persona
-                message.set_result(MessageEventResult().message(f"设置成功。如果您正在切换到不同的人格，请注意使用 /reset 来清空上下文，防止原人格对话影响现人格。"))
+                message.set_result(MessageEventResult().message("设置成功。如果您正在切换到不同的人格，请注意使用 /reset 来清空上下文，防止原人格对话影响现人格。"))
             else:
-                message.set_result(MessageEventResult().message(f"不存在该人格情景。使用 /persona list 查看所有。"))
+                message.set_result(MessageEventResult().message("不存在该人格情景。使用 /persona list 查看所有。"))
     
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("dashboard_update")
@@ -366,31 +380,6 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
         await download_dashboard()
         yield event.plain_result("管理面板更新完成。")
 
-    @filter.on_llm_request()
-    async def decorate_llm_req(self, event: AstrMessageEvent, req: ProviderRequest):
-        provider = self.context.get_using_provider()
-        if self.prompt_prefix:
-            req.prompt = self.prompt_prefix + req.prompt
-        if self.identifier:
-            user_id = event.message_obj.sender.user_id
-            user_nickname = event.message_obj.sender.nickname
-            user_info = f"\n[User ID: {user_id}, Nickname: {user_nickname}]\n"
-            req.prompt = user_info + req.prompt
-        if self.enable_datetime:
-            req.system_prompt += f"\nCurrent datetime: {datetime.datetime.now().strftime('%Y-%m-%d %H:%M')}\n"
-        
-        if persona := provider.curr_personality:
-            if prompt := persona['prompt']:
-                req.system_prompt += prompt
-            if mood_dialogs := persona['_mood_imitation_dialogs_processed']:
-                req.system_prompt += "\nHere are few shots of dialogs, you need to imitate the tone of 'B' in the following dialogs to respond:\n"
-                req.system_prompt += mood_dialogs
-            if begin_dialogs := persona["_begin_dialogs_processed"]:
-                req.contexts[:0] = begin_dialogs
-
-        # if provider.curr_personality['prompt']:
-        #     req.system_prompt += f"\n{provider.curr_personality['prompt']}"
-        
     @filter.command("set")
     async def set_variable(self, event: AstrMessageEvent, key: str, value: str):
         session_id = event.get_session_id()
@@ -428,32 +417,84 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
                 await platform.logout()
                 yield event.plain_result("已登出 gewechat")
                 return
-                
-    @filter.command_group("kdb")
-    def kdb(self):
-        pass
-        
-    @kdb.command("on")
-    async def on_kdb(self, event: AstrMessageEvent):
-        self.kdb_enabled = True
-        curr_kdb_name = self.context.provider_manager.curr_kdb_name
-        if not curr_kdb_name:
-            yield event.plain_result("未载入任何知识库")
-        else:
-            yield event.plain_result(f"知识库已打开。当前载入的知识库: {curr_kdb_name}")
-        
-    @kdb.command("off")
-    async def off_kdb(self, event: AstrMessageEvent):
-        self.kdb_enabled = False
-        yield event.plain_result("知识库已关闭")
-        
+            
+            
+    @filter.platform_adapter_type(filter.PlatformAdapterType.ALL)
+    async def on_message(self, event: AstrMessageEvent):
+        '''长期记忆'''
+        if self.ltm:
+            try:
+                await self.ltm.handle_message(event)
+            except BaseException as e:
+                logger.error(e)
+    
+    
     @filter.on_llm_request()
-    async def on_llm_response(self, event: AstrMessageEvent, req: ProviderRequest):
-        curr_kdb_name = self.context.provider_manager.curr_kdb_name
-        if self.kdb_enabled and curr_kdb_name:
-            mgr = self.context.knowledge_db_manager
-            results = await mgr.retrive_records(curr_kdb_name, req.prompt)
-            if results:
-                req.system_prompt += "\nHere are documents that related to user's query: \n"
-                for result in results:
-                    req.system_prompt += f"- {result}\n"
+    async def decorate_llm_req(self, event: AstrMessageEvent, req: ProviderRequest):
+        '''在请求 LLM 前注入人格信息、Identifier、时间等 System Prompt'''
+        provider = self.context.get_using_provider()
+        if self.prompt_prefix:
+            req.prompt = self.prompt_prefix + req.prompt
+            
+        if self.identifier:
+            user_id = event.message_obj.sender.user_id
+            user_nickname = event.message_obj.sender.nickname
+            user_info = f"\n[User ID: {user_id}, Nickname: {user_nickname}]\n"
+            req.prompt = user_info + req.prompt
+            
+        if self.enable_datetime:
+            req.system_prompt += f"\nCurrent datetime: {datetime.datetime.now().strftime('%Y-%m-%d %H:%M')}\n"
+        
+        if persona := provider.curr_personality:
+            if prompt := persona['prompt']:
+                req.system_prompt += prompt
+            if mood_dialogs := persona['_mood_imitation_dialogs_processed']:
+                req.system_prompt += "\nHere are few shots of dialogs, you need to imitate the tone of 'B' in the following dialogs to respond:\n"
+                req.system_prompt += mood_dialogs
+            if begin_dialogs := persona["_begin_dialogs_processed"]:
+                req.contexts[:0] = begin_dialogs
+                
+        if self.ltm:
+            try:
+                await self.ltm.on_req_llm(event, req)
+            except BaseException as e:
+                logger.error(f"ltm: {e}")
+
+    
+    @filter.after_message_sent()
+    async def after_llm_req(self, event: AstrMessageEvent):
+        '''在 LLM 请求后记录对话'''
+        if self.ltm:
+            try:
+                await self.ltm.after_req_llm(event)
+            except BaseException as e:
+                logger.error(f"ltm: {e}")
+
+    # @filter.command_group("kdb")
+    # def kdb(self):
+    #     pass
+        
+    # @kdb.command("on")
+    # async def on_kdb(self, event: AstrMessageEvent):
+    #     self.kdb_enabled = True
+    #     curr_kdb_name = self.context.provider_manager.curr_kdb_name
+    #     if not curr_kdb_name:
+    #         yield event.plain_result("未载入任何知识库")
+    #     else:
+    #         yield event.plain_result(f"知识库已打开。当前载入的知识库: {curr_kdb_name}")
+        
+    # @kdb.command("off")
+    # async def off_kdb(self, event: AstrMessageEvent):
+    #     self.kdb_enabled = False
+    #     yield event.plain_result("知识库已关闭")
+        
+    # @filter.on_llm_request()
+    # async def on_llm_response(self, event: AstrMessageEvent, req: ProviderRequest):
+    #     curr_kdb_name = self.context.provider_manager.curr_kdb_name
+    #     if self.kdb_enabled and curr_kdb_name:
+    #         mgr = self.context.knowledge_db_manager
+    #         results = await mgr.retrive_records(curr_kdb_name, req.prompt)
+    #         if results:
+    #             req.system_prompt += "\nHere are documents that related to user's query: \n"
+    #             for result in results:
+    #                 req.system_prompt += f"- {result}\n"

requirements.txt

@@ -1,5 +1,4 @@
 pydantic~=2.10.3
-vchat
 aiohttp
 openai
 qq-botpy