Merge branch 'master' into refactor/new-plugin-system

pkg/persistence/migrations/dbm001_migrate_v3_config.py

@@ -212,6 +212,7 @@ class DBMigrateV3Config(migration.DBMigration):
         self.ap.instance_config.data['api']['port'] = self.ap.system_cfg.data['http-api']['port']
         self.ap.instance_config.data['command'] = {
             'prefix': self.ap.command_cfg.data['command-prefix'],
+            'enable': self.ap.command_cfg.data['command-enable'],
             'privilege': self.ap.command_cfg.data['privilege'],
         }
         self.ap.instance_config.data['concurrency']['pipeline'] = self.ap.system_cfg.data['pipeline-concurrency']

pkg/pipeline/bansess/bansess.py

@@ -30,6 +30,10 @@ class BanSessionCheckStage(stage.PipelineStage):
                 if sess == f'{query.launcher_type.value}_{query.launcher_id}':
                     found = True
                     break
+                # 使用 *_id 来表示加白/拉黑某用户的私聊和群聊场景
+                if sess.startswith('*_') and (sess[2:] == query.launcher_id or sess[2:] == query.sender_id):
+                    found = True
+                    break
 
         ctn = False
 

pkg/pipeline/process/handlers/chat.py

@@ -46,6 +46,7 @@ class ChatMessageHandler(handler.MessageHandler):
 
         event_ctx = await self.ap.plugin_connector.emit_event(event)
 
+        is_create_card = False  # 判断下是否需要创建流式卡片
         if event_ctx.is_prevented_default():
             if event_ctx.event.reply is not None:
                 mc = platform_message.MessageChain(event_ctx.event.reply)
@@ -74,14 +75,17 @@ class ChatMessageHandler(handler.MessageHandler):
                     raise ValueError(f'未找到请求运行器: {query.pipeline_config["ai"]["runner"]["runner"]}')
                 if is_stream:
                     resp_message_id = uuid.uuid4()
-                    await query.adapter.create_message_card(str(resp_message_id), query.message_event)
+
                     async for result in runner.run(query):
                         result.resp_message_id = str(resp_message_id)
                         if query.resp_messages:
                             query.resp_messages.pop()
                         if query.resp_message_chain:
                             query.resp_message_chain.pop()
-
+                        # 此时连接外部 AI 服务正常,创建卡片
+                        if not is_create_card:  # 只有不是第一次才创建卡片
+                            await query.adapter.create_message_card(str(resp_message_id), query.message_event)
+                            is_create_card = True
                         query.resp_messages.append(result)
                         self.ap.logger.info(f'对话({query.query_id})流式响应: {self.cut_str(result.readable_str())}')
 

pkg/pipeline/process/process.py

@@ -42,12 +42,14 @@ class Processor(stage.PipelineStage):
 
         async def generator():
             cmd_prefix = self.ap.instance_config.data['command']['prefix']
+            cmd_enable = self.ap.instance_config.data['command'].get('enable', True)
 
-            if any(message_text.startswith(prefix) for prefix in cmd_prefix):
-                async for result in self.cmd_handler.handle(query):
-                    yield result
+            if cmd_enable and any(message_text.startswith(prefix) for prefix in cmd_prefix):
+                handler_to_use = self.cmd_handler
             else:
-                async for result in self.chat_handler.handle(query):
-                    yield result
+                handler_to_use = self.chat_handler
+
+            async for result in handler_to_use.handle(query):
+                yield result
 
         return generator()

pkg/platform/sources/dingtalk.py

@@ -20,6 +20,9 @@ class DingTalkMessageConverter(abstract_platform_adapter.AbstractMessageConverte
                 at = True
             if type(msg) is platform_message.Plain:
                 content += msg.text
+            if type(msg) is platform_message.Forward:
+                for node in msg.node_list:
+                    content += (await DingTalkMessageConverter.yiri2target(node.message_chain))[0]
         return content, at
 
     @staticmethod
@@ -58,7 +61,7 @@ class DingTalkEventConverter(abstract_platform_adapter.AbstractEventConverter):
         if event.conversation == 'FriendMessage':
             return platform_events.FriendMessage(
                 sender=platform_entities.Friend(
-                    id=event.incoming_message.sender_id,
+                    id=event.incoming_message.sender_staff_id,
                     nickname=event.incoming_message.sender_nick,
                     remark='',
                 ),
@@ -68,7 +71,7 @@ class DingTalkEventConverter(abstract_platform_adapter.AbstractEventConverter):
             )
         elif event.conversation == 'GroupMessage':
             sender = platform_entities.GroupMember(
-                id=event.incoming_message.sender_id,
+                id=event.incoming_message.sender_staff_id,
                 member_name=event.incoming_message.sender_nick,
                 permission='MEMBER',
                 group=platform_entities.Group(
@@ -162,8 +165,11 @@ class DingTalkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             content, at = await DingTalkMessageConverter.yiri2target(message)
 
             card_instance, card_instance_id = self.card_instance_id_dict[message_id]
+            if not content and bot_message.content:
+                content = bot_message.content  # 兼容直接传入content的情况
             # print(card_instance_id)
-            await self.bot.send_card_message(card_instance, card_instance_id, content, is_final)
+            if content:
+                await self.bot.send_card_message(card_instance, card_instance_id, content, is_final)
             if is_final and bot_message.tool_calls is None:
                 # self.seq = 1  # 消息回复结束之后重置seq
                 self.card_instance_id_dict.pop(message_id)  # 消息回复结束之后删除卡片实例id

pkg/utils/announce.py

@@ -45,17 +45,23 @@ class AnnouncementManager:
 
     async def fetch_all(self) -> list[Announcement]:
         """获取所有公告"""
-        resp = requests.get(
-            url='https://api.github.com/repos/langbot-app/LangBot/contents/res/announcement.json',
-            proxies=self.ap.proxy_mgr.get_forward_proxies(),
-            timeout=5,
-        )
-        obj_json = resp.json()
-        b64_content = obj_json['content']
-        # 解码
-        content = base64.b64decode(b64_content).decode('utf-8')
+        try:
+            resp = requests.get(
+                url='https://api.github.com/repos/langbot-app/LangBot/contents/res/announcement.json',
+                proxies=self.ap.proxy_mgr.get_forward_proxies(),
+                timeout=5,
+            )
+            resp.raise_for_status()  # 检查请求是否成功
+            obj_json = resp.json()
+            b64_content = obj_json['content']
+            # 解码
+            content = base64.b64decode(b64_content).decode('utf-8')
 
-        return [Announcement(**item) for item in json.loads(content)]
+            return [Announcement(**item) for item in json.loads(content)]
+        except (requests.RequestException, json.JSONDecodeError, KeyError) as e:
+            self.ap.logger.warning(f'获取公告失败: {e}')
+            pass
+        return []  # 请求失败时返回空列表
 
     async def fetch_saved(self) -> list[Announcement]:
         if not os.path.exists('data/labels/announcement_saved.json'):

pkg/utils/version.py

@@ -28,15 +28,19 @@ class VersionManager:
 
     async def get_release_list(self) -> list:
         """获取发行列表"""
-        rls_list_resp = requests.get(
-            url='https://api.github.com/repos/langbot-app/LangBot/releases',
-            proxies=self.ap.proxy_mgr.get_forward_proxies(),
-            timeout=5,
-        )
-
-        rls_list = rls_list_resp.json()
-
-        return rls_list
+        try:
+            rls_list_resp = requests.get(
+                url='https://api.github.com/repos/langbot-app/LangBot/releases',
+                proxies=self.ap.proxy_mgr.get_forward_proxies(),
+                timeout=5,
+            )
+            rls_list_resp.raise_for_status()  # 检查请求是否成功
+            rls_list = rls_list_resp.json()
+            return rls_list
+        except Exception as e:
+            self.ap.logger.warning(f"获取发行列表失败: {e}")
+            pass
+        return []
 
     async def update_all(self):
         """检查更新并下载源码"""