AstrBot 4.11.1__tar.gz → 4.11.2__tar.gz

{astrbot-4.11.1 → astrbot-4.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.11.1
+Version: 4.11.2
 Summary: Easy-to-use multi-platform LLM chatbot and development framework
 License-File: LICENSE
 Keywords: Astrbot,Astrbot Module,Astrbot Plugin

astrbot-4.11.2/astrbot/cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "4.11.2"

{astrbot-4.11.1 → astrbot-4.11.2}/astrbot/core/config/default.py

@@ -5,7 +5,7 @@ from typing import Any, TypedDict
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.11.1"
+VERSION = "4.11.2"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -376,16 +376,6 @@ CONFIG_METADATA_2 = {
                         "satori_heartbeat_interval": 10,
                         "satori_reconnect_delay": 5,
                     },
-                    "WeChatPadPro": {
-                        "id": "wechatpadpro",
-                        "type": "wechatpadpro",
-                        "enable": False,
-                        "admin_key": "stay33",
-                        "host": "这里填写你的局域网IP或者公网服务器IP",
-                        "port": 8059,
-                        "wpp_active_message_poll": False,
-                        "wpp_active_message_poll_interval": 3,
-                    },
                     # "WebChat": {
                     #     "id": "webchat",
                     #     "type": "webchat",

{astrbot-4.11.1 → astrbot-4.11.2}/astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py

@@ -361,6 +361,14 @@ class InternalAgentSubStage(Stage):
             if (enable_streaming := event.get_extra("enable_streaming")) is not None:
                 streaming_response = bool(enable_streaming)
 
+            # 检查消息内容是否有效，避免空消息触发钩子
+            has_provider_request = event.get_extra("provider_request") is not None
+            has_valid_message = bool(event.message_str and event.message_str.strip())
+
+            if not has_provider_request and not has_valid_message:
+                logger.debug("skip llm request: empty message and no provider_request")
+                return
+
             logger.debug("ready to request llm provider")
 
             # 通知等待调用 LLM（在获取锁之前）
@@ -522,13 +530,15 @@ class InternalAgentSubStage(Stage):
                     ):
                         yield
 
-                await self._save_to_history(
-                    event,
-                    req,
-                    agent_runner.get_final_llm_resp(),
-                    agent_runner.run_context.messages,
-                    agent_runner.stats,
-                )
+                # 检查事件是否被停止，如果被停止则不保存历史记录
+                if not event.is_stopped():
+                    await self._save_to_history(
+                        event,
+                        req,
+                        agent_runner.get_final_llm_resp(),
+                        agent_runner.run_context.messages,
+                        agent_runner.stats,
+                    )
 
             # 异步处理 WebChat 特殊情况
             if event.get_platform_name() == "webchat":

{astrbot-4.11.1 → astrbot-4.11.2}/astrbot/core/pipeline/waking_check/stage.py

@@ -22,7 +22,6 @@ UNIQUE_SESSION_ID_BUILDERS: dict[str, Callable[[AstrMessageEvent], str | None]]
     "qq_official_webhook": lambda e: e.get_sender_id(),
     "lark": lambda e: f"{e.get_sender_id()}%{e.get_group_id()}",
     "misskey": lambda e: f"{e.get_session_id()}_{e.get_sender_id()}",
-    "wechatpadpro": lambda e: f"{e.get_group_id()}#{e.get_sender_id()}",
 }
 
 

{astrbot-4.11.1 → astrbot-4.11.2}/astrbot/core/platform/manager.py

@@ -70,10 +70,6 @@ class PlatformManager:
                     from .sources.qqofficial_webhook.qo_webhook_adapter import (
                         QQOfficialWebhookPlatformAdapter,  # noqa: F401
                     )
-                case "wechatpadpro":
-                    from .sources.wechatpadpro.wechatpadpro_adapter import (
-                        WeChatPadProAdapter,  # noqa: F401
-                    )
                 case "lark":
                     from .sources.lark.lark_adapter import (
                         LarkPlatformAdapter,  # noqa: F401

{astrbot-4.11.1 → astrbot-4.11.2}/astrbot/core/star/filter/platform_adapter_type.py

@@ -12,7 +12,6 @@ class PlatformAdapterType(enum.Flag):
     TELEGRAM = enum.auto()
     WECOM = enum.auto()
     LARK = enum.auto()
-    WECHATPADPRO = enum.auto()
     DINGTALK = enum.auto()
     DISCORD = enum.auto()
     SLACK = enum.auto()
@@ -27,7 +26,6 @@ class PlatformAdapterType(enum.Flag):
         | TELEGRAM
         | WECOM
         | LARK
-        | WECHATPADPRO
         | DINGTALK
         | DISCORD
         | SLACK
@@ -49,7 +47,6 @@ ADAPTER_NAME_2_TYPE = {
     "discord": PlatformAdapterType.DISCORD,
     "slack": PlatformAdapterType.SLACK,
     "kook": PlatformAdapterType.KOOK,
-    "wechatpadpro": PlatformAdapterType.WECHATPADPRO,
     "vocechat": PlatformAdapterType.VOCECHAT,
     "weixin_official_account": PlatformAdapterType.WEIXIN_OFFICIAL_ACCOUNT,
     "satori": PlatformAdapterType.SATORI,

{astrbot-4.11.1 → astrbot-4.11.2}/astrbot/core/star/star_manager.py

@@ -22,6 +22,7 @@ from astrbot.core.utils.astrbot_path import (
     get_astrbot_plugin_path,
 )
 from astrbot.core.utils.io import remove_dir
+from astrbot.core.utils.metrics import Metric
 
 from . import StarMetadata
 from .command_management import sync_command_configs
@@ -656,6 +657,14 @@ class PluginManager:
                 如果找不到插件元数据则返回 None。
 
         """
+        # this metric is for displaying plugins installation count in webui
+        asyncio.create_task(
+            Metric.upload(
+                et="install_star",
+                repo=repo_url,
+            ),
+        )
+
         async with self._pm_lock:
             plugin_path = await self.updator.install(repo_url, proxy)
             # reload the plugin
@@ -1025,4 +1034,12 @@ class PluginManager:
                 "name": plugin.name,
             }
 
+            if plugin.repo:
+                asyncio.create_task(
+                    Metric.upload(
+                        et="install_star_f",  # install star
+                        repo=plugin.repo,
+                    ),
+                )
+
         return plugin_info

{astrbot-4.11.1 → astrbot-4.11.2}/astrbot/dashboard/routes/plugin.py

@@ -55,6 +55,7 @@ class PluginRoute(Route):
             "/plugin/on": ("POST", self.on_plugin),
             "/plugin/reload": ("POST", self.reload_plugins),
             "/plugin/readme": ("GET", self.get_plugin_readme),
+            "/plugin/changelog": ("GET", self.get_plugin_changelog),
             "/plugin/source/get": ("GET", self.get_custom_source),
             "/plugin/source/save": ("POST", self.save_custom_source),
         }
@@ -615,6 +616,55 @@ class PluginRoute(Route):
             logger.error(f"/api/plugin/readme: {traceback.format_exc()}")
             return Response().error(f"读取README文件失败: {e!s}").__dict__
 
+    async def get_plugin_changelog(self):
+        """获取插件更新日志
+
+        读取插件目录下的 CHANGELOG.md 文件内容。
+        """
+        plugin_name = request.args.get("name")
+        logger.debug(f"正在获取插件 {plugin_name} 的更新日志")
+
+        if not plugin_name:
+            return Response().error("插件名称不能为空").__dict__
+
+        # 查找插件
+        plugin_obj = None
+        for plugin in self.plugin_manager.context.get_all_stars():
+            if plugin.name == plugin_name:
+                plugin_obj = plugin
+                break
+
+        if not plugin_obj:
+            return Response().error(f"插件 {plugin_name} 不存在").__dict__
+
+        if not plugin_obj.root_dir_name:
+            return Response().error(f"插件 {plugin_name} 目录不存在").__dict__
+
+        plugin_dir = os.path.join(
+            self.plugin_manager.plugin_store_path,
+            plugin_obj.root_dir_name,
+        )
+
+        # 尝试多种可能的文件名
+        changelog_names = ["CHANGELOG.md", "changelog.md", "CHANGELOG", "changelog"]
+        for name in changelog_names:
+            changelog_path = os.path.join(plugin_dir, name)
+            if os.path.isfile(changelog_path):
+                try:
+                    with open(changelog_path, encoding="utf-8") as f:
+                        changelog_content = f.read()
+                    return (
+                        Response()
+                        .ok({"content": changelog_content}, "成功获取更新日志")
+                        .__dict__
+                    )
+                except Exception as e:
+                    logger.error(f"/api/plugin/changelog: {traceback.format_exc()}")
+                    return Response().error(f"读取更新日志失败: {e!s}").__dict__
+
+        # 没有找到 changelog 文件，返回 ok 但 content 为 null
+        return Response().ok({"content": None}, "该插件没有更新日志文件").__dict__
+
     async def get_custom_source(self):
         """获取自定义插件源"""
         sources = await sp.global_get("custom_plugin_sources", [])

astrbot-4.11.2/changelogs/v4.11.2.md

@@ -0,0 +1,15 @@
+## What's Changed
+
+### Features
+
+- feat: supports to display plugin CHANGELOG.md ([#4337](https://github.com/AstrBotDevs/AstrBot/issues/4337))
+
+### Fixes
+
+- fix: conversation was still saved to the context after `stop_event` ([#4345](https://github.com/AstrBotDevs/AstrBot/issues/4345))
+- fix: on_waiting_llm_request hook did not check message validity ([#4349](https://github.com/AstrBotDevs/AstrBot/issues/4349))
+fix(webui): maintain international consistency of the 'repo' button ([#4358](https://github.com/AstrBotDevs/AstrBot/issues/4358))
+
+### Improvements
+
+- plugin marketplace search supports matching display names. ([#4332](https://github.com/AstrBotDevs/AstrBot/issues/4332))

astrbot-4.11.2/dashboard/src/components/shared/ExtensionCard.vue

@@ -0,0 +1,379 @@
+<script setup lang="ts">
+import { ref, computed, inject } from "vue";
+import { useCustomizerStore } from "@/stores/customizer";
+import { useModuleI18n } from "@/i18n/composables";
+import UninstallConfirmDialog from "./UninstallConfirmDialog.vue";
+
+const props = defineProps({
+  extension: {
+    type: Object,
+    required: true,
+  },
+  marketMode: {
+    type: Boolean,
+    default: false,
+  },
+  highlight: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+// 定义要发送到父组件的事件
+const emit = defineEmits([
+  "configure",
+  "update",
+  "reload",
+  "install",
+  "uninstall",
+  "toggle-activation",
+  "view-handlers",
+  "view-readme",
+  "view-changelog",
+]);
+
+const reveal = ref(false);
+const showUninstallDialog = ref(false);
+
+// 国际化
+const { tm } = useModuleI18n("features/extension");
+
+// 操作函数
+const configure = () => {
+  emit("configure", props.extension);
+};
+
+const updateExtension = () => {
+  emit("update", props.extension);
+};
+
+const reloadExtension = () => {
+  emit("reload", props.extension);
+};
+
+const $confirm = inject("$confirm");
+
+const installExtension = async () => {
+  emit("install", props.extension);
+};
+
+const uninstallExtension = async () => {
+  showUninstallDialog.value = true;
+};
+
+const handleUninstallConfirm = (options: {
+  deleteConfig: boolean;
+  deleteData: boolean;
+}) => {
+  emit("uninstall", props.extension, options);
+};
+
+const toggleActivation = () => {
+  emit("toggle-activation", props.extension);
+};
+
+const viewHandlers = () => {
+  emit("view-handlers", props.extension);
+};
+
+const viewReadme = () => {
+  emit("view-readme", props.extension);
+};
+
+const viewChangelog = () => {
+  emit("view-changelog", props.extension);
+};
+</script>
+
+<template>
+  <v-card
+    class="mx-auto d-flex flex-column"
+    elevation="0"
+    :style="{
+      position: 'relative',
+      backgroundColor:
+        useCustomizerStore().uiTheme === 'PurpleTheme'
+          ? marketMode
+            ? '#f8f0dd'
+            : '#ffffff'
+          : '#282833',
+      color:
+        useCustomizerStore().uiTheme === 'PurpleTheme'
+          ? '#000000dd'
+          : '#ffffff',
+    }"
+  >
+    <v-card-text
+      style="
+        padding: 16px;
+        padding-bottom: 0px;
+        display: flex;
+        gap: 16px;
+        width: 100%;
+      "
+    >
+      <div v-if="extension?.logo">
+        <img :src="extension.logo" :alt="extension.name" cover width="100" />
+      </div>
+
+      <div style="overflow-x: auto">
+        <!-- Top-right three-dot menu -->
+        <div style="position: absolute; right: 8px; top: 8px; z-index: 5">
+          <v-menu offset-y>
+            <template v-slot:activator="{ props: menuProps }">
+              <v-btn
+                icon
+                variant="text"
+                aria-label="more"
+                v-if="extension?.repo"
+                :href="extension?.repo"
+                target="_blank"
+              >
+                <v-icon icon="mdi-github"></v-icon>
+              </v-btn>
+              <v-btn v-bind="menuProps" icon variant="text" aria-label="more">
+                <v-icon icon="mdi-dots-vertical"></v-icon>
+              </v-btn>
+            </template>
+
+            <v-list>
+              <v-list-item @click="viewReadme">
+                <v-list-item-title
+                  >📄 {{ tm("buttons.viewDocs") }}</v-list-item-title
+                >
+              </v-list-item>
+
+              <v-list-item v-if="!marketMode" @click="viewChangelog">
+                <v-list-item-title
+                  >📝 {{ tm("pluginChangelog.menuTitle") }}</v-list-item-title
+                >
+              </v-list-item>
+
+              <v-list-item
+                v-if="marketMode && !extension?.installed"
+                @click="installExtension"
+              >
+                <v-list-item-title>
+                  {{ tm("buttons.install") }}</v-list-item-title
+                >
+              </v-list-item>
+
+              <v-list-item v-if="marketMode && extension?.installed">
+                <v-list-item-title class="text--disabled">{{
+                  tm("status.installed")
+                }}</v-list-item-title>
+              </v-list-item>
+
+              <!-- Divider between market actions and plugin actions -->
+              <v-divider v-if="!marketMode" />
+
+              <template v-if="!marketMode">
+                <v-list-item @click="configure">
+                  <v-list-item-title>
+                    {{ tm("card.actions.pluginConfig") }}</v-list-item-title
+                  >
+                </v-list-item>
+
+                <v-list-item @click="uninstallExtension">
+                  <v-list-item-title class="text-error">{{
+                    tm("card.actions.uninstallPlugin")
+                  }}</v-list-item-title>
+                </v-list-item>
+
+                <v-list-item @click="reloadExtension">
+                  <v-list-item-title>{{
+                    tm("card.actions.reloadPlugin")
+                  }}</v-list-item-title>
+                </v-list-item>
+
+                <v-list-item @click="toggleActivation">
+                  <v-list-item-title>
+                    {{
+                      extension.activated
+                        ? tm("buttons.disable")
+                        : tm("buttons.enable")
+                    }}{{ tm("card.actions.togglePlugin") }}
+                  </v-list-item-title>
+                </v-list-item>
+
+                <v-list-item @click="viewHandlers">
+                  <v-list-item-title
+                    >{{ tm("card.actions.viewHandlers") }} ({{
+                      extension.handlers.length
+                    }})</v-list-item-title
+                  >
+                </v-list-item>
+
+                <v-list-item @click="updateExtension">
+                  <v-list-item-title>
+                    {{
+                      extension.has_update
+                        ? tm("card.actions.updateTo") +
+                          " " +
+                          extension.online_version
+                        : tm("card.actions.reinstall")
+                    }}
+                  </v-list-item-title>
+                </v-list-item>
+              </template>
+            </v-list>
+          </v-menu>
+        </div>
+
+        <div style="width: 100%; margin-bottom: 24px">
+          <!-- 最多一行 -->
+          <div
+            class="text-caption"
+            style="
+              color: gray;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              margin-right: 84px;
+            "
+          >
+            {{ extension.author }} / {{ extension.name }}
+          </div>
+          <p
+            class="text-h3 font-weight-black extension-title"
+            :class="{ 'text-h4': $vuetify.display.xs }"
+          >
+            <span class="extension-title__text">{{
+              extension.display_name?.length
+                ? extension.display_name
+                : extension.name
+            }}</span>
+            <v-tooltip
+              location="top"
+              v-if="extension?.has_update && !marketMode"
+            >
+              <template v-slot:activator="{ props: tooltipProps }">
+                <v-icon
+                  v-bind="tooltipProps"
+                  color="warning"
+                  class="ml-2"
+                  icon="mdi-update"
+                  size="small"
+                ></v-icon>
+              </template>
+              <span
+                >{{ tm("card.status.hasUpdate") }}:
+                {{ extension.online_version }}</span
+              >
+            </v-tooltip>
+            <v-tooltip
+              location="top"
+              v-if="!extension.activated && !marketMode"
+            >
+              <template v-slot:activator="{ props: tooltipProps }">
+                <v-icon
+                  v-bind="tooltipProps"
+                  color="error"
+                  class="ml-2"
+                  icon="mdi-cancel"
+                  size="small"
+                ></v-icon>
+              </template>
+              <span>{{ tm("card.status.disabled") }}</span>
+            </v-tooltip>
+          </p>
+
+          <div class="mt-1 d-flex flex-wrap">
+            <v-chip color="primary" label size="small">
+              <v-icon icon="mdi-source-branch" start></v-icon>
+              {{ extension.version }}
+            </v-chip>
+            <v-chip
+              v-if="extension?.has_update"
+              color="warning"
+              label
+              size="small"
+              class="ml-2"
+            >
+              <v-icon icon="mdi-arrow-up-bold" start></v-icon>
+              {{ extension.online_version }}
+            </v-chip>
+            <v-chip
+              color="primary"
+              label
+              size="small"
+              class="ml-2"
+              v-if="extension.handlers?.length"
+              @click="viewHandlers"
+              style="cursor: pointer"
+            >
+              <v-icon icon="mdi-cogs" start></v-icon>
+              {{ extension.handlers?.length
+              }}{{ tm("card.status.handlersCount") }}
+            </v-chip>
+            <v-chip
+              v-for="tag in extension.tags"
+              :key="tag"
+              :color="tag === 'danger' ? 'error' : 'primary'"
+              label
+              size="small"
+              class="ml-2"
+            >
+              {{ tag === "danger" ? tm("tags.danger") : tag }}
+            </v-chip>
+          </div>
+
+          <div
+            class="mt-2"
+            :class="{ 'text-caption': $vuetify.display.xs }"
+            style="overflow-y: auto; height: 70px; font-size: 90%"
+          >
+            {{ extension.desc }}
+          </div>
+        </div>
+      </div>
+    </v-card-text>
+
+    <v-card-actions class="extension-actions">
+      <v-btn color="primary" size="small" @click="viewReadme">
+        {{ tm("buttons.viewDocs") }}
+      </v-btn>
+      <v-btn v-if="!marketMode" color="primary" size="small" @click="configure">
+        {{ tm("card.actions.pluginConfig") }}
+      </v-btn>
+    </v-card-actions>
+  </v-card>
+
+  <!-- 卸载确认对话框 -->
+  <UninstallConfirmDialog
+    v-model="showUninstallDialog"
+    @confirm="handleUninstallConfirm"
+  />
+</template>
+
+<style scoped>
+.extension-image-container {
+  display: flex;
+  align-items: center;
+  margin-left: 12px;
+}
+
+.extension-title {
+  display: flex;
+  align-items: center;
+}
+
+.extension-title__text {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding-top: 6px;
+}
+
+@media (max-width: 600px) {
+  .extension-image-container {
+    margin-left: 8px;
+  }
+}
+
+.extension-actions {
+  margin-top: auto;
+  gap: 8px;
+}
+</style>