AstrBot 4.1.2__tar.gz → 4.1.3__tar.gz

{astrbot-4.1.2 → astrbot-4.1.3}/.github/workflows/code-format.yml

@@ -12,10 +12,10 @@ jobs:
     
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.10'
         

{astrbot-4.1.2 → astrbot-4.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.1.2
+Version: 4.1.3
 Summary: 易上手的多平台 LLM 聊天机器人及开发框架
 License-File: LICENSE
 Requires-Python: >=3.10

{astrbot-4.1.2 → astrbot-4.1.3}/astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -258,7 +258,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                                 )
                                 yield MessageChain(
                                     type="tool_direct_result"
-                                ).base64_image(res.content[0].data)
+                                ).base64_image(resource.blob)
                             else:
                                 tool_call_result_blocks.append(
                                     ToolCallMessageSegment(

{astrbot-4.1.2 → astrbot-4.1.3}/astrbot/core/config/default.py

@@ -6,7 +6,7 @@ import os
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.1.2"
+VERSION = "4.1.3"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 # 默认配置
@@ -60,6 +60,7 @@ DEFAULT_CONFIG = {
         "web_search_link": False,
         "display_reasoning_text": False,
         "identifier": False,
+        "group_name_display": False,
         "datetime_system_prompt": True,
         "default_personality": "default",
         "persona_pool": ["*"],
@@ -1724,6 +1725,9 @@ CONFIG_METADATA_2 = {
                     "identifier": {
                         "type": "bool",
                     },
+                    "group_name_display": {
+                        "type": "bool",
+                    },
                     "datetime_system_prompt": {
                         "type": "bool",
                     },
@@ -1903,17 +1907,31 @@ CONFIG_METADATA_3 = {
                         "_special": "select_provider",
                         "hint": "留空代表不使用。可用于不支持视觉模态的聊天模型。",
                     },
+                    "provider_stt_settings.enable": {
+                        "description": "默认启用语音转文本",
+                        "type": "bool",
+                    },
                     "provider_stt_settings.provider_id": {
                         "description": "语音转文本模型",
                         "type": "string",
                         "hint": "留空代表不使用。",
                         "_special": "select_provider_stt",
+                        "condition": {
+                            "provider_stt_settings.enable": True,
+                        },
+                    },
+                    "provider_tts_settings.enable": {
+                        "description": "默认启用文本转语音",
+                        "type": "bool",
                     },
                     "provider_tts_settings.provider_id": {
                         "description": "文本转语音模型",
                         "type": "string",
                         "hint": "留空代表不使用。",
                         "_special": "select_provider_tts",
+                        "condition": {
+                            "provider_tts_settings.enable": True,
+                        },
                     },
                     "provider_settings.image_caption_prompt": {
                         "description": "图片转述提示词",
@@ -1983,6 +2001,11 @@ CONFIG_METADATA_3 = {
                         "description": "用户识别",
                         "type": "bool",
                     },
+                    "provider_settings.group_name_display": {
+                        "description": "显示群名称",
+                        "type": "bool",
+                        "hint": "启用后，在支持的平台(aiocqhttp)上会在 prompt 中包含群名称信息。",
+                    },
                     "provider_settings.datetime_system_prompt": {
                         "description": "现实世界时间感知",
                         "type": "bool",

{astrbot-4.1.2 → astrbot-4.1.3}/astrbot/core/pipeline/respond/stage.py

@@ -1,17 +1,15 @@
 import random
 import asyncio
 import math
-import traceback
 import astrbot.core.message.components as Comp
 from typing import Union, AsyncGenerator
 from ..stage import register_stage, Stage
-from ..context import PipelineContext
+from ..context import PipelineContext, call_event_hook
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.message.message_event_result import MessageChain, ResultContentType
 from astrbot.core import logger
-from astrbot.core.message.message_event_result import BaseMessageComponent
-from astrbot.core.star.star_handler import star_handlers_registry, EventType
-from astrbot.core.star.star import star_map
+from astrbot.core.message.components import BaseMessageComponent, ComponentType
+from astrbot.core.star.star_handler import EventType
 from astrbot.core.utils.path_util import path_Mapping
 from astrbot.core.utils.session_lock import session_lock_manager
 
@@ -114,6 +112,43 @@ class RespondStage(Stage):
         # 如果所有组件都为空
         return True
 
+    def is_seg_reply_required(self, event: AstrMessageEvent) -> bool:
+        """检查是否需要分段回复"""
+        if not self.enable_seg:
+            return False
+
+        if self.only_llm_result and not event.get_result().is_llm_result():
+            return False
+
+        if event.get_platform_name() in [
+            "qq_official",
+            "weixin_official_account",
+            "dingtalk",
+        ]:
+            return False
+
+        return True
+
+    def _extract_comp(
+        self,
+        raw_chain: list[BaseMessageComponent],
+        extract_types: set[ComponentType],
+        modify_raw_chain: bool = True,
+    ):
+        extracted = []
+        if modify_raw_chain:
+            remaining = []
+            for comp in raw_chain:
+                if comp.type in extract_types:
+                    extracted.append(comp)
+                else:
+                    remaining.append(comp)
+            raw_chain[:] = remaining
+        else:
+            extracted = [comp for comp in raw_chain if comp.type in extract_types]
+
+        return extracted
+
     async def process(
         self, event: AstrMessageEvent
     ) -> Union[None, AsyncGenerator[None, None]]:
@@ -123,7 +158,14 @@ class RespondStage(Stage):
         if result.result_content_type == ResultContentType.STREAMING_FINISH:
             return
 
+        logger.info(
+            f"Prepare to send - {event.get_sender_name()}/{event.get_sender_id()}: {event._outline_chain(result.chain)}"
+        )
+
         if result.result_content_type == ResultContentType.STREAMING_RESULT:
+            if result.async_stream is None:
+                logger.warning("async_stream 为空，跳过发送。")
+                return
             # 流式结果直接交付平台适配器处理
             use_fallback = self.config.get("provider_settings", {}).get(
                 "streaming_segmented", False
@@ -148,87 +190,71 @@ class RespondStage(Stage):
             except Exception as e:
                 logger.warning(f"空内容检查异常: {e}")
 
-            record_comps = [c for c in result.chain if isinstance(c, Comp.Record)]
-            non_record_comps = [
-                c for c in result.chain if not isinstance(c, Comp.Record)
-            ]
-
-            if (
-                self.enable_seg
-                and (
-                    (self.only_llm_result and result.is_llm_result())
-                    or not self.only_llm_result
+            # 发送消息链
+            # Record 需要强制单独发送
+            need_separately = {ComponentType.Record}
+            if self.is_seg_reply_required(event):
+                header_comps = self._extract_comp(
+                    result.chain,
+                    {ComponentType.Reply, ComponentType.At},
+                    modify_raw_chain=True,
                 )
-                and event.get_platform_name()
-                not in ["qq_official", "weixin_official_account", "dingtalk"]
-            ):
-                decorated_comps = []
-                if self.reply_with_mention:
-                    for comp in result.chain:
-                        if isinstance(comp, Comp.At):
-                            decorated_comps.append(comp)
-                            result.chain.remove(comp)
-                            break
-                if self.reply_with_quote:
-                    for comp in result.chain:
-                        if isinstance(comp, Comp.Reply):
-                            decorated_comps.append(comp)
-                            result.chain.remove(comp)
-                            break
-
-                # leverage lock to guarentee the order of message sending among different events
+                if not result.chain or len(result.chain) == 0:
+                    # may fix #2670
+                    logger.warning(
+                        f"实际消息链为空, 跳过发送阶段。header_chain: {header_comps}, actual_chain: {result.chain}"
+                    )
+                    return
                 async with session_lock_manager.acquire_lock(event.unified_msg_origin):
-                    for rcomp in record_comps:
-                        i = await self._calc_comp_interval(rcomp)
-                        await asyncio.sleep(i)
-                        try:
-                            await event.send(MessageChain([rcomp]))
-                        except Exception as e:
-                            logger.error(f"发送消息失败: {e} chain: {result.chain}")
-                            break
-                    # 分段回复
-                    for comp in non_record_comps:
+                    for comp in result.chain:
                         i = await self._calc_comp_interval(comp)
                         await asyncio.sleep(i)
                         try:
-                            await event.send(MessageChain([*decorated_comps, comp]))
-                            decorated_comps = []  # 清空已发送的装饰组件
+                            if comp.type in need_separately:
+                                await event.send(MessageChain([comp]))
+                            else:
+                                await event.send(MessageChain([*header_comps, comp]))
+                                header_comps.clear()
                         except Exception as e:
-                            logger.error(f"发送消息失败: {e} chain: {result.chain}")
-                            break
+                            logger.error(
+                                f"发送消息链失败: chain = {MessageChain([comp])}, error = {e}",
+                                exc_info=True,
+                            )
             else:
-                for rcomp in record_comps:
+                if all(
+                    comp.type in {ComponentType.Reply, ComponentType.At}
+                    for comp in result.chain
+                ):
+                    # may fix #2670
+                    logger.warning(
+                        f"消息链全为 Reply 和 At 消息段, 跳过发送阶段。chain: {result.chain}"
+                    )
+                    return
+                sep_comps = self._extract_comp(
+                    result.chain,
+                    need_separately,
+                    modify_raw_chain=True,
+                )
+                for comp in sep_comps:
+                    chain = MessageChain([comp])
                     try:
-                        await event.send(MessageChain([rcomp]))
+                        await event.send(chain)
                     except Exception as e:
-                        logger.error(f"发送消息失败: {e} chain: {result.chain}")
-
-                try:
-                    await event.send(MessageChain(non_record_comps))
-                except Exception as e:
-                    logger.error(traceback.format_exc())
-                    logger.error(f"发送消息失败: {e} chain: {result.chain}")
-
-            logger.info(
-                f"AstrBot -> {event.get_sender_name()}/{event.get_sender_id()}: {event._outline_chain(result.chain)}"
-            )
-
-        handlers = star_handlers_registry.get_handlers_by_event_type(
-            EventType.OnAfterMessageSentEvent, plugins_name=event.plugins_name
-        )
-        for handler in handlers:
-            try:
-                logger.debug(
-                    f"hook(on_after_message_sent) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
-                )
-                await handler.handler(event)
-            except BaseException:
-                logger.error(traceback.format_exc())
+                        logger.error(
+                            f"发送消息链失败: chain = {chain}, error = {e}",
+                            exc_info=True,
+                        )
+                chain = MessageChain(result.chain)
+                if result.chain and len(result.chain) > 0:
+                    try:
+                        await event.send(chain)
+                    except Exception as e:
+                        logger.error(
+                            f"发送消息链失败: chain = {chain}, error = {e}",
+                            exc_info=True,
+                        )
 
-            if event.is_stopped():
-                logger.info(
-                    f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
-                )
-                return
+        if await call_event_hook(event, EventType.OnAfterMessageSentEvent):
+            return
 
         event.clear_result()

{astrbot-4.1.2 → astrbot-4.1.3}/astrbot/core/platform/astrbot_message.py

@@ -55,7 +55,7 @@ class AstrBotMessage:
     self_id: str  # 机器人的识别id
     session_id: str  # 会话id。取决于 unique_session 的设置。
     message_id: str  # 消息id
-    group_id: str = ""  # 群组id，如果为私聊，则为空
+    group: Group  # 群组
     sender: MessageMember  # 发送者
     message: List[BaseMessageComponent]  # 消息链使用 Nakuru 的消息链格式
     message_str: str  # 最直观的纯文本消息字符串
@@ -64,6 +64,28 @@ class AstrBotMessage:
 
     def __init__(self) -> None:
         self.timestamp = int(time.time())
+        self.group = None
 
     def __str__(self) -> str:
         return str(self.__dict__)
+
+    @property
+    def group_id(self) -> str:
+        """
+        向后兼容的 group_id 属性
+        群组id，如果为私聊，则为空
+        """
+        if self.group:
+            return self.group.group_id
+        return ""
+
+    @group_id.setter
+    def group_id(self, value: str):
+        """设置 group_id"""
+        if value:
+            if self.group:
+                self.group.group_id = value
+            else:
+                self.group = Group(group_id=value)
+        else:
+            self.group = None

{astrbot-4.1.2 → astrbot-4.1.3}/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py

@@ -187,6 +187,7 @@ class AiocqhttpAdapter(Platform):
         if event["message_type"] == "group":
             abm.type = MessageType.GROUP_MESSAGE
             abm.group_id = str(event.group_id)
+            abm.group.group_name = event.get("group_name", "N/A")
         elif event["message_type"] == "private":
             abm.type = MessageType.FRIEND_MESSAGE
         if self.unique_session and abm.type == MessageType.GROUP_MESSAGE:

{astrbot-4.1.2 → astrbot-4.1.3}/astrbot/core/star/filter/command.py

@@ -52,10 +52,11 @@ class CommandFilter(HandlerFilter):
                 # 忽略前两个参数，即 self 和 event
                 idx += 1
                 continue
-            if v.default == inspect.Parameter.empty:
-                self.handler_params[k] = v.annotation
-            else:
+            # 优先类型注解 其次默认值
+            if v.annotation == inspect.Parameter.empty:
                 self.handler_params[k] = v.default
+            else:
+                self.handler_params[k] = v.annotation
 
     def get_handler_md(self) -> StarHandlerMetadata:
         return self.handler_md

astrbot-4.1.3/changelogs/v4.1.3.md

@@ -0,0 +1,8 @@
+# What's Changed
+
+0. ‼️ fix: 修复 4.0.0 版本之后，配置默认 TTS 或者 STT 模型之后仍无法生效的问题 ([#2758](https://github.com/Soulter/AstrBot/issues/2758))
+1. ‼️ fix: 修复分段回复时，引用消息单独发送导致第一条消息内容为空的问题 ([#2757](https://github.com/Soulter/AstrBot/issues/2757))
+2. feat: 支持在 WebUI 复制提供商配置以简化操作 ([#2767](https://github.com/Soulter/AstrBot/issues/2767))
+3. fix: handle image value correctly for mcp BlobResourceContents ([#2753](https://github.com/Soulter/AstrBot/issues/2753))
+4. feat: 增加 QQ 群名称识别到 system prompt, 并提供相应的配置 ([#2770](https://github.com/Soulter/AstrBot/issues/2770))
+5. fix: parameter type/default handling in CommandFilter

{astrbot-4.1.2 → astrbot-4.1.3}/dashboard/src/components/shared/ItemCard.vue

@@ -4,28 +4,28 @@
       <span class="text-h2 text-truncate" :title="getItemTitle()">{{ getItemTitle() }}</span>
       <v-tooltip location="top">
         <template v-slot:activator="{ props }">
-          <v-switch 
-            color="primary" 
-            hide-details 
-            density="compact" 
+          <v-switch
+            color="primary"
+            hide-details
+            density="compact"
             :model-value="getItemEnabled()"
             :loading="loading"
             :disabled="loading"
-            v-bind="props" 
+            v-bind="props"
             @update:model-value="toggleEnabled"
           ></v-switch>
         </template>
         <span>{{ getItemEnabled() ? t('core.common.itemCard.enabled') : t('core.common.itemCard.disabled') }}</span>
       </v-tooltip>
     </v-card-title>
-    
+
     <v-card-text>
       <slot name="item-details" :item="item"></slot>
     </v-card-text>
-    
+
     <v-card-actions style="margin: 8px;">
       <v-btn
-        variant="outlined" 
+        variant="outlined"
         color="error"
         rounded="xl"
         @click="$emit('delete', item)"
@@ -40,6 +40,15 @@
       >
         {{ t('core.common.itemCard.edit') }}
       </v-btn>
+      <v-btn
+        v-if="showCopyButton"
+        variant="tonal"
+        color="secondary"
+        rounded="xl"
+        @click="$emit('copy', item)"
+      >
+        {{ t('core.common.itemCard.copy') }}
+      </v-btn>
       <v-spacer></v-spacer>
     </v-card-actions>
 
@@ -83,9 +92,13 @@ export default {
     loading: {
       type: Boolean,
       default: false
+    },
+    showCopyButton: {
+      type: Boolean,
+      default: false
     }
   },
-  emits: ['toggle-enabled', 'delete', 'edit'],
+  emits: ['toggle-enabled', 'delete', 'edit', 'copy'],
   methods: {
     getItemTitle() {
       return this.item[this.titleField];

{astrbot-4.1.2 → astrbot-4.1.3}/dashboard/src/i18n/locales/zh-CN/core/common.json

@@ -73,6 +73,7 @@
     "disabled": "已禁用",
     "delete": "删除",
     "edit": "编辑",
+    "copy": "复制",
     "noData": "暂无数据"
   }
-} 
+}

{astrbot-4.1.2 → astrbot-4.1.3}/dashboard/src/views/ProviderPage.vue

@@ -56,14 +56,16 @@
 
         <v-row v-else>
           <v-col v-for="(provider, index) in filteredProviders" :key="index" cols="12" md="6" lg="4" xl="3">
-            <item-card 
-              :item="provider" 
-              title-field="id" 
+            <item-card
+              :item="provider"
+              title-field="id"
               enabled-field="enable"
               @toggle-enabled="providerStatusChange"
               :bglogo="getProviderIcon(provider.provider)"
-              @delete="deleteProvider" 
-              @edit="configExistingProvider">
+              @delete="deleteProvider"
+              @edit="configExistingProvider"
+              @copy="copyProvider"
+              :show-copy-button="true">
               <template v-slot:details="{ item }">
               </template>
             </item-card>
@@ -95,7 +97,7 @@
               <v-alert v-if="providerStatuses.length === 0" type="info" variant="tonal">
                 {{ tm('availability.noData') }}
               </v-alert>
-              
+
               <v-container v-else class="pa-0">
                 <v-row>
                   <v-col v-for="status in providerStatuses" :key="status.id" cols="12" sm="6" md="4">
@@ -113,7 +115,7 @@
                         ></v-progress-circular>
 
                         <span class="font-weight-bold">{{ status.id }}</span>
-                        
+
                         <v-chip :color="getStatusColor(status.status)" size="small" class="ml-2">
                           {{ getStatusText(status.status) }}
                         </v-chip>
@@ -348,10 +350,10 @@ export default {
       save_message_success: "success",
 
       showConsole: false,
-      
+
       // 显示状态部分
       showStatus: false,
-      
+
       // 供应商状态相关
       providerStatuses: [],
       loadingStatus: false,
@@ -437,7 +439,7 @@ export default {
         }
       };
     },
-    
+
     // 根据选择的标签过滤提供商列表
     filteredProviders() {
       if (!this.config_data.provider || this.activeProviderTypeTab === 'all') {
@@ -449,7 +451,7 @@ export default {
         if (provider.provider_type) {
           return provider.provider_type === this.activeProviderTypeTab;
         }
-        
+
         // 否则使用映射关系
         const mappedType = this.oldVersionProviderTypeMapping[provider.type];
         return mappedType === this.activeProviderTypeTab;
@@ -657,6 +659,40 @@ export default {
       }
     },
 
+    async copyProvider(providerToCopy) {
+      console.log('copyProvider triggered for:', providerToCopy);
+      // 1. 创建深拷贝
+      const newProviderConfig = JSON.parse(JSON.stringify(providerToCopy));
+
+      // 2. 生成唯一的 ID
+      const generateUniqueId = (baseId) => {
+        let newId = `${baseId}_copy`;
+        let counter = 1;
+        const existingIds = this.config_data.provider.map(p => p.id);
+        while (existingIds.includes(newId)) {
+          newId = `${baseId}_copy_${counter}`;
+          counter++;
+        }
+        return newId;
+      };
+      newProviderConfig.id = generateUniqueId(providerToCopy.id);
+
+      // 3. 设置为禁用状态，等待用户手动开启
+      newProviderConfig.enable = false;
+
+      this.loading = true;
+      try {
+        // 4. 调用后端接口创建
+        const res = await axios.post('/api/config/provider/new', newProviderConfig);
+        this.showSuccess(res.data.message || `成功复制并创建了 ${newProviderConfig.id}`);
+        this.getConfig(); // 5. 刷新列表
+      } catch (err) {
+        this.showError(err.response?.data?.message || err.message);
+      } finally {
+        this.loading = false;
+      }
+    },
+
     deleteProvider(provider) {
       if (confirm(this.tm('messages.confirm.delete', { id: provider.id }))) {
         axios.post('/api/config/provider/delete', { id: provider.id }).then((res) => {
@@ -694,14 +730,14 @@ export default {
       this.save_message_success = "error";
       this.save_message_snack = true;
     },
-    
+
     // 获取供应商状态
     async fetchProviderStatus() {
       if (this.loadingStatus) return;
 
       this.loadingStatus = true;
       this.showStatus = true; // 自动展开状态部分
-      
+
       // 1. 立即初始化UI为pending状态
       this.providerStatuses = this.config_data.provider.map(p => ({
         id: p.id,

{astrbot-4.1.2 → astrbot-4.1.3}/packages/astrbot/main.py

@@ -1214,6 +1214,12 @@ UID: {user_id} 此 ID 可用于设置管理员。
             user_info = f"\n[User ID: {user_id}, Nickname: {user_nickname}]\n"
             req.prompt = user_info + req.prompt
 
+        if cfg.get("group_name_display") and event.message_obj.group_id:
+            group_name = event.message_obj.group.group_name
+
+            if group_name:
+                req.system_prompt += f"\nGroup name: {group_name}\n"
+
         # 启用附加时间戳
         if cfg.get("datetime_system_prompt"):
             current_time = None

{astrbot-4.1.2 → astrbot-4.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "AstrBot"
-version = "4.1.2"
+version = "4.1.3"
 description = "易上手的多平台 LLM 聊天机器人及开发框架"
 readme = "README.md"
 requires-python = ">=3.10"