Merge remote-tracking branch 'origin/HEAD' into anka-dev

astrbot/core/core_lifecycle.py

@@ -190,7 +190,6 @@ class AstrBotCoreLifecycle:
             task.cancel()
 
         for plugin in self.plugin_manager.context.get_all_stars():
-            logger.info(f"正在终止插件 {plugin.name} ...")
             try:
                 await self.plugin_manager._terminate_plugin(plugin)
             except Exception as e:

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

@@ -58,9 +58,9 @@ class LLMRequestSubStage(Stage):
 
         if event.get_extra("provider_request"):
             req = event.get_extra("provider_request")
-            assert isinstance(
-                req, ProviderRequest
-            ), "provider_request 必须是 ProviderRequest 类型。"
+            assert isinstance(req, ProviderRequest), (
+                "provider_request 必须是 ProviderRequest 类型。"
+            )
 
             if req.conversation:
                 req.contexts = json.loads(req.conversation.history)
@@ -80,7 +80,6 @@ class LLMRequestSubStage(Stage):
             conversation_id = await self.conv_manager.get_curr_conversation_id(
                 event.unified_msg_origin
             )
-            req.session_id = event.unified_msg_origin
             if not conversation_id:
                 conversation_id = await self.conv_manager.new_conversation(
                     event.unified_msg_origin
@@ -134,6 +133,10 @@ class LLMRequestSubStage(Stage):
             logger.debug("上下文长度超过限制，将截断。")
             req.contexts = req.contexts[-self.max_context_length * 2 :]
 
+        # session_id
+        if not req.session_id:
+            req.session_id = event.unified_msg_origin
+
         try:
             need_loop = True
             while need_loop:

astrbot/core/pipeline/whitelist_check/stage.py

@@ -15,6 +15,9 @@ class WhitelistCheckStage(Stage):
             "enable_id_white_list"
         ]
         self.whitelist = ctx.astrbot_config["platform_settings"]["id_whitelist"]
+        self.whitelist = [
+            str(i).strip() for i in self.whitelist if str(i).strip() != ""
+        ]
         self.wl_ignore_admin_on_group = ctx.astrbot_config["platform_settings"][
             "wl_ignore_admin_on_group"
         ]
@@ -53,7 +56,7 @@ class WhitelistCheckStage(Stage):
                 return
         if (
             event.unified_msg_origin not in self.whitelist
-            and event.get_group_id() not in self.whitelist
+            and str(event.get_group_id()).strip() not in self.whitelist
         ):
             if self.wl_log:
                 logger.info(

astrbot/core/star/star_manager.py

@@ -596,7 +596,7 @@ class PluginManager:
             asyncio.get_event_loop().run_in_executor(
                 None, star_metadata.star_cls.__del__
             )
-        else:
+        elif hasattr(star_metadata.star_cls, "terminate"):
             await star_metadata.star_cls.terminate()
 
     async def turn_on_plugin(self, plugin_name: str):

astrbot/core/utils/io.py

@@ -103,7 +103,7 @@ async def download_image_by_url(
                         with open(path, "wb") as f:
                             f.write(await resp.read())
                         return path
-    except aiohttp.client.ClientConnectorSSLError:
+    except (aiohttp.ClientConnectorSSLError, aiohttp.ClientConnectorCertificateError):
         # 关闭SSL验证
         ssl_context = ssl.create_default_context()
         ssl_context.set_ciphers("DEFAULT")
@@ -152,7 +152,7 @@ async def download_file(url: str, path: str, show_progress: bool = False):
                                 f"\r下载进度: {downloaded_size / total_size:.2%} 速度: {speed:.2f} KB/s",
                                 end="",
                             )
-    except aiohttp.client.ClientConnectorSSLError:
+    except (aiohttp.ClientConnectorSSLError, aiohttp.ClientConnectorCertificateError):
         # 关闭SSL验证
         ssl_context = ssl.create_default_context()
         ssl_context.set_ciphers("DEFAULT")

dashboard/src/views/ExtensionMarketplace.vue

@@ -63,14 +63,13 @@ import 'highlight.js/styles/github.css';
                         </v-row>
                     </div>
 
-                    
+
 
                     <div v-if="isListView" class="mt-4">
                         <h2>📦 全部插件</h2>
                         <v-col cols="12" md="12" style="padding: 0px;">
                             <v-data-table :headers="pluginMarketHeaders" :items="pluginMarketData" item-key="name"
-                                :loading="loading_" v-model:search="marketSearch"
-                                :filter-keys="filterKeys">
+                                :loading="loading_" v-model:search="marketSearch" :filter-keys="filterKeys">
                                 <template v-slot:item.name="{ item }">
                                     <div class="d-flex align-center">
                                         <img v-if="item.logo" :src="item.logo"
@@ -86,20 +85,22 @@ import 'highlight.js/styles/github.css';
                                 </template>
                                 <template v-slot:item.author="{ item }">
                                     <span v-if="item?.social_link"><a :href="item?.social_link">{{ item.author
-                                            }}</a></span>
+                                    }}</a></span>
                                     <span v-else>{{ item.author }}</span>
                                 </template>
                                 <template v-slot:item.tags="{ item }">
                                     <span v-if="item.tags.length === 0">无</span>
                                     <v-chip v-for="tag in item.tags" :key="tag" color="primary" size="small">{{ tag
-                                    }}</v-chip>
+                                        }}</v-chip>
                                 </template>
                                 <template v-slot:item.actions="{ item }">
-                                    <v-btn v-if="!item.installed" class="text-none mr-2" size="small" text="Read"
+                                    <v-btn v-if="!item.installed" class="text-none mr-2" size="small" 
                                         variant="flat" border
                                         @click="extension_url = item.repo; newExtension()">安装</v-btn>
-                                    <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border
+                                    <v-btn v-else class="text-none mr-2" size="small" variant="flat" border
                                         disabled>已安装</v-btn>
+                                    <v-btn class="text-none mr-2" size="small" variant="flat" border 
+                                        @click="open(item.repo)">查看帮助</v-btn>
                                 </template>
                             </v-data-table>
                         </v-col>
@@ -178,7 +179,7 @@ import 'highlight.js/styles/github.css';
     </v-snackbar>
 
     <WaitingForRestart ref="wfr"></WaitingForRestart>
-    
+
     <!-- README Dialog -->
     <v-dialog v-model="readmeDialog.show" width="800" persistent>
         <v-card>
@@ -190,16 +191,13 @@ import 'highlight.js/styles/github.css';
             </v-card-title>
             <v-divider></v-divider>
             <v-card-text style="height: 70vh; overflow-y: auto;">
-                <v-btn 
-                    color="primary" 
-                    prepend-icon="mdi-open-in-new"
-                    @click="openReadmeInNewTab()" 
-                    class="mt-4"
-                >
+                <v-btn color="primary" prepend-icon="mdi-open-in-new" @click="openReadmeInNewTab()" class="mt-4">
                     在GitHub中查看文档
                 </v-btn>
-                <div v-if="readmeDialog.content" class="markdown-body" v-html="renderMarkdown(readmeDialog.content)"></div>
-                <div v-else-if="readmeDialog.error" class="d-flex flex-column align-center justify-center" style="height: 100%;">
+                <div v-if="readmeDialog.content" class="markdown-body" v-html="renderMarkdown(readmeDialog.content)">
+                </div>
+                <div v-else-if="readmeDialog.error" class="d-flex flex-column align-center justify-center"
+                    style="height: 100%;">
                     <v-icon size="64" color="error" class="mb-4">mdi-alert-circle-outline</v-icon>
                     <p class="text-body-1 text-center mb-4">{{ readmeDialog.error }}</p>
                 </div>
@@ -282,8 +280,8 @@ export default {
             const search = this.marketSearch.toLowerCase();
             return this.pluginMarketData.filter(plugin =>
                 this.filterKeys.some(key =>
-                plugin[key]?.toLowerCase().includes(search)
-            ));
+                    plugin[key]?.toLowerCase().includes(search)
+                ));
         },
         pinnedPlugins() {
             return this.pluginMarketData.filter(plugin => plugin?.pinned);
@@ -310,6 +308,12 @@ export default {
         });
     },
     methods: {
+        open(link) {
+            if (link) {
+                window.open(link, '_blank');
+            }
+        },
+
         jumpToPluginMarket() {
             window.open('https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json', '_blank');
         },
@@ -378,21 +382,21 @@ export default {
         async getReadmeUrl(repoUrl) {
             // 去掉 repoUrl 末尾的斜杠
             repoUrl = repoUrl.replace(/\/+$/, '');
- 
+
             const match = repoUrl.match(/github\.com\/([^/]+)\/([^/]+)/);
             if (!match) {
                 throw new Error("无效的 GitHub 仓库地址");
             }
- 
+
             const owner = match[1];
             const repo = match[2];
- 
+
             const apiUrl = `https://api.github.com/repos/${owner}/${repo}`;
- 
+
             try {
                 const res = await fetch(apiUrl);
                 const data = await res.json();
- 
+
                 const branch = data?.default_branch || 'master';
                 return `${repoUrl}/blob/${branch}/README.md`;
             } catch (error) {
@@ -449,7 +453,7 @@ export default {
                     this.onLoadingDialogResult(1, res.data.message);
                     this.dialog = false;
                     this.getExtensions();
-                    
+
                     await this.showReadmeDialog(res);
                 }).catch((err) => {
                     this.loading_ = false;
@@ -514,7 +518,7 @@ export default {
             if (!content) return '';
             // Configure marked with highlight.js for syntax highlighting
             marked.setOptions({
-                highlight: function(code, lang) {
+                highlight: function (code, lang) {
                     if (lang && hljs.getLanguage(lang)) {
                         try {
                             return hljs.highlight(code, { language: lang }).value;
@@ -544,11 +548,11 @@ export default {
     color: #24292e;
 }
 
-.markdown-body h1, 
-.markdown-body h2, 
-.markdown-body h3, 
-.markdown-body h4, 
-.markdown-body h5, 
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
 .markdown-body h6 {
     margin-top: 24px;
     margin-bottom: 16px;