feat: 支持自定义文转图服务地址

refactor: 重写了后端与仪表盘的日志通信

.github/workflows/coverage_test.yml

@@ -22,6 +22,7 @@ jobs:
           pip install -r requirements.txt
           pip install pytest pytest-cov pytest-asyncio
           mkdir data
+          mkdir data/plugins
           mkdir data/config
           mkdir temp
 

addons/plugins/helloworld/README.md

@@ -1,10 +0,0 @@
-# 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

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

addons/plugins/helloworld/main.py

@@ -1,32 +0,0 @@
-flag_not_support = False
-try:
-    from util.plugin_dev.api.v1.bot import Context, AstrMessageEvent, CommandResult
-    from util.plugin_dev.api.v1.config import *
-except ImportError:
-    flag_not_support = True
-    print("导入接口失败。请升级到 AstrBot 最新版本。")
-
-'''
-注意以格式 XXXPlugin 或 Main 来修改插件名。
-提示：把此模板仓库 fork 之后 clone 到机器人文件夹下的 addons/plugins/ 目录下，然后用 Pycharm/VSC 等工具打开可获更棒的编程体验（自动补全等）
-'''
-class HelloWorldPlugin:
-    """
-    AstrBot 会传递 context 给插件。
-    
-    - context.register_commands: 注册指令
-    - context.register_task: 注册任务
-    - context.message_handler: 消息处理器(平台类插件用)
-    """
-    def __init__(self, context: Context) -> None:
-        self.context = context
-        self.context.register_commands("helloworld", "helloworld", "内置测试指令。", 1, self.helloworld)
-
-    """
-    指令处理函数。
-    
-    - 需要接收两个参数：message: AstrMessageEvent, context: Context
-    - 返回 CommandResult 对象
-    """
-    def helloworld(self, message: AstrMessageEvent, context: Context):
-        return CommandResult().message("Hello, World!")

addons/plugins/helloworld/metadata.yaml

@@ -1,6 +0,0 @@
-name: helloworld # 这是你的插件的唯一识别名。
-desc: 这是 AstrBot 的默认插件。
-help: 
-version: v1.3 # 插件版本号。格式：v1.1.1 或者 v1.1
-author: Soulter # 作者
-repo: https://github.com/Soulter/helloworld # 插件的仓库地址

astrbot/bootstrap.py

@@ -1,35 +1,37 @@
 import asyncio
 import traceback
+import os
 from astrbot.message.handler import MessageHandler
 from astrbot.persist.helper import dbConn
 from dashboard.server import AstrBotDashBoard
-from model.provider.provider import Provider
 from model.command.manager import CommandManager
 from model.command.internal_handler import InternalCommandHandler
 from model.plugin.manager import PluginManager
 from model.platform.manager import PlatformManager
-from typing import Dict, List, Union
+from typing import Union
 from type.types import Context
 from type.config import VERSION
-from SparkleLogging.utils.core import LogManager
 from logging import Logger
-from util.cmd_config import AstrBotConfig
+from util.cmd_config import AstrBotConfig, try_migrate
 from util.metrics import MetricUploader
-from util.config_utils import *
 from util.updator.astrbot_updator import AstrBotUpdator
+from util.log import LogManager
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot')
 
-
 class AstrBotBootstrap():
     def __init__(self) -> None:
         self.context = Context()
         
         # load configs and ensure the backward compatibility
-        try_migrate_config()
+        try_migrate()
         self.config_helper = AstrBotConfig()
         self.context.config_helper = self.config_helper
+        # set log queue handler 
+        LogManager.set_queue_handler(logger, self.context._log_queue)
         logger.info("AstrBot v" + VERSION)
+        # set log level
+        logger.setLevel(self.config_helper.log_level)
         # apply proxy settings
         http_proxy = self.context.config_helper.http_proxy
         https_proxy = self.context.config_helper.https_proxy
@@ -45,6 +47,12 @@ class AstrBotBootstrap():
             logger.info("未使用代理。")
             
         self.test_mode = os.environ.get('TEST_MODE', 'off') == 'on'
+
+        # set t2i endpoint
+        if self.context.config_helper.t2i_endpoint:
+            self.context.image_renderer.set_network_endpoint(
+                self.context.config_helper.t2i_endpoint
+            )
     
     async def run(self):
         self.command_manager = CommandManager()
@@ -66,7 +74,12 @@ class AstrBotBootstrap():
         self.context.plugin_updator = self.plugin_manager.updator
         self.context.message_handler = self.message_handler
         self.context.command_manager = self.command_manager
-        
+
+        # load dashboard
+        self.dashboard.run_http_server()
+        dashboard_ws_task = asyncio.create_task(self.dashboard.ws_server(), name="dashboard")
+        dashboard_log_task = asyncio.create_task(self.dashboard.log_consumer(), name="log")
+
         if self.test_mode:
             return
         
@@ -78,10 +91,8 @@ class AstrBotBootstrap():
         platform_tasks = self.load_platform()
         # load metrics uploader
         metrics_upload_task = asyncio.create_task(self.metrics_uploader.upload_metrics(), name="metrics-uploader")
-        # load dashboard
-        self.dashboard.run_http_server()
-        dashboard_task = asyncio.create_task(self.dashboard.ws_server(), name="dashboard")
-        tasks = [metrics_upload_task, dashboard_task, *platform_tasks, *self.context.ext_tasks]
+
+        tasks = [metrics_upload_task, dashboard_ws_task, dashboard_log_task, *platform_tasks, *self.context.ext_tasks]
         tasks = [self.handle_task(task) for task in tasks]
         await asyncio.gather(*tasks)
 

astrbot/message/handler.py

@@ -11,7 +11,7 @@ from model.command.manager import CommandManager
 from type.message_event import AstrMessageEvent, MessageResult
 from type.types import Context
 from type.command import CommandResult
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from nakuru.entities.components import Image
 from util.agent.func_call import FuncCall
@@ -60,6 +60,9 @@ class ContentSafetyHelper():
                 from astrbot.message.baidu_aip_judge import BaiduJudge
                 self.baidu_judge = BaiduJudge(aip)
                 logger.info("已启用百度 AI 内容审核。")
+            except ImportError as e:
+                logger.error("检测到库依赖不完整，将不会启用百度 AI 内容审核。请先使用 pip 安装 `baidu_aip` 包。")
+                logger.error(e)
             except BaseException as e:
                 logger.error("百度 AI 内容审核初始化失败。")
                 logger.error(e)
@@ -154,12 +157,20 @@ class MessageHandler():
                 is_command_call=True,
                 use_t2i=cmd_res.is_use_t2i
             )
-        
-        # next is the LLM part
+            
+        # middlewares
+        for middleware in self.context.middlewares:
+            try:
+                logger.info(f"执行中间件 {middleware.origin}/{middleware.name}...")
+                await middleware.func(message, self.context)
+            except BaseException as e:
+                logger.error(f"中间件 {middleware.origin}/{middleware.name} 处理消息时发生异常：{e}，跳过。")
+                logger.error(traceback.format_exc())
         
         if message.only_command:
             return
         
+        # next is the LLM part
         # check if the message is a llm-wake-up command
         if self.llm_wake_prefix and not msg_plain.startswith(self.llm_wake_prefix):
             logger.debug(f"消息 `{msg_plain}` 没有以 LLM 唤醒前缀 `{self.llm_wake_prefix}` 开头，忽略。")

dashboard/dist/assets/BaseBreadcrumb.vue_vue_type_style_index_0_lang-cae6d9fb.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,ae as p,B as n,af as o,j as f}from"./index-b457b676.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-25639696.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 _};

dashboard/dist/assets/BlankLayout-503500e2.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-b457b676.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-25639696.js";const f=e({__name:"BlankLayout",setup(p){return(u,_)=>(a(),t(c,null,{default:o(()=>[s(n(r))]),_:1}))}});export{f as default};

dashboard/dist/assets/ColorPage-55364acc.js

@@ -1 +1 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-76d4bf62.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b380931c.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-b457b676.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-cae6d9fb.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b010c672.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-25639696.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};

dashboard/dist/assets/ConfigDetailCard-0eb16275.js

@@ -1 +1 @@
-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-b457b676.js";import{_ as w}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b380931c.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 _};
+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-25639696.js";import{_ as w}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b010c672.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 _};

dashboard/dist/assets/Error404Page-5b9b1a3e.js

@@ -1 +1 @@
-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-b457b676.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};
+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-25639696.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};

dashboard/dist/assets/LoginPage-2bd5ea03.js

@@ -1,4 +1,4 @@
-import{_ as Ot}from"./LogoDark.vue_vue_type_script_setup_true_lang-5e7c5390.js";import{x as ke,ag as we,r as Vt,ah as St,D as w,ai as Ne,a2 as C,B as I,aj as Q,ak as Et,I as Be,al as Ie,am as jt,an as At,ao as wt,ap as G,y as Ft,o as Re,c as nt,w as T,a as A,O as He,b as ce,aq as Pt,d as Ct,e as Ge,s as Tt,ar as Nt,t as Ye,k as Bt,U as It,f as Fe,N as Rt,V as Pe,J as We,L as kt}from"./index-b457b676.js";import{a as Mt}from"./md5-3d74ecc3.js";/**
+import{_ as Ot}from"./LogoDark.vue_vue_type_script_setup_true_lang-b1d2f1af.js";import{x as ke,ag as we,r as Vt,ah as St,D as w,ai as Ne,a2 as C,B as I,aj as Q,ak as Et,I as Be,al as Ie,am as jt,an as At,ao as wt,ap as G,y as Ft,o as Re,c as nt,w as T,a as A,O as He,b as ce,aq as Pt,d as Ct,e as Ge,s as Tt,ar as Nt,t as Ye,k as Bt,U as It,f as Fe,N as Rt,V as Pe,J as We,L as kt}from"./index-25639696.js";import{a as Mt}from"./md5-0b0a2337.js";/**
   * vee-validate v4.11.3
   * (c) 2023 Abdelrahman Awad
   * @license MIT

dashboard/dist/assets/LogoDark.vue_vue_type_script_setup_true_lang-b1d2f1af.js

@@ -1 +1 @@
-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-b457b676.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-25639696.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};

dashboard/dist/assets/MaterialIcons-69a5e9aa.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-76d4bf62.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b380931c.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-b457b676.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-cae6d9fb.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b010c672.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-25639696.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};

dashboard/dist/assets/RegisterPage-b4e7e679.js

@@ -1 +1 @@
-import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-5e7c5390.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-b457b676.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(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};
+import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-b1d2f1af.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-25639696.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(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};

dashboard/dist/assets/ShadowPage-e7fd39fc.js

@@ -1 +1 @@
-import{_ as c}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-76d4bf62.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b380931c.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-b457b676.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-cae6d9fb.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b010c672.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-25639696.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};

dashboard/dist/assets/TablerIcons-eef884dc.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-76d4bf62.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b380931c.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-b457b676.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-cae6d9fb.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b010c672.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-25639696.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};

dashboard/dist/assets/TypographyPage-e6311caa.js

@@ -1 +1 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-76d4bf62.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b380931c.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-b457b676.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-cae6d9fb.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-b010c672.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-25639696.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};

dashboard/dist/assets/UiParentCard.vue_vue_type_script_setup_true_lang-b010c672.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-b457b676.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-25639696.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 _};

dashboard/dist/assets/md5-0b0a2337.js

@@ -1,4 +1,4 @@
-import{as as K,at as Y,au as V}from"./index-b457b676.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-25639696.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

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-b457b676.js"></script>
+    <script type="module" crossorigin src="/assets/index-25639696.js"></script>
     <link rel="stylesheet" href="/assets/index-0f1523f3.css">
   </head>
   <body>

dashboard/helper.py

@@ -2,7 +2,7 @@ from . import DashBoardData
 from util.cmd_config import AstrBotConfig
 from dataclasses import dataclass, asdict
 from util.plugin_dev.api.v1.config import update_config
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from type.types import Context
 from type.config import CONFIG_METADATA_2
@@ -15,29 +15,48 @@ class DashBoardHelper():
         self.context = context
         self.config_key_dont_show = ['dashboard', 'config_version']
 
+    def try_cast(self, value: str, type_: str):
+        if type_ == "int" and value.isdigit():
+            return int(value)
+        elif type_ == "float" and isinstance(value, str) \
+            and value.replace(".", "", 1).isdigit():
+            return float(value)
+        elif type_ == "float" and isinstance(value, int):
+            return float(value)
+            
+
     def validate_config(self, data):
         errors = []
-        # 递归验证数据
-        def validate(data, path=""):
-            for key, meta in CONFIG_METADATA_2.items():
+        def validate(data, metadata=CONFIG_METADATA_2, path=""):
+            for key, meta in metadata.items():
                 if key not in data:
-                    if key not in self.config_key_dont_show:
-                        # 这些key不会传给前端，所以不需要验证
-                        errors.append(f"Missing key: {path}{key}")
                     continue
                 value = data[key]
-                if meta["type"] == "int" and not isinstance(value, int):
-                    errors.append(f"Invalid type for {path}{key}: expected int, got {type(value).__name__}")
-                elif meta["type"] == "bool" and not isinstance(value, bool):
-                    errors.append(f"Invalid type for {path}{key}: expected bool, got {type(value).__name__}")
-                elif meta["type"] == "string" and not isinstance(value, str):
-                    errors.append(f"Invalid type for {path}{key}: expected string, got {type(value).__name__}")
-                elif meta["type"] == "list" and not isinstance(value, list):
-                    errors.append(f"Invalid type for {path}{key}: expected list, got {type(value).__name__}")
+                # 递归验证
+                if meta["type"] == "list" and isinstance(value, list):
                     for item in value:
                         validate(item, meta["items"], path=f"{path}{key}.")
-                elif meta["type"] == "dict" and not isinstance(value, dict):
-                    errors.append(f"Invalid type for {path}{key}: expected dict, got {type(value).__name__}")
+                elif meta["type"] == "object" and isinstance(value, dict):
+                    validate(value, meta["items"], path=f"{path}{key}.")
+
+                if meta["type"] == "int" and not isinstance(value, int):
+                    casted = self.try_cast(value, "int")
+                    if casted is None:
+                        errors.append(f"错误的类型 {path}{key}: 期望是 int, 得到了 {type(value).__name__}")
+                    data[key] = casted
+                elif meta["type"] == "float" and not isinstance(value, float):
+                    casted = self.try_cast(value, "float")
+                    if casted is None:
+                        errors.append(f"错误的类型 {path}{key}: 期望是 float, 得到了 {type(value).__name__}")
+                    data[key] = casted
+                elif meta["type"] == "bool" and not isinstance(value, bool):
+                    errors.append(f"错误的类型 {path}{key}: 期望是 bool, 得到了 {type(value).__name__}")
+                elif meta["type"] == "string" and not isinstance(value, str):
+                    errors.append(f"错误的类型 {path}{key}: 期望是 string, 得到了 {type(value).__name__}")
+                elif meta["type"] == "list" and not isinstance(value, list):
+                    errors.append(f"错误的类型 {path}{key}: 期望是 list, 得到了 {type(value).__name__}")
+                elif meta["type"] == "object" and not isinstance(value, dict):
+                    errors.append(f"错误的类型 {path}{key}: 期望是 dict, 得到了 {type(value).__name__}")
                     validate(value, meta["items"], path=f"{path}{key}.")
         validate(data)
         
@@ -68,6 +87,6 @@ class DashBoardHelper():
             typ = item['val_type']
             if typ == 'int':
                 if not value.isdigit():
-                    raise ValueError(f"Invalid type for {namespace}.{key}: expected int, got {type(value).__name__}")
+                    raise ValueError(f"错误的类型 {namespace}.{key}: 期望是 int, 得到了 {type(value).__name__}")
                 value = int(value)
             update_config(namespace, key, value)

dashboard/server.py

@@ -13,7 +13,7 @@ from werkzeug.serving import make_server
 from astrbot.persist.helper import dbConn
 from type.types import Context
 from typing import List
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from dashboard.helper import DashBoardHelper
 from util.io import get_local_ip_addresses
@@ -96,7 +96,7 @@ class AstrBotDashBoard():
             # 获得请求体
             post_data = request.json
             if post_data["password"] == password:
-                self.context.config_helper.put("dashboard_password", post_data["new_password"])
+                self.context.config_helper.dashboard.password = post_data['new_password']
                 return Response(
                     status="success",
                     message="修改成功。",
@@ -206,7 +206,8 @@ class AstrBotDashBoard():
             repo_url = post_data["url"]
             try:
                 logger.info(f"正在安装插件 {repo_url}")
-                self.plugin_manager.install_plugin(repo_url)
+                # self.plugin_manager.install_plugin(repo_url)
+                asyncio.run_coroutine_threadsafe(self.plugin_manager.install_plugin(repo_url), self.loop).result()
                 threading.Thread(target=self.astrbot_updator._reboot, args=(2, self.context)).start()
                 logger.info(f"安装插件 {repo_url} 成功，2秒后重启")
                 return Response(
@@ -228,8 +229,7 @@ class AstrBotDashBoard():
                 file = request.files['file']
                 print(file.filename)
                 logger.info(f"正在安装用户上传的插件 {file.filename}")
-                # save file to temp/
-                file_path = f"temp/{uuid.uuid4()}.zip"
+                file_path = f"data/temp/{uuid.uuid4()}.zip"
                 file.save(file_path)
                 self.plugin_manager.install_plugin_from_file(file_path)
                 logger.info(f"安装插件 {file.filename} 成功")
@@ -273,7 +273,8 @@ class AstrBotDashBoard():
             plugin_name = post_data["name"]
             try:
                 logger.info(f"正在更新插件 {plugin_name}")
-                self.plugin_manager.update_plugin(plugin_name)
+                # self.plugin_manager.update_plugin(plugin_name)
+                asyncio.run_coroutine_threadsafe(self.plugin_manager.update_plugin(plugin_name), self.loop).result()
                 threading.Thread(target=self.astrbot_updator._reboot, args=(2, self.context)).start()
                 logger.info(f"更新插件 {plugin_name} 成功，2秒后重启")
                 return Response(
@@ -289,20 +290,12 @@ class AstrBotDashBoard():
                     data=None
                 ).__dict__
 
-        @self.dashboard_be.post("/api/log")
-        def log():
-            for item in self.ws_clients:
-                try:
-                    asyncio.run_coroutine_threadsafe(
-                        self.ws_clients[item].send(request.data.decode()), self.loop).result()
-                except Exception as e:
-                    pass
-            return 'ok'
-
         @self.dashboard_be.get("/api/check_update")
         def get_update_info():
             try:
-                ret = self.astrbot_updator.check_update(None, None)
+                # ret = self.astrbot_updator.check_update(None, None)
+                ret = asyncio.run_coroutine_threadsafe(
+                    self.astrbot_updator.check_update(None, None), self.loop).result()
                 return Response(
                     status="success",
                     message=str(ret) if ret is not None else "已经是最新版本了。",
@@ -327,7 +320,8 @@ class AstrBotDashBoard():
             else:
                 latest = False
             try:
-                self.astrbot_updator.update(latest=latest, version=version)
+                # await self.astrbot_updator.update(latest=latest, version=version)
+                asyncio.run_coroutine_threadsafe(self.astrbot_updator.update(latest=latest, version=version), self.loop).result()
                 threading.Thread(target=self.astrbot_updator._reboot, args=(2, self.context)).start()
                 return Response(
                     status="success",
@@ -418,18 +412,22 @@ class AstrBotDashBoard():
 
     async def get_log_history(self):
         try:
-            with open("logs/astrbot/astrbot.log", "r", encoding="utf-8") as f:
-                return f.readlines()[-100:]
+            dq = self.context._log_queue.get_cache()
+            ret = ""
+            for log in dq:
+                ret += log + "\n\r"
+            return ret
         except Exception as e:
             logger.warning(f"读取日志历史失败: {e.__str__()}")
-            return []
+            return ""
 
     async def __handle_msg(self, websocket, path):
         address = websocket.remote_address
         self.ws_clients[address] = websocket
-        data = await self.get_log_history()
-        data = ''.join(data).replace('\n', '\r\n')
-        await websocket.send(data)
+        
+        # 发送日志历史
+        await websocket.send(await self.get_log_history())
+
         while True:
             try:
                 msg = await websocket.recv()
@@ -446,6 +444,15 @@ class AstrBotDashBoard():
         ws_server = websockets.serve(self.__handle_msg, "0.0.0.0", 6186)
         logger.info("WebSocket 服务器已启动。")
         await ws_server
+
+    async def log_consumer(self):
+        while True:
+            log = await self.context._log_queue.get()
+            for ws in self.ws_clients.values():
+                try:
+                    await ws.send(log)
+                except Exception as e:
+                    pass
         
     def http_server(self):
         http_server = make_server(

main.py

@@ -6,8 +6,7 @@ import warnings
 import traceback
 import mimetypes
 from astrbot.bootstrap import AstrBotBootstrap
-from SparkleLogging.utils.core import LogManager
-from logging import Formatter
+from util.log import LogManager
 
 warnings.filterwarnings("ignore")
 logo_tmpl = r"""
@@ -27,6 +26,8 @@ def main():
         # delete qqbotpy's logger
         for handler in logging.root.handlers[:]:
             logging.root.removeHandler(handler)
+        
+        logger.info(logo_tmpl)
 
         bootstrap = AstrBotBootstrap() 
         asyncio.run(bootstrap.run())
@@ -42,7 +43,8 @@ def check_env():
         exit()
         
     os.makedirs("data/config", exist_ok=True)
-    os.makedirs("temp", exist_ok=True)
+    os.makedirs("data/plugins", exist_ok=True)
+    os.makedirs("data/temp", exist_ok=True)
 
     # workaround for issue #181
     mimetypes.add_type("text/javascript", ".js") 
@@ -51,11 +53,5 @@ def check_env():
     
 if __name__ == "__main__":
     check_env()
-    
-    logger = LogManager.GetLogger(
-        log_name='astrbot',
-        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)
+    logger = LogManager.GetLogger(log_name='astrbot')
     main()

model/command/internal_handler.py

@@ -1,4 +1,4 @@
-import aiohttp
+import aiohttp, os
 
 from model.command.manager import CommandManager
 from model.plugin.manager import PluginManager
@@ -6,7 +6,7 @@ from type.message_event import AstrMessageEvent
 from type.command import CommandResult
 from type.types import Context
 from type.config import VERSION
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from util.agent.web_searcher import search_from_bing, fetch_website_content
 
@@ -19,23 +19,30 @@ class InternalCommandHandler:
         self.plugin_manager = plugin_manager
         
         self.manager.register("help", "查看帮助", 10, self.help)
-        self.manager.register("wake", "设置机器人唤醒词", 10, self.set_nick)
-        self.manager.register("update", "更新 AstrBot", 10, self.update)
+        self.manager.register("wake", "唤醒前缀", 10, self.set_nick)
+        self.manager.register("update", "更新管理", 10, self.update)
         self.manager.register("plugin", "插件管理", 10, self.plugin)
         self.manager.register("reboot", "重启 AstrBot", 10, self.reboot)
-        self.manager.register("websearch", "网页搜索开关", 10, self.web_search)
-        self.manager.register("t2i", "文本转图片开关", 10, self.t2i_toggle)
-        self.manager.register("myid", "获取你在此平台上的ID", 10, self.myid)
-        self.manager.register("provider", "查看和切换当前使用的 LLM 资源来源", 10, self.provider)
+        self.manager.register("websearch", "网页搜索", 10, self.web_search)
+        self.manager.register("t2i", "文转图", 10, self.t2i_toggle)
+        self.manager.register("myid", "用户ID", 10, self.myid)
+        self.manager.register("provider", "LLM 接入源", 10, self.provider)
+
+    def _check_auth(self, message: AstrMessageEvent, context: Context):
+        if os.environ.get("TEST_MODE", "off") == "on":
+            return
+        if message.role != "admin":
+            user_id = message.message_obj.sender.user_id
+            raise Exception(f"用户(ID: {user_id}) 没有足够的权限使用该指令。")
         
     def provider(self, message: AstrMessageEvent, context: Context):
         if len(context.llms) == 0:
-            return CommandResult().message("当前没有加载任何 LLM 资源。")
+            return CommandResult().message("当前没有加载任何 LLM 接入源。")
 
         tokens = self.manager.command_parser.parse(message.message_str)
         
         if tokens.len == 1:
-            ret = "## 当前载入的 LLM 资源\n"
+            ret = "## 当前载入的 LLM 接入源\n"
             for idx, llm in enumerate(context.llms):
                 ret += f"{idx}. {llm.llm_name}"
                 if llm.origin:
@@ -44,7 +51,7 @@ class InternalCommandHandler:
                     ret += " (当前使用)"
                 ret += "\n"
             
-            ret += "\n使用 provider <序号> 切换 LLM 资源。" 
+            ret += "\n使用 provider <序号> 切换 LLM 接入源。" 
             return CommandResult().message(ret)
         else:
             try:
@@ -52,14 +59,13 @@ class InternalCommandHandler:
                 if idx >= len(context.llms):
                     return CommandResult().message("provider: 无效的序号。")
                 context.message_handler.set_provider(context.llms[idx].llm_instance)
-                return CommandResult().message(f"已经成功切换到 LLM 资源 {context.llms[idx].llm_name}。")
+                return CommandResult().message(f"已经成功切换到 LLM 接入源 {context.llms[idx].llm_name}。")
             except BaseException as e:
                 return CommandResult().message("provider: 参数错误。")
 
     def set_nick(self, message: AstrMessageEvent, context: Context):
+        self._check_auth(message, context)
         message_str = message.message_str
-        if message.role != "admin":
-            return CommandResult().message("你没有权限使用该指令。")
         l = message_str.split(" ")
         if len(l) == 1:
             return CommandResult().message(f"设置机器人唤醒词。以唤醒词开头的消息会唤醒机器人处理，起到 @ 的效果。\n示例：wake 昵称。当前唤醒词是：{context.config_helper.wake_prefix[0]}")
@@ -71,18 +77,13 @@ class InternalCommandHandler:
         return CommandResult(
             hit=True,
             success=True,
-            message_chain=f"已经成功将唤醒词设定为 {nick}。",
+            message_chain=f"已经成功将唤醒前缀设定为 {nick}。",
         )
         
-    def update(self, message: AstrMessageEvent, context: Context):
+    async def update(self, message: AstrMessageEvent, context: Context):
+        self._check_auth(message, context)
         tokens = self.manager.command_parser.parse(message.message_str)
-        if message.role != "admin":
-            return CommandResult(
-                hit=True,
-                success=False,
-                message_chain="你没有权限使用该指令",
-            )
-        update_info = context.updator.check_update(None, None)
+        update_info = await context.updator.check_update(None, None)
         if tokens.len == 1:
             ret = ""
             if not update_info:
@@ -93,13 +94,13 @@ class InternalCommandHandler:
         else:
             if tokens.get(1) == "latest":
                 try:
-                    context.updator.update()
+                    await context.updator.update()
                     return CommandResult().message(f"已经成功更新到最新版本 v{update_info.version}。要应用更新，请重启 AstrBot。输入 /reboot 即可重启")
                 except BaseException as e:
                     return CommandResult().message(f"更新失败。原因：{str(e)}")
             elif tokens.get(1).startswith("v"):
                 try:
-                    context.updator.update(version=tokens.get(1))
+                    await context.updator.update(version=tokens.get(1))
                     return CommandResult().message(f"已经成功更新到版本 v{tokens.get(1)}。要应用更新，请重启 AstrBot。输入 /reboot 即可重启")
                 except BaseException as e:
                     return CommandResult().message(f"更新失败。原因：{str(e)}")
@@ -107,12 +108,7 @@ class InternalCommandHandler:
                 return CommandResult().message("update: 参数错误。")
             
     def reboot(self, message: AstrMessageEvent, context: Context):
-        if message.role != "admin":
-            return CommandResult(
-                hit=True,
-                success=False,
-                message_chain="你没有权限使用该指令",
-            )
+        self._check_auth(message, context)
         context.updator._reboot(3, context)
         return CommandResult(
             hit=True,
@@ -120,7 +116,7 @@ class InternalCommandHandler:
             message_chain="AstrBot 将在 3s 后重启。",
         )
     
-    def plugin(self, message: AstrMessageEvent, context: Context):
+    async def plugin(self, message: AstrMessageEvent, context: Context):
         tokens = self.manager.command_parser.parse(message.message_str)
         if tokens.len == 1:
             ret = "# 插件指令面板 \n- 安装插件: `plugin i 插件Github地址`\n- 卸载插件: `plugin d 插件名`\n- 查看插件列表：`plugin l`\n - 更新插件: `plugin u 插件名`\n"
@@ -133,10 +129,10 @@ class InternalCommandHandler:
             if plugin_list_info.strip() == "":
                 return CommandResult().message("plugin v: 没有找到插件。")
             return CommandResult().message(plugin_list_info)
+
+        self._check_auth(message, context)
         
-        elif tokens.get(1) == "d":
-            if message.role != "admin":
-                return CommandResult().message("plugin d: 你没有权限使用该指令。")
+        if tokens.get(1) == "d":
             if tokens.len == 2:
                 return CommandResult().message("plugin d: 请指定要卸载的插件名。")
             plugin_name = tokens.get(2)
@@ -147,25 +143,21 @@ class InternalCommandHandler:
             return CommandResult().message(f"plugin d: 已经成功卸载插件 {plugin_name}。")
         
         elif tokens.get(1) == "i":
-            if message.role != "admin":
-                return CommandResult().message("plugin i: 你没有权限使用该指令。")
             if tokens.len == 2:
                 return CommandResult().message("plugin i: 请指定要安装的插件的 Github 地址，或者前往可视化面板安装。")
             plugin_url = tokens.get(2)
             try:
-                self.plugin_manager.install_plugin(plugin_url)
+                await self.plugin_manager.install_plugin(plugin_url)
             except BaseException as e:
                 return CommandResult().message(f"plugin i: 安装插件失败。原因：{str(e)}")
             return CommandResult().message("plugin i: 已经成功安装插件。")
         
         elif tokens.get(1) == "u":
-            if message.role != "admin":
-                return CommandResult().message("plugin u: 你没有权限使用该指令。")
             if tokens.len == 2:
                 return CommandResult().message("plugin u: 请指定要更新的插件名。")
             plugin_name = tokens.get(2)
             try:
-                self.plugin_manager.update_plugin(plugin_name)
+                await context.plugin_updator.update(plugin_name)
             except BaseException as e:
                 return CommandResult().message(f"plugin u: 更新插件失败。原因：{str(e)}")
             return CommandResult().message(f"plugin u: 已经成功更新插件 {plugin_name}。")
@@ -181,18 +173,18 @@ class InternalCommandHandler:
         except BaseException as e:
             logger.warning("An error occurred while fetching astrbot notice. Never mind, it's not important.")
 
-        msg = "# Help Center\n## 指令列表\n"
+        msg = "# 帮助中心\n## 指令\n"
         for key, value in self.manager.commands_handler.items():
             if value.plugin_metadata:
                 msg += f"- `{key}` ({value.plugin_metadata.plugin_name}): {value.description}\n"
             else: msg += f"- `{key}`: {value.description}\n"
         # plugins
-        if context.cached_plugins != None:
+        if context.cached_plugins:
             plugin_list_info = ""
             for plugin in context.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"
+                msg += "\n## 插件\n> 使用plugin v 插件名 查看插件帮助\n"
                 msg += plugin_list_info
         msg += notice
 
@@ -280,5 +272,5 @@ class InternalCommandHandler:
             return CommandResult(
                 hit=True,
                 success=False,
-                message_chain=f"在 {message.platform} 上获取你的ID失败，原因: {str(e)}",
+                message_chain=f"获取失败，原因: {str(e)}",
             )

model/command/manager.py

@@ -9,7 +9,7 @@ from type.command import CommandResult
 from type.register import RegisteredPlugins
 from model.command.parser import CommandParser
 from model.plugin.command import PluginCommandBridge
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from dataclasses import dataclass
 
@@ -124,8 +124,11 @@ class CommandManager():
             else:
                 command_result = handler(message_event, context)
             
-            if not isinstance(command_result, CommandResult):
-                raise ValueError(f"Command {command} handler should return CommandResult.")
+            # if not isinstance(command_result, CommandResult):
+            #     raise ValueError(f"Command {command} handler should return CommandResult.")
+
+            if not command_result:
+                return
             
             context.metrics_uploader.command_stats[command] += 1
             

model/command/openai_official_handler.py

@@ -2,7 +2,7 @@ from model.command.manager import CommandManager
 from type.message_event import AstrMessageEvent
 from type.command import CommandResult
 from type.types import Context
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from nakuru.entities.components import Image
 from model.provider.openai_official import ProviderOpenAIOfficial, MODELS

model/platform/__init__.py

@@ -40,14 +40,18 @@ class Platform():
         '''
         pass
 
-    def parse_message_outline(self, message: AstrBotMessage) -> str:
+    def parse_message_outline(self, message: Union[AstrBotMessage, list]) -> str:
         '''
         将消息解析成大纲消息形式，如: xxxxx[图片]xxxxx。用于输出日志等。
         '''
-        if isinstance(message, str):
-            return message
         ret = ''
-        parsed = message if isinstance(message, list) else message.message
+        if isinstance(message, list):
+            parsed = message
+        elif isinstance(message, AstrBotMessage):
+            parsed = message.message
+        elif isinstance(message, str):
+            return message
+        
         try:
             for node in parsed:
                 if isinstance(node, Plain):

model/platform/manager.py

@@ -3,7 +3,7 @@ import asyncio
 from util.io import port_checker
 from type.register import RegisteredPlatform
 from type.types import Context
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
 from util.cmd_config import (

model/platform/qq_aiocqhttp.py

@@ -10,7 +10,7 @@ from type.message_event import *
 from type.command import *
 from typing import Union, List, Dict
 from nakuru.entities.components import *
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
 from util.cmd_config import PlatformConfig, AiocqhttpPlatformConfig
@@ -209,7 +209,7 @@ class AIOCQHTTP(Platform):
         
         if isinstance(message, AstrBotMessage):
             logger.info(
-                f"{message.sender.user_id} <- {self.parse_message_outline(message)}")
+                f"{message.sender.nickname}/{message.sender.user_id} <- {self.parse_message_outline(message_chain)}")
         else:
             logger.info(f"回复消息: {message_chain}")
 

model/platform/qq_nakuru.py

@@ -15,7 +15,7 @@ from . import Platform
 from type.astrbot_message import *
 from type.message_event import *
 from type.command import *
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
 from util.cmd_config import PlatformConfig, NakuruPlatformConfig
@@ -171,7 +171,7 @@ class QQNakuru(Platform):
                 (GroupMessage, FriendMessage, GuildMessage))
 
         logger.info(
-            f"{source.user_id} <- {self.parse_message_outline(res)}")
+            f"{message.sender.nickname}/{message.sender.user_id} <- {self.parse_message_outline(res)}")
 
         if isinstance(res, str):
             res = [Plain(text=res), ]

model/platform/qq_official.py

@@ -16,7 +16,7 @@ from type.message_event import *
 from type.command import *
 from typing import Union, List, Dict
 from nakuru.entities.components import *
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
 from util.cmd_config import PlatformConfig, QQOfficialPlatformConfig

model/plugin/command.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from type.register import RegisteredPlugins
 from typing import List, Union, Callable
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot')
@@ -24,4 +24,3 @@ class PluginCommandBridge():
         
     def register_command(self, plugin_name, command_name, description, priority, handler, use_regex=False, ignore_prefix=False):
         self.plugin_commands_waitlist.append(CommandRegisterRequest(command_name, description, priority, handler, use_regex, plugin_name, ignore_prefix))
-        

model/plugin/manager.py

@@ -13,7 +13,7 @@ from types import ModuleType
 from type.types import Context
 from type.plugin import *
 from type.register import *
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot')
@@ -107,13 +107,13 @@ class PluginManager():
         rc = process.poll()
         
         
-    def install_plugin(self, repo_url: str):
+    async def install_plugin(self, repo_url: str):
         ppath = self.plugin_store_path
 
         # we no longer use Git anymore :)
         # Repo.clone_from(repo_url, to_path=plugin_path, branch='master')
         
-        plugin_path = self.updator.update(repo_url)
+        plugin_path = await self.updator.update(repo_url)
         with open(os.path.join(plugin_path, "REPO"), "w", encoding='utf-8') as f:
             f.write(repo_url)
             
@@ -124,14 +124,14 @@ class PluginManager():
         # if not ok:
         #     raise Exception(err)
         
-    def download_from_repo_url(self, target_path: str, repo_url: str):
+    async def download_from_repo_url(self, 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 = self.updator.fetch_release_info(url=release_url)
+        releases = await self.updator.fetch_release_info(url=release_url)
         if not releases:
             # download from the default branch directly. 
             logger.warn(f"未在插件 {author}/{repo} 中找到任何发布版本，将从默认分支下载。")
@@ -139,7 +139,7 @@ class PluginManager():
         else:
             release_url = releases[0]['zipball_url']
 
-        download_file(release_url, target_path + ".zip")
+        await download_file(release_url, target_path + ".zip")
 
     def get_registered_plugin(self, plugin_name: str) -> RegisteredPlugin:
         for p in self.context.cached_plugins:
@@ -156,12 +156,12 @@ class PluginManager():
         if not remove_dir(os.path.join(ppath, root_dir_name)):
             raise Exception("移除插件成功，但是删除插件文件夹失败。您可以手动删除该文件夹，位于 addons/plugins/ 下。")
 
-    def update_plugin(self, plugin_name: str):
+    async def update_plugin(self, plugin_name: str):
         plugin = self.get_registered_plugin(plugin_name)
         if not plugin:
             raise Exception("插件不存在。")
         
-        self.updator.update(plugin)
+        await self.updator.update(plugin)
         
     def plugin_reload(self):
         cached_plugins = self.context.cached_plugins
@@ -184,7 +184,7 @@ class PluginManager():
 
                 self.check_plugin_dept_update(target_plugin=root_dir_name)
 
-                module = __import__("addons.plugins." +
+                module = __import__("data.plugins." +
                                         root_dir_name + "." + p, fromlist=[p])
 
                 cls = self.get_classes(module)

model/provider/openai_official.py

@@ -15,7 +15,7 @@ from util.io import download_image_by_url
 from astrbot.persist.helper import dbConn
 from model.provider.provider import Provider
 from util.cmd_config import LLMConfig
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from typing import List, Dict
 

requirements.txt

@@ -1,6 +1,5 @@
 pydantic~=1.10.4
 aiohttp
-requests
 openai
 qq-botpy
 chardet~=5.1.0
@@ -10,10 +9,9 @@ beautifulsoup4
 googlesearch-python
 tiktoken
 readability-lxml
-baidu-aip
 websockets
 flask
 psutil
 lxml_html_clean
-SparkleLogging
+colorlog
 aiocqhttp

tests/test_http_server.py

@@ -0,0 +1,51 @@
+
+import aiohttp
+import pytest
+
+BASE_URL = "http://0.0.0.0:6185/api"
+
+async def get_url(url):
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url) as response:
+            return await response.json()
+        
+async def post_url(url, data):
+    async with aiohttp.ClientSession() as session:
+        async with session.post(url, json=data) as response:
+            return await response.json()
+
+class TestHTTPServer:
+    @pytest.mark.asyncio
+    async def test_config(self):
+        configs = await get_url(f"{BASE_URL}/configs")
+        assert 'data' in configs and 'metadata' in configs['data'] \
+            and 'config' in configs['data']
+        config = configs['data']['config']
+        # test post config
+        await post_url(f"{BASE_URL}/astrbot-configs", config)
+        # text post config with invalid data
+        assert 'rate_limit' in config['platform_settings']
+        config['platform_settings']['rate_limit'] = "invalid"
+        ret = await post_url(f"{BASE_URL}/astrbot-configs", config)
+        assert 'status' in ret and ret['status'] == 'error'
+    
+    @pytest.mark.asyncio
+    async def test_update(self):
+        await get_url(f"{BASE_URL}/check_update")
+    
+    @pytest.mark.asyncio
+    async def test_plugins(self):
+        pname = "astrbot_plugin_bilibili"
+        url = f"https://github.com/Soulter/{pname}"
+
+        await get_url(f"{BASE_URL}/extensions")
+
+        # test install plugin
+        await post_url(f"{BASE_URL}/extensions/install", {
+            "url": url
+        })
+        
+        # test uninstall plugin
+        await post_url(f"{BASE_URL}/extensions/uninstall", {
+            "name": pname
+        })

tests/test_message.py

@@ -11,16 +11,11 @@ from model.platform.qq_aiocqhttp import AIOCQHTTP
 from model.provider.openai_official import ProviderOpenAIOfficial
 from type.astrbot_message import *
 from type.message_event import *
-from SparkleLogging.utils.core import LogManager
-from logging import Formatter
+from util.log import LogManager
 
 from util.cmd_config import QQOfficialPlatformConfig, AiocqhttpPlatformConfig
 
-logger = LogManager.GetLogger(
-log_name='astrbot',
-    out_to_console=True,
-    custom_formatter=Formatter('[%(asctime)s| %(name)s - %(levelname)s|%(filename)s:%(lineno)d]: %(message)s', datefmt="%H:%M:%S")
-)
+logger = LogManager.GetLogger(log_name='astrbot')
 pytest_plugins = ('pytest_asyncio',)
 
 os.environ['TEST_MODE'] = 'on'
@@ -135,7 +130,17 @@ class TestInteralCommandHsandle():
             abm = self.create("/t2i")
             await aiocqhttp.handle_msg(abm)
         await self.fast_test("/help")
-        
+
+    @pytest.mark.asyncio
+    async def test_plugin(self):
+        pname = "astrbot_plugin_bilibili"
+        url = f"https://github.com/Soulter/{pname}"
+        await self.fast_test("/plugin")
+        await self.fast_test(f"/plugin l")
+        await self.fast_test(f"/plugin i {url}")
+        await self.fast_test(f"/plugin u {url}")
+        await self.fast_test(f"/plugin d {pname}")
+
 class TestLLMChat():
     @pytest.mark.asyncio
     async def test_llm_chat(self):

type/cached_queue.py

@@ -0,0 +1,28 @@
+from asyncio import Queue
+from collections import deque
+from typing import Deque
+
+class CachedQueue(Queue):
+    def __init__(self, maxsize: int = 0, cachesize: int = 200):
+        super().__init__(maxsize)
+        self.cache = deque(maxlen=cachesize)
+
+    def put_nowait(self, item):
+        self.cache.append(item)
+        super().put_nowait(item)
+
+    def get_nowait(self):
+        item = super().get_nowait()
+        return item
+
+    def get(self):
+        item = super().get()
+        return item
+
+    def clear(self):
+        self.cache.clear()
+        with self.mutex:
+            self._queue.clear()
+
+    def get_cache(self) -> Deque:
+        return self.cache

type/config.py

@@ -1,4 +1,4 @@
-VERSION = '3.3.9'
+VERSION = '3.3.14'
 
 DEFAULT_CONFIG = {
     "qqbot": {
@@ -169,6 +169,8 @@ DEFAULT_CONFIG_VERSION_2 = {
         "username": "",
         "password": "",
     },
+    "log_level": "INFO",
+    "t2i_endpoint": "",
 }
 
 # 这个是用于迁移旧版本配置文件的映射表
@@ -350,4 +352,6 @@ CONFIG_METADATA_2 = {
             "password": {"description": "密码", "type": "string"},
         }
     },
+    "log_level": {"description": "控制台日志级别(DEBUG, INFO, WARNING, ERROR)", "type": "string"},
+    "t2i_endpoint": {"description": "文本转图像服务接口(为空时使用公共服务器)", "type": "string"},
 }

type/middleware.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+
+@dataclass
+class Middleware():
+    name: str = ""
+    description: str = ""
+    origin: str = ""  # 注册来源
+    func: callable = None

type/types.py

@@ -9,10 +9,11 @@ from util.updator.astrbot_updator import AstrBotUpdator
 from util.image_uploader import ImageUploader
 from util.updator.plugin_updator import PluginUpdator
 from type.command import CommandResult
+from type.middleware import Middleware
 from type.astrbot_message import MessageType
 from model.plugin.command import PluginCommandBridge
 from model.provider.provider import Provider
-from util.agent.func_call import FuncCall
+from type.cached_queue import CachedQueue
 
 
 class Context:
@@ -43,10 +44,13 @@ class Context:
         self.image_uploader = ImageUploader()
         self.message_handler = None # see astrbot/message/handler.py
         self.ext_tasks: List[Task] = []
+        self.middlewares: List[Middleware] = []
         
         self.command_manager = None
         self.running = True
 
+        self._log_queue = CachedQueue()
+
         # useless
         # self.reply_prefix = ""
 
@@ -115,6 +119,14 @@ class Context:
         删除一个函数调用工具。
         '''
         self.message_handler.llm_tools.remove_func(tool_name)
+        
+    def register_middleware(self, middleware: Middleware):
+        '''
+        注册一个中间件。所有的消息事件都会经过中间件处理，然后再进入 LLM 聊天模块。
+        
+        在 AstrBot 中，会对到来的消息事件首先检查指令，然后再检查中间件。触发指令后将不会进入 LLM 聊天模块，而中间件会。
+        '''
+        self.middlewares.append(middleware)
      
     def find_platform(self, platform_name: str) -> RegisteredPlatform:
         for platform in self.platforms:

util/agent/web_searcher.py

@@ -12,7 +12,7 @@ from util.websearch.bing import Bing
 from util.websearch.sogo import Sogo
 from util.websearch.google import Google
 from model.provider.provider import Provider
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from type.types import Context
 from type.message_event import AstrMessageEvent

util/cmd_config.py

@@ -1,6 +1,8 @@
 import os
 import json
+import shutil
 import logging
+from util.io import on_error
 from type.config import DEFAULT_CONFIG, DEFAULT_CONFIG_VERSION_2, MAPPINGS_1_2
 from dataclasses import dataclass, field, asdict
 from typing import List, Dict, Optional
@@ -131,6 +133,8 @@ class AstrBotConfig():
     dashboard: DashboardConfig = field(default_factory=DashboardConfig)
     platform: List[PlatformConfig] = field(default_factory=list)
     wake_prefix: List[str] = field(default_factory=list)
+    log_level: str = "INFO"
+    t2i_endpoint: str = ""
 
     def __init__(self) -> None:
         self.init_configs()
@@ -172,6 +176,8 @@ class AstrBotConfig():
         self.http_proxy=data.get("http_proxy", "")
         self.dashboard=DashboardConfig(**data.get("dashboard", {}))
         self.wake_prefix=data.get("wake_prefix", [])
+        self.log_level=data.get("log_level", "INFO")
+        self.t2i_endpoint=data.get("t2i_endpoint", "")
 
     def migrate_config_1_2(self, old: dict) -> dict:
         '''将配置文件从版本 1 迁移至版本 2'''
@@ -295,4 +301,27 @@ class AstrBotConfig():
                 raise KeyError(f"Key {key} not found in config.")
 
     def check_exist(self) -> bool:
-        return os.path.exists(ASTRBOT_CONFIG_PATH)
+        return os.path.exists(ASTRBOT_CONFIG_PATH)
+    
+def try_migrate():
+    '''
+    - 将 cmd_config.json 迁移至 data/cmd_config.json (如果存在)
+    - 将 addons/plugins 迁移至 data/plugins (如果存在)
+    '''
+    if os.path.exists("cmd_config.json") and not os.path.exists("data/cmd_config.json"):
+        try:
+            shutil.move("cmd_config.json", "data/cmd_config.json")
+        except:
+            logger.error("迁移 cmd_config.json 失败。")
+
+    if os.path.exists("addons/plugins"):
+        if os.path.exists("data/plugins"):
+            try:
+                shutil.rmtree("data/plugins", onerror=on_error)
+            except:
+                logger.error("删除 data/plugins 失败。")
+        try:
+            shutil.move("addons/plugins", "data/")
+            shutil.rmtree("addons", onerror=on_error)
+        except:
+            logger.error("迁移 addons/plugins 失败。")

util/config_utils.py

@@ -1,15 +0,0 @@
-import json, os, shutil
-import logging
-
-logger = logging.getLogger("astrbot")
-
-def try_migrate_config():
-    '''
-    将 cmd_config.json 迁移至 data/cmd_config.json (如果存在的话)
-    '''
-    if os.path.exists("cmd_config.json") and not os.path.exists("data/cmd_config.json"):
-        try:
-            shutil.move("cmd_config.json", "data/cmd_config.json")
-        except:
-            logger.error("迁移 cmd_config.json 失败。AstrBot 将不会读取配置文件，你可以手动将 cmd_config.json 迁移至 data/cmd_config.json。")
-        

util/io.py

@@ -4,10 +4,9 @@ import shutil
 import socket
 import time
 import aiohttp
-import requests
 
 from PIL import Image
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot')
@@ -47,13 +46,11 @@ def port_checker(port: int, host: str = "localhost"):
     
 
 def save_temp_img(img: Image) -> str:
-    if not os.path.exists("temp"):
-        os.makedirs("temp")
-
+    os.makedirs("data/temp", exist_ok=True)
     # 获得文件创建时间，清除超过1小时的
     try:
-        for f in os.listdir("temp"):
-            path = os.path.join("temp", f)
+        for f in os.listdir("data/temp"):
+            path = os.path.join("data/temp", f)
             if os.path.isfile(path):
                 ctime = os.path.getctime(path)
                 if time.time() - ctime > 3600:
@@ -63,7 +60,7 @@ def save_temp_img(img: Image) -> str:
 
     # 获得时间戳
     timestamp = int(time.time())
-    p = f"temp/{timestamp}.jpg"
+    p = f"data/temp/{timestamp}.jpg"
 
     if isinstance(img, Image.Image):
         img.save(p)
@@ -101,16 +98,20 @@ async def download_image_by_url(url: str, post: bool = False, post_data: dict =
     except Exception as e:
         raise e
     
-def download_file(url: str, path: str):
+async def download_file(url: str, path: str):
     '''
     从指定 url 下载文件到指定路径 path
     '''
     try:
         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)
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url) as resp:
+                with open(path, 'wb') as f:
+                    while True:
+                        chunk = await resp.content.read(8192)
+                        if not chunk:
+                            break
+                        f.write(chunk)
     except Exception as e:
         raise e
 

util/log.py

@@ -0,0 +1,51 @@
+import logging, asyncio, colorlog
+from type.cached_queue import CachedQueue
+
+log_color_config = {
+    'DEBUG': 'bold_blue', 'INFO': 'bold_cyan',
+    'WARNING': 'bold_yellow', 'ERROR': 'red',
+    'CRITICAL': 'bold_red', 'RESET': 'reset',
+    'asctime': 'green'
+}
+
+class LogQueueHandler(logging.Handler):
+    def __init__(self, log_queue: CachedQueue):
+        super().__init__()
+        self.log_queue = log_queue
+
+    def emit(self, record):
+        log_entry = self.format(record)
+        try:
+            self.log_queue.put_nowait(log_entry)
+        except Exception:
+            pass
+
+class LogManager:
+
+    @classmethod
+    def GetLogger(cls, log_name: str = 'default'):
+        logger = logging.getLogger(log_name)
+        if logger.hasHandlers():
+            return logger
+        console_handler = logging.StreamHandler()
+        console_handler.setLevel(logging.DEBUG)
+        console_formatter = colorlog.ColoredFormatter(
+            fmt='%(log_color)s [%(asctime)s| %(levelname)s] [%(funcName)s|%(filename)s:%(lineno)d]: %(message)s %(reset)s',
+            datefmt='%H:%M:%S',
+            log_colors=log_color_config
+        )
+        console_handler.setFormatter(console_formatter)
+        logger.setLevel(logging.DEBUG)
+        logger.addHandler(console_handler)
+        
+        return logger
+    
+    @classmethod
+    def set_queue_handler(cls, logger: logging.Logger, log_queue: CachedQueue):
+        handler = LogQueueHandler(log_queue)
+        handler.setLevel(logging.DEBUG)
+        if logger.handlers:
+            handler.setFormatter(logger.handlers[0].formatter)
+        else:
+            handler.setFormatter(logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s'))
+        logger.addHandler(handler)

util/metrics.py

@@ -1,5 +1,5 @@
 import asyncio
-import requests
+import aiohttp
 import json
 import sys
 
@@ -57,8 +57,9 @@ class MetricUploader():
                     "command_stats": self.command_stats,
                     "sys": sys.platform, # 系统版本
                 }
-                resp = requests.post(
-                    'https://api.soulter.top/upload', data=json.dumps(res), timeout=5)
+                async with aiohttp.ClientSession() as session:
+                    async with session.post('https://api.soulter.top/upload', data=json.dumps(res), timeout=5) as resp:
+                        pass
                 if resp.status_code == 200:
                     ok = resp.json()
                     if ok['status'] == 'ok':

util/plugin_dev/api/v1/__init__.py

@@ -0,0 +1,7 @@
+from .bot import *
+from .config import *
+from .llm import *
+from .message import *
+from .platform import *
+from .register import *
+from .types import *

util/plugin_dev/api/v1/types.py

@@ -3,5 +3,5 @@
 '''
 
 from type.plugin import PluginType
-
+from type.middleware import Middleware
 from nakuru.entities.components import Image, Plain, At, Node, BaseMessageComponent

util/t2i/renderer.py

@@ -1,17 +1,23 @@
 from util.t2i.strategies.local_strategy import LocalRenderStrategy
 from util.t2i.strategies.network_strategy import NetworkRenderStrategy
 from util.t2i.context import RenderContext
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot')
 
 class TextToImageRenderer:
-    def __init__(self):
-        self.network_strategy = NetworkRenderStrategy()
+    def __init__(self, endpoint_url: str = None):
+        self.network_strategy = NetworkRenderStrategy(endpoint_url)
         self.local_strategy = LocalRenderStrategy()
         self.context = RenderContext(self.network_strategy)
 
+    def set_network_endpoint(self, endpoint_url: str):
+        '''设置 t2i 的网络端点。
+        '''
+        logger.info("文本转图像服务接口: " + endpoint_url)
+        self.network_strategy.set_endpoint(endpoint_url)
+
     async def render_custom_template(self, tmpl_str: str, tmpl_data: dict, return_url: bool = False):
         '''使用自定义文转图模板。该方法会通过网络调用 t2i 终结点图文渲染API。
         @param tmpl_str: HTML Jinja2 模板。

util/t2i/strategies/local_strategy.py

@@ -1,5 +1,6 @@
 import re
-import requests
+import aiohttp
+from io import BytesIO
 
 from .base_strategy import RenderStrategy
 from PIL import ImageFont, Image, ImageDraw
@@ -82,8 +83,9 @@ class LocalRenderStrategy(RenderStrategy):
                 try:
                     image_url = re.findall(IMAGE_REGEX, line)[0]
                     print(image_url)
-                    image_res = Image.open(requests.get(
-                        image_url, stream=True, timeout=5).raw)
+                    async with aiohttp.ClientSession() as session:
+                        async with session.get(image_url) as resp:
+                            image_res = Image.open(BytesIO(await resp.read()))
                     images[i] = image_res
                     # 最大不得超过image_width的50%
                     img_height = image_res.size[1]

util/t2i/strategies/network_strategy.py

@@ -10,9 +10,16 @@ ASTRBOT_T2I_DEFAULT_ENDPOINT = "https://t2i.soulter.top/text2img"
 class NetworkRenderStrategy(RenderStrategy):
     def __init__(self, base_url: str = ASTRBOT_T2I_DEFAULT_ENDPOINT) -> None:
         super().__init__()
+        if not base_url:
+            base_url = ASTRBOT_T2I_DEFAULT_ENDPOINT
         self.BASE_RENDER_URL = base_url
         self.TEMPLATE_PATH = os.path.join(os.path.dirname(__file__), "template")
 
+    def set_endpoint(self, base_url: str):
+        if not base_url:
+            base_url = ASTRBOT_T2I_DEFAULT_ENDPOINT
+        self.BASE_RENDER_URL = base_url
+
     async def render_custom_template(self, tmpl_str: str, tmpl_data: dict, return_url: bool=True) -> str:
         '''使用自定义文转图模板'''
         post_data = {

util/updator/astrbot_updator.py

@@ -1,6 +1,6 @@
-import os, psutil, sys, zipfile, shutil, time
+import os, psutil, sys, time
 from util.updator.zip_updator import ReleaseInfo, RepoZipUpdator
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
 from type.config import VERSION
 from util.io import on_error, download_file
@@ -31,6 +31,9 @@ class AstrBotUpdator(RepoZipUpdator):
             pass
     
     def _reboot(self, delay: int = None, context = None):
+        if os.environ.get('TEST_MODE', 'off') == 'on':
+            logger.info("测试模式下不会重启。")
+            return
         # if delay: time.sleep(delay)
         py = sys.executable
         context.running = False
@@ -43,11 +46,11 @@ class AstrBotUpdator(RepoZipUpdator):
             logger.error(f"重启失败（{py}, {e}），请尝试手动重启。")
             raise e
         
-    def check_update(self, url: str, current_version: str) -> ReleaseInfo:
-        return super().check_update(self.ASTRBOT_RELEASE_API, VERSION)
+    async def check_update(self, url: str, current_version: str) -> ReleaseInfo:
+        return await super().check_update(self.ASTRBOT_RELEASE_API, VERSION)
         
-    def update(self, reboot = False, latest = True, version = None):
-        update_data = self.fetch_release_info(self.ASTRBOT_RELEASE_API, latest)
+    async def update(self, reboot = False, latest = True, version = None):
+        update_data = await self.fetch_release_info(self.ASTRBOT_RELEASE_API, latest)
         file_url = None
         
         if latest:
@@ -65,53 +68,10 @@ class AstrBotUpdator(RepoZipUpdator):
                 raise Exception(f"未找到版本号为 {version} 的更新文件。")
             
         try:
-            # self.download_from_repo_url("temp", file_url)
-            download_file(file_url, "temp.zip")
+            await download_file(file_url, "temp.zip")
             self.unzip_file("temp.zip", self.MAIN_PATH)
         except BaseException as e:
             raise e
         
         if reboot:
             self._reboot()
-            
-    def unzip_file(self, 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"))
-        
-        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)}")

util/updator/plugin_updator.py

@@ -1,24 +1,24 @@
-import os
+import os, zipfile, shutil
 
 from util.updator.zip_updator import RepoZipUpdator
 from util.io import remove_dir
-from type.plugin import PluginMetadata
 from type.register import RegisteredPlugin
 from typing import Union
-from SparkleLogging.utils.core import LogManager
+from util.log import LogManager
 from logging import Logger
+from util.io import on_error
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot')
 
 
 class PluginUpdator(RepoZipUpdator):
     def __init__(self) -> None:
-        self.plugin_store_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../addons/plugins"))
+        self.plugin_store_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../data/plugins"))
         
     def get_plugin_store_path(self) -> str:
         return self.plugin_store_path
 
-    def update(self, plugin: Union[RegisteredPlugin, str]) -> str:
+    async def update(self, plugin: Union[RegisteredPlugin, str]) -> str:
         repo_url = None
         
         if not isinstance(plugin, str):
@@ -33,7 +33,7 @@ class PluginUpdator(RepoZipUpdator):
             plugin_path = os.path.join(self.plugin_store_path, self.format_repo_name(repo_url))
             
         logger.info(f"正在更新插件，路径: {plugin_path}，仓库地址: {repo_url}")
-        self.download_from_repo_url(plugin_path, repo_url)
+        await self.download_from_repo_url(plugin_path, repo_url)
         
         try:
             remove_dir(plugin_path)
@@ -44,5 +44,41 @@ class PluginUpdator(RepoZipUpdator):
         
         return plugin_path
 
+    def unzip_file(self, zip_path: str, target_dir: str):
+        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"))
+        
+        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)}")

util/updator/zip_updator.py

@@ -1,5 +1,5 @@
-import requests, os, zipfile, shutil
-from SparkleLogging.utils.core import LogManager
+import aiohttp, os, zipfile, shutil
+from util.log import LogManager
 from logging import Logger
 from util.io import on_error, download_file
 
@@ -23,14 +23,15 @@ class RepoZipUpdator():
         self.path = path
         self.rm_on_error = on_error
             
-    def fetch_release_info(self, url: str, latest: bool = True) -> list:
+    async def fetch_release_info(self, url: str, latest: bool = True) -> list:
         '''
         请求版本信息。
         返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
         '''
-        result = requests.get(url).json()
-        
         try:
+            async with aiohttp.ClientSession() as session:
+                async with session.get(url) as response:
+                    result = await response.json()
             if not result: return []
             if latest:
                 ret = self.github_api_release_parser([result[0]])
@@ -66,7 +67,7 @@ class RepoZipUpdator():
     def unzip(self):
         raise NotImplementedError()
     
-    def update(self):
+    async def update(self):
         raise NotImplementedError()
     
     def compare_version(self, v1: str, v2: str) -> int:
@@ -86,8 +87,8 @@ class RepoZipUpdator():
                 return -1
         return 0
     
-    def check_update(self, url: str, current_version: str) -> ReleaseInfo:
-        update_data = self.fetch_release_info(url)
+    async def check_update(self, url: str, current_version: str) -> ReleaseInfo:
+        update_data = await self.fetch_release_info(url)
         tag_name = update_data[0]['tag_name']
         
         if self.compare_version(current_version, tag_name) >= 0:
@@ -98,22 +99,22 @@ class RepoZipUpdator():
             body=update_data[0]['body']
         )
         
-    def download_from_repo_url(self, target_path: str, repo_url: str):
+    async def download_from_repo_url(self, 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 = self.fetch_release_info(url=release_url)
+        releases = await self.fetch_release_info(url=release_url)
         if not releases:
             # download from the default branch directly. 
-            logger.warn(f"未在仓库 {author}/{repo} 中找到任何发布版本，将从默认分支下载。")
+            logger.warning(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")
+        await download_file(release_url, target_path + ".zip")
         
         
     def unzip_file(self, zip_path: str, target_dir: str):