chore: remove large font files to shrink the source code size

/models 指令优化

.gitignore

@@ -7,7 +7,6 @@ configs/config.yaml
 **/.DS_Store
 temp
 cmd_config.json
-addons/plugins/
 data/*
 cookies.json
 logs/

README.md

@@ -1,180 +1,51 @@
 <p align="center">
 
-<img src="https://github.com/Soulter/AstrBot/assets/37870767/b1686114-f3aa-4963-b07f-28bf83dc0a10" alt="QQChannelChatGPT" width="200" />
+<img width="806" alt="image" src="https://github.com/Soulter/AstrBot/assets/37870767/c6f057d9-46d7-4144-8116-00a962941746">
+
 </p>
 <div align="center">
 
-# AstrBot
-
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/Soulter/AstrBot)](https://github.com/Soulter/AstrBot/releases/latest)
-<img src="https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/34412545-2e37-400f-bedc-42348713ac1f.svg" alt="wakatime">
 <img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="python">
 <a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg"/></a>
 <a href="https://qm.qq.com/cgi-bin/qm/qr?k=EYGsuUTfe00_iOu9JTXS7_TEpMkXOvwv&jump_from=webapi&authKey=uUEMKCROfsseS+8IzqPjzV3y1tzy4AkykwTib2jNkOFdzezF9s9XknqnIaf3CDft">
 <img alt="Static Badge" src="https://img.shields.io/badge/QQ群-322154837-purple">
 </a>
-<img alt="Static Badge" src="https://img.shields.io/badge/频道-x42d56aki2-purple">
 
 <a href="https://astrbot.soulter.top/center">项目部署</a> ｜
-<a href="https://github.com/Soulter/QQChannelChatGPT/issues">问题提交</a> ｜
-<a href="https://astrbot.soulter.top/center/docs/%E5%BC%80%E5%8F%91/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91">插件开发（最少只需 25 行）</a>
+<a href="https://github.com/Soulter/AstrBot/issues">问题提交</a> ｜
+<a href="https://astrbot.soulter.top/center/docs/%E5%BC%80%E5%8F%91/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91">插件开发</a>
 </div>
 
-## 🤔您可能想了解的
-- **如何部署？** [帮助文档](https://astrbot.soulter.top/center/docs/%E9%83%A8%E7%BD%B2/%E9%80%9A%E8%BF%87Docker%E9%83%A8%E7%BD%B2) (部署不成功欢迎进群捞人解决<3)
-- **go-cqhttp启动不成功、报登录失败？** [在这里搜索解决方法](https://github.com/Mrs4s/go-cqhttp/issues)
-- **程序闪退/机器人启动不成功？** [提交issue或加群反馈](https://github.com/Soulter/QQChannelChatGPT/issues)
-- **如何开启 ChatGPT、Claude、HuggingChat 等语言模型？** [查看帮助](https://astrbot.soulter.top/center/docs/%E4%BD%BF%E7%94%A8/%E5%A4%A7%E8%AF%AD%E8%A8%80%E6%A8%A1%E5%9E%8B)
+## 🛠️ 功能
 
-## 🧩功能：
-
-✨ 最近功能：
-1. 可视化面板
-2. Docker 一键部署项目：[链接](https://astrbot.soulter.top/center/docs/%E9%83%A8%E7%BD%B2/%E9%80%9A%E8%BF%87Docker%E9%83%A8%E7%BD%B2)
-
-🌍支持的消息平台/接口
-- go-cqhttp（QQ、QQ频道）
-- QQ 官方机器人接口
+🌍 支持的消息平台
+- QQ 群、QQ 频道（OneBot、QQ 官方接口）
 - Telegram（由 [astrbot_plugin_telegram](https://github.com/Soulter/astrbot_plugin_telegram) 插件支持）
+- WeChat(微信) (由 [astrbot_plugin_vchat](https://github.com/z2z63/astrbot_plugin_vchat) 插件支持)
 
-🌍支持的AI语言模型一览：
+🌍 支持的大模型一览：
 
-**文字模型/图片理解**
+- OpenAI GPT、DallE 系列
+- Claude（由[LLMs插件](https://github.com/Soulter/llms)支持）
+- HuggingChat（由[LLMs插件](https://github.com/Soulter/llms)支持）
+- Gemini（由[LLMs插件](https://github.com/Soulter/llms)支持）
 
-- OpenAI GPT-3（原生支持）
-- OpenAI GPT-3.5（原生支持）
-- OpenAI GPT-4（原生支持）
-- Claude（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
-- HuggingChat（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
-- Gemini（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
+🌍 机器人支持的能力一览：
+- 大模型对话、人格、网页搜索
+- 可视化管理面板
+- 同时处理多平台消息
+- 精确到个人的会话隔离
+- 插件支持
+- 文本转图片回复（Markdown）
 
-**图片生成**
-- OpenAI Dalle 接口
-- NovelAI/Naifu (免费，由[AIDraw插件](https://github.com/Soulter/aidraw)支持)
+## 🧩 插件支持
 
-🌍机器人支持的能力一览：
-- 可视化面板（beta）
-- 同时部署机器人到 QQ 和 QQ 频道
-- 大模型对话
-- 大模型网页搜索能力 **(目前仅支持OpenAI系模型，最新版本下使用 web on 指令打开)**
-- 插件（在QQ或QQ频道聊天框内输入 `plugin` 了解详情）
-- 回复文字图片渲染（以图片markdown格式回复，**大幅度降低被风控概率**，需手动在`cmd_config.json`内开启qq_pic_mode）
-- 人格设置
-- 关键词回复
-- 热更新（更新本项目时**仅需**在QQ或QQ频道聊天框内输入`update latest r`）
-- Windows一键部署 https://github.com/Soulter/QQChatGPTLauncher/releases/latest
-
-<!-- 
-### 基本功能
-<details> 
- <summary>✅ 回复符合上下文</summary>
-
-   -  程序向API发送近多次对话内容，模型根据上下文生成回复
-
-   -  你可在`configs/config.yaml`中修改`total_token_limit`来近似控制缓存大小。
- </details> 
-
-<details> 
- <summary>✅ 超额自动切换</summary>
-
-   -  超额时，程序自动切换openai的key，方便快捷
-   
-</details>
-
-<details> 
-
- <summary>✅ 支持统计频道、消息数量等信息</summary> 
-
-   -  实现了简单的统计功能
-
- </details>
-
-<details> 
- <summary>✅ 多并发处理，回复速度快</summary> 
-  
-   -  使用了协程，理论最高可以支持每个子频道每秒回复5条信息
-  
- </details>
-
-<details>
- <summary>✅ 持久化转储历史记录，重启不丢失</summary> 
-
-   -  使用内置的sqlite数据库存储历史记录到本地
-
-   -  方式为定时转储，可在`config.yaml`下修改`dump_history_interval`来修改间隔时间，单位为分钟。
-  
- </details>
-
-<details> 
- <summary>✅ 支持多种指令控制</summary> 
-  
-   -  详见下方`指令功能`
-  
- </details>
-
-<details>
-<summary>✅ 官方API，稳定</summary>
-
-   -  不使用ChatGPT逆向接口，而使用官方API接口，稳定方便。
-
-   -  QQ频道机器人框架为QQ官方开源的框架，稳定。
-
-</details> -->
-
-<!-- > 关于token：token就相当于是AI中的单词数（但是不等于单词数），`text-davinci-003`模型中最大可以支持`4097`个token。在发送信息时，这个机器人会将用户的历史聊天记录打包发送给ChatGPT，因此，`token`也会相应的累加，为了保证聊天的上下文的逻辑性，就有了缓存token。 -->
-
-### 🛠️ 插件支持
-
-本项目支持接入插件。
-
-> 使用`plugin i 插件GitHub链接`即可安装。
-
-部分插件：
-
-- `LLMS`: https://github.com/Soulter/llms | Claude, HuggingChat 大语言模型接入。
- 
-- `GoodPlugins`: https://github.com/Soulter/goodplugins | 随机动漫图片、搜番、喜报生成器等等
-
-- `sysstat`: https://github.com/Soulter/sysstatqcbot | 查看系统状态
-
-- `BiliMonitor`: https://github.com/Soulter/BiliMonitor | 订阅B站动态
-  
-- `liferestart`: https://github.com/Soulter/liferestart | 人生重开模拟器
+有关插件的使用和列表请移步：[AstrBot 文档 - 插件](https://astrbot.soulter.top/center/docs/%E4%BD%BF%E7%94%A8/%E6%8F%92%E4%BB%B6)
 
+## ✨ Demo
 
 <img width="900" alt="image" src="https://github.com/Soulter/AstrBot/assets/37870767/824d1ff3-7b85-481c-b795-8e62dedb9fd7">
 
 
-<!-- 
-### 指令
 
-#### OpenAI官方API
-在频道内需要先`@`机器人之后再输入指令；在QQ中暂时需要在消息前加上`ai `，不需要@
-- `/reset`重置prompt
-- `/his`查看历史记录（每个用户都有独立的会话）
-- `/his [页码数]`查看不同页码的历史记录。例如`/his 2`查看第2页
-- `/token`查看当前缓存的总token数
-- `/count` 查看统计
-- `/status` 查看chatGPT的配置
-- `/help` 查看帮助
-- `/key` 动态添加key
-- `/set` 人格设置面板
-- `/keyword nihao 你好` 设置关键词回复。nihao->你好
-- `/画` 画画
-
-#### 逆向ChatGPT库语言模型
-- `/gpt` 切换为OpenAI官方API
-
-* 切换模型指令支持临时回复。如`/a 你好`将会临时使用一次bing模型 -->
-<!--
-## 🙇‍感谢
-
-本项目使用了一下项目:
-
-[ChatGPT by acheong08](https://github.com/acheong08/ChatGPT)
-
-[EdgeGPT by acheong08](https://github.com/acheong08/EdgeGPT)
-
-[go-cqhttp by Mrs4s](https://github.com/Mrs4s/go-cqhttp)
-
-[nakuru-project by Lxns-Network](https://github.com/Lxns-Network/nakuru-project) -->

addons/dashboard/dist/assets/BaseBreadcrumb.vue_vue_type_style_index_0_lang-1875d383.js

@@ -1 +1 @@
-import{x as i,o as l,c as _,w as s,a as e,f as a,J as m,V as c,b as t,t as u,ad as p,B as n,ae as o,j as f}from"./index-dc96e1be.js";const b={class:"text-h3"},h={class:"d-flex align-center"},g={class:"d-flex align-center"},V=i({__name:"BaseBreadcrumb",props:{title:String,breadcrumbs:Array,icon:String},setup(d){const r=d;return(x,B)=>(l(),_(c,{class:"page-breadcrumb mb-1 mt-1"},{default:s(()=>[e(a,{cols:"12",md:"12"},{default:s(()=>[e(m,{variant:"outlined",elevation:"0",class:"px-4 py-3 withbg"},{default:s(()=>[e(c,{"no-gutters":"",class:"align-center"},{default:s(()=>[e(a,{md:"5"},{default:s(()=>[t("h3",b,u(r.title),1)]),_:1}),e(a,{md:"7",sm:"12",cols:"12"},{default:s(()=>[e(p,{items:r.breadcrumbs,class:"text-h5 justify-md-end pa-1"},{divider:s(()=>[t("div",h,[e(n(o),{size:"17"})])]),prepend:s(()=>[e(f,{size:"small",icon:"mdi-home",class:"text-secondary mr-2"}),t("div",g,[e(n(o),{size:"17"})])]),_:1},8,["items"])]),_:1})]),_:1})]),_:1})]),_:1})]),_:1}))}});export{V as _};
+import{x as i,o as l,c as _,w as s,a as e,f as a,J as m,V as c,b as t,t as u,ae as p,B as n,af as o,j as f}from"./index-5ac7c267.js";const b={class:"text-h3"},h={class:"d-flex align-center"},g={class:"d-flex align-center"},V=i({__name:"BaseBreadcrumb",props:{title:String,breadcrumbs:Array,icon:String},setup(d){const r=d;return(x,B)=>(l(),_(c,{class:"page-breadcrumb mb-1 mt-1"},{default:s(()=>[e(a,{cols:"12",md:"12"},{default:s(()=>[e(m,{variant:"outlined",elevation:"0",class:"px-4 py-3 withbg"},{default:s(()=>[e(c,{"no-gutters":"",class:"align-center"},{default:s(()=>[e(a,{md:"5"},{default:s(()=>[t("h3",b,u(r.title),1)]),_:1}),e(a,{md:"7",sm:"12",cols:"12"},{default:s(()=>[e(p,{items:r.breadcrumbs,class:"text-h5 justify-md-end pa-1"},{divider:s(()=>[t("div",h,[e(n(o),{size:"17"})])]),prepend:s(()=>[e(f,{size:"small",icon:"mdi-home",class:"text-secondary mr-2"}),t("div",g,[e(n(o),{size:"17"})])]),_:1},8,["items"])]),_:1})]),_:1})]),_:1})]),_:1})]),_:1}))}});export{V as _};

addons/dashboard/dist/assets/BlankLayout-471b2640.js

@@ -1 +1 @@
-import{x as e,o as a,c as t,w as o,a as s,B as n,Z as r,W as c}from"./index-dc96e1be.js";const f=e({__name:"BlankLayout",setup(p){return(u,_)=>(a(),t(c,null,{default:o(()=>[s(n(r))]),_:1}))}});export{f as default};
+import{x as e,o as a,c as t,w as o,a as s,B as n,Z as r,W as c}from"./index-5ac7c267.js";const f=e({__name:"BlankLayout",setup(p){return(u,_)=>(a(),t(c,null,{default:o(()=>[s(n(r))]),_:1}))}});export{f as default};

addons/dashboard/dist/assets/ColorPage-beafd674.js

@@ -1 +1 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as p,D as a,o as r,s,a as e,w as t,f as o,V as i,F as n,u as g,c as h,a0 as b,e as x,t as y}from"./index-dc96e1be.js";const P=p({__name:"ColorPage",setup(C){const c=a({title:"Colors Page"}),d=a([{title:"Utilities",disabled:!1,href:"#"},{title:"Colors",disabled:!0,href:"#"}]),u=a(["primary","lightprimary","secondary","lightsecondary","info","success","accent","warning","error","darkText","lightText","borderLight","inputBorder","containerBg"]);return(V,k)=>(r(),s(n,null,[e(m,{title:c.value.title,breadcrumbs:d.value},null,8,["title","breadcrumbs"]),e(i,null,{default:t(()=>[e(o,{cols:"12",md:"12"},{default:t(()=>[e(_,{title:"Color Palette"},{default:t(()=>[e(i,null,{default:t(()=>[(r(!0),s(n,null,g(u.value,(l,f)=>(r(),h(o,{md:"3",cols:"12",key:f},{default:t(()=>[e(b,{rounded:"md",class:"align-center justify-center d-flex",height:"100",width:"100%",color:l},{default:t(()=>[x("class: "+y(l),1)]),_:2},1032,["color"])]),_:2},1024))),128))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{P as default};
+import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-1875d383.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js";import{x as p,D as a,o as r,s,a as e,w as t,f as o,V as i,F as n,u as g,c as h,a0 as b,e as x,t as y}from"./index-5ac7c267.js";const P=p({__name:"ColorPage",setup(C){const c=a({title:"Colors Page"}),d=a([{title:"Utilities",disabled:!1,href:"#"},{title:"Colors",disabled:!0,href:"#"}]),u=a(["primary","lightprimary","secondary","lightsecondary","info","success","accent","warning","error","darkText","lightText","borderLight","inputBorder","containerBg"]);return(V,k)=>(r(),s(n,null,[e(m,{title:c.value.title,breadcrumbs:d.value},null,8,["title","breadcrumbs"]),e(i,null,{default:t(()=>[e(o,{cols:"12",md:"12"},{default:t(()=>[e(_,{title:"Color Palette"},{default:t(()=>[e(i,null,{default:t(()=>[(r(!0),s(n,null,g(u.value,(l,f)=>(r(),h(o,{md:"3",cols:"12",key:f},{default:t(()=>[e(b,{rounded:"md",class:"align-center justify-center d-flex",height:"100",width:"100%",color:l},{default:t(()=>[x("class: "+y(l),1)]),_:2},1032,["color"])]),_:2},1024))),128))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{P as default};

addons/dashboard/dist/assets/ConfigDetailCard-756c045d.js

@@ -1 +1 @@
-import{o as l,s as o,u as c,c as n,w as u,Q as g,b as s,R as k,F as t,ab as h,O as p,t as m,a as V,ac as f,i as C,q as x,k as v,A as U}from"./index-dc96e1be.js";import{_ as w}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";const S={__name:"ConfigDetailCard",props:{config:Array},setup(d){return(y,B)=>(l(!0),o(t,null,c(d.config,r=>(l(),n(w,{key:r.name,title:r.name,style:{"margin-bottom":"16px"}},{default:u(()=>[g(s("a",null,"No data",512),[[k,d.config.length===0]]),(l(!0),o(t,null,c(r.body,e=>(l(),o(t,null,[e.config_type==="item"?(l(),o(t,{key:0},[e.val_type==="bool"?(l(),n(h,{key:0,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,color:"primary",inset:""},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="str"?(l(),n(p,{key:1,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="int"?(l(),n(p,{key:2,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="list"?(l(),o(t,{key:3},[s("span",null,m(e.name),1),V(f,{modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,chips:"",clearable:"",label:"请添加",multiple:"","prepend-icon":"mdi-tag-multiple-outline"},{selection:u(({attrs:a,item:i,select:b,selected:_})=>[V(C,x(a,{"model-value":_,closable:"",onClick:b,"onClick:close":D=>y.remove(i)}),{default:u(()=>[s("strong",null,m(i),1)]),_:2},1040,["model-value","onClick","onClick:close"])]),_:2},1032,["modelValue","onUpdate:modelValue"])],64)):v("",!0)],64)):e.config_type==="divider"?(l(),n(U,{key:1,style:{"margin-top":"8px","margin-bottom":"8px"}})):v("",!0)],64))),256))]),_:2},1032,["title"]))),128))}};export{S as _};
+import{o as l,s as o,u as c,c as n,w as u,Q as g,b as d,R as k,F as t,ac as h,O as p,t as m,a as V,ad as f,i as C,q as x,k as v,A as U}from"./index-5ac7c267.js";import{_ as w}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js";const S={__name:"ConfigDetailCard",props:{config:Array},setup(s){return(y,B)=>(l(!0),o(t,null,c(s.config,r=>(l(),n(w,{key:r.name,title:r.name,style:{"margin-bottom":"16px"}},{default:u(()=>[g(d("a",null,"No data",512),[[k,s.config.length===0]]),(l(!0),o(t,null,c(r.body,e=>(l(),o(t,null,[e.config_type==="item"?(l(),o(t,{key:0},[e.val_type==="bool"?(l(),n(h,{key:0,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,color:"primary",inset:""},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="str"?(l(),n(p,{key:1,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="int"?(l(),n(p,{key:2,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="list"?(l(),o(t,{key:3},[d("span",null,m(e.name),1),V(f,{modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,chips:"",clearable:"",label:"请添加",multiple:"","prepend-icon":"mdi-tag-multiple-outline"},{selection:u(({attrs:a,item:i,select:b,selected:_})=>[V(C,x(a,{"model-value":_,closable:"",onClick:b,"onClick:close":D=>y.remove(i)}),{default:u(()=>[d("strong",null,m(i),1)]),_:2},1040,["model-value","onClick","onClick:close"])]),_:2},1032,["modelValue","onUpdate:modelValue"])],64)):v("",!0)],64)):e.config_type==="divider"?(l(),n(U,{key:1,style:{"margin-top":"8px","margin-bottom":"8px"}})):v("",!0)],64))),256))]),_:2},1032,["title"]))),128))}};export{S as _};

addons/dashboard/dist/assets/ConfigPage-56ea019d.js

@@ -1 +1 @@
-import{_ as y}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as h,o,c as u,w as t,a,a8 as b,b as c,K as x,e as f,t as g,G as V,A as w,L as S,a9 as $,J as B,s as _,d as v,F as d,u as p,f as G,V as T,aa as j,T as l}from"./index-dc96e1be.js";import{_ as m}from"./ConfigDetailCard-8467c848.js";const D={class:"d-sm-flex align-center justify-space-between"},C=h({__name:"ConfigGroupCard",props:{title:String},setup(e){const s=e;return(i,n)=>(o(),u(B,{variant:"outlined",elevation:"0",class:"withbg",style:{width:"50%"}},{default:t(()=>[a(b,{style:{padding:"10px 20px"}},{default:t(()=>[c("div",D,[a(x,null,{default:t(()=>[f(g(s.title),1)]),_:1}),a(V)])]),_:1}),a(w),a(S,null,{default:t(()=>[$(i.$slots,"default")]),_:3})]),_:3}))}}),I={style:{display:"flex","flex-direction":"row","justify-content":"space-between","align-items":"center","margin-bottom":"12px"}},N={style:{display:"flex","flex-direction":"row"}},R={style:{"margin-right":"10px",color:"black"}},F={style:{color:"#222"}},k=h({__name:"ConfigGroupItem",props:{title:String,desc:String,btnRoute:String,namespace:String},setup(e){const s=e;return(i,n)=>(o(),_("div",I,[c("div",N,[c("h3",R,g(s.title),1),c("p",F,g(s.desc),1)]),a(v,{to:s.btnRoute,color:"primary",class:"ml-2",style:{"border-radius":"10px"}},{default:t(()=>[f("配置")]),_:1},8,["to"])]))}}),L={style:{display:"flex","flex-direction":"row",padding:"16px",gap:"16px",width:"100%"}},P={name:"ConfigPage",components:{UiParentCard:y,ConfigGroupCard:C,ConfigGroupItem:k,ConfigDetailCard:m},data(){return{config_data:[],config_base:[],save_message_snack:!1,save_message:"",save_message_success:"",config_outline:[],namespace:""}},mounted(){this.getConfig()},methods:{switchConfig(e){l.get("/api/configs?namespace="+e).then(s=>{this.namespace=e,this.config_data=s.data.data,console.log(this.config_data)}).catch(s=>{save_message=s,save_message_snack=!0,save_message_success="error"})},getConfig(){l.get("/api/config_outline").then(e=>{this.config_outline=e.data.data,console.log(this.config_outline)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"}),l.get("/api/configs").then(e=>{this.config_base=e.data.data,console.log(this.config_data)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"})},updateConfig(){l.post("/api/configs",{base_config:this.config_base,config:this.config_data,namespace:this.namespace}).then(e=>{e.data.status==="success"?(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="success"):(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="error")}).catch(e=>{this.save_message=e,this.save_message_snack=!0,this.save_message_success="error"})}}},J=Object.assign(P,{setup(e){return(s,i)=>(o(),_(d,null,[a(T,null,{default:t(()=>[c("div",L,[(o(!0),_(d,null,p(s.config_outline,n=>(o(),u(C,{key:n.name,title:n.name},{default:t(()=>[(o(!0),_(d,null,p(n.body,r=>(o(),u(k,{title:r.title,desc:r.desc,namespace:r.namespace,onClick:U=>s.switchConfig(r.namespace)},null,8,["title","desc","namespace","onClick"]))),256))]),_:2},1032,["title"]))),128))]),a(G,{cols:"12",md:"12"},{default:t(()=>[a(m,{config:s.config_data},null,8,["config"]),a(m,{config:s.config_base},null,8,["config"])]),_:1})]),_:1}),a(v,{icon:"mdi-content-save",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary",onClick:s.updateConfig},null,8,["onClick"]),a(j,{timeout:2e3,elevation:"24",color:s.save_message_success,modelValue:s.save_message_snack,"onUpdate:modelValue":i[0]||(i[0]=n=>s.save_message_snack=n)},{default:t(()=>[f(g(s.save_message),1)]),_:1},8,["color","modelValue"])],64))}});export{J as default};
+import{_ as b}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js";import{x as h,o,c as u,w as t,a,a8 as y,b as c,K as x,e as f,t as g,G as V,A as w,L as S,a9 as $,J as B,s as _,d as v,F as d,u as p,f as G,V as T,ab as j,T as l}from"./index-5ac7c267.js";import{_ as m}from"./ConfigDetailCard-756c045d.js";const D={class:"d-sm-flex align-center justify-space-between"},C=h({__name:"ConfigGroupCard",props:{title:String},setup(e){const s=e;return(i,n)=>(o(),u(B,{variant:"outlined",elevation:"0",class:"withbg",style:{width:"50%"}},{default:t(()=>[a(y,{style:{padding:"10px 20px"}},{default:t(()=>[c("div",D,[a(x,null,{default:t(()=>[f(g(s.title),1)]),_:1}),a(V)])]),_:1}),a(w),a(S,null,{default:t(()=>[$(i.$slots,"default")]),_:3})]),_:3}))}}),I={style:{display:"flex","flex-direction":"row","justify-content":"space-between","align-items":"center","margin-bottom":"12px"}},N={style:{display:"flex","flex-direction":"row"}},R={style:{"margin-right":"10px",color:"black"}},F={style:{color:"#222"}},k=h({__name:"ConfigGroupItem",props:{title:String,desc:String,btnRoute:String,namespace:String},setup(e){const s=e;return(i,n)=>(o(),_("div",I,[c("div",N,[c("h3",R,g(s.title),1),c("p",F,g(s.desc),1)]),a(v,{to:s.btnRoute,color:"primary",class:"ml-2",style:{"border-radius":"10px"}},{default:t(()=>[f("配置")]),_:1},8,["to"])]))}}),L={style:{display:"flex","flex-direction":"row",padding:"16px",gap:"16px",width:"100%"}},P={name:"ConfigPage",components:{UiParentCard:b,ConfigGroupCard:C,ConfigGroupItem:k,ConfigDetailCard:m},data(){return{config_data:[],config_base:[],save_message_snack:!1,save_message:"",save_message_success:"",config_outline:[],namespace:""}},mounted(){this.getConfig()},methods:{switchConfig(e){l.get("/api/configs?namespace="+e).then(s=>{this.namespace=e,this.config_data=s.data.data,console.log(this.config_data)}).catch(s=>{save_message=s,save_message_snack=!0,save_message_success="error"})},getConfig(){l.get("/api/config_outline").then(e=>{this.config_outline=e.data.data,console.log(this.config_outline)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"}),l.get("/api/configs").then(e=>{this.config_base=e.data.data,console.log(this.config_data)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"})},updateConfig(){l.post("/api/configs",{base_config:this.config_base,config:this.config_data,namespace:this.namespace}).then(e=>{e.data.status==="success"?(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="success"):(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="error")}).catch(e=>{this.save_message=e,this.save_message_snack=!0,this.save_message_success="error"})}}},J=Object.assign(P,{setup(e){return(s,i)=>(o(),_(d,null,[a(T,null,{default:t(()=>[c("div",L,[(o(!0),_(d,null,p(s.config_outline,n=>(o(),u(C,{key:n.name,title:n.name},{default:t(()=>[(o(!0),_(d,null,p(n.body,r=>(o(),u(k,{title:r.title,desc:r.desc,namespace:r.namespace,onClick:U=>s.switchConfig(r.namespace)},null,8,["title","desc","namespace","onClick"]))),256))]),_:2},1032,["title"]))),128))]),a(G,{cols:"12",md:"12"},{default:t(()=>[a(m,{config:s.config_data},null,8,["config"]),a(m,{config:s.config_base},null,8,["config"])]),_:1})]),_:1}),a(v,{icon:"mdi-content-save",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary",onClick:s.updateConfig},null,8,["onClick"]),a(j,{timeout:2e3,elevation:"24",color:s.save_message_success,modelValue:s.save_message_snack,"onUpdate:modelValue":i[0]||(i[0]=n=>s.save_message_snack=n)},{default:t(()=>[f(g(s.save_message),1)]),_:1},8,["color","modelValue"])],64))}});export{J as default};

addons/dashboard/dist/assets/Error404Page-06f6396d.js

@@ -1 +0,0 @@
-import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{o,c,w as s,V as i,a as r,b as e,d as l,e as a,f as d}from"./index-dc96e1be.js";const n="/assets/img-error-bg-ab6474a0.svg",_="/assets/img-error-blue-2675a7a9.svg",m="/assets/img-error-text-a6aebfa0.svg",g="/assets/img-error-purple-edee3fbc.svg";const p={},u={class:"text-center"},f=e("div",{class:"CardMediaWrapper"},[e("img",{src:n,alt:"grid",class:"w-100"}),e("img",{src:_,alt:"grid",class:"CardMediaParts"}),e("img",{src:m,alt:"build",class:"CardMediaBuild"}),e("img",{src:g,alt:"build",class:"CardMediaBuild"})],-1),h=e("h1",{class:"text-h1"},"Something is wrong",-1),v=e("p",null,[e("small",null,[a("The page you are looking was moved, removed, "),e("br"),a("renamed, or might never exist! ")])],-1);function x(b,V){return o(),c(i,{"no-gutters":"",class:"h-100vh"},{default:s(()=>[r(d,{class:"d-flex align-center justify-center"},{default:s(()=>[e("div",u,[f,h,v,r(l,{variant:"flat",color:"primary",class:"mt-4",to:"/","prepend-icon":"mdi-home"},{default:s(()=>[a(" Home")]),_:1})])]),_:1})]),_:1})}const C=t(p,[["render",x]]);export{C as default};

addons/dashboard/dist/assets/Error404Page-bcb6eec8.js

@@ -0,0 +1 @@
+import{_ as a}from"./_plugin-vue_export-helper-c27b6911.js";import{o,c,w as s,V as i,a as t,b as e,d as l,e as r,f as d}from"./index-5ac7c267.js";const n="/assets/img-error-bg-41f65efa.svg",_="/assets/img-error-blue-f50c8e77.svg",m="/assets/img-error-text-630dc36d.svg",g="/assets/img-error-purple-b97a483b.svg";const p={},u={class:"text-center"},f=e("div",{class:"CardMediaWrapper"},[e("img",{src:n,alt:"grid",class:"w-100"}),e("img",{src:_,alt:"grid",class:"CardMediaParts"}),e("img",{src:m,alt:"build",class:"CardMediaBuild"}),e("img",{src:g,alt:"build",class:"CardMediaBuild"})],-1),h=e("h1",{class:"text-h1"},"Something is wrong",-1),v=e("p",null,[e("small",null,[r("The page you are looking was moved, removed, "),e("br"),r("renamed, or might never exist! ")])],-1);function x(b,V){return o(),c(i,{"no-gutters":"",class:"h-100vh"},{default:s(()=>[t(d,{class:"d-flex align-center justify-center"},{default:s(()=>[e("div",u,[f,h,v,t(l,{variant:"flat",color:"primary",class:"mt-4",to:"/","prepend-icon":"mdi-home"},{default:s(()=>[r(" Home")]),_:1})])]),_:1})]),_:1})}const C=a(p,[["render",x]]);export{C as default};

addons/dashboard/dist/assets/LoginPage-5c692a20.js

@@ -1,4 +1,4 @@
-import{_ as _t}from"./LogoDark.vue_vue_type_script_setup_true_lang-7df35c25.js";import{x as ke,af as we,r as Ot,ag as Vt,D as A,ah as Ne,a2 as P,B as I,ai as Q,aj as St,I as Be,ak as Ie,al as Et,am as jt,an as At,ao as G,y as wt,o as Re,c as tt,w as C,a as j,O as He,b as ge,ap as Ft,d as Pt,e as Ge,s as Ct,aq as Tt,t as Nt,k as Bt,U as It,f as Fe,N as Rt,V as Pe,J as Ye,L as kt}from"./index-dc96e1be.js";import{a as Mt}from"./md5-45627dcb.js";/**
+import{_ as _t}from"./LogoDark.vue_vue_type_script_setup_true_lang-d555e5be.js";import{x as ke,ag as we,r as Ot,ah as Vt,D as A,ai as Ne,a2 as P,B as I,aj as Q,ak as St,I as Be,al as Ie,am as Et,an as jt,ao as At,ap as G,y as wt,o as Re,c as tt,w as C,a as j,O as He,b as ge,aq as Ft,d as Pt,e as Ge,s as Ct,ar as Tt,t as Nt,k as Bt,U as It,f as Fe,N as Rt,V as Pe,J as Ye,L as kt}from"./index-5ac7c267.js";import{a as Mt}from"./md5-086248bf.js";/**
   * vee-validate v4.11.3
   * (c) 2023 Abdelrahman Awad
   * @license MIT

addons/dashboard/dist/assets/LogoDark.vue_vue_type_script_setup_true_lang-d555e5be.js

@@ -1 +1 @@
-import{av as _,x as d,D as n,o as c,s as m,a as f,w as p,Q as r,b as a,R as o,B as t,aw as h}from"./index-dc96e1be.js";const s={Sidebar_drawer:!0,Customizer_drawer:!1,mini_sidebar:!1,fontTheme:"Roboto",inputBg:!1},l=_({id:"customizer",state:()=>({Sidebar_drawer:s.Sidebar_drawer,Customizer_drawer:s.Customizer_drawer,mini_sidebar:s.mini_sidebar,fontTheme:"Poppins",inputBg:s.inputBg}),getters:{},actions:{SET_SIDEBAR_DRAWER(){this.Sidebar_drawer=!this.Sidebar_drawer},SET_MINI_SIDEBAR(e){this.mini_sidebar=e},SET_FONT(e){this.fontTheme=e}}}),u={class:"logo",style:{display:"flex","align-items":"center"}},b={style:{"font-size":"24px","font-weight":"1000"}},w={style:{"font-size":"20px","font-weight":"1000"}},S={style:{"font-size":"20px"}},z=d({__name:"LogoDark",setup(e){n("rgb(var(--v-theme-primary))"),n("rgb(var(--v-theme-secondary))");const i=l();return(g,B)=>(c(),m("div",u,[f(t(h),{to:"/",style:{"text-decoration":"none",color:"black"}},{default:p(()=>[r(a("span",b,"AstrBot 仪表盘",512),[[o,!t(i).mini_sidebar]]),r(a("span",w,"Astr",512),[[o,t(i).mini_sidebar]]),r(a("span",S,"Bot",512),[[o,t(i).mini_sidebar]])]),_:1})]))}});export{z as _,l as u};
+import{aw as _,x as d,D as n,o as c,s as m,a as f,w as p,Q as r,b as a,R as o,B as t,ax as h}from"./index-5ac7c267.js";const s={Sidebar_drawer:!0,Customizer_drawer:!1,mini_sidebar:!1,fontTheme:"Roboto",inputBg:!1},l=_({id:"customizer",state:()=>({Sidebar_drawer:s.Sidebar_drawer,Customizer_drawer:s.Customizer_drawer,mini_sidebar:s.mini_sidebar,fontTheme:"Poppins",inputBg:s.inputBg}),getters:{},actions:{SET_SIDEBAR_DRAWER(){this.Sidebar_drawer=!this.Sidebar_drawer},SET_MINI_SIDEBAR(e){this.mini_sidebar=e},SET_FONT(e){this.fontTheme=e}}}),u={class:"logo",style:{display:"flex","align-items":"center"}},b={style:{"font-size":"24px","font-weight":"1000"}},w={style:{"font-size":"20px","font-weight":"1000"}},S={style:{"font-size":"20px"}},z=d({__name:"LogoDark",setup(e){n("rgb(var(--v-theme-primary))"),n("rgb(var(--v-theme-secondary))");const i=l();return(g,B)=>(c(),m("div",u,[f(t(h),{to:"/",style:{"text-decoration":"none",color:"black"}},{default:p(()=>[r(a("span",b,"AstrBot 仪表盘",512),[[o,!t(i).mini_sidebar]]),r(a("span",w,"Astr",512),[[o,t(i).mini_sidebar]]),r(a("span",S,"Bot",512),[[o,t(i).mini_sidebar]])]),_:1})]))}});export{z as _,l as u};

addons/dashboard/dist/assets/MaterialIcons-a926bc0c.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as n,D as a,o as c,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-dc96e1be.js";const p=["innerHTML"],v=n({__name:"MaterialIcons",setup(b){const s=a({title:"Material Icons"}),r=a('<iframe src="https://materialdesignicons.com/" frameborder="0"  width="100%" height="1000"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Material Icons",disabled:!0,href:"#"}]);return(h,M)=>(c(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(i,{title:"Material Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,p)]),_:1})]),_:1})]),_:1})],64))}});export{v as default};
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-1875d383.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js";import{x as n,D as a,o as c,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-5ac7c267.js";const p=["innerHTML"],v=n({__name:"MaterialIcons",setup(b){const s=a({title:"Material Icons"}),r=a('<iframe src="https://materialdesignicons.com/" frameborder="0"  width="100%" height="1000"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Material Icons",disabled:!0,href:"#"}]);return(h,M)=>(c(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(i,{title:"Material Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,p)]),_:1})]),_:1})]),_:1})],64))}});export{v as default};

addons/dashboard/dist/assets/RegisterPage-03654257.js

@@ -1 +0,0 @@
-import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-7df35c25.js";import{x as y,D as o,o as b,s as U,a as e,w as a,b as n,B as $,d as u,f as d,A as _,e as f,V as r,O as m,ap as A,au as E,F,c as T,N as q,J as V,L as P}from"./index-dc96e1be.js";const z="/assets/social-google-a359a253.svg",N=["src"],S=n("span",{class:"ml-2"},"Sign up with Google",-1),D=n("h5",{class:"text-h5 text-center my-4 mb-8"},"Sign up with Email address",-1),G={class:"d-sm-inline-flex align-center mt-2 mb-7 mb-sm-0 font-weight-bold"},L=n("a",{href:"#",class:"ml-1 text-lightText"},"Terms and Condition",-1),O={class:"mt-5 text-right"},j=y({__name:"AuthRegister",setup(w){const c=o(!1),i=o(!1),p=o(""),v=o(""),g=o(),h=o(""),x=o(""),k=o([s=>!!s||"Password is required",s=>s&&s.length<=10||"Password must be less than 10 characters"]),C=o([s=>!!s||"E-mail is required",s=>/.+@.+\..+/.test(s)||"E-mail must be valid"]);function R(){g.value.validate()}return(s,l)=>(b(),U(F,null,[e(u,{block:"",color:"primary",variant:"outlined",class:"text-lightText googleBtn"},{default:a(()=>[n("img",{src:$(z),alt:"google"},null,8,N),S]),_:1}),e(r,null,{default:a(()=>[e(d,{class:"d-flex align-center"},{default:a(()=>[e(_,{class:"custom-devider"}),e(u,{variant:"outlined",class:"orbtn",rounded:"md",size:"small"},{default:a(()=>[f("OR")]),_:1}),e(_,{class:"custom-devider"})]),_:1})]),_:1}),D,e(E,{ref_key:"Regform",ref:g,"lazy-validation":"",action:"/dashboards/analytical",class:"mt-7 loginForm"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:h.value,"onUpdate:modelValue":l[0]||(l[0]=t=>h.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Firstname"},null,8,["modelValue"])]),_:1}),e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:x.value,"onUpdate:modelValue":l[1]||(l[1]=t=>x.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Lastname"},null,8,["modelValue"])]),_:1})]),_:1}),e(m,{modelValue:v.value,"onUpdate:modelValue":l[2]||(l[2]=t=>v.value=t),rules:C.value,label:"Email Address / Username",class:"mt-4 mb-4",required:"",density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary"},null,8,["modelValue","rules"]),e(m,{modelValue:p.value,"onUpdate:modelValue":l[3]||(l[3]=t=>p.value=t),rules:k.value,label:"Password",required:"",density:"comfortable",variant:"outlined",color:"primary","hide-details":"auto","append-icon":i.value?"mdi-eye":"mdi-eye-off",type:i.value?"text":"password","onClick:append":l[4]||(l[4]=t=>i.value=!i.value),class:"pwdInput"},null,8,["modelValue","rules","append-icon","type"]),n("div",G,[e(A,{modelValue:c.value,"onUpdate:modelValue":l[5]||(l[5]=t=>c.value=t),rules:[t=>!!t||"You must agree to continue!"],label:"Agree with?",required:"",color:"primary",class:"ms-n2","hide-details":""},null,8,["modelValue","rules"]),L]),e(u,{color:"secondary",block:"",class:"mt-2",variant:"flat",size:"large",onClick:l[6]||(l[6]=t=>R())},{default:a(()=>[f("Sign Up")]),_:1})]),_:1},512),n("div",O,[e(_),e(u,{variant:"plain",to:"/auth/login",class:"mt-2 text-capitalize mr-n2"},{default:a(()=>[f("Already have an account?")]),_:1})])],64))}});const I={class:"pa-7 pa-sm-12"},J=n("h2",{class:"text-secondary text-h2 mt-8"},"Sign up",-1),Y=n("h4",{class:"text-disabled text-h4 mt-3"},"Enter credentials to continue",-1),M=y({__name:"RegisterPage",setup(w){return(c,i)=>(b(),T(r,{class:"h-100vh","no-gutters":""},{default:a(()=>[e(d,{cols:"12",class:"d-flex align-center bg-lightprimary"},{default:a(()=>[e(q,null,{default:a(()=>[n("div",I,[e(r,{justify:"center"},{default:a(()=>[e(d,{cols:"12",lg:"10",xl:"6",md:"7"},{default:a(()=>[e(V,{elevation:"0",class:"loginBox"},{default:a(()=>[e(V,{variant:"outlined"},{default:a(()=>[e(P,{class:"pa-9"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",class:"text-center"},{default:a(()=>[e(B),J,Y]),_:1})]),_:1}),e(j)]),_:1})]),_:1})]),_:1})]),_:1})]),_:1})])]),_:1})]),_:1})]),_:1}))}});export{M as default};

addons/dashboard/dist/assets/RegisterPage-a274fd0f.js

@@ -0,0 +1 @@
+import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-d555e5be.js";import{x as y,D as o,o as b,s as U,a as e,w as a,b as n,B as $,d as u,f as d,A as _,e as f,V as r,O as m,aq as q,av as A,F as E,c as F,N as T,J as V,L as P}from"./index-5ac7c267.js";const z="/assets/social-google-9b2fa67a.svg",N=["src"],S=n("span",{class:"ml-2"},"Sign up with Google",-1),D=n("h5",{class:"text-h5 text-center my-4 mb-8"},"Sign up with Email address",-1),G={class:"d-sm-inline-flex align-center mt-2 mb-7 mb-sm-0 font-weight-bold"},L=n("a",{href:"#",class:"ml-1 text-lightText"},"Terms and Condition",-1),O={class:"mt-5 text-right"},j=y({__name:"AuthRegister",setup(w){const c=o(!1),i=o(!1),p=o(""),v=o(""),g=o(),h=o(""),x=o(""),k=o([s=>!!s||"Password is required",s=>s&&s.length<=10||"Password must be less than 10 characters"]),C=o([s=>!!s||"E-mail is required",s=>/.+@.+\..+/.test(s)||"E-mail must be valid"]);function R(){g.value.validate()}return(s,l)=>(b(),U(E,null,[e(u,{block:"",color:"primary",variant:"outlined",class:"text-lightText googleBtn"},{default:a(()=>[n("img",{src:$(z),alt:"google"},null,8,N),S]),_:1}),e(r,null,{default:a(()=>[e(d,{class:"d-flex align-center"},{default:a(()=>[e(_,{class:"custom-devider"}),e(u,{variant:"outlined",class:"orbtn",rounded:"md",size:"small"},{default:a(()=>[f("OR")]),_:1}),e(_,{class:"custom-devider"})]),_:1})]),_:1}),D,e(A,{ref_key:"Regform",ref:g,"lazy-validation":"",action:"/dashboards/analytical",class:"mt-7 loginForm"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:h.value,"onUpdate:modelValue":l[0]||(l[0]=t=>h.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Firstname"},null,8,["modelValue"])]),_:1}),e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:x.value,"onUpdate:modelValue":l[1]||(l[1]=t=>x.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Lastname"},null,8,["modelValue"])]),_:1})]),_:1}),e(m,{modelValue:v.value,"onUpdate:modelValue":l[2]||(l[2]=t=>v.value=t),rules:C.value,label:"Email Address / Username",class:"mt-4 mb-4",required:"",density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary"},null,8,["modelValue","rules"]),e(m,{modelValue:p.value,"onUpdate:modelValue":l[3]||(l[3]=t=>p.value=t),rules:k.value,label:"Password",required:"",density:"comfortable",variant:"outlined",color:"primary","hide-details":"auto","append-icon":i.value?"mdi-eye":"mdi-eye-off",type:i.value?"text":"password","onClick:append":l[4]||(l[4]=t=>i.value=!i.value),class:"pwdInput"},null,8,["modelValue","rules","append-icon","type"]),n("div",G,[e(q,{modelValue:c.value,"onUpdate:modelValue":l[5]||(l[5]=t=>c.value=t),rules:[t=>!!t||"You must agree to continue!"],label:"Agree with?",required:"",color:"primary",class:"ms-n2","hide-details":""},null,8,["modelValue","rules"]),L]),e(u,{color:"secondary",block:"",class:"mt-2",variant:"flat",size:"large",onClick:l[6]||(l[6]=t=>R())},{default:a(()=>[f("Sign Up")]),_:1})]),_:1},512),n("div",O,[e(_),e(u,{variant:"plain",to:"/auth/login",class:"mt-2 text-capitalize mr-n2"},{default:a(()=>[f("Already have an account?")]),_:1})])],64))}});const I={class:"pa-7 pa-sm-12"},J=n("h2",{class:"text-secondary text-h2 mt-8"},"Sign up",-1),Y=n("h4",{class:"text-disabled text-h4 mt-3"},"Enter credentials to continue",-1),M=y({__name:"RegisterPage",setup(w){return(c,i)=>(b(),F(r,{class:"h-100vh","no-gutters":""},{default:a(()=>[e(d,{cols:"12",class:"d-flex align-center bg-lightprimary"},{default:a(()=>[e(T,null,{default:a(()=>[n("div",I,[e(r,{justify:"center"},{default:a(()=>[e(d,{cols:"12",lg:"10",xl:"6",md:"7"},{default:a(()=>[e(V,{elevation:"0",class:"loginBox"},{default:a(()=>[e(V,{variant:"outlined"},{default:a(()=>[e(P,{class:"pa-9"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",class:"text-center"},{default:a(()=>[e(B),J,Y]),_:1})]),_:1}),e(j)]),_:1})]),_:1})]),_:1})]),_:1})]),_:1})])]),_:1})]),_:1})]),_:1}))}});export{M as default};

addons/dashboard/dist/assets/ShadowPage-4758709f.js

@@ -1 +1 @@
-import{_ as c}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as m,D as s,o as l,s as r,a as e,w as a,f as i,V as o,F as d,u as _,J as p,X as b,b as h,t as g}from"./index-dc96e1be.js";const v=m({__name:"ShadowPage",setup(w){const n=s({title:"Shadow Page"}),u=s([{title:"Utilities",disabled:!1,href:"#"},{title:"Shadow",disabled:!0,href:"#"}]);return(V,x)=>(l(),r(d,null,[e(c,{title:n.value.title,breadcrumbs:u.value},null,8,["title","breadcrumbs"]),e(o,null,{default:a(()=>[e(i,{cols:"12",md:"12"},{default:a(()=>[e(f,{title:"Basic Shadow"},{default:a(()=>[e(o,{justify:"center"},{default:a(()=>[(l(),r(d,null,_(25,t=>e(i,{key:t,cols:"auto"},{default:a(()=>[e(p,{height:"100",width:"100",class:b(["mb-5",["d-flex justify-center align-center bg-primary",`elevation-${t}`]])},{default:a(()=>[h("div",null,g(t-1),1)]),_:2},1032,["class"])]),_:2},1024)),64))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{v as default};
+import{_ as c}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-1875d383.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js";import{x as m,D as s,o as l,s as r,a as e,w as a,f as i,V as o,F as d,u as _,J as p,X as b,b as h,t as g}from"./index-5ac7c267.js";const v=m({__name:"ShadowPage",setup(w){const n=s({title:"Shadow Page"}),u=s([{title:"Utilities",disabled:!1,href:"#"},{title:"Shadow",disabled:!0,href:"#"}]);return(V,x)=>(l(),r(d,null,[e(c,{title:n.value.title,breadcrumbs:u.value},null,8,["title","breadcrumbs"]),e(o,null,{default:a(()=>[e(i,{cols:"12",md:"12"},{default:a(()=>[e(f,{title:"Basic Shadow"},{default:a(()=>[e(o,{justify:"center"},{default:a(()=>[(l(),r(d,null,_(25,t=>e(i,{key:t,cols:"auto"},{default:a(()=>[e(p,{height:"100",width:"100",class:b(["mb-5",["d-flex justify-center align-center bg-primary",`elevation-${t}`]])},{default:a(()=>[h("div",null,g(t-1),1)]),_:2},1032,["class"])]),_:2},1024)),64))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{v as default};

addons/dashboard/dist/assets/TablerIcons-da1fd166.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as c,D as a,o as i,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-dc96e1be.js";const b=["innerHTML"],w=c({__name:"TablerIcons",setup(p){const s=a({title:"Tabler Icons"}),r=a('<iframe src="https://tablericons.com/" frameborder="0"  width="100%" height="600"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Tabler Icons",disabled:!0,href:"#"}]);return(h,T)=>(i(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(n,{title:"Tabler Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,b)]),_:1})]),_:1})]),_:1})],64))}});export{w as default};
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-1875d383.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js";import{x as c,D as a,o as i,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-5ac7c267.js";const b=["innerHTML"],w=c({__name:"TablerIcons",setup(p){const s=a({title:"Tabler Icons"}),r=a('<iframe src="https://tablericons.com/" frameborder="0"  width="100%" height="600"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Tabler Icons",disabled:!0,href:"#"}]);return(h,T)=>(i(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(n,{title:"Tabler Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,b)]),_:1})]),_:1})]),_:1})],64))}});export{w as default};

addons/dashboard/dist/assets/TypographyPage-ee445c8b.js

@@ -1 +1 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as f,o as i,c as g,w as e,a,a8 as y,K as b,e as w,t as d,A as C,L as V,a9 as L,J as _,D as o,s as h,f as k,b as t,F as x,u as B,X as H,V as T}from"./index-dc96e1be.js";const s=f({__name:"UiChildCard",props:{title:String},setup(r){const l=r;return(n,c)=>(i(),g(_,{variant:"outlined"},{default:e(()=>[a(y,{class:"py-3"},{default:e(()=>[a(b,{class:"text-h5"},{default:e(()=>[w(d(l.title),1)]),_:1})]),_:1}),a(C),a(V,null,{default:e(()=>[L(n.$slots,"default")]),_:3})]),_:3}))}}),D={class:"d-flex flex-column gap-1"},S={class:"text-caption pa-2 bg-lightprimary"},z=t("div",{class:"text-grey"},"Class",-1),N={class:"font-weight-medium"},$=t("div",null,[t("p",{class:"text-left"},"Left aligned on all viewport sizes."),t("p",{class:"text-center"},"Center aligned on all viewport sizes."),t("p",{class:"text-right"},"Right aligned on all viewport sizes."),t("p",{class:"text-sm-left"},"Left aligned on viewports SM (small) or wider."),t("p",{class:"text-right text-md-left"},"Left aligned on viewports MD (medium) or wider."),t("p",{class:"text-right text-lg-left"},"Left aligned on viewports LG (large) or wider."),t("p",{class:"text-right text-xl-left"},"Left aligned on viewports XL (extra-large) or wider.")],-1),M=t("div",{class:"d-flex justify-space-between flex-row"},[t("a",{href:"#",class:"text-decoration-none"},"Non-underlined link"),t("div",{class:"text-decoration-line-through"},"Line-through text"),t("div",{class:"text-decoration-overline"},"Overline text"),t("div",{class:"text-decoration-underline"},"Underline text")],-1),O=t("div",null,[t("p",{class:"text-high-emphasis"},"High-emphasis has an opacity of 87% in light theme and 100% in dark."),t("p",{class:"text-medium-emphasis"},"Medium-emphasis text and hint text have opacities of 60% in light theme and 70% in dark."),t("p",{class:"text-disabled"},"Disabled text has an opacity of 38% in light theme and 50% in dark.")],-1),j=f({__name:"TypographyPage",setup(r){const l=o({title:"Typography Page"}),n=o([["Heading 1","text-h1"],["Heading 2","text-h2"],["Heading 3","text-h3"],["Heading 4","text-h4"],["Heading 5","text-h5"],["Heading 6","text-h6"],["Subtitle 1","text-subtitle-1"],["Subtitle 2","text-subtitle-2"],["Body 1","text-body-1"],["Body 2","text-body-2"],["Button","text-button"],["Caption","text-caption"],["Overline","text-overline"]]),c=o([{title:"Utilities",disabled:!1,href:"#"},{title:"Typography",disabled:!0,href:"#"}]);return(U,F)=>(i(),h(x,null,[a(m,{title:l.value.title,breadcrumbs:c.value},null,8,["title","breadcrumbs"]),a(T,null,{default:e(()=>[a(k,{cols:"12",md:"12"},{default:e(()=>[a(v,{title:"Basic Typography"},{default:e(()=>[a(s,{title:"Heading"},{default:e(()=>[t("div",D,[(i(!0),h(x,null,B(n.value,([p,u])=>(i(),g(_,{variant:"outlined",key:p,class:"my-4"},{default:e(()=>[t("div",{class:H([u,"pa-2"])},d(p),3),t("div",S,[z,t("div",N,d(u),1)])]),_:2},1024))),128))])]),_:1}),a(s,{title:"Text-alignment",class:"mt-8"},{default:e(()=>[$]),_:1}),a(s,{title:"Decoration",class:"mt-8"},{default:e(()=>[M]),_:1}),a(s,{title:"Opacity",class:"mt-8"},{default:e(()=>[O]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{j as default};
+import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-1875d383.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js";import{x as f,o as i,c as g,w as e,a,a8 as y,K as b,e as w,t as d,A as C,L as V,a9 as L,J as _,D as o,s as h,f as k,b as t,F as x,u as B,X as H,V as T}from"./index-5ac7c267.js";const s=f({__name:"UiChildCard",props:{title:String},setup(r){const l=r;return(n,c)=>(i(),g(_,{variant:"outlined"},{default:e(()=>[a(y,{class:"py-3"},{default:e(()=>[a(b,{class:"text-h5"},{default:e(()=>[w(d(l.title),1)]),_:1})]),_:1}),a(C),a(V,null,{default:e(()=>[L(n.$slots,"default")]),_:3})]),_:3}))}}),D={class:"d-flex flex-column gap-1"},S={class:"text-caption pa-2 bg-lightprimary"},z=t("div",{class:"text-grey"},"Class",-1),N={class:"font-weight-medium"},$=t("div",null,[t("p",{class:"text-left"},"Left aligned on all viewport sizes."),t("p",{class:"text-center"},"Center aligned on all viewport sizes."),t("p",{class:"text-right"},"Right aligned on all viewport sizes."),t("p",{class:"text-sm-left"},"Left aligned on viewports SM (small) or wider."),t("p",{class:"text-right text-md-left"},"Left aligned on viewports MD (medium) or wider."),t("p",{class:"text-right text-lg-left"},"Left aligned on viewports LG (large) or wider."),t("p",{class:"text-right text-xl-left"},"Left aligned on viewports XL (extra-large) or wider.")],-1),M=t("div",{class:"d-flex justify-space-between flex-row"},[t("a",{href:"#",class:"text-decoration-none"},"Non-underlined link"),t("div",{class:"text-decoration-line-through"},"Line-through text"),t("div",{class:"text-decoration-overline"},"Overline text"),t("div",{class:"text-decoration-underline"},"Underline text")],-1),O=t("div",null,[t("p",{class:"text-high-emphasis"},"High-emphasis has an opacity of 87% in light theme and 100% in dark."),t("p",{class:"text-medium-emphasis"},"Medium-emphasis text and hint text have opacities of 60% in light theme and 70% in dark."),t("p",{class:"text-disabled"},"Disabled text has an opacity of 38% in light theme and 50% in dark.")],-1),j=f({__name:"TypographyPage",setup(r){const l=o({title:"Typography Page"}),n=o([["Heading 1","text-h1"],["Heading 2","text-h2"],["Heading 3","text-h3"],["Heading 4","text-h4"],["Heading 5","text-h5"],["Heading 6","text-h6"],["Subtitle 1","text-subtitle-1"],["Subtitle 2","text-subtitle-2"],["Body 1","text-body-1"],["Body 2","text-body-2"],["Button","text-button"],["Caption","text-caption"],["Overline","text-overline"]]),c=o([{title:"Utilities",disabled:!1,href:"#"},{title:"Typography",disabled:!0,href:"#"}]);return(U,F)=>(i(),h(x,null,[a(m,{title:l.value.title,breadcrumbs:c.value},null,8,["title","breadcrumbs"]),a(T,null,{default:e(()=>[a(k,{cols:"12",md:"12"},{default:e(()=>[a(v,{title:"Basic Typography"},{default:e(()=>[a(s,{title:"Heading"},{default:e(()=>[t("div",D,[(i(!0),h(x,null,B(n.value,([p,u])=>(i(),g(_,{variant:"outlined",key:p,class:"my-4"},{default:e(()=>[t("div",{class:H([u,"pa-2"])},d(p),3),t("div",S,[z,t("div",N,d(u),1)])]),_:2},1024))),128))])]),_:1}),a(s,{title:"Text-alignment",class:"mt-8"},{default:e(()=>[$]),_:1}),a(s,{title:"Decoration",class:"mt-8"},{default:e(()=>[M]),_:1}),a(s,{title:"Opacity",class:"mt-8"},{default:e(()=>[O]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{j as default};

addons/dashboard/dist/assets/UiParentCard.vue_vue_type_script_setup_true_lang-b40a2daa.js

@@ -1 +1 @@
-import{x as n,o,c as i,w as e,a,a8 as d,b as c,K as u,e as p,t as _,a9 as s,A as f,L as V,J as m}from"./index-dc96e1be.js";const C={class:"d-sm-flex align-center justify-space-between"},h=n({__name:"UiParentCard",props:{title:String},setup(l){const r=l;return(t,x)=>(o(),i(m,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(d,null,{default:e(()=>[c("div",C,[a(u,null,{default:e(()=>[p(_(r.title),1)]),_:1}),s(t.$slots,"action")])]),_:3}),a(f),a(V,null,{default:e(()=>[s(t.$slots,"default")]),_:3})]),_:3}))}});export{h as _};
+import{x as n,o,c as i,w as e,a,a8 as d,b as c,K as u,e as p,t as _,a9 as s,A as f,L as V,J as m}from"./index-5ac7c267.js";const C={class:"d-sm-flex align-center justify-space-between"},h=n({__name:"UiParentCard",props:{title:String},setup(l){const r=l;return(t,x)=>(o(),i(m,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(d,null,{default:e(()=>[c("div",C,[a(u,null,{default:e(()=>[p(_(r.title),1)]),_:1}),s(t.$slots,"action")])]),_:3}),a(f),a(V,null,{default:e(()=>[s(t.$slots,"default")]),_:3})]),_:3}))}});export{h as _};

addons/dashboard/dist/assets/md5-086248bf.js

@@ -1,4 +1,4 @@
-import{ar as K,as as Y,at as V}from"./index-dc96e1be.js";var C={exports:{}};const $={},k=Object.freeze(Object.defineProperty({__proto__:null,default:$},Symbol.toStringTag,{value:"Module"})),z=K(k);/**
+import{as as K,at as Y,au as V}from"./index-5ac7c267.js";var C={exports:{}};const $={},k=Object.freeze(Object.defineProperty({__proto__:null,default:$},Symbol.toStringTag,{value:"Module"})),z=K(k);/**
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5

addons/dashboard/dist/index.html

@@ -11,7 +11,7 @@
       href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Poppins:wght@400;500;600;700&family=Roboto:wght@400;500;700&display=swap"
     />
     <title>AstrBot - 仪表盘</title>
-    <script type="module" crossorigin src="/assets/index-dc96e1be.js"></script>
+    <script type="module" crossorigin src="/assets/index-5ac7c267.js"></script>
     <link rel="stylesheet" href="/assets/index-0f1523f3.css">
   </head>
   <body>

addons/dashboard/helper.py

@@ -119,14 +119,14 @@ class DashBoardHelper():
             )
             qq_gocq_platform_group = DashBoardConfig(
                 config_type="group",
-                name="OneBot协议平台配置",
+                name="go-cqhttp",
                 description="",
                 body=[
                     DashBoardConfig(
                         config_type="item",
                         val_type="bool",
                         name="启用",
-                        description="支持cq-http、shamrock等（目前仅支持QQ平台）",
+                        description="",
                         value=config['gocqbot']['enable'],
                         path="gocqbot.enable",
                     ),

addons/dashboard/server.py

@@ -4,8 +4,9 @@ import json
 import threading
 import asyncio
 import os
-import sys
+import uuid
 import time
+import traceback
 
 from flask import Flask, request
 from flask.logging import default_handler
@@ -16,7 +17,7 @@ from persist.session import dbConn
 from type.register import RegisteredPlugin
 from typing import List
 from util.cmd_config import CmdConfig
-from util.updator import check_update, update_project, request_release_info
+from util.updator import check_update, update_project, request_release_info, _reboot
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
@@ -196,7 +197,7 @@ class AstrBotDashBoard():
             repo_url = post_data["url"]
             try:
                 logger.info(f"正在安装插件 {repo_url}")
-                putil.install_plugin(repo_url, self.dashboard_data.plugins)
+                putil.install_plugin(repo_url, global_object)
                 logger.info(f"安装插件 {repo_url} 成功")
                 return Response(
                     status="success",
@@ -204,6 +205,31 @@ class AstrBotDashBoard():
                     data=None
                 ).__dict__
             except Exception as e:
+                logger.error(f"/api/extensions/install: {traceback.format_exc()}")
+                return Response(
+                    status="error",
+                    message=e.__str__(),
+                    data=None
+                ).__dict__
+            
+        @self.dashboard_be.post("/api/extensions/upload-install")
+        def upload_install_plugin():
+            try:
+                file = request.files['file']
+                print(file.filename)
+                logger.info(f"正在安装用户上传的插件 {file.filename}")
+                # save file to temp/
+                file_path = f"temp/{uuid.uuid4()}.zip"
+                file.save(file_path)
+                putil.install_plugin_from_file(file_path, global_object)
+                logger.info(f"安装插件 {file.filename} 成功")
+                return Response(
+                    status="success",
+                    message="安装成功~",
+                    data=None
+                ).__dict__
+            except Exception as e:
+                logger.error(f"/api/extensions/upload-install: {traceback.format_exc()}")
                 return Response(
                     status="error",
                     message=e.__str__(),
@@ -217,7 +243,7 @@ class AstrBotDashBoard():
             try:
                 logger.info(f"正在卸载插件 {plugin_name}")
                 putil.uninstall_plugin(
-                    plugin_name, self.dashboard_data.plugins)
+                    plugin_name, global_object)
                 logger.info(f"卸载插件 {plugin_name} 成功")
                 return Response(
                     status="success",
@@ -225,6 +251,7 @@ class AstrBotDashBoard():
                     data=None
                 ).__dict__
             except Exception as e:
+                logger.error(f"/api/extensions/uninstall: {traceback.format_exc()}")
                 return Response(
                     status="error",
                     message=e.__str__(),
@@ -237,7 +264,7 @@ class AstrBotDashBoard():
             plugin_name = post_data["name"]
             try:
                 logger.info(f"正在更新插件 {plugin_name}")
-                putil.update_plugin(plugin_name, self.dashboard_data.plugins)
+                putil.update_plugin(plugin_name, global_object)
                 logger.info(f"更新插件 {plugin_name} 成功")
                 return Response(
                     status="success",
@@ -245,6 +272,7 @@ class AstrBotDashBoard():
                     data=None
                 ).__dict__
             except Exception as e:
+                logger.error(f"/api/extensions/update: {traceback.format_exc()}")
                 return Response(
                     status="error",
                     message=e.__str__(),
@@ -273,6 +301,7 @@ class AstrBotDashBoard():
                     }
                 ).__dict__
             except Exception as e:
+                logger.error(f"/api/check_update: {traceback.format_exc()}")
                 return Response(
                     status="error",
                     message=e.__str__(),
@@ -288,8 +317,7 @@ class AstrBotDashBoard():
             else:
                 latest = False
             try:
-                update_project(request_release_info(latest),
-                               latest=latest, version=version)
+                update_project(latest=latest, version=version)
                 threading.Thread(target=self.shutdown_bot, args=(3,)).start()
                 return Response(
                     status="success",
@@ -297,6 +325,7 @@ class AstrBotDashBoard():
                     data=None
                 ).__dict__
             except Exception as e:
+                logger.error(f"/api/update_project: {traceback.format_exc()}")
                 return Response(
                     status="error",
                     message=e.__str__(),
@@ -344,8 +373,7 @@ class AstrBotDashBoard():
 
     def shutdown_bot(self, delay_s: int):
         time.sleep(delay_s)
-        py = sys.executable
-        os.execl(py, py, *sys.argv)
+        _reboot()
 
     def _get_configs(self, namespace: str):
         if namespace == "":
@@ -390,13 +418,13 @@ class AstrBotDashBoard():
                     },
                     {
                         "title": "QQ_OFFICIAL",
-                        "desc": "QQ官方API，仅支持频道",
+                        "desc": "QQ官方API。支持频道、群（需获得群权限）",
                         "namespace": "internal_platform_qq_official",
                         "tag": ""
                     },
                     {
-                        "title": "OneBot协议",
-                        "desc": "支持cq-http、shamrock等（目前仅支持QQ平台）",
+                        "title": "go-cqhttp",
+                        "desc": "第三方 QQ 协议实现。支持频道、群",
                         "namespace": "internal_platform_qq_gocq",
                         "tag": ""
                     }

addons/plugins/helloworld/README.md

@@ -0,0 +1,10 @@
+# helloworld
+
+AstrBot 插件模板
+
+A template plugin for AstrBot plugin feature
+
+# 支持
+
+[帮助文档](https://astrbot.soulter.top/center/docs/%E5%BC%80%E5%8F%91/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91/
+)

addons/plugins/helloworld/REPO

@@ -0,0 +1 @@
+https://github.com/Soulter/helloworld

addons/plugins/helloworld/helloworld.py

@@ -1,168 +0,0 @@
-import os
-import shutil
-from nakuru.entities.components import *
-flag_not_support = False
-try:
-    from util.plugin_dev.api.v1.config import *
-    from util.plugin_dev.api.v1.bot import (
-        AstrMessageEvent,
-        CommandResult,
-    )
-except ImportError:
-    flag_not_support = True
-    print("导入接口失败。请升级到 AstrBot 最新版本。")
-
-
-'''
-注意改插件名噢！格式：XXXPlugin 或 Main
-小提示：把此模板仓库 fork 之后 clone 到机器人文件夹下的 addons/plugins/ 目录下，然后用 Pycharm/VSC 等工具打开可获更棒的编程体验（自动补全等）
-'''
-
-
-class HelloWorldPlugin:
-    """
-    初始化函数, 可以选择直接pass
-    """
-
-    def __init__(self) -> None:
-        # 复制旧配置文件到 data 目录下。
-        if os.path.exists("keyword.json"):
-            shutil.move("keyword.json", "data/keyword.json")
-        self.keywords = {}
-        if os.path.exists("data/keyword.json"):
-            self.keywords = json.load(open("data/keyword.json", "r"))
-        else:
-            self.save_keyword()
-
-    """
-    机器人程序会调用此函数。
-    返回规范: bool: 插件是否响应该消息 (所有的消息均会调用每一个载入的插件, 如果不响应, 则应返回 False)
-             Tuple: Non e或者长度为 3 的元组。如果不响应, 返回 None； 如果响应, 第 1 个参数为指令是否调用成功, 第 2 个参数为返回的消息链列表, 第 3 个参数为指令名称
-    例子：一个名为"yuanshen"的插件；当接收到消息为“原神 可莉”, 如果不想要处理此消息，则返回False, None；如果想要处理，但是执行失败了，返回True, tuple([False, "请求失败。", "yuanshen"]) ；执行成功了，返回True, tuple([True, "结果文本", "yuanshen"])
-    """
-
-    def run(self, ame: AstrMessageEvent):
-        if ame.message_str == "helloworld":
-            return CommandResult(
-                hit=True,
-                success=True,
-                message_chain=[Plain("Hello World!!")],
-                command_name="helloworld"
-            )
-        if ame.message_str.startswith("/keyword") or ame.message_str.startswith("keyword"):
-            return self.handle_keyword_command(ame)
-
-        ret = self.check_keyword(ame.message_str)
-        if ret:
-            return ret
-
-        return CommandResult(
-            hit=False,
-            success=False,
-            message_chain=None,
-            command_name=None
-        )
-
-    def handle_keyword_command(self, ame: AstrMessageEvent):
-        l = ame.message_str.split(" ")
-
-        # 获取图片
-        image_url = ""
-        for comp in ame.message_obj.message:
-            if isinstance(comp, Image) and image_url == "":
-                if comp.url is None:
-                    image_url = comp.file
-                else:
-                    image_url = comp.url
-
-        command_result = CommandResult(
-            hit=True,
-            success=False,
-            message_chain=None,
-            command_name="keyword"
-        )
-        if len(l) == 1 or (len(l) == 2 and image_url == ""):
-            ret = """【设置关键词回复】
-示例：
-1. keyword <触发词> <回复词>
-keyword hi 你好
-发送 hi 回复你好
-* 回复词支持图片
-
-2. keyword d <触发词>
-keyword d hi
-删除 hi 触发词产生的回复"""
-            command_result.success = True
-            command_result.message_chain = [Plain(ret)]
-            return command_result
-        elif len(l) == 3 and l[1] == "d":
-            if l[2] not in self.keywords:
-                command_result.message_chain = [Plain(f"关键词 {l[2]} 不存在")]
-                return command_result
-            self.keywords.pop(l[2])
-            self.save_keyword()
-            command_result.success = True
-            command_result.message_chain = [Plain("删除成功")]
-            return command_result
-        else:
-            self.keywords[l[1]] = {
-                "plain_text": " ".join(l[2:]),
-                "image_url": image_url
-            }
-            self.save_keyword()
-            command_result.success = True
-            command_result.message_chain = [Plain("设置成功")]
-            return command_result
-
-    def save_keyword(self):
-        json.dump(self.keywords, open(
-            "data/keyword.json", "w"), ensure_ascii=False)
-
-    def check_keyword(self, message_str: str):
-        for k in self.keywords:
-            if message_str == k:
-                plain_text = ""
-                if 'plain_text' in self.keywords[k]:
-                    plain_text = self.keywords[k]['plain_text']
-                else:
-                    plain_text = self.keywords[k]
-                image_url = ""
-                if 'image_url' in self.keywords[k]:
-                    image_url = self.keywords[k]['image_url']
-                if image_url != "":
-                    res = [Plain(plain_text), Image.fromURL(image_url)]
-                    return CommandResult(
-                        hit=True,
-                        success=True,
-                        message_chain=res,
-                        command_name="keyword"
-                    )
-                return CommandResult(
-                    hit=True,
-                    success=True,
-                    message_chain=[Plain(plain_text)],
-                    command_name="keyword"
-                )
-
-    """
-    插件元信息。
-    当用户输入 plugin v 插件名称 时，会调用此函数，返回帮助信息。
-    返回参数要求(必填)：dict{
-        "name": str, # 插件名称
-        "desc": str, # 插件简短描述
-        "help": str, # 插件帮助信息
-        "version": str, # 插件版本
-        "author": str, # 插件作者
-        "repo": str, # 插件仓库地址 [ 可选 ]
-        "homepage": str, # 插件主页  [ 可选 ]
-    }
-    """
-
-    def info(self):
-        return {
-            "name": "helloworld",
-            "desc": "这是 AstrBot 的默认插件，支持关键词回复。",
-            "help": "输入 /keyword 查看关键词回复帮助。",
-            "version": "v1.3",
-            "author": "Soulter"
-        }

addons/plugins/helloworld/main.py

@@ -0,0 +1,64 @@
+import os
+import shutil
+from nakuru.entities.components import *
+flag_not_support = False
+try:
+    from util.plugin_dev.api.v1.config import *
+    from util.plugin_dev.api.v1.bot import (
+        AstrMessageEvent,
+        CommandResult,
+    )
+except ImportError:
+    flag_not_support = True
+    print("导入接口失败。请升级到 AstrBot 最新版本。")
+
+
+'''
+注意改插件名噢！格式：XXXPlugin 或 Main
+小提示：把此模板仓库 fork 之后 clone 到机器人文件夹下的 addons/plugins/ 目录下，然后用 Pycharm/VSC 等工具打开可获更棒的编程体验（自动补全等）
+'''
+class HelloWorldPlugin:
+    """
+    初始化函数, 可以选择直接pass
+    """
+    def __init__(self) -> None:
+        pass
+
+    """
+    机器人程序会调用此函数。
+    """
+    def run(self, ame: AstrMessageEvent):
+        if ame.message_str.startswith("helloworld"): # 如果消息文本以"helloworld"开头
+            return CommandResult(
+                hit=True, # 代表插件会响应此消息
+                success=True, # 插件响应类型为成功响应
+                message_chain=[Plain("Hello World!!")], # 消息链
+                command_name="helloworld" # 指令名
+            )
+        return CommandResult(
+            hit=False, # 插件不会响应此消息
+            success=False,
+            message_chain=None
+        )
+    """
+    插件元信息。
+    当用户输入 plugin v 插件名称 时，会调用此函数，返回帮助信息。
+    返回参数要求(必填)：dict{
+        "name": str, # 插件名称
+        "desc": str, # 插件简短描述
+        "help": str, # 插件帮助信息
+        "version": str, # 插件版本
+        "author": str, # 插件作者
+        "repo": str, # 插件仓库地址 [ 可选 ]
+        "homepage": str, # 插件主页  [ 可选 ]
+    }
+    """
+    def info(self):
+        return {
+            "name": "helloworld",
+            "desc": "这是 AstrBot 的默认插件，支持关键词回复。",
+            "help": "输入 /keyword 查看关键词回复帮助。",
+            "version": "v1.3",
+            "author": "Soulter",
+            "repo": "https://github.com/Soulter/helloworld"
+        }

addons/plugins/helloworld/metadata.yaml

@@ -0,0 +1,6 @@
+name: helloworld # 这是你的插件的唯一识别名。
+desc: 这是 AstrBot 的默认插件，支持关键词回复。 # 插件简短描述
+help: 输入 /keyword 查看关键词回复帮助。 # 插件的帮助信息
+version: v1.3 # 插件版本号。格式：v1.1.1 或者 v1.1
+author: Soulter # 作者
+repo: https://github.com/Soulter/helloworld # 插件的仓库地址

astrbot/core.py

@@ -22,6 +22,7 @@ from util.cmd_config import init_astrbot_config_items
 from type.types import GlobalObject
 from type.register import *
 from type.message import AstrBotMessage
+from type.config import *
 from addons.dashboard.helper import DashBoardHelper
 from addons.dashboard.server import DashBoardData
 from persist.session import dbConn
@@ -38,9 +39,6 @@ frequency_time = 60
 # 计数默认值
 frequency_count = 10
 
-# 版本
-version = '3.1.13'
-
 # 语言模型
 OPENAI_OFFICIAL = 'openai_official'
 NONE_LLM = 'none_llm'
@@ -53,38 +51,26 @@ llm_wake_prefix = ""
 # 百度内容审核实例
 baidu_judge = None
 
-# CLI
-PLATFORM_CLI = 'cli'
-
-init_astrbot_config_items()
-
 # 全局对象
 _global_object: GlobalObject = None
 
-# 语言模型选择
-
 
 def privider_chooser(cfg):
     l = []
-    if 'openai' in cfg and len(cfg['openai']['key']) > 0 and cfg['openai']['key'][0] is not None:
+    if 'openai' in cfg and len(cfg['openai']['key']) and cfg['openai']['key'][0]:
         l.append('openai_official')
     return l
 
-
-'''
-初始化机器人
-'''
-
-
 def init():
+    '''
+    初始化机器人
+    '''
     global llm_instance, llm_command_instance
     global baidu_judge, chosen_provider
     global frequency_count, frequency_time
     global _global_object
 
-    # 迁移旧配置
-    gu.try_migrate_config()
-    # 使用新配置
+    init_astrbot_config_items()
     cfg = cc.get_all()
 
     _event_loop = asyncio.new_event_loop()
@@ -92,9 +78,10 @@ def init():
 
     # 初始化 global_object
     _global_object = GlobalObject()
-    _global_object.version = version
+    _global_object.version = VERSION
     _global_object.base_config = cfg
-    logger.info("AstrBot v"+version)
+    _global_object.logger = logger
+    logger.info("AstrBot v" + VERSION)
 
     if 'reply_prefix' in cfg:
         # 适配旧版配置
@@ -167,7 +154,7 @@ def init():
         logger.info("独立会话配置错误: "+str(e))
 
     nick_qq = cc.get("nick_qq", None)
-    if nick_qq == None:
+    if not nick_qq:
         nick_qq = ("ai", "!", "！")
     if isinstance(nick_qq, str):
         nick_qq = (nick_qq,)
@@ -182,33 +169,29 @@ def init():
     logger.info("正在载入插件...")
     # 加载插件
     _command = Command(None, _global_object)
-    ok, err = putil.plugin_reload(_global_object.cached_plugins)
+    ok, err = putil.plugin_reload(_global_object)
     if ok:
         logger.info(
             f"成功载入 {len(_global_object.cached_plugins)} 个插件")
     else:
-        logger.info(err)
+        logger.error(err)
 
     if chosen_provider is None:
         llm_command_instance[NONE_LLM] = _command
         chosen_provider = NONE_LLM
 
     logger.info("正在载入机器人消息平台")
-    # logger.info("提示：需要添加管理员 ID 才能使用 update/plugin 等指令)，可在可视化面板添加。（如已添加可忽略）")
-    platform_str = ""
     # GOCQ
     if 'gocqbot' in cfg and cfg['gocqbot']['enable']:
         logger.info("启用 QQ_GOCQ 机器人消息平台")
         threading.Thread(target=run_gocq_bot, args=(
             cfg, _global_object), daemon=True).start()
-        platform_str += "QQ_GOCQ,"
 
     # QQ频道
     if 'qqbot' in cfg and cfg['qqbot']['enable'] and cfg['qqbot']['appid'] != None:
         logger.info("启用 QQ_OFFICIAL 机器人消息平台")
         threading.Thread(target=run_qqchan_bot, args=(
             cfg, _global_object), daemon=True).start()
-        platform_str += "QQ_OFFICIAL,"
 
     # 初始化dashboard
     _global_object.dashboard_data = DashBoardData(
@@ -229,19 +212,15 @@ def init():
     logger.info(
         "如果有任何问题, 请在 https://github.com/Soulter/AstrBot 上提交 issue 或加群 322154837。")
     logger.info("请给 https://github.com/Soulter/AstrBot 点个 star。")
-    if platform_str == '':
-        platform_str = "(未启动任何平台，请前往面板添加)"
     logger.info(f"🎉 项目启动完成")
 
     dashboard_thread.join()
 
 
-'''
-运行 QQ_OFFICIAL 机器人
-'''
-
-
 def run_qqchan_bot(cfg: dict, global_object: GlobalObject):
+    '''
+    运行 QQ_OFFICIAL 机器人
+    '''
     try:
         from model.platform.qq_official import QQOfficial
         qqchannel_bot = QQOfficial(
@@ -254,14 +233,11 @@ def run_qqchan_bot(cfg: dict, global_object: GlobalObject):
         logger.error(r"如果您是初次启动，请前往可视化面板填写配置。详情请看：https://astrbot.soulter.top/center/。")
 
 
-'''
-运行 QQ_GOCQ 机器人
-'''
-
-
 def run_gocq_bot(cfg: dict, _global_object: GlobalObject):
+    '''
+    运行 QQ_GOCQ 机器人
+    '''
     from model.platform.qq_gocq import QQGOCQ
-
     noticed = False
     host = cc.get("gocq_host", "127.0.0.1")
     port = cc.get("gocq_websocket_port", 6700)
@@ -288,12 +264,10 @@ def run_gocq_bot(cfg: dict, _global_object: GlobalObject):
         input("启动QQ机器人出现错误"+str(e))
 
 
-'''
-检查发言频率
-'''
-
-
 def check_frequency(id) -> bool:
+    '''
+    检查发言频率
+    '''
     ts = int(time.time())
     if id in user_frequency:
         if ts-user_frequency[id]['time'] > frequency_time:
@@ -319,7 +293,6 @@ async def record_message(platform: str, session_id: str):
     db_inst.increment_stat_session(platform, session_id, 1)
     db_inst.increment_stat_message(curr_ts, 1)
     db_inst.increment_stat_platform(curr_ts, platform, 1)
-    _global_object.cnt_total += 1
 
 
 async def oper_msg(message: AstrBotMessage,
@@ -335,11 +308,10 @@ async def oper_msg(message: AstrBotMessage,
     platform: str 所注册的平台的名称。如果没有注册，将抛出一个异常。
     """
     global chosen_provider, _global_object
-    message_str = ''
-    session_id = session_id
-    role = role
+    message_str = message.message_str
     hit = False  # 是否命中指令
     command_result = ()  # 调用指令返回的结果
+    llm_result_str = ""
 
     # 获取平台实例
     reg_platform: RegisteredPlatform = None
@@ -353,35 +325,13 @@ async def oper_msg(message: AstrBotMessage,
     # 统计数据，如频道消息量
     await record_message(platform, session_id)
 
-    for i in message.message:
-        if isinstance(i, Plain):
-            message_str += i.text.strip()
-    if message_str == "":
+    if not message_str:
         return MessageResult("Hi~")
 
     # 检查发言频率
     if not check_frequency(message.sender.user_id):
         return MessageResult(f'你的发言超过频率限制(╯▔皿▔)╯。\n管理员设置{frequency_time}秒内只能提问{frequency_count}次。')
 
-    # 检查是否是更换语言模型的请求
-    temp_switch = ""
-    if message_str.startswith('/gpt'):
-        target = chosen_provider
-        if message_str.startswith('/gpt'):
-            target = OPENAI_OFFICIAL
-        l = message_str.split(' ')
-        if len(l) > 1 and l[1] != "":
-            # 临时对话模式，先记录下之前的语言模型，回答完毕后再切回
-            temp_switch = chosen_provider
-            chosen_provider = target
-            message_str = l[1]
-        else:
-            chosen_provider = target
-            cc.put("chosen_provider", chosen_provider)
-            return MessageResult(f"已切换至【{chosen_provider}】")
-
-    llm_result_str = ""
-
     # check commands and plugins
     message_str_no_wake_prefix = message_str
     for wake_prefix in _global_object.nick: # nick: tuple
@@ -411,7 +361,7 @@ async def oper_msg(message: AstrBotMessage,
             logger.info("一条消息由于 Bot 未启动任何语言模型并且未触发指令而将被忽略。")
             return
         try:
-            if llm_wake_prefix != "" and not message_str.startswith(llm_wake_prefix):
+            if llm_wake_prefix and not message_str.startswith(llm_wake_prefix):
                 return
             # check image url
             image_url = None
@@ -429,7 +379,7 @@ async def oper_msg(message: AstrBotMessage,
                 message_str = message_str[3:]
                 web_sch_flag = True
             else:
-                message_str += " " + cc.get("llm_env_prompt", "")
+                message_str += "\n" + cc.get("llm_env_prompt", "")
             if chosen_provider == OPENAI_OFFICIAL:
                 if _global_object.web_search or web_sch_flag:
                     official_fc = chosen_provider == OPENAI_OFFICIAL
@@ -442,38 +392,15 @@ async def oper_msg(message: AstrBotMessage,
             logger.error(f"调用异常：{traceback.format_exc()}")
             return MessageResult(f"调用异常。详细原因：{str(e)}")
 
-    # 切换回原来的语言模型
-    if temp_switch != "":
-        chosen_provider = temp_switch
-
     if hit:
         # 有指令或者插件触发
         # command_result 是一个元组：(指令调用是否成功, 指令返回的文本结果, 指令类型)
-        if command_result == None:
+        if not command_result:
             return
-        command = command_result[2]
-
-        if command == "update latest r":
-            def update_restart():
-                py = sys.executable
-                os.execl(py, py, *sys.argv)
-            return MessageResult(command_result[1] + "\n\n即将自动重启。", callback=update_restart)
-
         if not command_result[0]:
             return MessageResult(f"指令调用错误: \n{str(command_result[1])}")
-
-        # 画图指令
-        if command == 'draw':
-            # 保存到本地
-            path = await gu.download_image_by_url(command_result[1])
-            return MessageResult([Image.fromFileSystem(path)])
-        # 其他指令
-        else:
-            try:
-                return MessageResult(command_result[1])
-            except BaseException as e:
-                return MessageResult(f"回复消息出错: {str(e)}")
-        return
+        if isinstance(command_result[1], (list, str)):
+            return MessageResult(command_result[1])
 
     # 敏感过滤
     # 过滤不合适的词
@@ -485,7 +412,4 @@ async def oper_msg(message: AstrBotMessage,
         if not check:
             return MessageResult(f"你的提问得到的回复【百度内容审核】未通过，不予回复。\n\n{msg}")
     # 发送信息
-    try:
-        return MessageResult(llm_result_str)
-    except BaseException as e:
-        logger.info("回复消息错误: \n"+str(e))
+    return MessageResult(llm_result_str)

main.py

@@ -4,14 +4,12 @@ import sys
 import warnings
 import traceback
 import threading
-from SparkleLogging.utils.core import LogManager
 from logging import Formatter, Logger
+from util.cmd_config import CmdConfig, try_migrate_config
 
 warnings.filterwarnings("ignore")
-abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
 
 logger: Logger = None
-
 logo_tmpl = """
      ___           _______.___________..______      .______     ______   .___________.
     /   \         /       |           ||   _  \     |   _  \   /  __  \  |           |
@@ -35,9 +33,11 @@ def update_dept():
     '''
     # 获取 Python 可执行文件路径
     py = sys.executable
+    requirements_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "requirements.txt")
+    print(requirements_path)
     # 更新依赖库
     mirror = "https://mirrors.aliyun.com/pypi/simple/"
-    os.system(f"{py} -m pip install -r requirements.txt -i {mirror}")
+    os.system(f"{py} -m pip install -r {requirements_path} -i {mirror}")
     
 def main():
     try:
@@ -65,8 +65,6 @@ def main():
         input("未知错误。")
         exit()
 
-    make_necessary_dirs()
-
     # 启动主程序（cores/qqbot/core.py）
     bot_core.init()
 
@@ -78,26 +76,27 @@ def check_env():
         exit()
 
 if __name__ == "__main__":
+    update_dept()
+    make_necessary_dirs()
+    try_migrate_config()
+    cc = CmdConfig()
+    http_proxy = cc.get("http_proxy")
+    https_proxy = cc.get("https_proxy")
+    if http_proxy:
+        os.environ['HTTP_PROXY'] = http_proxy
+    if https_proxy:
+        os.environ['HTTPS_PROXY'] = https_proxy
+    os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
+    
+    from SparkleLogging.utils.core import LogManager
     logger = LogManager.GetLogger(
     log_name='astrbot-core',
         out_to_console=True,
         custom_formatter=Formatter('[%(asctime)s| %(name)s - %(levelname)s|%(filename)s:%(lineno)d]: %(message)s', datefmt="%H:%M:%S")
     )
     logger.info(logo_tmpl)
-    
-    # 设置代理
-    from util.cmd_config import CmdConfig
-    cc = CmdConfig()
-    http_proxy = cc.get("http_proxy")
-    https_proxy = cc.get("https_proxy")
     logger.info(f"使用代理: {http_proxy}, {https_proxy}")
-    if http_proxy:
-        os.environ['HTTP_PROXY'] = http_proxy
-    if https_proxy:
-        os.environ['HTTPS_PROXY'] = https_proxy
-    os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
-
-    update_dept()
+    
     check_env()
     t = threading.Thread(target=main, daemon=True)
     t.start()

model/command/command.py

@@ -11,6 +11,7 @@ from nakuru.entities.components import (
     Image
 )
 from util import general_utils as gu
+from util.image_render.helper import text_to_image_base
 from model.provider.provider import Provider
 from util.cmd_config import CmdConfig as cc
 from type.message import *
@@ -64,6 +65,8 @@ class Command:
                     result = await plugin.plugin_instance.run(ame)
                 else:
                     result = await asyncio.to_thread(plugin.plugin_instance.run, ame)
+                if not result:
+                    continue
                 if isinstance(result, CommandResult):
                     hit = result.hit
                     res = result._result_tuple()
@@ -73,6 +76,7 @@ class Command:
                 else:
                     raise TypeError("插件返回值格式错误。")
                 if hit:
+                    plugin.trig()
                     logger.debug("hit plugin: " + plugin.metadata.plugin_name)
                     return True, res
             except TypeError as e:
@@ -94,14 +98,16 @@ class Command:
         if self.command_start_with(message, "nick"):
             return True, self.set_nick(message, platform, role)
         if self.command_start_with(message, "plugin"):
-            return True, self.plugin_oper(message, role, cached_plugins, platform)
+            return True, await self.plugin_oper(message, role, self.global_object, platform)
         if self.command_start_with(message, "myid") or self.command_start_with(message, "!myid"):
             return True, self.get_my_id(message_obj, platform)
         if self.command_start_with(message, "web"):  # 网页搜索
             return True, self.web_search(message)
         if self.command_start_with(message, "update"):
             return True, self.update(message, role)
-        if not self.provider and self.command_start_with(message, "help"):
+        if message == "t2i":
+            return True, self.t2i_toggle(message, role)
+        if not self.provider and message == "help":
             return True, await self.help()
 
         return False, None
@@ -116,40 +122,34 @@ class Command:
         elif l[1] == 'off':
             self.global_object.web_search = False
             return True, "已关闭网页搜索", "web"
+        
+    def t2i_toggle(self, message, role):
+        p = cc.get("qq_pic_mode", True)
+        if p:
+            cc.put("qq_pic_mode", False)
+            return True, "已关闭文本转图片模式。", "t2i"
+        cc.put("qq_pic_mode", True)
+        return True, "已开启文本转图片模式。", "t2i"
 
     def get_my_id(self, message_obj, platform):
         try:
-            user_id = str(message_obj.user_id)
+            user_id = str(message_obj.sender.user_id)
             return True, f"你在此平台上的ID：{user_id}", "plugin"
         except BaseException as e:
             return False, f"在{platform}上获取你的ID失败，原因: {str(e)}", "plugin"
 
-    def get_new_conf(self, message, role):
-        if role != "admin":
-            return False, f"你的身份组{role}没有权限使用此指令。", "newconf"
-        l = message.split(" ")
-        if len(l) <= 1:
-            obj = cc.get_all()
-            p = gu.create_text_image("【cmd_config.json】", json.dumps(
-                obj, indent=4, ensure_ascii=False))
-            return True, [Image.fromFileSystem(p)], "newconf"
-
-    '''
-    插件指令
-    '''
-
-    def plugin_oper(self, message: str, role: str, cached_plugins: List[RegisteredPlugin], platform: str):
+    async def plugin_oper(self, message: str, role: str, ctx: GlobalObject, platform: str):
         l = message.split(" ")
         if len(l) < 2:
-            p = gu.create_text_image(
-                "【插件指令面板】", "安装插件: \nplugin i 插件Github地址\n卸载插件: \nplugin d 插件名 \n重载插件: \nplugin reload\n查看插件列表：\nplugin l\n更新插件: plugin u 插件名\n")
-            return True, [Image.fromFileSystem(p)], "plugin"
+            p = await text_to_image_base("# 插件指令面板 \n- 安装插件: `plugin i 插件Github地址`\n- 卸载插件: `plugin d 插件名`\n- 重载插件: `plugin reload`\n- 查看插件列表：`plugin l`\n - 更新插件: `plugin u 插件名`\n")
+            with open(p, 'rb') as f:
+                return True, [Image.fromBytes(f.read())], "plugin"
         else:
             if l[1] == "i":
                 if role != "admin":
                     return False, f"你的身份组{role}没有权限安装插件", "plugin"
                 try:
-                    putil.install_plugin(l[2], cached_plugins)
+                    putil.install_plugin(l[2], )
                     return True, "插件拉取并载入成功~", "plugin"
                 except BaseException as e:
                     return False, f"拉取插件失败，原因: {str(e)}", "plugin"
@@ -157,37 +157,37 @@ class Command:
                 if role != "admin":
                     return False, f"你的身份组{role}没有权限删除插件", "plugin"
                 try:
-                    putil.uninstall_plugin(l[2], cached_plugins)
+                    putil.uninstall_plugin(l[2], ctx)
                     return True, "插件卸载成功~", "plugin"
                 except BaseException as e:
                     return False, f"卸载插件失败，原因: {str(e)}", "plugin"
             elif l[1] == "u":
                 try:
-                    putil.update_plugin(l[2], cached_plugins)
+                    putil.update_plugin(l[2], ctx)
                     return True, "\n更新插件成功!!", "plugin"
                 except BaseException as e:
                     return False, f"更新插件失败，原因: {str(e)}。\n建议: 使用 plugin i 指令进行覆盖安装(插件数据可能会丢失)", "plugin"
             elif l[1] == "l":
                 try:
                     plugin_list_info = ""
-                    for plugin in cached_plugins:
-                        plugin_list_info += f"{plugin.metadata.plugin_name}: \n名称: {plugin.metadata.plugin_name}\n简介: {plugin.metadata.plugin_desc}\n版本: {plugin.metadata.version}\n作者: {plugin.metadata.author}\n"
-                    p = gu.create_text_image(
-                        "【已激活插件列表】", plugin_list_info + "\n使用plugin v 插件名 查看插件帮助\n")
-                    return True, [Image.fromFileSystem(p)], "plugin"
+                    for plugin in ctx.cached_plugins:
+                        plugin_list_info += f"### {plugin.metadata.plugin_name} \n- 名称: {plugin.metadata.plugin_name}\n- 简介: {plugin.metadata.desc}\n- 版本: {plugin.metadata.version}\n- 作者: {plugin.metadata.author}\n"
+                    p = await text_to_image_base(f"# 已激活的插件\n{plugin_list_info}\n> 使用plugin v 插件名 查看插件帮助\n")
+                    with open(p, 'rb') as f:
+                        return True, [Image.fromBytes(f.read())], "plugin"
                 except BaseException as e:
                     return False, f"获取插件列表失败，原因: {str(e)}", "plugin"
             elif l[1] == "v":
                 try:
                     info = None
-                    for i in cached_plugins:
+                    for i in ctx.cached_plugins:
                         if i.metadata.plugin_name == l[2]:
                             info = i.metadata
                             break
                     if info:
-                        p = gu.create_text_image(
-                            f"【插件信息】", f"名称: {info.plugin_name}\n类型: {info.plugin_type}\n{info.desc}\n版本: {info.version}\n作者: {info.author}")
-                        return True, [Image.fromFileSystem(p)], "plugin"
+                        p = await text_to_image_base(f"# `{info.plugin_name}` 插件信息\n- 类型: {info.plugin_type}\n- 简介{info.desc}\n- 版本: {info.version}\n- 作者: {info.author}")
+                        with open(p, 'rb') as f:
+                            return True, [Image.fromBytes(f.read())], "plugin"
                     else:
                         return False, "未找到该插件", "plugin"
                 except BaseException as e:
@@ -217,9 +217,10 @@ class Command:
             "help": "帮助",
             "keyword": "设置关键词/关键指令回复",
             "update": "更新项目",
-            "nick": "设置机器人昵称",
+            "nick": "设置机器人唤醒词",
             "plugin": "插件安装、卸载和重载",
             "web on/off": "LLM 网页搜索能力",
+            "t2i": "启用/关闭文本转图片模式"
         }
 
     async def help_messager(self, commands: dict, platform: str, cached_plugins: List[RegisteredPlugin] = None):
@@ -229,22 +230,23 @@ class Command:
                     notice = (await resp.json())["notice"]
         except BaseException as e:
             notice = ""
-        msg = "# Help Center\n## 指令列表\n"
+        msg = "## 指令列表\n"
         for key, value in commands.items():
-            msg += f"`{key}` - {value}\n"
+            msg += f"- `{key}`: {value}\n"
         # plugins
-        if cached_plugins != None:
+        if cached_plugins:
             plugin_list_info = ""
             for plugin in cached_plugins:
-                plugin_list_info += f"`{plugin.metadata.plugin_name}` {plugin.metadata.desc}\n"
-            if plugin_list_info.strip() != "":
-                msg += "\n## 插件列表\n> 使用plugin v 插件名 查看插件帮助\n"
+                plugin_list_info += f"- `{plugin.metadata.plugin_name}`: {plugin.metadata.desc}\n"
+            if plugin_list_info.strip():
+                msg += "\n## 插件列表\n> 使用 plugin v 插件名 查看插件帮助\n"
                 msg += plugin_list_info
         msg += notice
 
         try:
-            p = gu.create_markdown_image(msg)
-            return [Image.fromFileSystem(p),]
+            p = await text_to_image_base(msg)
+            with open(p, 'rb') as f:
+                return [Image.fromBytes(f.read()),]
         except BaseException as e:
             logger.error(str(e))
             return msg
@@ -265,15 +267,14 @@ class Command:
         if len(l) == 1:
             try:
                 update_info = util.updator.check_update()
-                update_info += "\nTips:\n输入「update latest」更新到最新版本\n输入「update <版本号如v3.1.3>」切换到指定版本\n输入「update r」重启机器人\n"
+                update_info += "\n> Tips: 输入「update latest」更新到最新版本，输入「update <版本号如v3.1.3>」切换到指定版本，输入「update r」重启机器人\n"
                 return True, update_info, "update"
             except BaseException as e:
                 return False, "检查更新失败: "+str(e), "update"
         else:
             if l[1] == "latest":
                 try:
-                    release_data = util.updator.request_release_info()
-                    util.updator.update_project(release_data)
+                    util.updator.update_project()
                     return True, "更新成功，重启生效。可输入「update r」重启", "update"
                 except BaseException as e:
                     return False, "更新失败: "+str(e), "update"
@@ -282,10 +283,7 @@ class Command:
             else:
                 if l[1].lower().startswith('v'):
                     try:
-                        release_data = util.updator.request_release_info(
-                            latest=False)
-                        util.updator.update_project(
-                            release_data, latest=False, version=l[1])
+                        util.updator.update_project(latest=False, version=l[1])
                         return True, "更新成功，重启生效。可输入「update r」重启", "update"
                     except BaseException as e:
                         return False, "更新失败: "+str(e), "update"

model/command/openai_official.py

@@ -1,11 +1,13 @@
 from model.command.command import Command
 from model.provider.openai_official import ProviderOpenAIOfficial, MODELS
 from util.personality import personalities
+from util.general_utils import download_image_by_url
 from type.types import GlobalObject
 from type.command import CommandItem
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from openai._exceptions import NotFoundError
+from nakuru.entities.components import Image
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
 
@@ -84,6 +86,7 @@ class CommandOpenAIOfficial(Command):
         for model in models:
             ret += f"\n{i}. {model.id}"
             i += 1
+        ret += "\nTips: 使用 /model 模型名/编号，即可实时更换模型。如目标模型不存在于上表，请输入模型名。"
         logger.debug(ret)
         return True, ret, "models"
 
@@ -93,31 +96,28 @@ class CommandOpenAIOfficial(Command):
         if len(l) == 1:
             return True, "请输入 /model 模型名/编号", "model"
         model = str(l[1])
-        models = await self.get_models()
-        models = list(models)
-        if model.isdigit() and int(model) <= len(models) and int(model) >= 1:
-            model = models[int(model)-1]
+        if model.isdigit():
+            models = await self.get_models()
+            models = list(models)
+            if int(model) <= len(models) and int(model) >= 1:
+                model = models[int(model)-1]
+            self.provider.set_model(model.id)
+            return True, f"模型已设置为 {model.id}", "model"
         else:
-            f = False
-            for m in models:
-                if model == m.id:
-                    f = True
-                    break
-            if not f:
-                return True, "模型不存在或输入非法", "model"
+            self.provider.set_model(model)
+            return True, f"模型已设置为 {model} (自定义)", "model"
 
-        self.provider.set_model(model.id)
-        return True, f"模型已设置为 {model.id}", "model"
-    
         
     async def help(self):
         commands = super().general_commands()
         commands['画'] = '调用 OpenAI DallE 模型生成图片'
-        commands['set'] = '人格设置面板'
-        commands['status'] = '查看 Api Key 状态和配置信息'
-        commands['token'] = '查看本轮会话 token'
-        commands['reset'] = '重置当前与 LLM 的会话，但保留人格（system prompt）'
-        commands['reset p'] = '重置当前与 LLM 的会话，并清除人格。'
+        commands['/set'] = '人格设置面板'
+        commands['/status'] = '查看 Api Key 状态和配置信息'
+        commands['/token'] = '查看本轮会话 token'
+        commands['/reset'] = '重置当前与 LLM 的会话，但保留人格（system prompt）'
+        commands['/reset p'] = '重置当前与 LLM 的会话，并清除人格。'
+        commands['/models'] = '获取当前可用的模型'
+        commands['/model'] = '更换模型'
         
         return True, await super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"
 
@@ -248,9 +248,8 @@ class CommandOpenAIOfficial(Command):
     async def draw(self, message: str):
         if self.provider is None:
             return False, "未启用 OpenAI 官方 API", "draw"
-        if message.startswith("/画"):
-            message = message[2:]
-        elif message.startswith("画"):
-            message = message[1:]
+        message = message.removeprefix("/").removeprefix("画")
         img_url = await self.provider.image_generate(message)
-        return True, img_url, "draw"
+        p = await download_image_by_url(url=img_url)
+        with open(p, 'rb') as f:
+            return True, [Image.fromBytes(f.read())], "draw"

model/platform/_message_parse.py

@@ -7,7 +7,8 @@ from nakuru import (
 import botpy.message
 from type.message import *
 from typing import List, Union
-import time
+from util.general_utils import save_temp_img
+import time, base64
 
 # QQ官方消息类型转换
 
@@ -18,11 +19,14 @@ def qq_official_message_parse(message: List[BaseMessageComponent]):
     for i in message:
         if isinstance(i, Plain):
             plain_text += i.text
-        elif isinstance(i, Image) and image_path == None:
-            if i.path is not None:
+        elif isinstance(i, Image) and not image_path:
+            if i.path:
                 image_path = i.path
+            elif i.file and i.file.startswith("base64://"):
+                img_data = base64.b64decode(i.file[9:])
+                image_path = save_temp_img(img_data)
             else:
-                image_path = i.file
+                image_path = save_temp_img(i.file)
     return plain_text, image_path
 
 # QQ官方消息类型 2 AstrBotMessage

model/platform/_platfrom.py

@@ -14,34 +14,40 @@ class Platform():
         初始化平台的各种接口
         '''
         self.message_handler = message_handler
+        self.cnt_receive = 0
+        self.cnt_reply = 0
         pass
 
     @abc.abstractmethod
-    async def handle_msg():
+    async def handle_msg(self):
         '''
         处理到来的消息
         '''
+        self.cnt_receive += 1
         pass
 
     @abc.abstractmethod
-    async def reply_msg():
+    async def reply_msg(self):
         '''
         回复消息（被动发送）
         '''
+        self.cnt_reply += 1
         pass
 
     @abc.abstractmethod
-    async def send_msg(target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
+    async def send_msg(self, target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
         '''
         发送消息（主动发送）
         '''
+        self.cnt_reply += 1
         pass
 
     @abc.abstractmethod
-    async def send(target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
+    async def send(self, target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
         '''
         发送消息（主动发送）同 send_msg()
         '''
+        self.cnt_reply += 1
         pass
 
     def parse_message_outline(self, message: Union[GuildMessage, GroupMessage, FriendMessage, str, list]) -> str:

model/platform/qq_gocq.py

@@ -1,5 +1,6 @@
 from nakuru.entities.components import Plain, At, Image, Node
 from util import general_utils as gu
+from util.image_render.helper import text_to_image_base
 from util.cmd_config import CmdConfig
 import asyncio
 from nakuru import (
@@ -11,6 +12,7 @@ from nakuru import (
     Notify
 )
 from typing import Union
+from type.types import GlobalObject
 import time
 
 from ._platfrom import Platform
@@ -29,7 +31,7 @@ class FakeSource:
 
 
 class QQGOCQ(Platform):
-    def __init__(self, cfg: dict, message_handler: callable, global_object) -> None:
+    def __init__(self, cfg: dict, message_handler: callable, global_object: GlobalObject) -> None:
         super().__init__(message_handler)
 
         self.loop = asyncio.new_event_loop()
@@ -38,17 +40,10 @@ class QQGOCQ(Platform):
         self.waiting = {}
         self.cc = CmdConfig()
         self.cfg = cfg
-
-        try:
-            self.nick_qq = cfg['nick_qq']
-        except:
-            self.nick_qq = ["ai", "!", "！"]
-        nick_qq = self.nick_qq
-        if isinstance(nick_qq, str):
-            nick_qq = [nick_qq]
+        
+        self.context = global_object
 
         self.unique_session = cfg['uniqueSessionMode']
-        self.pic_mode = cfg['qq_pic_mode']
 
         self.client = CQHTTP(
             host=self.cc.get("gocq_host", "127.0.0.1"),
@@ -109,6 +104,7 @@ class QQGOCQ(Platform):
         self.client.run()
 
     async def handle_msg(self, message: AstrBotMessage):
+        await super().handle_msg()
         logger.info(
             f"{message.sender.nickname}/{message.sender.user_id} -> {self.parse_message_outline(message)}")
 
@@ -132,8 +128,8 @@ class QQGOCQ(Platform):
                     if message.type.value == "GroupMessage":
                         if str(i.qq) == str(message.self_id):
                             resp = True
-                elif isinstance(i, Plain):
-                    for nick in self.nick_qq:
+                elif isinstance(i, Plain) and self.context.nick:
+                    for nick in self.context.nick:
                         if nick != '' and i.text.strip().startswith(nick):
                             resp = True
                             break
@@ -181,6 +177,7 @@ class QQGOCQ(Platform):
     async def reply_msg(self,
                         message: Union[AstrBotMessage, GuildMessage, GroupMessage, FriendMessage],
                         result_message: list):
+        await super().reply_msg()
         """
         插件开发者请使用send方法, 可以不用直接调用这个方法。
         """
@@ -206,7 +203,7 @@ class QQGOCQ(Platform):
             res.append(Plain(text=res_str))
 
         # if image mode, put all Plain texts into a new picture.
-        if self.pic_mode and isinstance(res, list):
+        if self.cc.get("qq_pic_mode", False) and isinstance(res, list):
             plains = []
             news = []
             for i in res:
@@ -216,7 +213,8 @@ class QQGOCQ(Platform):
                     news.append(i)
             plains_str = "".join(plains).strip()
             if plains_str != "" and len(plains_str) > 50:
-                p = gu.create_markdown_image("".join(plains))
+                # p = gu.create_markdown_image("".join(plains))
+                p = await text_to_image_base(plains_str)
                 news.append(Image.fromFileSystem(p))
                 res = news
 
@@ -259,6 +257,7 @@ class QQGOCQ(Platform):
         提供给插件的发送QQ消息接口。
         参数说明：第一个参数可以是消息对象，也可以是QQ群号。第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
         '''
+        await super().reply_msg()
         try:
             await self.reply_msg(message, result_message)
         except BaseException as e:
@@ -270,22 +269,17 @@ class QQGOCQ(Platform):
         '''
         同 send_msg()
         '''
+        await super().reply_msg()
         await self.reply_msg(to, res)
 
-    def create_text_image(title: str, text: str, max_width=30, font_size=20):
+    async def create_text_image(text: str):
         '''
         文本转图片。
-        title: 标题
         text: 文本内容
-        max_width: 文本宽度最大值（默认30）
-        font_size: 字体大小（默认20）
-
         返回：文件路径
         '''
         try:
-            img = gu.word2img(title, text, max_width, font_size)
-            p = gu.save_temp_img(img)
-            return p
+            return await text_to_image_base(text)
         except Exception as e:
             raise e
 

model/platform/qq_official.py

@@ -19,7 +19,9 @@ from ._message_parse import (
 )
 from type.message import *
 from typing import Union, List
-from nakuru.entities.components import BaseMessageComponent
+from nakuru.entities.components import *
+from util.image_render.helper import text_to_image_base
+from util.cmd_config import CmdConfig
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 
@@ -57,7 +59,8 @@ class QQOfficial(Platform):
         asyncio.set_event_loop(self.loop)
 
         self.waiting: dict = {}
-
+        
+        self.cc = CmdConfig()
         self.cfg = cfg
         self.appid = cfg['qqbot']['appid']
         self.token = cfg['qqbot']['token']
@@ -102,6 +105,7 @@ class QQOfficial(Platform):
             )
 
     async def handle_msg(self, message: AstrBotMessage):
+        await super().handle_msg()
         assert isinstance(message.raw_message, (botpy.message.Message,
                           botpy.message.GroupMessage, botpy.message.DirectMessage))
         is_group = message.type != MessageType.FRIEND_MESSAGE
@@ -154,6 +158,7 @@ class QQOfficial(Platform):
         '''
         回复频道消息
         '''
+        await super().reply_msg()
         if isinstance(message, AstrBotMessage):
             source = message.raw_message
         else:
@@ -167,34 +172,56 @@ class QQOfficial(Platform):
         image_path = ''
         msg_ref = None
 
+        # if isinstance(res, list):
+        #     plain_text, image_path = qq_official_message_parse(res)
+        # elif isinstance(res, str):
+        #     plain_text = res
+
+        # if self.cfg['qq_pic_mode']:
+        #     # 文本转图片，并且加上原来的图片
+        #     if plain_text != '' or image_path != '':
+        #         if image_path is not None and image_path != '':
+        #             if image_path.startswith("http"):
+        #                 plain_text += "\n\n" + "![](" + image_path + ")"
+        #             else:
+        #                 plain_text += "\n\n" + \
+        #                     "![](file:///" + image_path + ")"
+        #         # image_path = gu.create_markdown_image("".join(plain_text))
+        #         image_path = await text_to_image_base("".join(plain_text))
+        #         plain_text = ""
+
+        # else:
+        #     if image_path is not None and image_path != '':
+        #         msg_ref = None
+        #         if image_path.startswith("http"):
+        #             async with aiohttp.ClientSession() as session:
+        #                 async with session.get(image_path) as response:
+        #                     if response.status == 200:
+        #                         image = PILImage.open(io.BytesIO(await response.read()))
+        #                         image_path = gu.save_temp_img(image)
+        if self.cc.get("qq_pic_mode", False):
+            plains = []
+            news = []
+            if isinstance(res, str):
+                res = [Plain(text=res, convert=False),]
+            for i in res:
+                if isinstance(i, Plain):
+                    plains.append(i.text)
+                else:
+                    news.append(i)
+            plains_str = "".join(plains).strip()
+            if plains_str and len(plains_str) > 50:
+                p = await text_to_image_base(plains_str, return_url=False)
+                with open(p, "rb") as f:
+                    news.append(Image.fromBytes(f.read()))
+                res = news
+
         if isinstance(res, list):
             plain_text, image_path = qq_official_message_parse(res)
-        elif isinstance(res, str):
+        else:
             plain_text = res
 
-        if self.cfg['qq_pic_mode']:
-            # 文本转图片，并且加上原来的图片
-            if plain_text != '' or image_path != '':
-                if image_path is not None and image_path != '':
-                    if image_path.startswith("http"):
-                        plain_text += "\n\n" + "![](" + image_path + ")"
-                    else:
-                        plain_text += "\n\n" + \
-                            "![](file:///" + image_path + ")"
-                image_path = gu.create_markdown_image("".join(plain_text))
-                plain_text = ""
-
-        else:
-            if image_path is not None and image_path != '':
-                msg_ref = None
-                if image_path.startswith("http"):
-                    async with aiohttp.ClientSession() as session:
-                        async with session.get(image_path) as response:
-                            if response.status == 200:
-                                image = PILImage.open(io.BytesIO(await response.read()))
-                                image_path = gu.save_temp_img(image)
-
-        if source is not None and image_path == '':  # file_image与message_reference不能同时传入
+        if source and not image_path:  # file_image与message_reference不能同时传入
             msg_ref = Reference(message_id=source.id,
                                 ignore_get_message_error=False)
 
@@ -213,7 +240,7 @@ class QQOfficial(Platform):
             data['guild_id'] = source.guild_id
         else:
             raise ValueError(f"未知的消息类型: {message.type}")
-        if image_path != '':
+        if image_path:
             data['file_image'] = image_path
 
         try:

model/provider/openai_official.py

@@ -73,6 +73,7 @@ class ProviderOpenAIOfficial(Provider):
             base_url=self.base_url
         )
         self.model_configs: Dict = cfg['chatGPTConfigs']
+        super().set_curr_model(self.model_configs['model'])
         self.image_generator_model_configs: Dict = self.cc.get('openai_image_generate', None)
         self.session_memory: Dict[str, List]  = {} # 会话记忆
         self.session_memory_lock = threading.Lock()
@@ -289,6 +290,7 @@ class ProviderOpenAIOfficial(Provider):
                         extra_conf: Dict = None,
                         **kwargs
                     ) -> str:
+        super().accu_model_stat()
         if not session_id:
             session_id = "unknown"
             if "unknown" in self.session_memory:
@@ -415,12 +417,13 @@ class ProviderOpenAIOfficial(Provider):
 
         return False
     
-    async def image_generate(self, prompt, session_id, **kwargs) -> str:
+    async def image_generate(self, prompt: str, session_id: str = None, **kwargs) -> str:
         '''
         生成图片
         '''
         retry = 0
         conf = self.image_generator_model_configs
+        super().accu_model_stat(model=conf['model'])
         if not conf:
             logger.error("OpenAI 图片生成模型配置不存在。")
             raise Exception("OpenAI 图片生成模型配置不存在。")
@@ -481,6 +484,8 @@ class ProviderOpenAIOfficial(Provider):
 
     def set_model(self, model: str):
         self.model_configs['model'] = model
+        self.cc.put_by_dot_str("openai.chatGPTConfigs.model", model)
+        super().set_curr_model(model)
     
     def get_configs(self):
         return self.model_configs

model/provider/provider.py

@@ -1,4 +1,27 @@
+from collections import defaultdict
+
 class Provider:
+    def __init__(self) -> None:
+        self.model_stat = defaultdict(int) # 用于记录 LLM Model 使用数据
+        self.curr_model_name = "unknown"
+        
+    def reset_model_stat(self):
+        self.model_stat.clear()
+        
+    def set_curr_model(self, model_name: str):
+        self.curr_model_name = model_name
+    
+    def get_curr_model(self):
+        '''
+        返回当前正在使用的 LLM
+        '''
+        return self.curr_model_name
+    
+    def accu_model_stat(self, model: str = None):
+        if not model:
+            model = self.get_curr_model()
+        self.model_stat[model] += 1
+        
     async def text_chat(self,
                         prompt: str,
                         session_id: str,
@@ -18,7 +41,7 @@ class Provider:
         extra_conf: 额外配置
         default_personality: 默认人格
         '''
-        raise NotImplementedError
+        raise NotImplementedError()
 
     async def image_generate(self, prompt, session_id, **kwargs) -> str:
         '''
@@ -26,10 +49,10 @@ class Provider:
         prompt: 提示词
         session_id: 会话id
         '''
-        raise NotImplementedError
+        raise NotImplementedError()
 
     async def forget(self, session_id=None) -> bool:
         '''
         重置会话
         '''
-        raise NotImplementedError
+        raise NotImplementedError()

requirements.txt

@@ -5,7 +5,6 @@ openai~=1.2.3
 qq-botpy
 chardet~=5.1.0
 Pillow
-GitPython
 nakuru-project
 beautifulsoup4
 googlesearch-python

type/command.py

@@ -18,7 +18,7 @@ class CommandResult():
     用于在Command中返回多个值
     '''
 
-    def __init__(self, hit: bool, success: bool, message_chain: list, command_name: str = "unknown_command") -> None:
+    def __init__(self, hit: bool, success: bool = False, message_chain: list = [], command_name: str = "unknown_command") -> None:
         self.hit = hit
         self.success = success
         self.message_chain = message_chain

type/config.py

@@ -0,0 +1 @@
+VERSION = '3.2.4'

type/plugin.py

@@ -2,7 +2,7 @@ from enum import Enum
 from dataclasses import dataclass
 
 class PluginType(Enum):
-    PLATFORM = 'platfrom'  # 平台类插件。
+    PLATFORM = 'platform'  # 平台类插件。
     LLM = 'llm'  # 大语言模型类插件
     COMMON = 'common'  # 其他插件
 

type/register.py

@@ -15,6 +15,13 @@ class RegisteredPlugin:
     module_path: str
     module: ModuleType
     root_dir_name: str
+    trig_cnt: int = 0
+    
+    def reset_trig_cnt(self):
+        self.trig_cnt = 0
+    
+    def trig(self):
+        self.trig_cnt += 1
 
     def __str__(self) -> str:
         return f"RegisteredPlugin({self.metadata}, {self.module_path}, {self.root_dir_name})"

type/types.py

@@ -1,5 +1,7 @@
+
 from type.register import *
 from typing import List
+from logging import Logger
 
 class GlobalObject:
     '''
@@ -15,9 +17,10 @@ class GlobalObject:
     web_search: bool  # 是否开启了网页搜索
     reply_prefix: str  # 回复前缀
     unique_session: bool  # 是否开启了独立会话
-    cnt_total: int  # 总消息数
     default_personality: dict
     dashboard_data = None
+    
+    logger: Logger = None
 
     def __init__(self):
         self.nick = None  # gocq 的昵称
@@ -26,7 +29,6 @@ class GlobalObject:
         self.web_search = False  # 是否开启了网页搜索
         self.reply_prefix = None
         self.unique_session = False
-        self.cnt_total = 0
         self.platforms = []
         self.llms = []
         self.default_personality = None

util/cmd_config.py

@@ -1,5 +1,6 @@
 import os
 import json
+import yaml
 from typing import Union
 
 cpath = "data/cmd_config.json"
@@ -117,3 +118,28 @@ def init_astrbot_config_items():
     cc.init_attributes("https_proxy", "")
     cc.init_attributes("dashboard_username", "")
     cc.init_attributes("dashboard_password", "")
+
+
+
+def try_migrate_config():
+    '''
+    将 cmd_config.json 迁移至 data/cmd_config.json
+    '''
+    print("try migrate configs")
+    if os.path.exists("cmd_config.json"):
+        with open("cmd_config.json", "r", encoding="utf-8-sig") as f:
+            data = json.load(f)
+        with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
+            json.dump(data, f, indent=2, ensure_ascii=False)
+        try:
+            os.remove("cmd_config.json")
+        except Exception as e:
+            pass
+    if not os.path.exists("cmd_config.json") and not os.path.exists("data/cmd_config.json"):
+        # 从 configs/config.yaml 上拿数据
+        configs_pth = os.path.abspath(os.path.join(os.path.abspath(__file__), "../../configs/config.yaml"))
+        with open(configs_pth, encoding='utf-8') as f:
+            data = yaml.load(f, Loader=yaml.Loader)
+            print(data)
+            with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
+                json.dump(data, f, indent=2, ensure_ascii=False)

util/general_utils.py

@@ -5,11 +5,13 @@ import re
 import requests
 import aiohttp
 import socket
-import platform
 import json
 import sys
 import psutil
 import ssl
+import zipfile
+import shutil
+import stat
 
 from PIL import Image, ImageDraw, ImageFont
 from type.types import GlobalObject
@@ -30,56 +32,16 @@ def port_checker(port: int, host: str = "localhost"):
         sk.close()
         return False
 
-
-def get_font_path() -> str:
-    if os.path.exists("resources/fonts/syst.otf"):
-        font_path = "resources/fonts/syst.otf"
-    elif os.path.exists("QQChannelChatGPT/resources/fonts/syst.otf"):
-        font_path = "QQChannelChatGPT/resources/fonts/syst.otf"
-    elif os.path.exists("AstrBot/resources/fonts/syst.otf"):
-        font_path = "AstrBot/resources/fonts/syst.otf"
-    elif os.path.exists("C:/Windows/Fonts/simhei.ttf"):
-        font_path = "C:/Windows/Fonts/simhei.ttf"
-    elif os.path.exists("/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"):
-        font_path = "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"
-    else:
-        raise Exception("找不到字体文件")
-    return font_path
-
-
-def word2img(title: str, text: str, max_width=30, font_size=20):
-    font_path = get_font_path()
-    width_factor = 1.0
-    height_factor = 1.5
-    # 格式化文本宽度最大为30
-    lines = text.split('\n')
-    i = 0
-    length = len(lines)
-    for l in lines:
-        if len(l) > max_width:
-            cp = l
-            for ii in range(len(l)):
-                if ii % max_width == 0:
-                    cp = cp[:ii] + '\n' + cp[ii:]
-                    length += 1
-            lines[i] = cp
-        i += 1
-    text = '\n'.join(lines)
-    width = int(max_width * font_size * width_factor)
-    height = int(length * font_size * height_factor)
-    image = Image.new('RGB', (width, height), (255, 255, 255))
-    draw = ImageDraw.Draw(image)
-
-    text_font = ImageFont.truetype(font_path, font_size)
-    title_font = ImageFont.truetype(font_path, font_size + 5)
-    # 标题居中
-    title_width, title_height = title_font.getsize(title)
-    draw.text(((width - title_width) / 2, 10),
-              title, fill=(0, 0, 0), font=title_font)
-    # 文本不居中
-    draw.text((10, title_height+20), text, fill=(0, 0, 0), font=text_font)
-
-    return image
+def get_font(size: int) -> ImageFont.FreeTypeFont:
+    # get yahei first
+    # common and default fonts on Windows, macOS and Linux
+    fonts = ["msyh.ttc", "NotoSansCJK-Regular.ttc", "msyhbd.ttc", "PingFang.ttc", "Heiti.ttc"]
+    for font in fonts:
+        try:
+            font = ImageFont.truetype(font, size)
+            return font
+        except Exception as e:
+            pass
 
 
 def render_markdown(markdown_text, image_width=800, image_height=600, font_size=26, font_color=(0, 0, 0), bg_color=(255, 255, 255)):
@@ -121,11 +83,8 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
     # 用于匹配图片的正则表达式
     IMAGE_REGEX = r"!\s*\[.*?\]\s*\((.*?)\)"
 
-    font_path = get_font_path()
-    font_path1 = font_path
-
     # 加载字体
-    font = ImageFont.truetype(font_path, font_size)
+    font = get_font(font_size)
 
     images: Image = {}
 
@@ -246,7 +205,7 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
             header_level = line.count("#")
             line = line.strip("#").strip()
             font_size_header = HEADER_FONT_STANDARD_SIZE - header_level * 4
-            font = ImageFont.truetype(font_path, font_size_header)
+            font = get_font(font_size_header)
             y += HEADER_MARGIN  # 上边距
             # 字间距
             draw.text((x, y), line, font=font, fill=font_color)
@@ -260,7 +219,7 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
             y += QUOTE_LEFT_LINE_MARGIN
             draw.line((x, y, x, y + QUOTE_LEFT_LINE_HEIGHT),
                       fill=QUOTE_LEFT_LINE_COLOR, width=QUOTE_LEFT_LINE_WIDTH)
-            font = ImageFont.truetype(font_path, QUOTE_FONT_SIZE)
+            font = get_font(QUOTE_FONT_SIZE)
             draw.text((x + QUOTE_FONT_LINE_MARGIN, y + QUOTE_FONT_LINE_MARGIN),
                       quote_text, font=font, fill=QUOTE_FONT_COLOR)
             y += font_size + QUOTE_LEFT_LINE_HEIGHT + QUOTE_LEFT_LINE_MARGIN
@@ -268,7 +227,7 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
         elif line.startswith("-"):
             # 处理列表
             list_text = line.strip("-").strip()
-            font = ImageFont.truetype(font_path, LIST_FONT_SIZE)
+            font = get_font(LIST_FONT_SIZE)
             y += LIST_MARGIN
             draw.text((x, y), "  ·  " + list_text,
                       font=font, fill=LIST_FONT_COLOR)
@@ -285,7 +244,7 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
                 code_block_codes = []
                 draw.rounded_rectangle((x, code_block_start_y, image_width - 10, y+CODE_BLOCK_CODES_MARGIN_VERTICAL +
                                        CODE_BLOCK_TEXT_MARGIN), radius=5, fill=CODE_BLOCK_BG_COLOR, width=2)
-                font = ImageFont.truetype(font_path1, CODE_BLOCK_FONT_SIZE)
+                font = get_font(CODE_BLOCK_FONT_SIZE)
                 draw.text((x + CODE_BLOCK_CODES_MARGIN_HORIZONTAL, code_block_start_y +
                           CODE_BLOCK_CODES_MARGIN_VERTICAL), codes, font=font, fill=font_color)
                 y += CODE_BLOCK_CODES_MARGIN_VERTICAL + CODE_BLOCK_MARGIN
@@ -302,7 +261,7 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
                 # the judge has a tiny bug.
                 # when line is like "hi`hi`". all the parts will be in parts_inline.
                 if part in parts_inline:
-                    font = ImageFont.truetype(font_path, INLINE_CODE_FONT_SIZE)
+                    font = get_font(INLINE_CODE_FONT_SIZE)
                     code_text = part.strip("`")
                     code_width = font.getsize(
                         code_text)[0] + INLINE_CODE_FONT_MARGIN*2
@@ -315,7 +274,7 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
                               code_text, font=font, fill=font_color)
                     x += code_width+INLINE_CODE_MARGIN-INLINE_CODE_FONT_MARGIN
                 else:
-                    font = ImageFont.truetype(font_path, font_size)
+                    font = get_font(font_size)
                     draw.text((x, y), part, font=font, fill=font_color)
                     x += font.getsize(part)[0]
             y += font_size + INLINE_CODE_MARGIN
@@ -326,7 +285,7 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
             if line == "":
                 y += TEXT_LINE_MARGIN
             else:
-                font = ImageFont.truetype(font_path, font_size)
+                font = get_font(font_size)
 
                 draw.text((x, y), line, font=font, fill=font_color)
                 y += font_size + TEXT_LINE_MARGIN*2
@@ -370,44 +329,47 @@ def save_temp_img(img: Image) -> str:
     logger.info(f"保存临时图片: {p}")
     return p
 
-async def download_image_by_url(url: str) -> str:
+async def download_image_by_url(url: str, post: bool = False, post_data: dict = None) -> str:
     '''
     下载图片
     '''
     try:
         logger.info(f"下载图片: {url}")
         async with aiohttp.ClientSession() as session:
-            async with session.get(url) as resp:
-                return save_temp_img(await resp.read())
+            if post:
+                async with session.post(url, json=post_data) as resp:
+                    return save_temp_img(await resp.read())
+            else:
+                async with session.get(url) as resp:
+                    return save_temp_img(await resp.read())
     except aiohttp.client_exceptions.ClientConnectorSSLError as e:
         # 关闭SSL验证
         ssl_context = ssl.create_default_context()
         ssl_context.check_hostname = False
         ssl_context.verify_mode = ssl.CERT_NONE
         async with aiohttp.ClientSession(trust_env=False) as session:
-            async with session.get(url, ssl=ssl_context) as resp:
-                return save_temp_img(await resp.read())
+            if post:
+                async with session.get(url, ssl=ssl_context) as resp:
+                    return save_temp_img(await resp.read())
+            else:
+                async with session.get(url, ssl=ssl_context) as resp:
+                    return save_temp_img(await resp.read())
     except Exception as e:
         raise e
-
-
-def create_text_image(title: str, text: str, max_width=30, font_size=20):
+    
+def download_file(url: str, path: str):
     '''
-    文本转图片。
-    title: 标题
-    text: 文本内容
-    max_width: 文本宽度最大值（默认30）
-    font_size: 字体大小（默认20）
-
-    返回：文件路径
+    从指定 url 下载文件到指定路径 path
     '''
     try:
-        img = word2img(title, text, max_width, font_size)
-        p = save_temp_img(img)
-        return p
+        logger.info(f"下载文件: {url}")
+        with requests.get(url, stream=True) as r:
+            with open(path, 'wb') as f:
+                for chunk in r.iter_content(chunk_size=8192):
+                    f.write(chunk)
     except Exception as e:
         raise e
-
+    
 
 def create_markdown_image(text: str):
     '''
@@ -422,21 +384,6 @@ def create_markdown_image(text: str):
         raise e
 
 
-def try_migrate_config():
-    '''
-    将 cmd_config.json 迁移至 data/cmd_config.json
-    '''
-    if os.path.exists("cmd_config.json"):
-        with open("cmd_config.json", "r", encoding="utf-8-sig") as f:
-            data = json.load(f)
-        with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
-            json.dump(data, f, indent=2, ensure_ascii=False)
-        try:
-            os.remove("cmd_config.json")
-        except Exception as e:
-            pass
-
-
 def get_local_ip_addresses():
     ip = ''
     try:
@@ -450,31 +397,42 @@ def get_local_ip_addresses():
     return ip
 
 
-def get_sys_info(global_object: GlobalObject):
-    mem = None
-    stats = global_object.dashboard_data.stats
-    os_name = platform.system()
-    os_version = platform.version()
-
-    if 'sys_perf' in stats and 'memory' in stats['sys_perf']:
-        mem = stats['sys_perf']['memory']
-    return {
-        'mem': mem,
-        'os': os_name + '_' + os_version,
-        'py': platform.python_version(),
-    }
-
-
 def upload(_global_object: GlobalObject):
+    '''
+    上传相关非敏感统计数据
+    '''
+    time.sleep(10)
     while True:
-        addr_ip = ''
+        platform_stats = {}
+        llm_stats = {}
+        plugin_stats = {}
+        for platform in _global_object.platforms:
+            platform_stats[platform.platform_name] = {
+                "cnt_receive": platform.platform_instance.cnt_receive,
+                "cnt_reply": platform.platform_instance.cnt_reply
+            }
+            
+        for llm in _global_object.llms:
+            stat = llm.llm_instance.model_stat
+            for k in stat:
+                llm_stats[llm.llm_name + "#" + k] = stat[k]
+            llm.llm_instance.reset_model_stat()
+            
+        for plugin in _global_object.cached_plugins:
+            plugin_stats[plugin.metadata.plugin_name] = {
+                "metadata": plugin.metadata,
+                "trig_cnt": plugin.trig_cnt
+            }
+            plugin.reset_trig_cnt()
+        
         try:
             res = {
-                "version": _global_object.version,
-                "count": _global_object.cnt_total,
-                "ip": addr_ip,
-                "sys": sys.platform,
-                "admin": "null",
+                "stat_version": "moon",
+                "version": _global_object.version, # 版本号
+                "platform_stats": platform_stats, # 过去 30 分钟各消息平台交互消息数
+                "llm_stats": llm_stats,
+                "plugin_stats": plugin_stats,
+                "sys": sys.platform, # 系统版本
             }
             resp = requests.post(
                 'https://api.soulter.top/upload', data=json.dumps(res), timeout=5)
@@ -484,7 +442,7 @@ def upload(_global_object: GlobalObject):
                     _global_object.cnt_total = 0
         except BaseException as e:
             pass
-        time.sleep(10*60)
+        time.sleep(30*60)
 
 def retry(n: int = 3):
     '''
@@ -501,7 +459,6 @@ def retry(n: int = 3):
         return wrapper
     return decorator
 
-
 def run_monitor(global_object: GlobalObject):
     '''
     监测机器性能
@@ -519,3 +476,24 @@ def run_monitor(global_object: GlobalObject):
         }
         stat['sys_start_time'] = start_time
         time.sleep(30)
+
+def remove_dir(file_path) -> bool:
+    if not os.path.exists(file_path): return True
+    try:
+        shutil.rmtree(file_path, onerror=on_error)
+        return True
+    except BaseException as e:
+        logger.error(f"删除文件/文件夹 {file_path} 失败: {str(e)}")
+        return False
+    
+def on_error(func, path, exc_info):
+    '''
+    a callback of the rmtree function.
+    '''
+    print(f"remove {path} failed.")
+    import stat
+    if not os.access(path, os.W_OK):
+        os.chmod(path, stat.S_IWUSR)
+        func(path)
+    else:
+        raise

util/image_render/helper.py

@@ -0,0 +1,43 @@
+import aiohttp, os
+from util.general_utils import download_image_by_url, create_markdown_image
+from type.config import VERSION
+
+BASE_RENDER_URL = "https://t2i.soulter.top/text2img"
+TEMPLATE_PATH = os.path.join(os.path.dirname(__file__), "template")
+
+async def text_to_image_base(text: str, return_url: bool = False) -> str:
+    '''
+    返回图像的文件路径
+    '''
+    with open(os.path.join(TEMPLATE_PATH, "base.html"), "r", encoding='utf-8') as f:
+        tmpl_str = f.read()
+
+    assert(tmpl_str)
+
+    text = text.replace("`", "\`")
+
+    post_data = {
+        "tmpl": tmpl_str,
+        "json": return_url,
+        "tmpldata": {
+            "text": text,
+            "version": f"v{VERSION}",
+        },
+        "options": {
+            "full_page": True
+        }
+    }
+    
+    if return_url:
+        async with aiohttp.ClientSession() as session:
+            async with session.post(f"{BASE_RENDER_URL}/generate", json=post_data) as resp:
+                ret = await resp.json()
+                return f"{BASE_RENDER_URL}/{ret['data']['id']}"
+    else:
+        image_path = ""
+        try:
+            image_path = await download_image_by_url(f"{BASE_RENDER_URL}/generate", post=True, post_data=post_data)
+        except Exception as e:
+            print(f"调用 markdown 渲染 API 失败，错误信息：{e}，将使用本地渲染方式。")
+            image_path = create_markdown_image(text)
+        return image_path

util/image_render/template/base.html

@@ -0,0 +1,247 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.10/dist/katex.min.css" integrity="sha384-wcIxkf4k558AjM3Yz3BBFQUbk/zgIYC2R0QpeeYb+TwlBVMrlgLqwRjRtGZiK7ww" crossorigin="anonymous">
+  <link rel="stylesheet" href="/path/to/styles/default.min.css">
+  <script src="/path/to/highlight.min.js"></script>
+  <script>hljs.highlightAll();</script>
+  <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.10/dist/katex.min.js" integrity="sha384-hIoBPJpTUs74ddyc4bFZSM1TVlQDA60VBbJS0oA934VSz82sBx1X7kSx2ATBDIyd" crossorigin="anonymous"></script>
+  <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.10/dist/contrib/auto-render.min.js" integrity="sha384-43gviWU0YVjaDtb/GhzOouOXtZMP/7XUzwPTstBeZFe/+rCMvRwr4yROQP43s0Xk" crossorigin="anonymous"
+      onload="renderMathInElement(document.getElementById('content'),{delimiters: [{left: '$$', right: '$$', display: true},{left: '$', right: '$', display: false}]});"></script>
+</head>
+<body>
+  <div style="background-color: #3276dc; color: #fff; font-size: 64px; ">
+    <span style="font-weight: bold; margin-left: 16px"># AstrBot</span>
+    <span>{{ version }}</span>
+  </div>
+  <article style="margin-top: 32px" id="content"></article>
+  <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+  <script>
+    document.getElementById('content').innerHTML = marked.parse(`{{ text | safe}}`);
+  </script>
+
+</body>
+</html>
+<style>
+    #content {
+        min-width: 200px;
+        max-width: 85%;
+        margin: 0 auto;
+        padding: 2rem 1em 1em;
+      }
+    
+      body {
+        word-break: break-word;
+        line-height: 1.75;
+        font-weight: 400;
+        font-size: 32px;
+        margin: 0;
+        padding: 0;
+        overflow-x: hidden;
+        color: #333;
+        font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
+      }
+      h1, h2, h3, h4, h5, h6 {
+        line-height: 1.5;
+        margin-top: 35px;
+        margin-bottom: 10px;
+        padding-bottom: 5px;
+      }
+      h1:first-child, h2:first-child, h3:first-child, h4:first-child, h5:first-child, h6:first-child {
+        margin-top: -1.5rem;
+        margin-bottom: 1rem;
+      }
+      h1::before, h2::before, h3::before, h4::before, h5::before, h6::before {
+        content: "#";
+        display: inline-block;
+        color: #3eaf7c;
+        padding-right: 0.23em;
+      }
+      h1 {
+        position: relative;
+        font-size: 2.5rem;
+        margin-bottom: 5px;
+      }
+      h1::before {
+        font-size: 2.5rem;
+      }
+      h2 {
+        padding-bottom: 0.5rem;
+        font-size: 2.2rem;
+        border-bottom: 1px solid #ececec;
+      }
+      h3 {
+        font-size: 1.5rem;
+        padding-bottom: 0;
+      }
+      h4 {
+        font-size: 1.25rem;
+      }
+      h5 {
+        font-size: 1rem;
+      }
+      h6 {
+        margin-top: 5px;
+      }
+      p {
+        line-height: inherit;
+        margin-top: 22px;
+        margin-bottom: 22px;
+      }
+      strong {
+        color: #3eaf7c;
+      }
+      img {
+        max-width: 100%;
+        border-radius: 2px;
+        display: block;
+        margin: auto;
+        border: 3px solid rgba(62, 175, 124, 0.2);
+      }
+      hr {
+        border-top: 1px solid #3eaf7c;
+        border-bottom: none;
+        border-left: none;
+        border-right: none;
+        margin-top: 32px;
+        margin-bottom: 32px;
+      }
+      code {
+        font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+        word-break: break-word;
+        overflow-x: auto;
+        padding: 0.2rem 0.5rem;
+        margin: 0;
+        color: #3eaf7c;
+        font-size: 0.85em;
+        background-color: rgba(27, 31, 35, 0.05);
+        border-radius: 3px;
+      }
+      pre {
+        font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+        overflow: auto;
+        position: relative;
+        line-height: 1.75;
+        border-radius: 6px;
+        border: 2px solid #3eaf7c;
+      }
+      pre > code {
+        font-size: 12px;
+        padding: 15px 12px;
+        margin: 0;
+        word-break: normal;
+        display: block;
+        overflow-x: auto;
+        color: #333;
+        background: #f8f8f8;
+      }
+      a {
+        font-weight: 500;
+        text-decoration: none;
+        color: #3eaf7c;
+      }
+      a:hover, a:active {
+        border-bottom: 1.5px solid #3eaf7c;
+      }
+      a:before {
+        content: "⇲";
+      }
+      table {
+        display: inline-block !important;
+        font-size: 12px;
+        width: auto;
+        max-width: 100%;
+        overflow: auto;
+        border: solid 1px #3eaf7c;
+      }
+      thead {
+        background: #3eaf7c;
+        color: #fff;
+        text-align: left;
+      }
+      tr:nth-child(2n) {
+        background-color: rgba(62, 175, 124, 0.2);
+      }
+      th, td {
+        padding: 12px 7px;
+        line-height: 24px;
+      }
+      td {
+        min-width: 120px;
+      }
+      blockquote {
+        color: #666;
+        padding: 1px 23px;
+        margin: 22px 0;
+        border-left: 0.5rem solid rgba(62, 175, 124, 0.6);
+        border-color: #42b983;
+        background-color: #f8f8f8;
+      }
+      blockquote::after {
+        display: block;
+        content: "";
+      }
+      blockquote > p {
+        margin: 10px 0;
+      }
+      details {
+        border: none;
+        outline: none;
+        border-left: 4px solid #3eaf7c;
+        padding-left: 10px;
+        margin-left: 4px;
+      }
+      details summary {
+        cursor: pointer;
+        border: none;
+        outline: none;
+        background: white;
+        margin: 0px -17px;
+      }
+      details summary::-webkit-details-marker {
+        color: #3eaf7c;
+      }
+      ol, ul {
+        padding-left: 28px;
+      }
+      ol li, ul li {
+        margin-bottom: 0;
+        list-style: inherit;
+      }
+      ol li .task-list-item, ul li .task-list-item {
+        list-style: none;
+      }
+      ol li .task-list-item ul, ul li .task-list-item ul, ol li .task-list-item ol, ul li .task-list-item ol {
+        margin-top: 0;
+      }
+      ol ul, ul ul, ol ol, ul ol {
+        margin-top: 3px;
+      }
+      ol li {
+        padding-left: 6px;
+      }
+      ol li::marker {
+        color: #3eaf7c;
+      }
+      ul li {
+        list-style: none;
+      }
+      ul li:before {
+        content: "•";
+        margin-right: 4px;
+        color: #3eaf7c;
+      }
+      @media (max-width: 720px) {
+        h1 {
+          font-size: 24px;
+       }
+        h2 {
+          font-size: 20px;
+       }
+        h3 {
+          font-size: 18px;
+       }
+      }
+
+</style>

util/plugin_dev/api/v1/message.py

@@ -1,5 +1,5 @@
 from astrbot.core import oper_msg
-from type.message import AstrMessageEvent, AstrBotMessage
+from type.message import *
 from type.command import CommandResult
 from model.platform._message_result import MessageResult
 

util/plugin_util.py

@@ -1,21 +1,19 @@
 '''
 插件工具函数
 '''
-import os, sys
+import os, sys, zipfile, shutil, yaml
 import inspect
-import shutil
-import stat
 import traceback
+import uuid
 
-try:
-    from git.repo import Repo
-except ImportError:
-    pass
 from types import ModuleType
 from type.plugin import *
 from type.register import *
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
+from type.types import GlobalObject
+from util.general_utils import download_file, remove_dir
+from util.updator import request_release_info
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
 
@@ -60,7 +58,7 @@ def get_modules(path):
 
 
 def get_plugin_store_path():
-    plugin_dir = os.path.abspath(os.path.join(os.path.abspath(__file__), "../../addons/plugins"))
+    plugin_dir = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../addons/plugins"))
     return plugin_dir
 
 def get_plugin_modules():
@@ -91,7 +89,19 @@ def check_plugin_dept_update(cached_plugins: RegisteredPlugins, target_plugin: s
             update_plugin_dept(os.path.join(plugin_path, "requirements.txt"))
 
 
-def plugin_reload(cached_plugins: RegisteredPlugins):
+def has_init_param(cls, param_name):
+    try:
+        # 获取 __init__ 方法的签名
+        init_signature = inspect.signature(cls.__init__)
+        
+        # 检查参数名是否在签名中
+        return param_name in init_signature.parameters
+    except (AttributeError, ValueError):
+        # 如果类没有 __init__ 方法或者无法获取签名
+        return False
+
+def plugin_reload(ctx: GlobalObject):
+    cached_plugins = ctx.cached_plugins
     plugins = get_plugin_modules()
     if plugins is None:
         return False, "未找到任何插件模块"
@@ -113,7 +123,12 @@ def plugin_reload(cached_plugins: RegisteredPlugins):
                                     root_dir_name + "." + p, fromlist=[p])
 
             cls = get_classes(p, module)
-            obj = getattr(module, cls[0])()
+            
+            try:
+                # 尝试传入 ctx
+                obj = getattr(module, cls[0])(ctx=ctx)
+            except:
+                obj = getattr(module, cls[0])()
 
             metadata = None
             try:
@@ -125,8 +140,7 @@ def plugin_reload(cached_plugins: RegisteredPlugins):
                     else:
                         metadata = PluginMetadata(
                             plugin_name=info['name'],
-                            plugin_type=PluginType.COMMON if 'plugin_type' not in info else PluginType(
-                                info['plugin_type']),
+                            plugin_type=PluginType.COMMON if 'plugin_type' not in info else PluginType(info['plugin_type']),
                             author=info['author'],
                             desc=info['desc'],
                             version=info['version'],
@@ -163,24 +177,99 @@ def update_plugin_dept(path):
     os.system(f"{py} -m pip install -r {path} -i {mirror} --quiet")
 
 
-def install_plugin(repo_url: str, cached_plugins: RegisteredPlugins):
+def install_plugin(repo_url: str, ctx: GlobalObject):
     ppath = get_plugin_store_path()
-    # 删除末尾的 /
     if repo_url.endswith("/"):
         repo_url = repo_url[:-1]
-    # 得到 url 的最后一段
-    d = repo_url.split("/")[-1]
-    # 转换非法字符：-
-    d = d.replace("-", "_")
-    d = d.lower() # 转换为小写
-    # 创建文件夹
-    plugin_path = os.path.join(ppath, d)
-    if os.path.exists(plugin_path):
-        remove_dir(plugin_path)
-    Repo.clone_from(repo_url, to_path=plugin_path, branch='master')
-    ok, err = plugin_reload(cached_plugins)
+
+    repo_namespace = repo_url.split("/")[-2:]
+    repo = repo_namespace[1]
+
+    plugin_path = os.path.join(ppath, repo.replace("-", "_").lower())
+    if os.path.exists(plugin_path): remove_dir(plugin_path)
+
+    # we no longer use Git anymore :)
+    # Repo.clone_from(repo_url, to_path=plugin_path, branch='master')
+
+    download_from_repo_url(plugin_path, repo_url)
+    unzip_file(plugin_path + ".zip", plugin_path)
+
+    with open(os.path.join(plugin_path, "REPO"), "w", encoding='utf-8') as f:
+        f.write(repo_url)
+
+    ok, err = plugin_reload(ctx)
     if not ok:
         raise Exception(err)
+    
+def install_plugin_from_file(zip_file_path: str, ctx: GlobalObject):
+    # try to unzip
+    temp_dir = os.path.join(os.path.dirname(zip_file_path), str(uuid.uuid4()))
+    unzip_file(zip_file_path, temp_dir)
+    # check if the plugin has metadata.yaml
+    if not os.path.exists(os.path.join(temp_dir, "metadata.yaml")):
+        remove_dir(temp_dir)
+        raise Exception("插件缺少 metadata.yaml 文件。")
+    
+    metadata = load_plugin_metadata(temp_dir)
+    plugin_name = metadata.plugin_name
+    if not plugin_name: 
+        remove_dir(temp_dir)
+        raise Exception("插件 metadata.yaml 文件中 name 字段为空。")
+    plugin_name = plugin_name.replace("-", "_").lower()
+
+    ppath = get_plugin_store_path()
+    plugin_path = os.path.join(ppath, plugin_name.replace("-", "_").lower())
+    if os.path.exists(plugin_path): remove_dir(plugin_path)
+
+    # move to the target path
+    shutil.move(temp_dir, plugin_path)
+
+    with open(os.path.join(plugin_path, "REPO"), "w", encoding='utf-8') as f:
+        if metadata.repo: f.write(metadata.repo)
+
+    # remove the temp dir
+    remove_dir(temp_dir)
+
+    ok, err = plugin_reload(ctx)
+    if not ok:
+        raise Exception(err)
+    
+def load_plugin_metadata(plugin_path: str) -> PluginMetadata:
+    if not os.path.exists(plugin_path):
+        raise Exception("插件不存在。")
+    if not os.path.exists(os.path.join(plugin_path, "metadata.yaml")):
+        raise Exception("插件缺少 metadata.yaml 文件。")
+    metadata = None
+    with open(os.path.join(plugin_path, "metadata.yaml"), "r", encoding='utf-8') as f:
+        metadata = yaml.safe_load(f)
+    if 'name' not in metadata or 'desc' not in metadata or 'version' not in metadata or 'author' not in metadata:
+        raise Exception("插件 metadata.yaml 信息不完整。")
+    return PluginMetadata(
+        plugin_name=metadata['name'],
+        plugin_type=PluginType.COMMON if 'plugin_type' not in metadata else PluginType(metadata['plugin_type']),
+        author=metadata['author'],
+        desc=metadata['desc'],
+        version=metadata['version'],
+        repo=metadata['repo'] if 'repo' in metadata else None
+    )
+    
+    
+def download_from_repo_url(target_path: str, repo_url: str):
+    repo_namespace = repo_url.split("/")[-2:]
+    author = repo_namespace[0]
+    repo = repo_namespace[1]
+
+    logger.info(f"正在下载插件 {repo} ...")
+    release_url = f"https://api.github.com/repos/{author}/{repo}/releases"
+    releases = request_release_info(latest=True, url=release_url, mirror_url=release_url)
+    if not releases:
+        # download from the default branch directly. 
+        logger.warn(f"未在插件 {author}/{repo} 中找到任何发布版本，将从默认分支下载。")
+        release_url = f"https://github.com/{author}/{repo}/archive/refs/heads/master.zip"
+    else:
+        release_url = releases[0]['zipball_url']
+
+    download_file(release_url, target_path + ".zip")
 
 
 def get_registered_plugin(plugin_name: str, cached_plugins: RegisteredPlugins) -> RegisteredPlugin:
@@ -192,41 +281,81 @@ def get_registered_plugin(plugin_name: str, cached_plugins: RegisteredPlugins) -
     return ret
 
 
-def uninstall_plugin(plugin_name: str, cached_plugins: RegisteredPlugins):
-    plugin = get_registered_plugin(plugin_name, cached_plugins)
+def uninstall_plugin(plugin_name: str, ctx: GlobalObject):
+    plugin = get_registered_plugin(plugin_name, ctx.cached_plugins)
     if not plugin:
         raise Exception("插件不存在。")
     root_dir_name = plugin.root_dir_name
     ppath = get_plugin_store_path()
-    cached_plugins.remove(plugin)
+    ctx.cached_plugins.remove(plugin)
     if not remove_dir(os.path.join(ppath, root_dir_name)):
         raise Exception("移除插件成功，但是删除插件文件夹失败。您可以手动删除该文件夹，位于 addons/plugins/ 下。")
 
 
-def update_plugin(plugin_name: str, cached_plugins: RegisteredPlugins):
-    plugin = get_registered_plugin(plugin_name, cached_plugins)
+def update_plugin(plugin_name: str, ctx: GlobalObject):
+    plugin = get_registered_plugin(plugin_name, ctx.cached_plugins)
     if not plugin:
         raise Exception("插件不存在。")
     ppath = get_plugin_store_path()
     root_dir_name = plugin.root_dir_name
     plugin_path = os.path.join(ppath, root_dir_name)
-    repo = Repo(path=plugin_path)
-    repo.remotes.origin.pull()
-    ok, err = plugin_reload(cached_plugins)
+
+    if not os.path.exists(os.path.join(plugin_path, "REPO")):
+        raise Exception("插件更新信息文件 `REPO` 不存在，请手动升级，或者先卸载然后重新安装该插件。")
+    
+    repo_url = None
+    with open(os.path.join(plugin_path, "REPO"), "r", encoding='utf-8') as f:
+        repo_url = f.read()
+
+    download_from_repo_url(plugin_path, repo_url)
+    try:
+        remove_dir(plugin_path)
+    except BaseException as e:
+        logger.error(f"删除旧版本插件 {plugin_name} 文件夹失败: {str(e)}，使用覆盖安装。")
+    unzip_file(plugin_path + ".zip", plugin_path)
+
+    ok, err = plugin_reload(ctx)
     if not ok:
         raise Exception(err)
 
+def unzip_file(zip_path: str, target_dir: str):
+    '''
+    解压缩文件, 并将压缩包内**第一个**文件夹内的文件移动到 target_dir
+    '''
+    os.makedirs(target_dir, exist_ok=True)
+    update_dir = ""
+    logger.info(f"解压文件: {zip_path}")
+    with zipfile.ZipFile(zip_path, 'r') as z:
+        update_dir = z.namelist()[0]
+        z.extractall(target_dir)
 
-def remove_dir(file_path) -> bool:
-    try_cnt = 50
-    while try_cnt > 0:
-        if not os.path.exists(file_path):
-            return False
-        try:
-            shutil.rmtree(file_path)
-            return True
-        except PermissionError as e:
-            err_file_path = str(e).split("\'", 2)[1]
-            if os.path.exists(err_file_path):
-                os.chmod(err_file_path, stat.S_IWUSR)
-            try_cnt -= 1
+    files = os.listdir(os.path.join(target_dir, update_dir))
+    for f in files:
+        logger.info(f"移动更新文件/目录: {f}")
+        if os.path.isdir(os.path.join(target_dir, update_dir, f)):
+            if os.path.exists(os.path.join(target_dir, f)):
+                shutil.rmtree(os.path.join(target_dir, f), onerror=on_error)
+        else:
+            if os.path.exists(os.path.join(target_dir, f)):
+                os.remove(os.path.join(target_dir, f))
+        shutil.move(os.path.join(target_dir, update_dir, f), target_dir)
+    
+    try:
+        logger.info(f"删除临时更新文件: {zip_path} 和 {os.path.join(target_dir, update_dir)}")
+        shutil.rmtree(os.path.join(target_dir, update_dir), onerror=on_error)
+        os.remove(zip_path)
+    except:
+        logger.warn(f"删除更新文件失败，可以手动删除 {zip_path} 和 {os.path.join(target_dir, update_dir)}")
+
+
+def on_error(func, path, exc_info):
+    '''
+    a callback of the rmtree function.
+    '''
+    print(f"remove {path} failed.")
+    import stat
+    if not os.access(path, os.W_OK):
+        os.chmod(path, stat.S_IWUSR)
+        func(path)
+    else:
+        raise

util/updator.py

@@ -1,50 +1,61 @@
-has_git = True
-try:
-    import git.exc
-    from git.repo import Repo
-except BaseException as e:
-    has_git = False
-import sys, os
+import sys, os, zipfile, shutil
 import requests
+import psutil
+from type.config import VERSION
+from SparkleLogging.utils.core import LogManager
+from logging import Logger
+
+from util.general_utils import download_file
+
+logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
+
+ASTRBOT_RELEASE_API = "https://api.github.com/repos/Soulter/AstrBot/releases"
+MIRROR_ASTRBOT_RELEASE_API = "https://api.soulter.top/releases" # 0-10 分钟的缓存时间
+
+def get_main_path():
+    ret = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
+    return ret
+
+def terminate_child_processes():
+    try:
+        parent = psutil.Process(os.getpid())
+        children = parent.children(recursive=True)
+        logger.info(f"正在终止 {len(children)} 个子进程。")
+        for child in children:
+            logger.info(f"正在终止子进程 {child.pid}")
+            child.terminate()
+            try:
+                child.wait(timeout=3)
+            except psutil.NoSuchProcess:
+                continue
+            except psutil.TimeoutExpired:
+                logger.info(f"子进程 {child.pid} 没有被正常终止, 正在强行杀死。")
+                child.kill()
+    except psutil.NoSuchProcess:
+        pass
 
 def _reboot():
     py = sys.executable
+    terminate_child_processes()
     os.execl(py, py, *sys.argv)
     
-def find_repo() -> Repo:
-    if not has_git:
-        raise Exception("未安装 GitPython 库，无法进行更新。")
-    repo = None
-    
-    # 由于项目更名过，因此这里需要多次尝试。
-    try:
-        repo = Repo()
-    except git.exc.InvalidGitRepositoryError:
-        try:
-            repo = Repo(path="QQChannelChatGPT")  
-        except git.exc.InvalidGitRepositoryError:
-            repo = Repo(path="AstrBot")
-    if not repo:
-        raise Exception("在已知的目录下未找到项目位置。请联系项目维护者。")
-    return repo
-    
-def request_release_info(latest: bool = True) -> list:
+def request_release_info(latest: bool = True, url: str = ASTRBOT_RELEASE_API, mirror_url: str = MIRROR_ASTRBOT_RELEASE_API) -> list:
     '''
     请求版本信息。
     返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
     '''
-    api_url1 = "https://api.github.com/repos/Soulter/AstrBot/releases"
-    api_url2 = "https://api.soulter.top/releases" # 0-10 分钟的缓存时间
     try:
-        result = requests.get(api_url2).json()
+        result = requests.get(mirror_url).json()
     except BaseException as e:
-        result = requests.get(api_url1).json()
+        result = requests.get(url).json()
     try:
+        if not result: return []
         if latest:
             ret = github_api_release_parser([result[0]])
         else:
             ret = github_api_release_parser(result)
     except BaseException as e:
+        logger.error(f"解析版本信息失败: {result}")
         raise Exception(f"解析版本信息失败: {result}")
     return ret
         
@@ -66,53 +77,64 @@ def github_api_release_parser(releases: list) -> list:
             "published_at": release['published_at'],
             "body": release['body'],
             "commit_hash": commit_hash,
-            "tag_name": release['tag_name']
+            "tag_name": release['tag_name'],
+            "zipball_url": release['zipball_url']
         })
     return ret
 
-def check_update() -> str:
-    repo = find_repo()
-    curr_commit = repo.commit().hexsha
-    update_data = request_release_info()
-    new_commit = update_data[0]['commit_hash']
-    print(f"当前版本: {curr_commit}")
-    print(f"最新版本: {new_commit}")
-    if curr_commit.startswith(new_commit):
-        return "当前已经是最新版本。"
-    else:
-        update_info = f"""有新版本可用。
-=== 当前版本 ===
-{curr_commit}
+def compare_version(v1: str, v2: str) -> int:
+    '''
+    比较两个版本号的大小。
+    返回 1 表示 v1 > v2，返回 -1 表示 v1 < v2，返回 0 表示 v1 = v2。
+    '''
+    v1 = v1.replace('v', '')
+    v2 = v2.replace('v', '')
+    v1 = v1.split('.')
+    v2 = v2.split('.')
 
-=== 新版本 ===
+    for i in range(3):
+        if int(v1[i]) > int(v2[i]):
+            return 1
+        elif int(v1[i]) < int(v2[i]):
+            return -1
+    return 0
+
+def check_update() -> str:
+    update_data = request_release_info()
+    tag_name = update_data[0]['tag_name']
+    logger.debug(f"当前版本: v{VERSION}")
+    logger.debug(f"最新版本: {tag_name}")
+
+    if compare_version(VERSION, tag_name) >= 0:
+        return "当前已经是最新版本。"
+
+    update_info = f"""# 当前版本
+v{VERSION}
+
+# 最新版本
 {update_data[0]['version']}
 
-=== 发布时间 ===
+# 发布时间
 {update_data[0]['published_at']}
 
-=== 更新内容 ===
-{update_data[0]['body']}"""
-        return update_info
+# 更新内容
+---
+{update_data[0]['body']}
+---"""
+    return update_info
     
-def update_project(update_data: list,
-                   reboot: bool = False, 
+def update_project(reboot: bool = False, 
                    latest: bool = True,
                    version: str = ''):
-    repo = find_repo()
-    # update_data = request_release_info(latest)
+    update_data = request_release_info(latest)
     if latest:
-        # 检查本地commit和最新commit是否一致
-        curr_commit = repo.head.commit.hexsha
-        new_commit = update_data[0]['commit_hash']
-        if curr_commit == '':
-            raise Exception("无法获取当前版本号对应的版本位置。请联系项目维护者。")
-        if curr_commit.startswith(new_commit):
+        latest_version = update_data[0]['tag_name']
+        if compare_version(VERSION, latest_version) >= 0:
             raise Exception("当前已经是最新版本。")
         else:
-            # 更新到最新版本对应的commit
             try:
-                repo.git.fetch()
-                repo.git.checkout(update_data[0]['tag_name'], "-f")
+                download_file(update_data[0]['zipball_url'], "temp.zip")
+                unzip_file("temp.zip", get_main_path())
                 if reboot: _reboot()
             except BaseException as e:
                 raise e
@@ -123,21 +145,65 @@ def update_project(update_data: list,
         for data in update_data:
             if data['tag_name'] == version:
                 try:
-                    repo.git.fetch()
-                    repo.git.checkout(data['tag_name'], "-f")
+                    download_file(data['zipball_url'], "temp.zip")
+                    unzip_file("temp.zip", get_main_path())
                     flag = True
                     if reboot: _reboot()
                 except BaseException as e:
                     raise e
         if not flag:
             raise Exception("未找到指定版本。")
+
+def unzip_file(zip_path: str, target_dir: str):
+    '''
+    解压缩文件, 并将压缩包内**第一个**文件夹内的文件移动到 target_dir
+    '''
+    os.makedirs(target_dir, exist_ok=True)
+    update_dir = ""
+    logger.info(f"解压文件: {zip_path}")
+    with zipfile.ZipFile(zip_path, 'r') as z:
+        update_dir = z.namelist()[0]
+        z.extractall(target_dir)
+
+    avoid_dirs = ["logs", "data", "configs", "temp_plugins", update_dir]
+    # copy addons/plugins to the target_dir temporarily
+    if os.path.exists(os.path.join(target_dir, "addons/plugins")):
+        logger.info("备份插件目录：从 addons/plugins 到 temp_plugins")
+        shutil.copytree(os.path.join(target_dir, "addons/plugins"), "temp_plugins")
+
+    files = os.listdir(os.path.join(target_dir, update_dir))
+    for f in files:
+        logger.info(f"移动更新文件/目录: {f}")
+        if os.path.isdir(os.path.join(target_dir, update_dir, f)):
+            if f in avoid_dirs: continue
+            if os.path.exists(os.path.join(target_dir, f)):
+                shutil.rmtree(os.path.join(target_dir, f), onerror=on_error)
+        else:
+            if os.path.exists(os.path.join(target_dir, f)):
+                os.remove(os.path.join(target_dir, f))
+        shutil.move(os.path.join(target_dir, update_dir, f), target_dir)
+    
+    # move back
+    if os.path.exists("temp_plugins"):
+        logger.info("恢复插件目录：从 temp_plugins 到 addons/plugins")
+        shutil.rmtree(os.path.join(target_dir, "addons/plugins"), onerror=on_error)
+        shutil.move("temp_plugins", os.path.join(target_dir, "addons/plugins"))
     
-def checkout_branch(branch_name: str):
-    repo = find_repo()
     try:
-        repo.git.fetch()
-        repo.git.checkout(branch_name, "-f")
-        repo.git.pull("origin", branch_name, "-f")
-        return True
-    except BaseException as e:
-        raise e
+        logger.info(f"删除临时更新文件: {zip_path} 和 {os.path.join(target_dir, update_dir)}")
+        shutil.rmtree(os.path.join(target_dir, update_dir), onerror=on_error)
+        os.remove(zip_path)
+    except:
+        logger.warn(f"删除更新文件失败，可以手动删除 {zip_path} 和 {os.path.join(target_dir, update_dir)}")
+
+def on_error(func, path, exc_info):
+    '''
+    a callback of the rmtree function.
+    '''
+    print(f"remove {path} failed.")
+    import stat
+    if not os.access(path, os.W_OK):
+        os.chmod(path, stat.S_IWUSR)
+        func(path)
+    else:
+        raise