perf: 优化更新速度和更新流程

perf: 改善日志

.github/workflows/docker-image.yml

@@ -0,0 +1,24 @@
+name: Docker Image CI/CD
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**/*.md'
+  workflow_dispatch:
+jobs:
+  publish-latest-docker-image:
+    runs-on: ubuntu-latest
+    name: Build and publish docker image
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build image
+        run: |
+          docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest .
+      - name: Publish image
+        run: |
+          docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
+          docker push ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest

.github/workflows/stale.yml

@@ -0,0 +1,27 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '21 23 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

.gitignore

@@ -1,3 +1,10 @@
 __pycache__
 botpy.log
 .vscode
+data.db
+configs/session
+configs/config.yaml
+**/.DS_Store
+temp
+cmd_config.json
+addons/plugins/

Dockerfile

@@ -0,0 +1,8 @@
+FROM python:3.10.13-bullseye
+WORKDIR /AstrBot
+
+COPY . /AstrBot/
+
+RUN python -m pip install -r requirements.txt
+
+CMD [ "python", "main.py" ]

README.md

@@ -1,37 +1,63 @@
+<p align="center">
+
+<img src="https://github.com/Soulter/AstrBot/assets/37870767/b1686114-f3aa-4963-b07f-28bf83dc0a10" alt="QQChannelChatGPT" width="200" />
+</p>
 <div align="center">
 
-<img src="https://socialify.git.ci/Soulter/QQChannelChatGPT/image?description=1&forks=1&issues=1&language=1&name=1&owner=1&pattern=Circuit%20Board&stargazers=1&theme=Light" alt="QQChannelChatGPT" width="600" height="300" />
+# AstrBot
 
-<!-- [![Language](https://img.shields.io/badge/language-python-green.svg?style=plastic)](https://www.python.org/)
-[![License](https://img.shields.io/badge/license-AGPL3-orange.svg?style=plastic)](https://github.com/Soulter/QQChannelChatGPT/blob/master/LICENSE)
-![Python](https://img.shields.io/badge/python-3.9+-blue) -->
- 
-基于go-cq和官方QQ频道SDK的机器人项目。支持ChatGPT、NewBing等大模型。一次部署，同时使用
-
-部署文档：https://github.com/Soulter/QQChannelChatGPT/wiki
- 
-插件文档：https://github.com/Soulter/QQChannelChatGPT/wiki/%E5%9B%9B%E3%80%81%E5%BC%80%E5%8F%91%E6%8F%92%E4%BB%B6
-
-欢迎体验 | **QQ群号：322154837**
-
-<!-- <img src="https://user-images.githubusercontent.com/37870767/230417115-9dd3c9d5-6b6b-4928-8fe3-82f559208aab.JPG" width="300"></img> -->
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/Soulter/AstrBot)](https://github.com/Soulter/AstrBot/releases/latest)
+<img src="https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/34412545-2e37-400f-bedc-42348713ac1f.svg" alt="wakatime">
+<img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="python">
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg"/></a>
+<a href="https://qm.qq.com/cgi-bin/qm/qr?k=EYGsuUTfe00_iOu9JTXS7_TEpMkXOvwv&jump_from=webapi&authKey=uUEMKCROfsseS+8IzqPjzV3y1tzy4AkykwTib2jNkOFdzezF9s9XknqnIaf3CDft">
+<img alt="Static Badge" src="https://img.shields.io/badge/QQ群-322154837-purple">
+</a>
+<img alt="Static Badge" src="https://img.shields.io/badge/频道-x42d56aki2-purple">
 
+<a href="https://astrbot.soulter.top/center">项目部署</a> ｜
+<a href="https://github.com/Soulter/QQChannelChatGPT/issues">问题提交</a> ｜
+<a href="https://astrbot.soulter.top/center/docs/%E5%BC%80%E5%8F%91/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91">插件开发（最少只需 25 行）</a>
 </div>
 
+## 🤔您可能想了解的
+- **如何部署？** [帮助文档](https://astrbot.soulter.top/center/docs/%E9%83%A8%E7%BD%B2/%E9%80%9A%E8%BF%87Docker%E9%83%A8%E7%BD%B2) (部署不成功欢迎进群捞人解决<3)
+- **go-cqhttp启动不成功、报登录失败？** [在这里搜索解决方法](https://github.com/Mrs4s/go-cqhttp/issues)
+- **程序闪退/机器人启动不成功？** [提交issue或加群反馈](https://github.com/Soulter/QQChannelChatGPT/issues)
+- **如何开启 ChatGPT、Claude、HuggingChat 等语言模型？** [查看帮助](https://astrbot.soulter.top/center/docs/%E4%BD%BF%E7%94%A8/%E5%A4%A7%E8%AF%AD%E8%A8%80%E6%A8%A1%E5%9E%8B)
+
 ## 🧩功能：
 
-近期新功能：
-- Markdown渲染支持：回复消息支持图片。
-- 支持插件。https://github.com/Soulter/QQChannelChatGPT/wiki/%E5%9B%9B%E3%80%81%E5%BC%80%E5%8F%91%E6%8F%92%E4%BB%B6
-- 热更新
-- 接入QQ，支持在QQ上和QQ频道上同时聊天！https://github.com/Soulter/QQChannelChatGPT/issues/82
-- Windows启动器。链接：https://github.com/Soulter/QQChatGPTLauncher/releases/latest
+✨ 最近功能：
+1. 可视化面板
+2. Docker 一键部署项目：[链接](https://astrbot.soulter.top/center/docs/%E9%83%A8%E7%BD%B2/%E9%80%9A%E8%BF%87Docker%E9%83%A8%E7%BD%B2)
+
+🌍支持的AI语言模型一览：
+
+**文字模型/图片理解**
+
+- OpenAI GPT-3（原生支持）
+- OpenAI GPT-3.5（原生支持）
+- OpenAI GPT-4（原生支持）
+- Claude（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
+- HuggingChat（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
+
+**图片生成**
+- OpenAI Dalle 接口
+- NovelAI/Naifu (免费，由[AIDraw插件](https://github.com/Soulter/aidraw)支持)
+
+🌍机器人支持的能力一览：
+- 可视化面板（beta）
+- 同时部署机器人到 QQ 和 QQ 频道
+- 大模型对话
+- 大模型网页搜索能力 **(目前仅支持OpenAI系模型，最新版本下使用 web on 指令打开)**
+- 插件（在QQ或QQ频道聊天框内输入 `plugin` 了解详情）
+- 回复文字图片渲染（以图片markdown格式回复，**大幅度降低被风控概率**，需手动在`cmd_config.json`内开启qq_pic_mode）
+- 人格设置
+- 关键词回复
+- 热更新（更新本项目时**仅需**在QQ或QQ频道聊天框内输入`update latest r`）
+- Windows一键部署 https://github.com/Soulter/QQChatGPTLauncher/releases/latest
 
-支持的AI语言模型（请在`configs/config.yaml`下配置）：
-- 逆向ChatGPT
-- 官方ChatGPT API
-- Bing
-- ...
 <!-- 
 ### 基本功能
 <details> 
@@ -97,17 +123,21 @@
 
 > 使用`plugin i 插件GitHub链接`即可安装。
 
-插件开发教程：https://github.com/Soulter/QQChannelChatGPT/wiki/%E5%9B%9B%E3%80%81%E5%BC%80%E5%8F%91%E6%8F%92%E4%BB%B6
-
-部分好用的插件：
-
-- `HuggingChat`: https://github.com/Soulter/HuggingChatForQQBot | HuggingChat模型接入
+部分插件：
 
+- `LLMS`: https://github.com/Soulter/llms | Claude, HuggingChat 大语言模型接入。
+ 
 - `GoodPlugins`: https://github.com/Soulter/goodplugins | 随机动漫图片、搜番、喜报生成器等等
 
 - `sysstat`: https://github.com/Soulter/sysstatqcbot | 查看系统状态
 
-- `BiliMonitor`: https://github.com/Soulter/BiliMonitor | 订阅B站动态！
+- `BiliMonitor`: https://github.com/Soulter/BiliMonitor | 订阅B站动态
+  
+- `liferestart`: https://github.com/Soulter/liferestart | 人生重开模拟器
+
+
+<img width="900" alt="image" src="https://github.com/Soulter/AstrBot/assets/37870767/824d1ff3-7b85-481c-b795-8e62dedb9fd7">
+
 
 <!-- 
 ### 指令
@@ -124,42 +154,16 @@
 - `/key` 动态添加key
 - `/set` 人格设置面板
 - `/keyword nihao 你好` 设置关键词回复。nihao->你好
-- `/bing` 切换为bing
 - `/revgpt` 切换为ChatGPT逆向库
 - `/画` 画画
 
-#### Bing语言模型
-- `/reset`重置prompt
-- `/gpt` 切换为OpenAI官方API
-- `/revgpt` 切换为ChatGPT逆向库
-
 #### 逆向ChatGPT库语言模型
 - `/gpt` 切换为OpenAI官方API
-- `/bing` 切换为bing
-
-* 切换模型指令支持临时回复。如`/bing 你好`将会临时使用一次bing模型 -->
-
-## 📰使用方法：
-
-使用文档：https://github.com/Soulter/QQChannelChatGPT/wiki
-
-**Windows用户可以使用启动器一键安装，请前往Release下载最新版本（Beta）**
-<!-- 
-### 安装第三方库
-
-```shell
-pip install -r requirements.txt
-```
-> ⚠Python版本应>=3.9
-
-### 配置
-
-**详细部署教程链接：**https://github.com/Soulter/QQChannelChatGPT/wiki
-
-### 启动
-- 启动main.py -->
 
+* 切换模型指令支持临时回复。如`/a 你好`将会临时使用一次bing模型 -->
+<!--
 ## 🙇‍感谢
+
 本项目使用了一下项目:
 
 [ChatGPT by acheong08](https://github.com/acheong08/ChatGPT)
@@ -168,151 +172,4 @@ pip install -r requirements.txt
 
 [go-cqhttp by Mrs4s](https://github.com/Mrs4s/go-cqhttp)
 
-[nakuru-project by Lxns-Network](https://github.com/Lxns-Network/nakuru-project)
-
-<!-- ## 👀部分演示截图
-
-帮助中心（`help`指令）
-![)F%2VQA`O)`4BHTXZ653(~9](https://github.com/Soulter/QQChannelChatGPT/assets/37870767/57eaa8c6-6962-4940-823c-2e26b5206cf5)
-
- -->
-## ⚙配置文件说明：
-```yaml
-# 如果你不知道怎么部署，请查看https://github.com/Soulter/QQChannelChatGPT/wiki
-# 不一定需要key了，如果你没有key但有openAI账号或者必应账号，可以考虑使用下面的逆向库
-
-
-###############平台设置#################
-
-# QQ频道机器人
-# QQ开放平台的appid和令牌
-# q.qq.com
-# enable为true则启用，false则不启用
-qqbot:
-  enable: true
-  appid: 
-  token: 
-
-# QQ机器人
-# enable为true则启用，false则不启用
-# 需要安装GO-CQHTTP配合使用。
-# 文档：https://docs.go-cqhttp.org/
-# 请将go-cqhttp的配置文件的sever部分粘贴为以下内容，否则无法使用
-# 请先启动go-cqhttp再启动本程序
-# 
-# servers:
-#   - http:
-#       host: 127.0.0.1
-#       version: 0
-#       port: 5700
-#       timeout: 5
-#   - ws:
-#       address: 127.0.0.1:6700
-#       middlewares:
-#         <<: *default
-gocqbot:
-  enable: false
-
-# 设置是否一个人一个会话
-uniqueSessionMode: false
-# QChannelBot 的版本，请勿修改此字段，否则可能产生一些bug
-version: 3.0
-# [Beta] 转储历史记录时间间隔(分钟)
-dump_history_interval: 10
-# 一个用户只能在time秒内发送count条消息
-limit:
-  time: 60
-  count: 5
-# 公告
-notice: "此机器人由Github项目QQChannelChatGPT驱动。"
-# 是否打开私信功能
-# 设置为true则频道成员可以私聊机器人。
-# 设置为false则频道成员不能私聊机器人。
-direct_message_mode: true
-
-# 系统代理
-# http_proxy: http://localhost:7890
-# https_proxy: http://localhost:7890
-
-# 自定义回复前缀，如[Rev]或其他，务必加引号以防止不必要的bug。
-reply_prefix:
-  openai_official: "[GPT]"
-  rev_chatgpt: "[Rev]"
-  rev_edgegpt: "[RevBing]"
-
-# 百度内容审核服务
-# 新用户免费5万次调用。https://cloud.baidu.com/doc/ANTIPORN/index.html
-baidu_aip:
-  enable: false
-  app_id: 
-  api_key: 
-  secret_key: 
-
-
-
-
-###############语言模型设置#################
-
-
-# OpenAI官方API
-# 注意：已支持多key自动切换，方法：
-# key:
-#   - sk-xxxxxx
-#   - sk-xxxxxx
-# 在下方非注释的地方使用以上格式
-# 关于api_base：可以使用一些云函数（如腾讯、阿里）来避免国内被墙的问题。
-# 详见：
-# https://github.com/Ice-Hazymoon/openai-scf-proxy
-# https://github.com/Soulter/QQChannelChatGPT/issues/42
-# 设置为none则表示使用官方默认api地址
-openai:
-  key: 
-    - 
-  api_base: none
-  # 这里是GPT配置，语言模型默认使用gpt-3.5-turbo
-  chatGPTConfigs:
-    model: gpt-3.5-turbo
-    max_tokens: 3000
-    temperature: 0.9
-    top_p: 1
-    frequency_penalty: 0
-    presence_penalty: 0
-    
-  total_tokens_limit: 5000
-
-# 逆向文心一言【暂时不可用，请勿使用】
-rev_ernie:
-  enable: false
-
-# 逆向New Bing
-# 需要在项目根目录下创建cookies.json并粘贴cookies进去。
-# 详见：https://soulter.top/posts/qpdg.html
-rev_edgegpt:
-  enable: false
-
-# 逆向ChatGPT库
-# https://github.com/acheong08/ChatGPT
-# 优点：免费（无免费额度限制）；
-# 缺点：速度相对慢。OpenAI 速率限制：免费帐户每小时 50 个请求。您可以通过多帐户循环来绕过它
-# enable设置为true后，将会停止使用上面正常的官方API调用而使用本逆向项目
-#
-# 多账户可以保证每个请求都能得到及时的回复。
-# 关于account的格式
-# account:
-#   - email: 第1个账户
-#     password: 第1个账户密码
-#   - email: 第2个账户
-#     password: 第2个账户密码
-#   - ....
-# 支持使用access_token登录
-# 例：
-# - session_token: xxxxx
-# - access_token: xxxx
-# 请严格按照上面这个格式填写。
-# 逆向ChatGPT库的email-password登录方式不工作，建议使用access_token登录
-# 获取access_token的方法，详见：https://soulter.top/posts/qpdg.html
-rev_ChatGPT:
-  enable: false
-  account:
-    - access_token: 
-```
+[nakuru-project by Lxns-Network](https://github.com/Lxns-Network/nakuru-project) -->

addons/dashboard/dist/_redirects

@@ -0,0 +1 @@
+/*    /index.html   200

addons/dashboard/dist/assets/BaseBreadcrumb-4d676ba5.css

@@ -0,0 +1 @@
+.page-breadcrumb .v-toolbar{background:transparent}

addons/dashboard/dist/assets/BaseBreadcrumb.vue_vue_type_style_index_0_lang-79f7dd1a.js

@@ -0,0 +1 @@
+import{x as i,o as l,c as _,w as s,a as e,f as a,J as m,V as r,b as t,t as u,ab as p,B as n,ac as o,j as f}from"./index-70ea897e.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 c=d;return(x,B)=>(l(),_(r,{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(r,{"no-gutters":"",class:"align-center"},{default:s(()=>[e(a,{md:"5"},{default:s(()=>[t("h3",b,u(c.title),1)]),_:1}),e(a,{md:"7",sm:"12",cols:"12"},{default:s(()=>[e(p,{items:c.breadcrumbs,class:"text-h5 justify-md-end pa-1"},{divider:s(()=>[t("div",h,[e(n(o),{size:"17"})])]),prepend:s(()=>[e(f,{size:"small",icon:"mdi-home",class:"text-secondary mr-2"}),t("div",g,[e(n(o),{size:"17"})])]),_:1},8,["items"])]),_:1})]),_:1})]),_:1})]),_:1})]),_:1}))}});export{V as _};

addons/dashboard/dist/assets/BlankLayout-4f378b43.js

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

addons/dashboard/dist/assets/ColorPage-8c6eccaf.js

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

addons/dashboard/dist/assets/ConfigPage-30efc2f6.js

@@ -0,0 +1 @@
+import{_ as h}from"./UiParentCard.vue_vue_type_script_setup_true_lang-13601505.js";import{o as a,s as t,a as n,w as i,f as b,F as d,u as g,V as C,d as U,e as x,t as c,a8 as B,R as _,c as r,a9 as w,O as v,b as V,aa as N,i as F,q as P,k as f,A as S}from"./index-70ea897e.js";const D={name:"ConfigPage",components:{UiParentCard:h},data(){return{config_data:{data:[]},save_message_snack:!1,save_message:"",save_message_success:""}},mounted(){this.getConfig()},methods:{getConfig(){_.get("/api/configs").then(o=>{this.config_data=o.data.data,console.log(this.config_data)})},updateConfig(){_.post("/api/configs",this.config_data).then(o=>{console.log(this.config_data),o.data.status==="success"?(this.save_message=o.data.message,this.save_message_snack=!0,this.save_message_success="success"):(this.save_message=o.data.message,this.save_message_snack=!0,this.save_message_success="error")})}}},$=Object.assign(D,{setup(o){return(s,m)=>(a(),t(d,null,[n(C,null,{default:i(()=>[n(b,{cols:"12",md:"12"},{default:i(()=>[(a(!0),t(d,null,g(s.config_data.data,u=>(a(),r(h,{key:u.name,title:u.name,style:{"margin-bottom":"16px"}},{default:i(()=>[(a(!0),t(d,null,g(u.body,e=>(a(),t(d,null,[e.config_type==="item"?(a(),t(d,{key:0},[e.val_type==="bool"?(a(),r(w,{key:0,modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,label:e.name,hint:e.description,color:"primary",inset:""},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="string"?(a(),r(v,{key:1,modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="int"?(a(),r(v,{key:2,modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="list"?(a(),t(d,{key:3},[V("span",null,c(e.name),1),n(N,{modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,chips:"",clearable:"",label:"请添加",multiple:"","prepend-icon":"mdi-tag-multiple-outline"},{selection:i(({attrs:l,item:p,select:k,selected:y})=>[n(F,P(l,{"model-value":y,closable:"",onClick:k,"onClick:close":O=>s.remove(p)}),{default:i(()=>[V("strong",null,c(p),1)]),_:2},1040,["model-value","onClick","onClick:close"])]),_:2},1032,["modelValue","onUpdate:modelValue"])],64)):f("",!0)],64)):e.config_type==="divider"?(a(),r(S,{key:1,style:{"margin-top":"8px","margin-bottom":"8px"}})):f("",!0)],64))),256))]),_:2},1032,["title"]))),128))]),_:1})]),_:1}),n(U,{icon:"mdi-content-save",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary",onClick:s.updateConfig},null,8,["onClick"]),n(B,{timeout:2e3,elevation:"24",color:s.save_message_success,modelValue:s.save_message_snack,"onUpdate:modelValue":m[0]||(m[0]=u=>s.save_message_snack=u)},{default:i(()=>[x(c(s.save_message),1)]),_:1},8,["color","modelValue"])],64))}});export{$ as default};

addons/dashboard/dist/assets/ConsolePage-ff373be6.css

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */.xterm{cursor:text;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:5}.xterm .xterm-helper-textarea{padding:0;border:0;margin:0;position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-5;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#fff;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;right:0;left:0;top:0;bottom:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm.xterm-cursor-pointer,.xterm .xterm-cursor-pointer{cursor:pointer}.xterm.column-select.focus{cursor:crosshair}.xterm .xterm-accessibility,.xterm .xterm-message{position:absolute;left:0;top:0;bottom:0;right:0;z-index:10;color:transparent;pointer-events:none}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-dim{opacity:1!important}.xterm-underline-1{text-decoration:underline}.xterm-underline-2{text-decoration:double underline}.xterm-underline-3{text-decoration:wavy underline}.xterm-underline-4{text-decoration:dotted underline}.xterm-underline-5{text-decoration:dashed underline}.xterm-overline{text-decoration:overline}.xterm-overline.xterm-underline-1{text-decoration:overline underline}.xterm-overline.xterm-underline-2{text-decoration:overline double underline}.xterm-overline.xterm-underline-3{text-decoration:overline wavy underline}.xterm-overline.xterm-underline-4{text-decoration:overline dotted underline}.xterm-overline.xterm-underline-5{text-decoration:overline dashed underline}.xterm-strikethrough{text-decoration:line-through}.xterm-screen .xterm-decoration-container .xterm-decoration{z-index:6;position:absolute}.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer{z-index:7}.xterm-decoration-overview-ruler{z-index:8;position:absolute;top:0;right:0;pointer-events:none}.xterm-decoration-top{z-index:2;position:relative}

addons/dashboard/dist/assets/Error404Page-0951219d.js

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

addons/dashboard/dist/assets/Error404Page-11cf087a.css

@@ -0,0 +1 @@
+.CardMediaWrapper{max-width:720px;margin:0 auto;position:relative}.CardMediaBuild{position:absolute;top:0;left:0;width:100%;animation:5s bounce ease-in-out infinite}.CardMediaParts{position:absolute;top:0;left:0;width:100%;animation:10s blink ease-in-out infinite}

addons/dashboard/dist/assets/ExtensionPage-de80b39d.js

@@ -0,0 +1 @@
+import{x as b,o as d,c as h,w as e,a,a6 as C,b as i,K as x,e as o,t as u,G as m,d as r,A as E,L as V,a7 as y,J as w,s as p,f as c,F as f,u as $,V as k,q as S,N as B,O as N,P as T,H as j,a8 as D,R as g,j as F}from"./index-70ea897e.js";const G={class:"d-sm-flex align-center justify-space-between"},v=b({__name:"ExtensionCard",props:{title:String,link:String},setup(n){const s=n,l=t=>{window.open(t,"_blank")};return(t,_)=>(d(),h(w,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(C,{style:{padding:"10px 20px"}},{default:e(()=>[i("div",G,[a(x,null,{default:e(()=>[o(u(s.title),1)]),_:1}),a(m),a(r,{icon:"mdi-link",variant:"plain",onClick:_[0]||(_[0]=z=>l(s.link))})])]),_:1}),a(E),a(V,null,{default:e(()=>[y(t.$slots,"default")]),_:3})]),_:3}))}}),P=i("div",{style:{"background-color":"white",width:"100%",padding:"16px","border-radius":"10px"}},[i("h3",null,"🧩 已安装的插件")],-1),U={style:{"min-height":"180px","max-height":"180px",overflow:"hidden"}},q={class:"d-flex align-center gap-3"},A=i("div",{style:{"background-color":"white",width:"100%",padding:"16px","border-radius":"10px"}},[i("h3",null,"🧩 插件市场 [待开发]")],-1),I=i("span",{class:"text-h5"},"从 Git 仓库链接安装插件",-1),L=i("small",null,"github, gitee, gitlab 等公开的仓库都行。",-1),O=i("br",null,null,-1),R={name:"ExtensionPage",components:{ExtensionCard:v},data(){return{extension_data:{data:[]},save_message_snack:!1,save_message:"",save_message_success:"",extension_url:"",status:"",dialog:!1,snack_message:"",snack_show:!1,snack_success:"success",install_loading:!1,uninstall_loading:!1}},mounted(){this.getExtensions()},methods:{getExtensions(){g.get("/api/extensions").then(n=>{this.extension_data.data=n.data.data,console.log(this.extension_data)})},newExtension(){this.install_loading=!0,console.log(this.install_loading),g.post("/api/extensions/install",{url:this.extension_url}).then(n=>{if(this.install_loading=!1,n.data.status==="error"){this.snack_message=n.data.message,this.snack_show=!0,this.snack_success="error";return}this.extension_data.data=n.data.data,console.log(this.extension_data),this.extension_url="",this.snack_message=n.data.message,this.snack_show=!0,this.snack_success="success",this.dialog=!1,this.getExtensions()}).catch(n=>{this.install_loading=!1,this.snack_message=n,this.snack_show=!0,this.snack_success="error"})},uninstallExtension(n){this.uninstall_loading=!0,g.post("/api/extensions/uninstall",{name:n}).then(s=>{if(this.uninstall_loading=!1,s.data.status==="error"){this.snack_message=s.data.message,this.snack_show=!0,this.snack_success="error";return}this.extension_data.data=s.data.data,console.log(this.extension_data),this.snack_message=s.data.message,this.snack_show=!0,this.snack_success="success",this.dialog=!1,this.getExtensions()}).catch(s=>{this.uninstall_loading=!1,this.snack_message=s,this.snack_show=!0,this.snack_success="error"})}}},J=Object.assign(R,{setup(n){return(s,l)=>(d(),p(f,null,[a(k,null,{default:e(()=>[a(c,{cols:"12",md:"12"},{default:e(()=>[P]),_:1}),(d(!0),p(f,null,$(s.extension_data.data,t=>(d(),h(c,{cols:"12",md:"6",lg:"4"},{default:e(()=>[(d(),h(v,{key:t.name,title:t.name,link:t.repo,style:{"margin-bottom":"16px"}},{default:e(()=>[i("p",U,u(t.desc),1),i("div",q,[a(F,null,{default:e(()=>[o("mdi-account")]),_:1}),i("span",null,u(t.author),1),a(m),a(r,{variant:"plain",onClick:_=>s.uninstallExtension(t.name),loading:s.uninstall_loading},{default:e(()=>[o("卸 载")]),_:2},1032,["onClick","loading"])])]),_:2},1032,["title","link"]))]),_:2},1024))),256)),a(c,{cols:"12",md:"12"},{default:e(()=>[A]),_:1})]),_:1}),a(j,{modelValue:s.dialog,"onUpdate:modelValue":l[3]||(l[3]=t=>s.dialog=t),persistent:"",width:"700"},{activator:e(({props:t})=>[a(r,S(t,{icon:"mdi-plus",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary"}),null,16)]),default:e(()=>[a(w,null,{default:e(()=>[a(x,null,{default:e(()=>[I]),_:1}),a(V,null,{default:e(()=>[a(B,null,{default:e(()=>[a(k,null,{default:e(()=>[a(c,{cols:"12"},{default:e(()=>[a(N,{label:"Git 库链接",modelValue:s.extension_url,"onUpdate:modelValue":l[0]||(l[0]=t=>s.extension_url=t),required:""},null,8,["modelValue"])]),_:1})]),_:1})]),_:1}),L,O,i("small",null,u(s.status),1)]),_:1}),a(T,null,{default:e(()=>[a(m),a(r,{color:"blue-darken-1",variant:"text",onClick:l[1]||(l[1]=t=>s.dialog=!1)},{default:e(()=>[o(" 关闭 ")]),_:1}),a(r,{color:"blue-darken-1",variant:"text",loading:s.install_loading,onClick:l[2]||(l[2]=t=>s.newExtension(s.extension_url))},{default:e(()=>[o(" 安装 ")]),_:1},8,["loading"])]),_:1})]),_:1})]),_:1},8,["modelValue"]),a(D,{timeout:2e3,elevation:"24",color:s.snack_success,modelValue:s.snack_show,"onUpdate:modelValue":l[4]||(l[4]=t=>s.snack_show=t)},{default:e(()=>[o(u(s.snack_message),1)]),_:1},8,["color","modelValue"])],64))}});export{J as default};

addons/dashboard/dist/assets/LoginPage-74e85ca7.css

@@ -0,0 +1 @@
+.custom-devider{border-color:#00000014!important}.googleBtn{border-color:#00000014;margin:30px 0 20px}.outlinedInput .v-field{border:1px solid rgba(0,0,0,.08);box-shadow:none}.orbtn{padding:2px 40px;border-color:#00000014;margin:20px 15px}.pwdInput{position:relative}.pwdInput .v-input__append{position:absolute;right:10px;top:50%;transform:translateY(-50%)}.loginForm .v-text-field .v-field--active input{font-weight:500}.loginBox{max-width:475px;margin:0 auto}

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

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

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

@@ -0,0 +1 @@
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-79f7dd1a.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-13601505.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-70ea897e.js";const p=["innerHTML"],v=n({__name:"MaterialIcons",setup(b){const s=a({title:"Material Icons"}),r=a('<iframe src="https://materialdesignicons.com/" frameborder="0"  width="100%" height="1000"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Material Icons",disabled:!0,href:"#"}]);return(h,M)=>(c(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(i,{title:"Material Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,p)]),_:1})]),_:1})]),_:1})],64))}});export{v as default};

addons/dashboard/dist/assets/RegisterPage-799ed804.css

@@ -0,0 +1 @@
+.custom-devider{border-color:#00000014!important}.googleBtn{border-color:#00000014;margin:30px 0 20px}.outlinedInput .v-field{border:1px solid rgba(0,0,0,.08);box-shadow:none}.orbtn{padding:2px 40px;border-color:#00000014;margin:20px 15px}.pwdInput{position:relative}.pwdInput .v-input__append{position:absolute;right:10px;top:50%;transform:translateY(-50%)}.loginBox{max-width:475px;margin:0 auto}

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

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

addons/dashboard/dist/assets/ShadowPage-00585b3f.js

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

addons/dashboard/dist/assets/TablerIcons-28b82875.js

@@ -0,0 +1 @@
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-79f7dd1a.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-13601505.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-70ea897e.js";const b=["innerHTML"],w=c({__name:"TablerIcons",setup(p){const s=a({title:"Tabler Icons"}),r=a('<iframe src="https://tablericons.com/" frameborder="0"  width="100%" height="600"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Tabler Icons",disabled:!0,href:"#"}]);return(h,T)=>(i(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(n,{title:"Tabler Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,b)]),_:1})]),_:1})]),_:1})],64))}});export{w as default};

addons/dashboard/dist/assets/TypographyPage-6333374a.js

@@ -0,0 +1 @@
+import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-79f7dd1a.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-13601505.js";import{x as f,o as i,c as g,w as e,a,a6 as y,K as b,e as w,t as d,A as C,L as V,a7 as L,J as _,D as o,s as h,f as k,b as t,F as x,u as B,U as H,V as T}from"./index-70ea897e.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"},U=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),$=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),M=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),A=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(O,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(()=>[U]),_:1}),a(s,{title:"Decoration",class:"mt-8"},{default:e(()=>[$]),_:1}),a(s,{title:"Opacity",class:"mt-8"},{default:e(()=>[M]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{A as default};

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

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

addons/dashboard/dist/assets/_plugin-vue_export-helper-c27b6911.js

@@ -0,0 +1 @@
+const s=(t,r)=>{const o=t.__vccOpts||t;for(const[c,e]of r)o[c]=e;return o};export{s as _};

addons/dashboard/dist/assets/img-error-bg-ab6474a0.svg

@@ -0,0 +1,34 @@
+<svg width="676" height="391" viewBox="0 0 676 391" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.09">
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 4.49127 197.53)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 342.315 387.578)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 28.0057 211.105)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 365.829 374.002)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 51.52 224.68)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 389.344 360.428)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 75.0345 238.255)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 412.858 346.852)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 98.5488 251.83)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 436.372 333.277)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 122.063 265.405)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 459.887 319.703)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 145.578 278.979)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 483.401 306.127)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 169.092 292.556)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 506.916 292.551)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 192.597 306.127)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 530.43 278.977)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 216.111 319.703)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 553.944 265.402)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 239.626 333.277)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 577.459 251.827)" stroke="black"/>
+<path d="M263.231 346.905L601.064 151.871" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 600.973 238.252)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 286.654 360.428)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 624.487 224.677)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 310.169 374.002)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 648.002 211.102)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(0.866041 -0.499972 -0.866041 -0.499972 333.683 387.578)" stroke="black"/>
+<line y1="-0.5" x2="390.089" y2="-0.5" transform="matrix(-0.866041 -0.499972 -0.866041 0.499972 671.516 197.527)" stroke="black"/>
+</g>
+</svg>

addons/dashboard/dist/assets/img-error-blue-2675a7a9.svg

@@ -0,0 +1,43 @@
+<svg width="676" height="395" viewBox="0 0 676 395" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="26.998" height="26.8293" transform="matrix(0.866041 -0.499972 0.866041 0.499972 361.873 290.126)" fill="#E3F2FD"/>
+<rect width="24.2748" height="24.1231" transform="matrix(0.866041 -0.499972 0.866041 0.499972 364.249 291.115)" fill="#90CAF9"/>
+<rect width="26.998" height="26.8293" transform="matrix(0.866041 -0.499972 0.866041 0.499972 291.67 86.4912)" fill="#E3F2FD"/>
+<rect width="24.2748" height="24.1231" transform="matrix(0.866041 -0.499972 0.866041 0.499972 294.046 87.48)" fill="#90CAF9"/>
+<g filter="url(#filter0_d)">
+<path d="M370.694 211.828L365.394 208.768V215.835L365.404 215.829C365.459 216.281 365.785 216.724 366.383 217.069L417.03 246.308C418.347 247.068 420.481 247.068 421.798 246.308L468.671 219.248C469.374 218.842 469.702 218.301 469.654 217.77V210.861L464.282 213.962L418.024 187.257C416.708 186.497 414.573 186.497 413.257 187.257L370.694 211.828Z" fill="url(#paint0_linear)"/>
+</g>
+<rect width="59.6284" height="63.9858" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 364 208.812)" fill="#90CAF9"/>
+<rect width="59.6284" height="63.9858" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 364 208.812)" fill="url(#paint1_linear)"/>
+<rect width="56.6816" height="60.8238" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 366.645 208.761)" fill="url(#paint2_linear)"/>
+<path d="M421.238 206.161C421.238 206.434 421.62 206.655 422.092 206.655L432.159 206.656C435.164 206.656 437.6 208.063 437.601 209.798C437.602 211.533 435.166 212.939 432.162 212.938L422.09 212.937C421.62 212.937 421.24 213.157 421.24 213.428L421.241 215.814C421.241 216.087 421.624 216.308 422.096 216.308L432.689 216.309C438.917 216.31 443.967 213.395 443.965 209.799C443.964 206.202 438.914 203.286 432.684 203.286L422.086 203.284C421.617 203.284 421.236 203.504 421.237 203.775L421.238 206.161Z" fill="#1E88E5"/>
+<path d="M413.422 213.43C413.422 213.157 413.039 212.936 412.567 212.936L402.896 212.935C399.891 212.935 397.455 211.528 397.454 209.793C397.453 208.059 399.889 206.652 402.894 206.653L412.57 206.654C413.039 206.654 413.419 206.435 413.419 206.164L413.418 203.777C413.418 203.504 413.035 203.283 412.563 203.283L402.366 203.282C396.138 203.281 391.089 206.197 391.09 209.793C391.091 213.389 396.141 216.305 402.371 216.306L412.573 216.307C413.042 216.307 413.423 216.088 413.423 215.817L413.422 213.43Z" fill="#1E88E5"/>
+<path d="M407.999 198.145L411.211 201.235C411.266 201.288 411.332 201.336 411.405 201.379C411.813 201.614 412.461 201.669 412.979 201.49C413.59 201.278 413.787 200.821 413.421 200.469L410.209 197.379C409.843 197.027 409.051 196.913 408.441 197.124C407.831 197.335 407.633 197.793 407.999 198.145Z" fill="#1E88E5"/>
+<path d="M416.235 200.853C416.235 201.058 416.38 201.244 416.613 201.379C416.846 201.513 417.168 201.597 417.524 201.597C418.236 201.596 418.813 201.263 418.813 200.852L418.812 197.021C418.811 196.61 418.234 196.277 417.522 196.277C416.811 196.278 416.234 196.611 416.234 197.022L416.235 200.853Z" fill="#1E88E5"/>
+<path d="M421.627 200.47C421.317 200.769 421.412 201.143 421.82 201.379C421.893 201.421 421.977 201.459 422.069 201.491C422.68 201.703 423.472 201.588 423.838 201.236L427.047 198.147C427.413 197.794 427.215 197.337 426.605 197.126C425.994 196.915 425.203 197.029 424.836 197.381L421.627 200.47Z" fill="#1E88E5"/>
+<path d="M427.056 221.447L423.844 218.357C423.478 218.005 422.686 217.891 422.076 218.102C421.466 218.314 421.268 218.771 421.634 219.123L424.846 222.213C424.901 222.266 424.967 222.314 425.04 222.357C425.448 222.592 426.097 222.647 426.614 222.468C427.225 222.257 427.423 221.799 427.056 221.447Z" fill="#1E88E5"/>
+<path d="M418.82 218.739C418.82 218.328 418.243 217.995 417.531 217.995C416.819 217.995 416.242 218.329 416.242 218.74L416.243 222.57C416.244 222.776 416.388 222.962 416.621 223.096C416.854 223.231 417.177 223.314 417.533 223.314C418.245 223.314 418.822 222.981 418.821 222.57L418.82 218.739Z" fill="#1E88E5"/>
+<path d="M413.428 219.122C413.794 218.77 413.596 218.312 412.986 218.101C412.375 217.89 411.584 218.004 411.217 218.356L408.008 221.445C407.698 221.744 407.793 222.118 408.201 222.354C408.274 222.396 408.358 222.434 408.45 222.466C409.061 222.678 409.853 222.563 410.219 222.211L413.428 219.122Z" fill="#1E88E5"/>
+<defs>
+<filter id="filter0_d" x="301.394" y="186.687" width="232.264" height="208.191" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="84"/>
+<feGaussianBlur stdDeviation="32"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.129412 0 0 0 0 0.588235 0 0 0 0 0.952941 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear" x1="417.526" y1="205.789" x2="365.394" y2="216.782" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2196F3"/>
+<stop offset="1" stop-color="#B1DCFF"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="0.503035" y1="2.68177" x2="20.3032" y2="42.2842" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FAFAFA" stop-opacity="0.74"/>
+<stop offset="1" stop-color="#91CBFA"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="-18.5494" y1="-44.8799" x2="14.7845" y2="40.5766" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FAFAFA" stop-opacity="0.74"/>
+<stop offset="1" stop-color="#91CBFA"/>
+</linearGradient>
+</defs>
+</svg>

addons/dashboard/dist/assets/img-error-purple-edee3fbc.svg

@@ -0,0 +1,42 @@
+<svg width="710" height="391" viewBox="0 0 710 391" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="26.9258" height="26.7576" transform="matrix(0.866041 -0.499972 0.866041 0.499972 161.088 154.333)" fill="#EDE7F6"/>
+<rect width="24.9267" height="24.7709" transform="matrix(0.866041 -0.499972 0.866041 0.499972 162.809 155.327)" fill="#B39DDB"/>
+<rect width="26.9258" height="26.7576" transform="matrix(0.866041 -0.499972 0.866041 0.499972 536.744 181.299)" fill="#EDE7F6"/>
+<rect width="24.9267" height="24.7709" transform="matrix(0.866041 -0.499972 0.866041 0.499972 538.465 182.292)" fill="#B39DDB"/>
+<g filter="url(#filter0_d)">
+<path d="M67.7237 137.573V134.673H64.009V140.824L64.0177 140.829C64.0367 141.477 64.4743 142.121 65.3305 142.615L103.641 164.733C105.393 165.744 108.232 165.744 109.983 164.733L204.044 110.431C204.879 109.949 205.316 109.324 205.355 108.693L205.355 108.692V108.68C205.358 108.628 205.358 108.576 205.355 108.523L205.362 102.335L200.065 104.472L165.733 84.6523C163.982 83.6413 161.142 83.6413 159.391 84.6523L67.7237 137.573Z" fill="url(#paint0_linear)"/>
+</g>
+<rect width="115.933" height="51.5596" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 62.1588 134.683)" fill="#673AB7"/>
+<rect width="115.933" height="51.5596" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 62.1588 134.683)" fill="url(#paint1_linear)" fill-opacity="0.3"/>
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="64" y="78" width="141" height="81">
+<rect width="115.933" height="51.5596" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 62.1588 134.683)" fill="#673AB7"/>
+</mask>
+<g mask="url(#mask0)">
+</g>
+<mask id="mask1" mask-type="alpha" maskUnits="userSpaceOnUse" x="64" y="78" width="141" height="81">
+<rect width="115.933" height="51.5596" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 62.1588 134.683)" fill="#673AB7"/>
+</mask>
+<g mask="url(#mask1)">
+<rect width="64.3732" height="64.3732" rx="5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 111.303 81.6006)" fill="#5E35B1"/>
+<rect opacity="0.7" x="0.866041" width="63.3732" height="63.3732" rx="4.5" transform="matrix(0.866041 -0.499972 0.866041 0.499972 79.1848 87.8305)" stroke="#5E35B1"/>
+</g>
+<defs>
+<filter id="filter0_d" x="0.0090332" y="83.894" width="269.353" height="229.597" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="84"/>
+<feGaussianBlur stdDeviation="32"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.403922 0 0 0 0 0.227451 0 0 0 0 0.717647 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear" x1="200.346" y1="102.359" x2="71.0293" y2="158.071" gradientUnits="userSpaceOnUse">
+<stop stop-color="#A491C8"/>
+<stop offset="1" stop-color="#D7C5F8"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="8.1531" y1="-0.145767" x2="57.1962" y2="72.3003" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>

addons/dashboard/dist/assets/img-error-text-a6aebfa0.svg

@@ -0,0 +1,27 @@
+<svg width="676" height="391" viewBox="0 0 676 391" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M267.744 237.142L279.699 230.24L300.636 242.329L288.682 249.231L313.566 263.598L286.344 279.314L261.46 264.947L215.984 291.203L197.779 282.558L169.334 211.758L169.092 211.618L196.313 195.902L267.744 237.142ZM219.359 265.077L240.523 252.859L204.445 232.029L205.487 234.589L219.359 265.077Z" fill="#FFAB91"/>
+<path d="M469.959 120.206L481.913 113.304L502.851 125.392L490.897 132.294L515.78 146.661L488.559 162.377L463.675 148.011L418.199 174.266L399.994 165.621L371.548 94.8211L371.307 94.6816L398.528 78.9654L469.959 120.206ZM421.574 148.141L442.737 135.922L406.66 115.093L407.701 117.653L421.574 148.141Z" fill="#FFAB91"/>
+<path d="M204.523 235.027V232.237L219.401 265.014L240.555 252.926V255.018L218.936 267.339L204.523 235.027Z" fill="#D84315"/>
+<path d="M406.738 118.09V115.301L421.616 148.078L442.77 135.99V138.082L421.151 150.402L406.738 118.09Z" fill="#D84315"/>
+<rect width="109.114" height="136.405" transform="matrix(0.866025 -0.5 0.866025 0.5 220.507 181.925)" fill="url(#paint0_linear)"/>
+<rect width="40.2357" height="70.0545" transform="matrix(0.866025 -0.5 0.866025 0.5 280.437 201.886)" fill="url(#paint1_linear)"/>
+<rect x="25.1147" width="80.1144" height="107.405" transform="matrix(0.866025 -0.5 0.866025 0.5 223.872 194.482)" stroke="#1565C0" stroke-width="29"/>
+<rect x="25.1147" width="80.1144" height="107.405" transform="matrix(0.866025 -0.5 0.866025 0.5 223.872 194.482)" stroke="url(#paint2_linear)" stroke-width="29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M279.517 230.177L267.662 237.15L196.064 195.772L168.866 211.58L169.331 212.097L170.096 214.002L196.436 198.795L267.866 240.035L279.821 233.133L298.211 243.751L300.787 242.265L279.517 230.177ZM291.278 250.695L288.804 252.124L311.1 264.996L313.805 263.418L291.278 250.695Z" fill="#D84315"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M481.732 113.24L469.877 120.214L398.279 78.8359L371.081 94.6433L371.546 95.1603L372.311 97.0652L398.651 81.8581L470.081 123.099L482.036 116.196L500.426 126.814L503.002 125.328L481.732 113.24ZM493.493 133.759L491.019 135.187L513.315 148.06L516.02 146.482L493.493 133.759Z" fill="#D84315"/>
+<path d="M288.674 252.229V249.207L291.929 251.067L288.674 252.229Z" fill="#D84315"/>
+<defs>
+<linearGradient id="paint0_linear" x1="77.7511" y1="139.902" x2="-10.8629" y2="8.75671" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3076C8"/>
+<stop offset="0.992076" stop-color="#91CBFA"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="25.8162" y1="51.0447" x2="68.7073" y2="-5.41524" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2E75C7"/>
+<stop offset="1" stop-color="#4283CC"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="-16.1224" y1="-47.972" x2="123.494" y2="290.853" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>

addons/dashboard/dist/assets/social-google-a359a253.svg

@@ -0,0 +1,6 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.06129 13.2253L4.31871 15.9975L1.60458 16.0549C0.793457 14.5504 0.333374 12.8292 0.333374 11C0.333374 9.23119 0.763541 7.56319 1.52604 6.09448H1.52662L3.94296 6.53748L5.00146 8.93932C4.77992 9.58519 4.65917 10.2785 4.65917 11C4.65925 11.783 4.80108 12.5332 5.06129 13.2253Z" fill="#FBBB00"/>
+<path d="M21.4804 9.00732C21.6029 9.65257 21.6668 10.3189 21.6668 11C21.6668 11.7637 21.5865 12.5086 21.4335 13.2271C20.9143 15.6722 19.5575 17.8073 17.678 19.3182L17.6774 19.3177L14.6339 19.1624L14.2031 16.4734C15.4503 15.742 16.425 14.5974 16.9384 13.2271H11.2346V9.00732H17.0216H21.4804Z" fill="#518EF8"/>
+<path d="M17.6772 19.3176L17.6777 19.3182C15.8498 20.7875 13.5277 21.6666 11 21.6666C6.93783 21.6666 3.40612 19.3962 1.60449 16.0549L5.0612 13.2253C5.96199 15.6294 8.28112 17.3408 11 17.3408C12.1686 17.3408 13.2634 17.0249 14.2029 16.4734L17.6772 19.3176Z" fill="#28B446"/>
+<path d="M17.8085 2.78892L14.353 5.61792C13.3807 5.01017 12.2313 4.65908 11 4.65908C8.21963 4.65908 5.85713 6.44896 5.00146 8.93925L1.52658 6.09442H1.526C3.30125 2.67171 6.8775 0.333252 11 0.333252C13.5881 0.333252 15.9612 1.25517 17.8085 2.78892Z" fill="#F14336"/>
+</svg>

addons/dashboard/dist/favicon.svg

@@ -0,0 +1 @@
+<svg t="1702013028016" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1541" width="200" height="200"><path d="M0 0m204.8 0l614.4 0q204.8 0 204.8 204.8l0 614.4q0 204.8-204.8 204.8l-614.4 0q-204.8 0-204.8-204.8l0-614.4q0-204.8 204.8-204.8Z" fill="#FFEC9C" p-id="1542"></path><path d="M819.2 0H534.272A756.48 756.48 0 0 0 0 483.584V819.2a204.8 204.8 0 0 0 204.8 204.8h614.4a204.8 204.8 0 0 0 204.8-204.8V204.8a204.8 204.8 0 0 0-204.8-204.8z" fill="#FFE98A" p-id="1543"></path><path d="M819.2 0h-3.84a755.2 755.2 0 0 0-539.392 1024H819.2a204.8 204.8 0 0 0 204.8-204.8V204.8a204.8 204.8 0 0 0-204.8-204.8z" fill="#FFE471" p-id="1544"></path><path d="M497.152 721.152A752.384 752.384 0 0 0 560.384 1024H819.2a204.8 204.8 0 0 0 204.8-204.8V204.8a204.8 204.8 0 0 0-89.088-168.96 755.2 755.2 0 0 0-437.76 685.312z" fill="#FFE161" p-id="1545"></path><path d="M526.08 140.032l98.304 199.168L844.8 371.2a15.616 15.616 0 0 1 8.704 25.6l-159.744 156.16 37.632 219.136a15.616 15.616 0 0 1-22.528 16.384l-196.608-102.4-196.608 102.4a15.616 15.616 0 0 1-22.528-16.384l37.12-219.136-159.232-155.136a15.616 15.616 0 0 1 8.704-25.6l219.904-32 98.304-199.168a15.616 15.616 0 0 1 28.16-1.024z" fill="#FFF5CC" p-id="1546"></path><path d="M665.6 409.6a444.16 444.16 0 0 0 25.6-61.44l-65.536-9.472-99.584-198.656a15.616 15.616 0 0 0-27.904 0l-98.304 199.168L179.2 371.2a15.616 15.616 0 0 0-8.704 25.6l159.744 156.16-15.104 87.04A407.808 407.808 0 0 0 665.6 409.6z" fill="#FFFFFF" p-id="1547"></path></svg>

addons/dashboard/dist/index.html

@@ -0,0 +1,21 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="keywords" content="AstrBot Soulter" />
+    <meta name="description" content="AstrBot Dashboard" />
+    <link
+      rel="stylesheet"
+      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-70ea897e.js"></script>
+    <link rel="stylesheet" href="/assets/index-0f1523f3.css">
+  </head>
+  <body>
+    <div id="app"></div>
+    
+  </body>
+</html>

addons/dashboard/helper.py

@@ -0,0 +1,581 @@
+from addons.dashboard.server import AstrBotDashBoard, DashBoardData
+from pydantic import BaseModel
+from typing import Union, Optional
+import uuid
+from util import general_utils as gu
+from util.cmd_config import CmdConfig
+from dataclasses import dataclass
+import sys
+import os
+import threading
+import time
+import asyncio
+
+
+def shutdown_bot(delay_s: int):
+    time.sleep(delay_s)
+    py = sys.executable
+    os.execl(py, py, *sys.argv)
+
+@dataclass
+class DashBoardConfig():
+    config_type: str
+    name: Optional[str] = None
+    description: Optional[str] = None
+    path: Optional[str] = None # 仅 item 才需要
+    body: Optional[list['DashBoardConfig']] = None # 仅 group 才需要
+    value: Optional[Union[list, dict, str, int, bool]] = None # 仅 item 才需要
+    val_type: Optional[str] = None # 仅 item 才需要
+
+class DashBoardHelper():
+    def __init__(self, global_object, config: dict):
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+        self.logger = global_object.logger
+        dashboard_data = global_object.dashboard_data
+        dashboard_data.configs = {
+            "data": []
+        }
+        self.parse_default_config(dashboard_data, config)
+        self.dashboard_data: DashBoardData = dashboard_data
+        self.dashboard = AstrBotDashBoard(global_object)
+        self.key_map = {} # key: uuid, value: config key name
+        self.cc = CmdConfig()
+        
+        @self.dashboard.register("post_configs")
+        def on_post_configs(post_configs: dict):
+            try:
+                # self.logger.log(f"收到配置更新请求", gu.LEVEL_INFO, tag="可视化面板")
+                self.save_config(post_configs)
+                self.parse_default_config(self.dashboard_data, self.cc.get_all())
+                # 重启
+                threading.Thread(target=shutdown_bot, args=(2,), daemon=True).start()
+            except Exception as e:
+                # self.logger.log(f"在保存配置时发生错误：{e}", gu.LEVEL_ERROR, tag="可视化面板")
+                raise e
+
+        
+    # 将 config.yaml、 中的配置解析到 dashboard_data.configs 中
+    def parse_default_config(self, dashboard_data: DashBoardData, config: dict):
+        
+        try:
+            bot_platform_group = DashBoardConfig(
+                config_type="group",
+                name="机器人平台配置",
+                description="机器人平台配置描述",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="启用 QQ 频道平台",
+                        description="就是你想到的那个 QQ 频道平台。详见 q.qq.com",
+                        value=config['qqbot']['enable'],
+                        path="qqbot.enable",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="QQ机器人APPID",
+                        description="详见 q.qq.com",
+                        value=config['qqbot']['appid'],
+                        path="qqbot.appid",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="QQ机器人令牌",
+                        description="详见 q.qq.com",
+                        value=config['qqbot']['token'],
+                        path="qqbot.token",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="QQ机器人 Secret",
+                        description="详见 q.qq.com",
+                        value=config['qqbot_secret'],
+                        path="qqbot_secret",
+                    ),
+                    DashBoardConfig(
+                        config_type="divider"
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="启用 GO-CQHTTP 平台",
+                        description="gocq 是一个基于 HTTP 协议的 CQHTTP 协议的实现。详见 github.com/Mrs4s/go-cqhttp",
+                        value=config['gocqbot']['enable'],
+                        path="gocqbot.enable",
+                    )
+                ]
+            )
+            
+            proxy_group = DashBoardConfig(
+                config_type="group",
+                name="代理配置",
+                description="代理配置描述",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="HTTP 代理地址",
+                        description="建议上下一致",
+                        value=config['http_proxy'],
+                        path="proxy",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="HTTPS 代理地址",
+                        description="建议上下一致",
+                        value=config['https_proxy'],
+                        path="proxy",
+                    )
+                ]
+            )
+            general_platform_detail_group = DashBoardConfig(
+                config_type="group",
+                name="通用平台配置",
+                description="",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="启动消息文字转图片",
+                        description="启动后，机器人会将消息转换为图片发送，以降低风控风险。",
+                        value=config['qq_pic_mode'],
+                        path="qq_pic_mode",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="消息限制时间",
+                        description="在此时间内，机器人不会回复同一个用户的消息。单位：秒",
+                        value=config['limit']['time'],
+                        path="limit.time",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="消息限制次数",
+                        description="在上面的时间内，如果用户发送消息超过此次数，则机器人不会回复。单位：次",
+                        value=config['limit']['count'],
+                        path="limit.count",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="回复前缀",
+                        description="[xxxx] 你好！ 其中xxxx是你可以填写的前缀。如果为空则不显示。",
+                        value=config['reply_prefix'],
+                        path="reply_prefix",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="管理员用户 ID",
+                        description="对机器人 !myid 即可获得。如果此功能不可用，请加群 322154837",
+                        value=config['gocq_qqchan_admin'],
+                        path="gocq_qqchan_admin",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="list",
+                        name="通用管理员用户 ID（同上，此项支持多个管理员）",
+                        description="",
+                        value=config['other_admins'],
+                        path="other_admins",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="独立会话",
+                        description="是否启用独立会话模式，即 1 个用户自然账号 1 个会话。",
+                        value=config['uniqueSessionMode'],
+                        path="uniqueSessionMode",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="是否允许 QQ 频道私聊",
+                        description="仅针对 QQ 频道 SDK，而非 GO-CQHTTP。如果启用，那么机器人会响应私聊消息。",
+                        value=config['direct_message_mode'],
+                        path="direct_message_mode",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="LLM 唤醒词",
+                        description="如果不为空, 那么只有当消息以此词开头时，才会调用大语言模型进行回复。如设置为 /chat，那么只有当消息以 /chat 开头时，才会调用大语言模型进行回复。",
+                        value=config['llm_wake_prefix'],
+                        path="llm_wake_prefix",
+                    )
+                ]
+            )
+            
+            gocq_platform_detail_group = DashBoardConfig(
+                config_type="group",
+                name="GO-CQHTTP 平台配置",
+                description="",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="HTTP 服务器地址",
+                        description="",
+                        value=config['gocq_host'],
+                        path="gocq_host",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="HTTP 服务器端口",
+                        description="",
+                        value=config['gocq_http_port'],
+                        path="gocq_http_port",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="WebSocket 服务器端口",
+                        description="",
+                        value=config['gocq_websocket_port'],
+                        path="gocq_websocket_port",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="是否响应群消息",
+                        description="",
+                        value=config['gocq_react_group'],
+                        path="gocq_react_group",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="是否响应私聊消息",
+                        description="",
+                        value=config['gocq_react_friend'],
+                        path="gocq_react_friend",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="是否响应群成员增加消息",
+                        description="",
+                        value=config['gocq_react_group_increase'],
+                        path="gocq_react_group_increase",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="是否响应频道消息",
+                        description="",
+                        value=config['gocq_react_guild'],
+                        path="gocq_react_guild",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="转发阈值（字符数）",
+                        description="机器人回复的消息长度超出这个值后，会被折叠成转发卡片发出以减少刷屏。",
+                        value=config['qq_forward_threshold'],
+                        path="qq_forward_threshold",
+                    ),
+                ]
+            )
+
+            llm_group = DashBoardConfig(
+                config_type="group",
+                name="OpenAI 官方接口类设置",
+                description="",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="list",
+                        name="OpenAI API KEY",
+                        description="OpenAI API 的 KEY。支持使用非官方但是兼容的 API（第三方中转key）。",
+                        value=config['openai']['key'],
+                        path="openai.key",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="OpenAI API 节点地址",
+                        description="OpenAI API 的节点地址，配合非官方 API 使用。如果不想填写，那么请填写 none",
+                        value=config['openai']['api_base'],
+                        path="openai.api_base",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="OpenAI 模型",
+                        description="OpenAI 模型。详见 https://platform.openai.com/docs/api-reference/chat",
+                        value=config['openai']['chatGPTConfigs']['model'],
+                        path="openai.chatGPTConfigs.model",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="OpenAI 最大生成长度",
+                        description="OpenAI 最大生成长度。详见 https://platform.openai.com/docs/api-reference/chat",
+                        value=config['openai']['chatGPTConfigs']['max_tokens'],
+                        path="openai.chatGPTConfigs.max_tokens",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="float",
+                        name="OpenAI 温度",
+                        description="OpenAI 温度。详见 https://platform.openai.com/docs/api-reference/chat",
+                        value=config['openai']['chatGPTConfigs']['temperature'],
+                        path="openai.chatGPTConfigs.temperature",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="float",
+                        name="OpenAI top_p",
+                        description="OpenAI top_p。详见 https://platform.openai.com/docs/api-reference/chat",
+                        value=config['openai']['chatGPTConfigs']['top_p'],
+                        path="openai.chatGPTConfigs.top_p",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="float",
+                        name="OpenAI frequency_penalty",
+                        description="OpenAI frequency_penalty。详见 https://platform.openai.com/docs/api-reference/chat",
+                        value=config['openai']['chatGPTConfigs']['frequency_penalty'],
+                        path="openai.chatGPTConfigs.frequency_penalty",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="float",
+                        name="OpenAI presence_penalty",
+                        description="OpenAI presence_penalty。详见 https://platform.openai.com/docs/api-reference/chat",
+                        value=config['openai']['chatGPTConfigs']['presence_penalty'],
+                        path="openai.chatGPTConfigs.presence_penalty",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="OpenAI 总生成长度限制",
+                        description="OpenAI 总生成长度限制。详见 https://platform.openai.com/docs/api-reference/chat",
+                        value=config['openai']['total_tokens_limit'],
+                        path="openai.total_tokens_limit",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="OpenAI 图像生成模型",
+                        description="OpenAI 图像生成模型。",
+                        value=config['openai_image_generate']['model'],
+                        path="openai_image_generate.model",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="OpenAI 图像生成大小",
+                        description="OpenAI 图像生成大小。",
+                        value=config['openai_image_generate']['size'],
+                        path="openai_image_generate.size",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="OpenAI 图像生成风格",
+                        description="OpenAI 图像生成风格。修改前请参考 OpenAI 官方文档",
+                        value=config['openai_image_generate']['style'],
+                        path="openai_image_generate.style",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="OpenAI 图像生成质量",
+                        description="OpenAI 图像生成质量。修改前请参考 OpenAI 官方文档",
+                        value=config['openai_image_generate']['quality'],
+                        path="openai_image_generate.quality",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="大语言模型问题题首提示词",
+                        description="如果填写了此项，在每个对大语言模型的请求中，都会在问题前加上此提示词。",
+                        value=config['llm_env_prompt'],
+                        path="llm_env_prompt",
+                    ),
+                ]
+            )
+            
+            rev_chatgpt_accounts = config['rev_ChatGPT']['account']
+            new_accs = []
+            for i in rev_chatgpt_accounts:
+                if isinstance(i, dict) and 'access_token' in i:
+                    new_accs.append(i['access_token'])
+                elif isinstance(i, str):
+                    new_accs.append(i)
+            config['rev_ChatGPT']['account'] = new_accs
+            
+            rev_chatgpt_group = DashBoardConfig(
+                config_type="group",
+                name="逆向语言模型服务设置",
+                description="",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="启用逆向语言模型服务",
+                        description="",
+                        value=config['rev_ChatGPT']['enable'],
+                        path="rev_ChatGPT.enable",
+                    ), 
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="终结点（Endpoint）地址",
+                        description="逆向服务的终结点服务器的地址。",
+                        value=config['CHATGPT_BASE_URL'],
+                        path="CHATGPT_BASE_URL",
+                    ), 
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="list",
+                        name="assess_token",
+                        description="assess_token",
+                        value=config['rev_ChatGPT']['account'],
+                        path="rev_ChatGPT.account",
+                    ),
+                ]
+            )
+            
+            baidu_aip_group = DashBoardConfig(
+                config_type="group",
+                name="百度内容审核",
+                description="需要去申请",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="启动百度内容审核服务",
+                        description="",
+                        value=config['baidu_aip']['enable'],
+                        path="baidu_aip.enable"
+                    ),
+                    # "app_id": null,
+                    # "api_key": null,
+                    # "secret_key": null
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="APP ID",
+                        description="",
+                        value=config['baidu_aip']['app_id'],
+                        path="baidu_aip.app_id"
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="API KEY",
+                        description="",
+                        value=config['baidu_aip']['api_key'],
+                        path="baidu_aip.api_key"
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="SECRET KEY",
+                        description="",
+                        value=config['baidu_aip']['secret_key'],
+                        path="baidu_aip.secret_key"
+                    )
+                ]
+            )
+
+
+
+            other_group = DashBoardConfig(
+                config_type="group",
+                name="其他配置",
+                description="其他配置描述",
+                body=[
+                    # 人格
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="默认人格文本",
+                        description="默认人格文本",
+                        value=config['default_personality_str'],
+                        path="default_personality_str",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="string",
+                        name="面板用户名",
+                        description="是的，就是你理解的这个面板的用户名",
+                        value=config['dashboard_username'],
+                        path="dashboard_username",
+                    ),
+                ]
+            )
+            
+            dashboard_data.configs['data'] = [
+                bot_platform_group,
+                general_platform_detail_group,
+                gocq_platform_detail_group,
+                proxy_group,
+                llm_group,
+                rev_chatgpt_group,
+                other_group,
+                baidu_aip_group
+            ]
+        
+        except Exception as e:
+            self.logger.log(f"配置文件解析错误：{e}", gu.LEVEL_ERROR)
+            raise e
+        
+    
+    def save_config(self, post_config: dict):
+        '''
+        根据 path 解析并保存配置
+        '''
+        
+        queue = []
+        for config in post_config['data']:
+            queue.append(config)
+            
+        while len(queue) > 0:
+            config = queue.pop(0)
+            if config['config_type'] == "group":
+                for item in config['body']:
+                    queue.append(item)
+            elif config['config_type'] == "item":
+                if config['path'] is None or config['path'] == "":
+                    continue
+                
+                path = config['path'].split('.')
+                if len(path) == 0:
+                    continue
+                
+                if config['val_type'] == "bool":
+                    self.cc.put_by_dot_str(config['path'], config['value'])
+                elif config['val_type'] == "string":
+                    self.cc.put_by_dot_str(config['path'], config['value'])
+                elif config['val_type'] == "int":
+                    try:
+                        self.cc.put_by_dot_str(config['path'], int(config['value']))
+                    except:
+                        raise ValueError(f"配置项 {config['name']} 的值必须是整数")
+                elif config['val_type'] == "float":
+                    try:
+                        self.cc.put_by_dot_str(config['path'], float(config['value']))
+                    except:
+                        raise ValueError(f"配置项 {config['name']} 的值必须是浮点数")
+                elif config['val_type'] == "list":
+                    if config['value'] is None:
+                        self.cc.put_by_dot_str(config['path'], [])
+                    elif not isinstance(config['value'], list):
+                        raise ValueError(f"配置项 {config['name']} 的值必须是列表")
+                    self.cc.put_by_dot_str(config['path'], config['value'])
+                else:
+                    raise NotImplementedError(f"未知或者未实现的的配置项类型：{config['val_type']}")
+        
+    def run(self):
+        self.dashboard.run()

addons/dashboard/server.py

@@ -0,0 +1,268 @@
+from flask import Flask, request
+from flask.logging import default_handler
+from werkzeug.serving import make_server
+import datetime
+from util import general_utils as gu
+from dataclasses import dataclass
+import logging
+from cores.database.conn import dbConn
+from util.cmd_config import CmdConfig
+import util.plugin_util as putil
+import websockets
+import json
+import threading
+import asyncio
+import time
+
+@dataclass
+class DashBoardData():
+    stats: dict
+    configs: dict
+    logs: dict
+    plugins: list[dict]
+
+@dataclass
+class Response():
+    status: str
+    message: str
+    data: dict
+    
+class AstrBotDashBoard():
+    def __init__(self, global_object):
+        self.loop = asyncio.get_event_loop()
+        asyncio.set_event_loop(self.loop)
+        self.dashboard_data = global_object.dashboard_data
+        self.dashboard_be = Flask(__name__, static_folder="dist", static_url_path="/")
+        log = logging.getLogger('werkzeug')
+        log.setLevel(logging.ERROR)
+        self.funcs = {}
+        self.cc = CmdConfig()
+        self.logger = global_object.logger
+        self.ws_clients = {} # remote_ip: ws
+        # 启动 websocket 服务器
+        self.ws_server = websockets.serve(self.__handle_msg, "0.0.0.0", 6186)
+        
+        @self.dashboard_be.get("/")
+        def index():
+            # 返回页面
+            return self.dashboard_be.send_static_file("index.html")
+        
+        @self.dashboard_be.post("/api/authenticate")
+        def authenticate():
+            username = self.cc.get("dashboard_username", "")
+            password = self.cc.get("dashboard_password", "")
+            # 获得请求体
+            post_data = request.json
+            if post_data["username"] == username and post_data["password"] == password:
+                return Response(
+                    status="success",
+                    message="登录成功。",
+                    data={
+                        "token": "astrbot-test-token",
+                        "username": username
+                    }
+                ).__dict__
+            else:
+                return Response(
+                    status="error",
+                    message="用户名或密码错误。",
+                    data=None
+                ).__dict__
+                
+        @self.dashboard_be.post("/api/change_password")
+        def change_password():
+            password = self.cc.get("dashboard_password", "")
+            # 获得请求体
+            post_data = request.json
+            if post_data["password"] == password:
+                self.cc.put("dashboard_password", post_data["new_password"])
+                return Response(
+                    status="success",
+                    message="修改成功。",
+                    data=None
+                ).__dict__
+            else:
+                return Response(
+                    status="error",
+                    message="原密码错误。",
+                    data=None
+                ).__dict__
+
+        @self.dashboard_be.get("/api/stats")
+        def get_stats():
+            db_inst = dbConn()
+            all_session = db_inst.get_all_stat_session()
+            last_24_message = db_inst.get_last_24h_stat_message()
+            # last_24_platform = db_inst.get_last_24h_stat_platform()
+            platforms = db_inst.get_platform_cnt_total()
+            self.dashboard_data.stats["session"] = []
+            self.dashboard_data.stats["session_total"] = db_inst.get_session_cnt_total()
+            self.dashboard_data.stats["message"] = last_24_message
+            self.dashboard_data.stats["message_total"] = db_inst.get_message_cnt_total()
+            self.dashboard_data.stats["platform"] = platforms
+
+            return Response(
+                status="success",
+                message="",
+                data=self.dashboard_data.stats
+            ).__dict__
+        
+        @self.dashboard_be.get("/api/configs")
+        def get_configs():
+            return Response(
+                status="success",
+                message="",
+                data=self.dashboard_data.configs
+            ).__dict__
+            
+        @self.dashboard_be.post("/api/configs")
+        def post_configs():
+            post_configs = request.json
+            try:
+                self.funcs["post_configs"](post_configs)
+                return Response(
+                    status="success",
+                    message="保存成功~ 机器人将在 2 秒内重启以应用新的配置。",
+                    data=None
+                ).__dict__
+            except Exception as e:
+                return Response(
+                    status="error",
+                    message=e.__str__(),
+                    data=self.dashboard_data.configs
+                ).__dict__
+        
+        @self.dashboard_be.get("/api/logs")
+        def get_logs():
+            return Response(
+                status="success",
+                message="",
+                data=self.dashboard_data.logs
+            ).__dict__
+            
+        @self.dashboard_be.get("/api/extensions")
+        def get_plugins():
+            _plugin_resp = []
+            for plugin in self.dashboard_data.plugins:
+                _p = self.dashboard_data.plugins[plugin]
+                _t = {
+                    "name": _p["info"]["name"],
+                    "repo": '' if "repo" not in _p["info"] else _p["info"]["repo"],
+                    "author": _p["info"]["author"],
+                    "desc": _p["info"]["desc"],
+                    "version": _p["info"]["version"]
+                }
+                _plugin_resp.append(_t)
+            return Response(
+                status="success",
+                message="",
+                data=_plugin_resp
+            ).__dict__
+            
+        @self.dashboard_be.post("/api/extensions/install")
+        def install_plugin():
+            post_data = request.json
+            repo_url = post_data["url"]
+            try:
+                self.logger.log(f"正在安装插件 {repo_url}", tag="可视化面板")
+                putil.install_plugin(repo_url, self.dashboard_data.plugins)
+                self.logger.log(f"安装插件 {repo_url} 成功", tag="可视化面板")
+                return Response(
+                    status="success",
+                    message="安装成功~",
+                    data=None
+                ).__dict__
+            except Exception as e:
+                return Response(
+                    status="error",
+                    message=e.__str__(),
+                    data=None
+                ).__dict__
+        
+        @self.dashboard_be.post("/api/extensions/uninstall")
+        def uninstall_plugin():
+            post_data = request.json
+            plugin_name = post_data["name"]
+            try:
+                self.logger.log(f"正在卸载插件 {plugin_name}", tag="可视化面板")
+                putil.uninstall_plugin(plugin_name, self.dashboard_data.plugins)
+                self.logger.log(f"卸载插件 {plugin_name} 成功", tag="可视化面板")
+                return Response(
+                    status="success",
+                    message="卸载成功~",
+                    data=None
+                ).__dict__
+            except Exception as e:
+                return Response(
+                    status="error",
+                    message=e.__str__(),
+                    data=None
+                ).__dict__
+                
+        @self.dashboard_be.post("/api/extensions/update")
+        def update_plugin():
+            post_data = request.json
+            plugin_name = post_data["name"]
+            try:
+                self.logger.log(f"正在更新插件 {plugin_name}", tag="可视化面板")
+                putil.update_plugin(plugin_name, self.dashboard_data.plugins)
+                self.logger.log(f"更新插件 {plugin_name} 成功", tag="可视化面板")
+                return Response(
+                    status="success",
+                    message="更新成功~",
+                    data=None
+                ).__dict__
+            except Exception as e:
+                return Response(
+                    status="error",
+                    message=e.__str__(),
+                    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)
+                except Exception as e:
+                    pass
+            return 'ok'
+        
+    def register(self, name: str):
+        def decorator(func):
+            self.funcs[name] = func
+            return func
+        return decorator
+
+    async def __handle_msg(self, websocket, path):
+        address = websocket.remote_address
+        # self.logger.log(f"和 {address} 建立了 websocket 连接", tag="可视化面板")
+        self.ws_clients[address] = websocket
+        data = ''.join(self.logger.history).replace('\n', '\r\n')
+        await websocket.send(data)
+        while True:
+            try:
+                msg = await websocket.recv()
+            except websockets.exceptions.ConnectionClosedError:
+                # self.logger.log(f"和 {address} 的 websocket 连接已断开", tag="可视化面板")
+                del self.ws_clients[address]
+                break
+            except Exception as e:
+                # self.logger.log(f"和 {path} 的 websocket 连接发生了错误: {e.__str__()}", tag="可视化面板")
+                del self.ws_clients[address]
+                break
+        
+    def run_ws_server(self, loop):
+        asyncio.set_event_loop(loop)
+        loop.run_until_complete(self.ws_server)
+        loop.run_forever()
+
+    def run(self):
+        threading.Thread(target=self.run_ws_server, args=(self.loop,)).start()
+        self.logger.log("已启动 websocket 服务器", tag="可视化面板")
+        ip_address = gu.get_local_ip_addresses()
+        ip_str = f"http://{ip_address}:6185\n\thttp://localhost:6185"
+        self.logger.log(f"\n==================\n您可访问:\n\n\t{ip_str}\n\n来登录可视化面板，默认账号密码为空。\n注意: 所有配置项现已全量迁移至 cmd_config.json 文件下，可登录可视化面板在线修改配置。\n==================\n", tag="可视化面板")
+        http_server = make_server('0.0.0.0', 6185, self.dashboard_be, threaded=True)
+        http_server.serve_forever()
+

addons/plugins/helloworld/helloworld.py

@@ -4,76 +4,62 @@ from nakuru import (
     FriendMessage
 )
 from botpy.message import Message, DirectMessage
-from model.platform.qq import QQ
-import time
-import threading
+from cores.qqbot.global_object import (
+    AstrMessageEvent,
+    CommandResult
+)
 
+'''
+注意改插件名噢！格式：XXXPlugin 或 Main
+小提示：把此模板仓库 fork 之后 clone 到机器人文件夹下的 addons/plugins/ 目录下，然后用 Pycharm/VSC 等工具打开可获更棒的编程体验（自动补全等）
+'''
 class HelloWorldPlugin:
     """
     初始化函数, 可以选择直接pass
     """
     def __init__(self) -> None:
-        self.myThread = None # 线程对象，如果要使用线程，需要在此处定义。在run处定义会被释放掉
-        print("这是HelloWorld测试插件, 发送 helloworld 即可触发此插件。")
+        print("hello, world!")
 
     """
-    入口函数，机器人会调用此函数。
-    参数规范: message: 消息文本; role: 身份; platform: 消息平台; message_obj: 消息对象; qq_platform: QQ平台对象，可以通过调用qq_platform.send()直接发送消息。详见Helloworld插件示例
-    参数详情: role为admin或者member; platform为qqchan或者gocq; message_obj为nakuru的GroupMessage对象或者FriendMessage对象或者频道的Message, DirectMessage对象。
-    返回规范: bool: 是否hit到此插件(所有的消息均会调用每一个载入的插件, 如果没有hit到, 则应返回False)
-             Tuple: None或者长度为3的元组。当没有hit到时, 返回None. hit到时, 第1个参数为指令是否调用成功, 第2个参数为返回的消息文本或者gocq的消息链列表, 第3个参数为指令名称
-    例子：做一个名为"yuanshen"的插件；当接收到消息为“原神 可莉”, 如果不想要处理此消息，则返回False, None；如果想要处理，但是执行失败了，返回True, tuple([False, "请求失败啦~", "yuanshen"])
-          ；执行成功了，返回True, tuple([True, "结果文本", "yuanshen"])
+    机器人程序会调用此函数。
+    返回规范: bool: 插件是否响应该消息 (所有的消息均会调用每一个载入的插件, 如果不响应, 则应返回 False)
+             Tuple: Non e或者长度为 3 的元组。如果不响应, 返回 None； 如果响应, 第 1 个参数为指令是否调用成功, 第 2 个参数为返回的消息链列表, 第 3 个参数为指令名称
+    例子：一个名为"yuanshen"的插件；当接收到消息为“原神 可莉”, 如果不想要处理此消息，则返回False, None；如果想要处理，但是执行失败了，返回True, tuple([False, "请求失败。", "yuanshen"]) ；执行成功了，返回True, tuple([True, "结果文本", "yuanshen"])
     """
-    def run(self, message: str, role: str, platform: str, message_obj, qq_platform: QQ):
-
-        if platform == "gocq":
-            """
-            QQ平台指令处理逻辑
-            """
-            img_url = "https://gchat.qpic.cn/gchatpic_new/905617992/720871955-2246763964-C6EE1A52CC668EC982453065C4FA8747/0?term=2&is_origin=0"
-            if message == "helloworld":
-                return True, tuple([True, [Plain("Hello World!!"), Image.fromURL(url=img_url)], "helloworld"])
-            elif message == "hiloop":
-                if self.myThread is None:
-                    self.myThread = threading.Thread(target=self.helloworldThread, args=(message_obj, qq_platform))
-                    self.myThread.start()
-                return True, tuple([True, [Plain("A lot of Helloworlds!!"), Image.fromURL(url=img_url)], "helloworld"]) 
-            else:
-                return False, None
-        elif platform == "qqchan":
-            """
-            频道处理逻辑(频道暂时只支持回复字符串类型的信息，返回的信息都会被转成字符串，如果不想处理某一个平台的信息，直接返回False, None就行)
-            """
-            if message == "helloworld":
-                return True, tuple([True, "Hello World!!", "helloworld"])
-            else:
-                return False, None
+    def run(self, ame: AstrMessageEvent):
+        if ame.message_str == "helloworld":
+            # return True, tuple([True, "Hello World!!", "helloworld"])
+            return CommandResult(
+                hit=True,
+                success=True,
+                message_chain=[Plain("Hello World!!")],
+                command_name="helloworld"
+            )
+        else:
+            return CommandResult(
+                hit=False,
+                success=False,
+                message_chain=None,
+                command_name=None
+            )
     """
-    帮助函数，当用户输入 plugin v 插件名称 时，会调用此函数，返回帮助信息
+    插件元信息。
+    当用户输入 plugin v 插件名称 时，会调用此函数，返回帮助信息。
     返回参数要求(必填)：dict{
         "name": str, # 插件名称
         "desc": str, # 插件简短描述
         "help": str, # 插件帮助信息
         "version": str, # 插件版本
         "author": str, # 插件作者
+        "repo": str, # 插件仓库地址 [ 可选 ]
+        "homepage": str, # 插件主页  [ 可选 ]
     }
     """        
     def info(self):
         return {
             "name": "helloworld",
             "desc": "测试插件",
-            "help": "测试插件, 回复helloworld即可触发",
-            "version": "v1.0.1 beta",
+            "help": "测试插件, 回复 helloworld 即可触发",
+            "version": "v1.2",
             "author": "Soulter"
-        }
-    
-    def helloworldThread(self, meseage_obj, qq_platform: QQ):
-        while True:
-            qq_platform.send(meseage_obj, [Plain("Hello World!!")]) # 第一个参数可以是message_obj, 也可以是qq群号
-            time.sleep(3) # 睡眠3秒。 用while True一定要记得sleep，不然会卡死
-        
-
-        # 热知识：检测消息开头指令，使用以下方法
-        # if message.startswith("原神"):
-        #     pass
+        }

cores/database/conn.py

@@ -1,7 +1,7 @@
 import sqlite3
 import yaml
-
-# TODO: 数据库缓存prompt
+import time
+from typing import Tuple
 
 class dbConn():
     def __init__(self):
@@ -15,7 +15,33 @@ class dbConn():
             CREATE TABLE IF NOT EXISTS tb_session(
                 qq_id   VARCHAR(32) PRIMARY KEY,
                 history TEXT
-            )
+            );
+            '''
+        )
+        c.execute(
+            '''
+            CREATE TABLE IF NOT EXISTS tb_stat_session(
+                platform VARCHAR(32),
+                session_id VARCHAR(32),
+                cnt INTEGER
+            );
+            '''
+        )
+        c.execute(
+            '''
+            CREATE TABLE IF NOT EXISTS tb_stat_message(
+                ts INTEGER,
+                cnt INTEGER
+            );
+            '''
+        )
+        c.execute(
+            '''
+            CREATE TABLE IF NOT EXISTS tb_stat_platform(
+                ts INTEGER,
+                platform VARCHAR(32),
+                cnt INTEGER
+            );
             '''
         )
         
@@ -81,6 +107,188 @@ class dbConn():
         )
         conn.commit()
 
+
+    def increment_stat_session(self, platform, session_id, cnt):
+        # if not exist, insert
+        conn = self.conn
+        c = conn.cursor()
+
+        if self.check_stat_session(platform, session_id):
+            c.execute(
+                '''
+                UPDATE tb_stat_session SET cnt = cnt + ? WHERE platform = ? AND session_id = ?
+                ''', (cnt, platform, session_id)
+            )
+            conn.commit()
+        else:
+            c.execute(
+                '''
+                INSERT INTO tb_stat_session(platform, session_id, cnt) VALUES (?, ?, ?)
+                ''', (platform, session_id, cnt)
+            )
+            conn.commit()
+
+    def check_stat_session(self, platform, session_id):
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT * FROM tb_stat_session WHERE platform = ? AND session_id = ?
+            ''', (platform, session_id)
+        )
+        return c.fetchone() is not None
+    
+    def get_all_stat_session(self):
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT * FROM tb_stat_session
+            '''
+        )
+        return c.fetchall()
+    
+    def get_session_cnt_total(self):
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT COUNT(*) FROM tb_stat_session
+            '''
+        )
+        return c.fetchone()[0]
+    
+    def increment_stat_message(self, ts, cnt):
+        # 以一个小时为单位。ts的单位是秒。
+        # 找到最近的一个小时，如果没有，就插入
+
+        conn = self.conn
+        c = conn.cursor()
+
+        ok, new_ts = self.check_stat_message(ts)
+
+        if ok:
+            c.execute(
+                '''
+                UPDATE tb_stat_message SET cnt = cnt + ? WHERE ts = ?
+                ''', (cnt, new_ts)
+            )
+            conn.commit()
+        else:
+            c.execute(
+                '''
+                INSERT INTO tb_stat_message(ts, cnt) VALUES (?, ?)
+                ''', (new_ts, cnt)
+            )
+            conn.commit()
+
+    def check_stat_message(self, ts) -> Tuple[bool, int]:
+        # 换算成当地整点的时间戳
+
+        ts = ts - ts % 3600
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT * FROM tb_stat_message WHERE ts = ?
+            ''', (ts, )
+        )
+        if c.fetchone() is not None:
+            return True, ts
+        else:
+            return False, ts
+        
+    def get_last_24h_stat_message(self):
+        # 获取最近24小时的消息统计
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT * FROM tb_stat_message WHERE ts > ?
+            ''', (time.time() - 86400, )
+        )
+        return c.fetchall()
+    
+    def get_message_cnt_total(self) -> int:
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT SUM(cnt) FROM tb_stat_message
+            '''
+        )
+        return c.fetchone()[0]
+
+    def increment_stat_platform(self, ts, platform, cnt):
+        # 以一个小时为单位。ts的单位是秒。
+        # 找到最近的一个小时，如果没有，就插入
+
+        conn = self.conn
+        c = conn.cursor()
+
+        ok, new_ts = self.check_stat_platform(ts, platform)
+
+        if ok:
+            c.execute(
+                '''
+                UPDATE tb_stat_platform SET cnt = cnt + ? WHERE ts = ? AND platform = ?
+                ''', (cnt, new_ts, platform)
+            )
+            conn.commit()
+        else:
+            c.execute(
+                '''
+                INSERT INTO tb_stat_platform(ts, platform, cnt) VALUES (?, ?, ?)
+                ''', (new_ts, platform, cnt)
+            )
+            conn.commit()
+
+    def check_stat_platform(self, ts, platform):
+        # 换算成当地整点的时间戳
+
+        ts = ts - ts % 3600
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT * FROM tb_stat_platform WHERE ts = ? AND platform = ?
+            ''', (ts, platform)
+        )
+        if c.fetchone() is not None:
+            return True, ts
+        else:
+            return False, ts
+        
+    def get_last_24h_stat_platform(self):
+        # 获取最近24小时的消息统计
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT * FROM tb_stat_platform WHERE ts > ?
+            ''', (time.time() - 86400, )
+        )
+        return c.fetchall()
+    
+    def get_platform_cnt_total(self) -> int:
+        conn = self.conn
+        c = conn.cursor()
+        c.execute(
+            '''
+            SELECT platform, SUM(cnt) FROM tb_stat_platform GROUP BY platform
+            '''
+        )
+        # return c.fetchall()
+        platforms = []
+        ret = c.fetchall()
+        for i in ret:
+            # platforms[i[0]] = i[1]
+            platforms.append({
+                "name": i[0],
+                "count": i[1]
+            })
+        return platforms
+
     def close(self):
         self.conn.close()
     

cores/monitor/perf.py

@@ -0,0 +1,23 @@
+'''
+监测机器性能
+- Bot 内存使用量
+- CPU 占用率
+'''
+
+import psutil
+from cores.qqbot.global_object import GlobalObject
+import time
+
+def run_monitor(global_object: GlobalObject):
+    '''运行监测'''
+    start_time = time.time()
+    while True:
+        stat = global_object.dashboard_data.stats
+        # 程序占用的内存大小
+        mem = psutil.Process().memory_info().rss / 1024 / 1024 # MB
+        stat['sys_perf'] = {
+            'memory': mem,
+            'cpu': psutil.cpu_percent()
+        }
+        stat['sys_start_time'] = start_time
+        time.sleep(30)

cores/qqbot/global_object.py

@@ -0,0 +1,92 @@
+from model.platform.qq_official import QQOfficial, NakuruGuildMember, NakuruGuildMessage
+from model.platform.qq_gocq import QQGOCQ
+from model.provider.provider import Provider
+from addons.dashboard.server import DashBoardData
+from nakuru import (
+    CQHTTP,
+    GroupMessage,
+    GroupMemberIncrease,
+    FriendMessage,
+    GuildMessage,
+    Notify
+)
+from typing import Union
+
+class GlobalObject:
+    '''
+    存放一些公用的数据，用于在不同模块(如core与command)之间传递
+    '''
+    nick: str # gocq 的昵称
+    base_config: dict # config.json
+    cached_plugins: dict # 缓存的插件
+    web_search: bool # 是否开启了网页搜索
+    reply_prefix: str
+    admin_qq: str
+    admin_qqchan: str
+    uniqueSession: bool
+    cnt_total: int
+    platform_qq: QQGOCQ
+    platform_qqchan: QQOfficial
+    default_personality: dict
+    dashboard_data: DashBoardData
+    stat: dict
+    logger: None
+    
+    def __init__(self):
+        self.nick = None # gocq 的昵称
+        self.base_config = None # config.yaml
+        self.cached_plugins = {} # 缓存的插件
+        self.web_search = False # 是否开启了网页搜索
+        self.reply_prefix = None
+        self.admin_qq = "123456"
+        self.admin_qqchan = "123456"
+        self.uniqueSession = False
+        self.cnt_total = 0
+        self.platform_qq = None
+        self.platform_qqchan = None
+        self.default_personality = None
+        self.dashboard_data = None
+        self.stat = {}
+
+
+class AstrMessageEvent():
+    message_str: str # 纯消息字符串
+    message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage] # 消息对象
+    gocq_platform: QQGOCQ
+    qq_sdk_platform: QQOfficial
+    platform: str # `gocq` 或 `qqchan`
+    role: str # `admin` 或 `member`
+    global_object: GlobalObject # 一些公用数据
+    session_id: int # 会话id (可能是群id，也可能是某个user的id。取决于是否开启了 uniqueSession)
+
+    def __init__(self, message_str: str, 
+                 message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage], 
+                 gocq_platform: QQGOCQ, 
+                 qq_sdk_platform: QQOfficial, 
+                 platform: str, 
+                 role: str, 
+                 global_object: GlobalObject,
+                 llm_provider: Provider = None,
+                 session_id: int = None):
+        self.message_str = message_str
+        self.message_obj = message_obj
+        self.gocq_platform = gocq_platform
+        self.qq_sdk_platform = qq_sdk_platform
+        self.platform = platform
+        self.role = role
+        self.global_object = global_object
+        self.llm_provider = llm_provider
+        self.session_id = session_id
+        
+class CommandResult():
+    '''
+    用于在Command中返回多个值
+    '''
+    def __init__(self, hit: bool, success: bool, message_chain: list, command_name: str = "unknown_command") -> None:
+        self.hit = hit
+        self.success = success
+        self.message_chain = message_chain
+        self.command_name = command_name
+        
+    def _result_tuple(self):
+        return (self.success, self.message_chain, self.command_name)

main.py

@@ -1,122 +1,92 @@
 import os, sys
 from pip._internal import main as pipmain
-import util.general_utils as gu
+import warnings
+import traceback
+import threading
 
+warnings.filterwarnings("ignore")
 abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
 
 def main():
+    # config.yaml 配置文件加载和环境确认
     try:
         import cores.qqbot.core as qqBot
         import yaml
+        import util.general_utils as gu
         ymlfile =  open(abs_path+"configs/config.yaml", 'r', encoding='utf-8')
         cfg = yaml.safe_load(ymlfile)
+    except ImportError as import_error:
+        traceback.print_exc()
+        print(import_error)
+        input("第三方库未完全安装完毕，请退出程序重试。")
+    except FileNotFoundError as file_not_found:
+        print(file_not_found)
+        input("配置文件不存在，请检查是否已经下载配置文件。")
     except BaseException as e:
         print(e)
-        input("第三方依赖库未完全安装完毕，请退出程序重试。")
-        exit()
-
-    if 'http_proxy' in cfg:
+        
+    # 设置代理
+    if 'http_proxy' in cfg and cfg['http_proxy'] != '':
         os.environ['HTTP_PROXY'] = cfg['http_proxy']
-    if 'https_proxy' in cfg:
+    if 'https_proxy' in cfg and cfg['https_proxy'] != '':
         os.environ['HTTPS_PROXY'] = cfg['https_proxy']
+    
+    os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
 
-    provider = privider_chooser(cfg)
-    if len(provider) == 0:
-        gu.log("未开启任何语言模型, 请在configs/config.yaml下选择开启相应语言模型。", gu.LEVEL_CRITICAL)
+    # 检查并创建 temp 文件夹
+    if not os.path.exists(abs_path + "temp"):
+        os.mkdir(abs_path+"temp")
+
+    # 启动主程序（cores/qqbot/core.py）
+    qqBot.initBot(cfg)
+
+def check_env(ch_mirror=False):
+    if not (sys.version_info.major == 3 and sys.version_info.minor >= 9):
+        print("请使用Python3.9+运行本项目")
         input("按任意键退出...")
         exit()
-    print('[System] 开启的语言模型: ' + str(provider))
-    # 执行Bot
-    qqBot.initBot(cfg, provider)
-
-# 语言模型提供商选择器
-# 目前有：OpenAI官方API、逆向库
-def privider_chooser(cfg):
-    l = []
-    if 'rev_ChatGPT' in cfg and cfg['rev_ChatGPT']['enable']:
-        l.append('rev_chatgpt')
-    if 'rev_ernie' in cfg and cfg['rev_ernie']['enable']:
-        l.append('rev_ernie')
-    if 'rev_edgegpt' in cfg and cfg['rev_edgegpt']['enable']:
-        l.append('rev_edgegpt')
-    if 'openai' in cfg and cfg['openai']['key'] != None and len(cfg['openai']['key'])>0:
-        l.append('openai_official')
-    return l
-
-def check_env():
-    if not (sys.version_info.major == 3 and sys.version_info.minor >= 8):
-        print("请使用Python3.8运行本项目")
-        input("按任意键退出...")
-        exit()
-
-    # 检查pip
-    # pip_tag = "pip"
-    # mm = os.system("pip -V")
-    # if mm != 0:
-    #     mm1 = os.system("pip3 -V")
-    #     if mm1 != 0:
-    #         print("未检测到pip, 请安装Python(版本应>=3.9)")
-    #         input("按任意键退出...")
-    #         exit()
-    #     else:
-    #         pip_tag = "pip3"
     
     if os.path.exists('requirements.txt'):
         pth = 'requirements.txt'
     else:
         pth = 'QQChannelChatGPT'+ os.sep +'requirements.txt'
-    print("正在更新三方依赖库...")
+    print("正在检查或下载第三方库，请耐心等待...")
     try:
-        pipmain(['install', '-r', pth])
-        print("依赖库安装完毕。")
+        if ch_mirror:
+            print("使用阿里云镜像")
+            pipmain(['install', '-r', pth, '-i', 'https://mirrors.aliyun.com/pypi/simple/'])
+        else:
+            pipmain(['install', '-r', pth])
     except BaseException as e:
         print(e)
         while True:
-            res = input("依赖库可能安装失败了。\n如果是报错ValueError: check_hostname requires server_hostname，请尝试先关闭代理后重试。\n输入y回车重试\n输入c回车使用国内镜像源下载\n输入其他按键回车继续往下执行。")
+            res = input("安装失败。\n如报错ValueError: check_hostname requires server_hostname，请尝试先关闭代理后重试。\n1.输入y回车重试\n2. 输入c回车使用国内镜像源下载\n3. 输入其他按键回车继续往下执行。")
             if res == "y":
                 try:
                     pipmain(['install', '-r', pth])
-                    print("依赖库安装完毕。")
                     break
                 except BaseException as e:
                     print(e)
                     continue
-
             elif res == "c":
                 try:
                     pipmain(['install', '-r', pth, '-i', 'https://mirrors.aliyun.com/pypi/simple/'])
-                    print("依赖库安装完毕。")
                     break
                 except BaseException as e:
                     print(e)
                     continue
             else:
                 break
-
-def get_platform():
-    import platform
-    sys_platform = platform.platform().lower()
-    if "windows" in sys_platform:
-        return "win"
-    elif "macos" in sys_platform:
-        return "mac"
-    elif "linux" in sys_platform:
-        return "linux"
-    else:
-        print("other")
+    print("第三方库检查完毕。")
 
 if __name__ == "__main__":
-    check_env()
-
-    # 获取参数
     args = sys.argv
-    if len(args) > 1:
-        if args[1] == '-replit':
-            print("[System] 启动Replit Web保活服务...")
-            try:
-                from webapp_replit import keep_alive
-                keep_alive()
-            except BaseException as e:
-                print(e)
-                print(f"[System-err] Replit Web保活服务启动失败:{str(e)}")
-    main()
+
+    if '-cn' in args:
+        check_env(True)
+    else:
+        check_env()
+    
+    t = threading.Thread(target=main, daemon=False)
+    t.start()
+    t.join()

model/command/command.py

@@ -1,254 +1,183 @@
 import json
-import git.exc
-from git.repo import Repo
+from util import general_utils as gu
+has_git = True
+try:
+    import git.exc
+    from git.repo import Repo
+except BaseException as e:
+    has_git = False
 import os
 import sys
 import requests
 from model.provider.provider import Provider
 import json
 import util.plugin_util as putil
-import shutil
-import importlib
-from util import general_utils as gu
 from util.cmd_config import CmdConfig as cc
-from model.platform.qq import QQ
-import stat
+from util.general_utils import Logger
+import util.updator
 from nakuru.entities.components import (
     Plain,
     Image
 )
 from PIL import Image as PILImage
+from cores.qqbot.global_object import GlobalObject, AstrMessageEvent
+from pip._internal import main as pipmain
+from cores.qqbot.global_object import CommandResult
 
 PLATFORM_QQCHAN = 'qqchan'
 PLATFORM_GOCQ = 'gocq'
 
 # 指令功能的基类，通用的（不区分语言模型）的指令就在这实现
 class Command:
-    def __init__(self, provider: Provider):
-        self.provider = Provider
+    def __init__(self, provider: Provider, global_object: GlobalObject = None):
+        self.provider = provider
+        self.global_object = global_object
+        self.logger: Logger = global_object.logger
 
-    def get_plugin_modules(self):
-        plugins = []
-        try:
-            if os.path.exists("addons/plugins"):
-                plugins = putil.get_modules("addons/plugins")
-                return plugins
-            elif os.path.exists("QQChannelChatGPT/addons/plugins"):
-                plugins = putil.get_modules("QQChannelChatGPT/addons/plugins")
-                return plugins
-            else:
-                return None
-        except BaseException as e:
-            raise e
-
-    def check_command(self, message, role, platform, message_obj, cached_plugins: dict, qq_platform: QQ):
+    def check_command(self, 
+                      message, 
+                      session_id: str,
+                      role, 
+                      platform, 
+                      message_obj):
         # 插件
-
+        cached_plugins = self.global_object.cached_plugins
+        ame = AstrMessageEvent(
+            message_str=message,
+            message_obj=message_obj,
+            gocq_platform=self.global_object.platform_qq,
+            qq_sdk_platform=self.global_object.platform_qqchan,
+            platform=platform,
+            role=role,
+            global_object=self.global_object,
+            session_id = session_id
+        )
         for k, v in cached_plugins.items():
             try:
-                hit, res = v["clsobj"].run(message, role, platform, message_obj, qq_platform)
+                result = v["clsobj"].run(ame)
+                if isinstance(result, CommandResult):
+                    hit = result.hit
+                    res = result._result_tuple()
+                elif isinstance(result, tuple):
+                    hit = result[0]
+                    res = result[1]
+                else:
+                    raise TypeError("插件返回值格式错误。")
                 if hit:
                     return True, res
+            except TypeError as e:
+                # 参数不匹配，尝试使用旧的参数方案
+                try:
+                    hit, res = v["clsobj"].run(message, role, platform, message_obj, self.global_object.platform_qq)
+                    if hit:
+                        return True, res
+                except BaseException as e:
+                    self.logger.log(f"{k}插件异常，原因: {str(e)}\n已安装插件: {cached_plugins.keys}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING)
             except BaseException as e:
-                gu.log(f"{k}插件加载出现问题，原因: {str(e)}\n已安装插件: {cached_plugins.keys}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING)
+                self.logger.log(f"{k} 插件异常，原因: {str(e)}\n已安装插件: {cached_plugins.keys}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING)
 
         if self.command_start_with(message, "nick"):
             return True, self.set_nick(message, platform, role)
-        
         if self.command_start_with(message, "plugin"):
             return True, self.plugin_oper(message, role, cached_plugins, platform)
-        
-        if self.command_start_with(message, "myid"):
+        if self.command_start_with(message, "myid") or self.command_start_with(message, "!myid"):
             return True, self.get_my_id(message_obj, platform)
         if self.command_start_with(message, "nconf") or self.command_start_with(message, "newconf"):
-            return True, self.get_new_conf(message, role, platform)
+            return True, self.get_new_conf(message, role)
+        if self.command_start_with(message, "web"): # 网页搜索
+            return True, self.web_search(message)
+        if self.command_start_with(message, "keyword"):
+            return True, self.keyword(message_obj, role)
+        if self.command_start_with(message, "ip"):
+            ip = requests.get("https://myip.ipip.net", timeout=5).text
+            return True, f"机器人 IP 信息：{ip}", "ip"
+            
         
         return False, None
     
+    def web_search(self, message):
+        l = message.split(' ')
+        if len(l) == 1:
+            return True, f"网页搜索功能当前状态: {self.global_object.web_search}", "web"
+        elif l[1] == 'on':
+            self.global_object.web_search = True
+            return True, "已开启网页搜索", "web"
+        elif l[1] == 'off':
+            self.global_object.web_search = False
+            return True, "已关闭网页搜索", "web"
+
     def get_my_id(self, message_obj, platform):
-        if platform == "gocq":
-            if message_obj.type == "GuildMessage":
-                return True, f"你的频道id是{str(message_obj.sender.tiny_id)}", "plugin"
-            else:
-                return True, f"你的QQ是{str(message_obj.sender.user_id)}", "plugin"
-            
-    def get_new_conf(self, message, role, platform):
+        user_id = "Unknown"
+        if platform == PLATFORM_QQCHAN:
+            user_id = str(message_obj.sender.tiny_id)
+        elif platform == PLATFORM_GOCQ:
+            user_id = str(message_obj.user_id)
+
+        return True, f"你在此平台上的ID：{user_id}", "plugin"
+
+    def get_new_conf(self, message, role):
         if role != "admin":
             return False, f"你的身份组{role}没有权限使用此指令。", "newconf"
-        if platform == gu.PLATFORM_GOCQ:
-            l = message.split(" ")
-            if len(l) <= 1:
-                obj = cc.get_all()
-                p = gu.create_text_image("【cmd_config.json】", json.dumps(obj, indent=4, ensure_ascii=False))
-                return True, [Image.fromFileSystem(p)], "newconf"
-        return False, f"Not support or not implemented.", "newconf"
-            
-
-    
-    def plugin_reload(self, cached_plugins: dict, target: str = None, all: bool = False):
-        plugins = self.get_plugin_modules()
-        fail_rec = ""
-        if plugins != None:
-            for p in plugins:
-                try:
-                    if p not in cached_plugins or p == target or all:
-                        module = __import__("addons.plugins." + p + "." + p, fromlist=[p])
-                        if p in cached_plugins:
-                            module = importlib.reload(module)
-                        cls = putil.get_classes(p, module)
-                        obj = getattr(module, cls[0])()
-                        try:
-                            info = obj.info()
-                            if 'name' not in info or 'desc' not in info or 'version' not in info or 'author' not in info:
-                                fail_rec += f"载入插件{p}失败，原因: 插件信息不完整\n"
-                                continue
-                            if isinstance(info, dict) == False:
-                                fail_rec += f"载入插件{p}失败，原因: 插件信息格式不正确\n"
-                                continue
-                        except BaseException as e:
-                            fail_rec += f"调用插件{p} info失败, 原因: {str(e)}\n"
-                            continue
-                        cached_plugins[p] = {
-                            "module": module,
-                            "clsobj": obj,
-                            "info": info
-                        }  
-                except BaseException as e:
-                    raise e
-                    fail_rec += f"加载{p}插件出现问题，原因{str(e)}\n"
-            if fail_rec == "":
-                return True, None
-            else:
-                return False, fail_rec
-        else:
-            return False, "未找到任何插件模块"
+        l = message.split(" ")
+        if len(l) <= 1:
+            obj = cc.get_all()
+            p = gu.create_text_image("【cmd_config.json】", json.dumps(obj, indent=4, ensure_ascii=False))
+            return True, [Image.fromFileSystem(p)], "newconf"
     
     '''
     插件指令
     '''
     def plugin_oper(self, message: str, role: str, cached_plugins: dict, platform: str):
+        if not has_git:
+            return False, "你正在运行在无Git环境下，暂时将无法使用插件、热更新功能。", "plugin"
         l = message.split(" ")
         if len(l) < 2:
-            if platform == gu.PLATFORM_GOCQ:
-                p = gu.create_text_image("【插件指令面板】", "安装插件: \nplugin i 插件Github地址\n卸载插件: \nplugin i 插件名 \n重载插件: \nplugin reload\n查看插件列表：\nplugin l\n更新插件: plugin u 插件名\n")
-                return True, [Image.fromFileSystem(p)], "plugin"
-            return True, "\n=====插件指令面板=====\n安装插件: \nplugin i 插件Github地址\n卸载插件: \nplugin i 插件名 \n重载插件: \nplugin reload\n查看插件列表：\nplugin l\n更新插件: plugin u 插件名\n===============", "plugin"
+            p = gu.create_text_image("【插件指令面板】", "安装插件: \nplugin i 插件Github地址\n卸载插件: \nplugin d 插件名 \n重载插件: \nplugin reload\n查看插件列表：\nplugin l\n更新插件: plugin u 插件名\n")
+            return True, [Image.fromFileSystem(p)], "plugin"
         else:
-            ppath = ""
-            if os.path.exists("addons/plugins"):
-                ppath = "addons/plugins"
-            elif os.path.exists("QQChannelChatGPT/addons/plugins"):
-                ppath = "QQChannelChatGPT/addons/plugins"
-            else:
-                return False, "未找到插件目录", "plugin"
             if l[1] == "i":
                 if role != "admin":
                     return False, f"你的身份组{role}没有权限安装插件", "plugin"
                 try:
-                    # 得到url的最后一段
-                    d = l[2].split("/")[-1]
-                    # 创建文件夹
-                    plugin_path = os.path.join(ppath, d)
-                    if os.path.exists(plugin_path):
-                        shutil.rmtree(plugin_path)
-                    os.mkdir(plugin_path)
-                    Repo.clone_from(l[2],to_path=plugin_path,branch='master')
-
-                    # 读取插件的requirements.txt
-                    if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
-                        with open(os.path.join(plugin_path, "requirements.txt"), "r", encoding="utf-8") as f:
-                            for line in f.readlines():
-                                mm = os.system(f"pip3 install {line.strip()}")
-                                if mm != 0:
-                                    return False, "插件依赖安装失败，需要您手动pip安装对应插件的依赖。", "plugin"
-                    # 加载没缓存的插件
-                    ok, err = self.plugin_reload(cached_plugins, target=d)
-                    if ok:
-                        return True, "插件拉取并载入成功~", "plugin"
-                    else:
-                        # if os.path.exists(plugin_path):
-                        #     shutil.rmtree(plugin_path)
-                        return False, f"插件拉取载入失败。\n跟踪: \n{err}", "plugin"
+                    putil.install_plugin(l[2], cached_plugins)
+                    return True, "插件拉取并载入成功~", "plugin"
                 except BaseException as e:
                     return False, f"拉取插件失败，原因: {str(e)}", "plugin"
             elif l[1] == "d":
                 if role != "admin":
                     return False, f"你的身份组{role}没有权限删除插件", "plugin"
                 try:
-                    # 删除文件夹
-                    # shutil.rmtree(os.path.join(ppath, l[2]))
-                    self.remove_dir(os.path.join(ppath, l[2]))
-                    if l[2] in cached_plugins:
-                        del cached_plugins[l[2]]
+                    putil.uninstall_plugin(l[2], cached_plugins)
                     return True, "插件卸载成功~", "plugin"
                 except BaseException as e:
                     return False, f"卸载插件失败，原因: {str(e)}", "plugin"
             elif l[1] == "u":
-                plugin_path = os.path.join(ppath, l[2])
                 try:
-                    repo = Repo(path = plugin_path)
-                    repo.remotes.origin.pull()
-                    ok, err = self.plugin_reload(cached_plugins, target=l[2])
-                    if ok:
-                        return True, "\n更新插件成功!!", "plugin"
-                    else:
-                        return False, "更新插件成功，但是重载插件失败。\n问题跟踪: \n"+err, "plugin"
+                    putil.update_plugin(l[2], cached_plugins)
+                    return True, "\n更新插件成功!!", "plugin"
                 except BaseException as e:
-                    return False, "更新插件失败, 请使用plugin i指令覆盖安装", "plugin"
-
+                    return False, f"更新插件失败，原因: {str(e)}。\n建议: 使用 plugin i 指令进行覆盖安装(插件数据可能会丢失)", "plugin"
             elif l[1] == "l":
                 try:
                     plugin_list_info = "\n".join([f"{k}: \n名称: {v['info']['name']}\n简介: {v['info']['desc']}\n版本: {v['info']['version']}\n作者: {v['info']['author']}\n" for k, v in cached_plugins.items()])
-                    if platform == gu.PLATFORM_GOCQ:
-                        p = gu.create_text_image("【已激活插件列表】", plugin_list_info + "\n使用plugin v 插件名 查看插件帮助\n")
-                        return True, [Image.fromFileSystem(p)], "plugin"
-                    return True, "\n=====已激活插件列表=====\n" + plugin_list_info + "\n使用plugin v 插件名 查看插件帮助\n=================", "plugin"
+                    p = gu.create_text_image("【已激活插件列表】", plugin_list_info + "\n使用plugin v 插件名 查看插件帮助\n")
+                    return True, [Image.fromFileSystem(p)], "plugin"
                 except BaseException as e:
                     return False, f"获取插件列表失败，原因: {str(e)}", "plugin"
             elif l[1] == "v":
                 try:
                     if l[2] in cached_plugins:
                         info = cached_plugins[l[2]]["info"]
-                        if platform == gu.PLATFORM_GOCQ:
-                            p = gu.create_text_image(f"【插件信息】", f"名称: {info['name']}\n{info['desc']}\n版本: {info['version']}\n作者: {info['author']}\n\n帮助:\n{info['help']}")
-                            return True, [Image.fromFileSystem(p)], "plugin"
-                        res = f"\n=====插件信息=====\n名称: {info['name']}\n{info['desc']}\n版本: {info['version']}作者: {info['author']}\n\n帮助:\n{info['help']}"
-                        return True, res, "plugin"
+                        p = gu.create_text_image(f"【插件信息】", f"名称: {info['name']}\n{info['desc']}\n版本: {info['version']}\n作者: {info['author']}\n\n帮助:\n{info['help']}")
+                        return True, [Image.fromFileSystem(p)], "plugin"
                     else:
                         return False, "未找到该插件", "plugin"
                 except BaseException as e:
                     return False, f"获取插件信息失败，原因: {str(e)}", "plugin"
-            elif l[1] == "reload":
-                if role != "admin":
-                    return False, f"你的身份组{role}没有权限重载插件", "plugin"
-                try:
-                    ok, err = self.plugin_reload(cached_plugins, all = True)
-                    if ok:
-                        return True, "\n重载插件成功~", "plugin"
-                    else:
-                        # if os.path.exists(plugin_path):
-                        #     shutil.rmtree(plugin_path)
-                        return False, f"插件重载失败。\n跟踪: \n{err}", "plugin"
-                except BaseException as e:
-                    return False, f"插件重载失败，原因: {str(e)}", "plugin"
-                
             elif l[1] == "dev":
                 if role != "admin":
                     return False, f"你的身份组{role}没有权限开发者模式", "plugin"
                 return True, "cached_plugins: \n" + str(cached_plugins), "plugin"
-    
-
-    def remove_dir(self, file_path):        
-        while 1:
-            if not os.path.exists(file_path):
-                break
-            try:
-                shutil.rmtree(file_path)
-            except PermissionError as e:
-                err_file_path = str(e).split("\'", 2)[1]
-                if os.path.exists(err_file_path):
-                    os.chmod(err_file_path, stat.S_IWUSR)
-
 
     '''
     nick: 存储机器人的昵称
@@ -261,39 +190,23 @@ class Command:
             if len(l) == 1:
                 return True, "【设置机器人昵称】示例：\n支持多昵称\nnick 昵称1 昵称2 昵称3", "nick"
             nick = l[1:]
-            self.general_command_storer("nick_qq", nick)
+            cc.put("nick_qq", nick)
+            self.global_object.nick = tuple(nick)
             return True, f"设置成功！现在你可以叫我这些昵称来提问我啦~", "nick"
         elif platform == PLATFORM_QQCHAN:
             nick = message.split(" ")[2]
             return False, "QQ频道平台不支持为机器人设置昵称。", "nick"
-    
-    """
-    存储指令结果到cmd_config.json
-    """
-    def general_command_storer(self, key, value):
-        if not os.path.exists("cmd_config.json"):
-            config = {}
-        else:
-            with open("cmd_config.json", "r", encoding="utf-8") as f:
-                config = json.load(f)
-        config[key] = value
-        with open("cmd_config.json", "w", encoding="utf-8") as f:
-            json.dump(config, f, indent=4, ensure_ascii=False)
-            f.flush()
 
-    
     def general_commands(self):
         return {
             "help": "帮助",
             "keyword": "设置关键词/关键指令回复",
-            "update": "更新面板",
-            "update latest": "更新到最新版本",
-            "update r": "重启机器人",
-            "reset": "重置会话",
+            "update": "更新项目",
             "nick": "设置机器人昵称",
             "plugin": "插件安装、卸载和重载",
-            "/bing": "切换到bing模型",
-            "/gpt": "切换到OpenAI ChatGPT API",
+            "web on/off": "LLM 网页搜索能力",
+            "reset": "重置 LLM 对话",
+            "/gpt": "切换到 OpenAI 官方接口",
             "/revgpt": "切换到网页版ChatGPT",
         }
     
@@ -315,32 +228,53 @@ class Command:
                 msg += plugin_list_info
         msg += notice
 
-        if platform == gu.PLATFORM_GOCQ:
-            try:
-                # p = gu.create_text_image("【Help Center】", msg)
-                p = gu.create_markdown_image(msg)
-                return [Image.fromFileSystem(p)]
-            except BaseException as e:
-                gu.log(str(e))
-                return msg
-        return msg
+        try:
+            # p = gu.create_text_image("【Help Center】", msg)
+            p = gu.create_markdown_image(msg)
+            return [Image.fromFileSystem(p)]
+        except BaseException as e:
+            self.logger.log(str(e))
+        finally:
+            return msg
     
-    # 接受可变参数
     def command_start_with(self, message: str, *args):
+        '''
+        当消息以指定的指令开头时返回True
+        '''
         for arg in args:
             if message.startswith(arg) or message.startswith('/'+arg):
                 return True
         return False
     
     # keyword: 关键字
-    def keyword(self, message: str, role: str):
+    def keyword(self, message_obj, role: str):
         if role != "admin":
             return True, "你没有权限使用该指令", "keyword"
+        
+        plain_text = ""
+        image_url = ""
 
-        l = message.split(" ")
+        for comp in message_obj.message:
+            if isinstance(comp, Plain):
+                plain_text += comp.text
+            elif isinstance(comp, Image) and image_url == "":
+                if comp.url is None:
+                    image_url = comp.file
+                else:
+                    image_url = comp.url
 
-        if len(l) < 3:
-            return True, "【设置关键词回复】示例：\nkeyword hi 你好\n当发送hi的时候会回复你好\nkeyword /hi 你好\n当发送/hi时会回复你好\n删除关键词: keyword d hi\n删除hi关键词的回复", "keyword"
+        l = plain_text.split(" ")
+
+        if len(l) < 3 and image_url == "":
+            return True, """【设置关键词回复】示例：
+1. keyword hi 你好
+当发送hi的时候会回复你好
+2. keyword /hi 你好
+当发送/hi时会回复你好
+3. keyword d hi
+删除hi关键词的回复
+4. keyword hi <图片>
+当发送hi时会回复图片""", "keyword"
         
         del_mode = False
         if l[1] == "d":
@@ -356,70 +290,64 @@ class Command:
                             return False, "该关键词不存在", "keyword"
                         else: del keyword[l[2]]
                     else:
-                        keyword[l[1]] = l[2]
+                        keyword[l[1]] = {
+                            "plain_text": " ".join(l[2:]),
+                            "image_url": image_url
+                        }
             else:
                 if del_mode:
                     return False, "该关键词不存在", "keyword"
-                keyword = {l[1]: l[2]}
+                keyword = {
+                    l[1]: {
+                    "plain_text": " ".join(l[2:]),
+                    "image_url": image_url
+                    }
+                }
             with open("keyword.json", "w", encoding="utf-8") as f:
                 json.dump(keyword, f, ensure_ascii=False, indent=4)
                 f.flush()
             if del_mode:
                 return True, "删除成功: "+l[2], "keyword"
-            return True, "设置成功: "+l[1]+" -> "+l[2], "keyword"
+            if image_url == "":
+                return True, "设置成功: "+l[1]+" "+" ".join(l[2:]), "keyword"
+            else:
+                return True, [Plain("设置成功: "+l[1]+" "+" ".join(l[2:])), Image.fromURL(image_url)], "keyword"
         except BaseException as e:
             return False, "设置失败: "+str(e), "keyword"
     
     def update(self, message: str, role: str):
+        if not has_git:
+            return False, "你正在运行在无Git环境下，暂时将无法使用插件、热更新功能。", "update"
         if role != "admin":
             return True, "你没有权限使用该指令", "keyword"
         l = message.split(" ")
         if len(l) == 1:
-            # 得到本地版本号和最新版本号
             try:
-                repo = Repo()
-            except git.exc.InvalidGitRepositoryError:
-                repo = Repo(path="QQChannelChatGPT")
-            now_commit = repo.head.commit
-
-            # 得到远程3条commit列表, 包含commit信息
-            origin = repo.remotes.origin
-            origin.fetch()
-            commits = list(repo.iter_commits('master', max_count=3))
-            commits_log = ''
-            index = 1
-            for commit in commits:
-                if commit.message.endswith("\n"):
-                    commits_log += f"[{index}] {commit.message}-----------\n"
-                else:
-                    commits_log += f"[{index}] {commit.message}\n-----------\n"
-                index+=1
-            remote_commit_hash = origin.refs.master.commit.hexsha[:6]
-
-            return True, f"当前版本: {now_commit.hexsha[:6]}\n最新版本: {remote_commit_hash}\n\n3条commit(非最新):\n{str(commits_log)}\n使用update latest更新至最新版本\n", "update"
+                update_info = util.updator.check_update()
+                update_info += "\nTips:\n输入「update latest」更新到最新版本\n输入「update <版本号如v3.1.3>」切换到指定版本\n输入「update r」重启机器人\n"
+                return True, update_info, "update"
+            except BaseException as e:
+                return False, "检查更新失败: "+str(e), "update"
         else:
             if l[1] == "latest":
-                pash_tag = ""
                 try:
-                    try:
-                        repo = Repo()
-                    except git.exc.InvalidGitRepositoryError:
-                        repo = Repo(path="QQChannelChatGPT")
-                        pash_tag = "QQChannelChatGPT"+os.sep
-                    repo.remotes.origin.pull()
-
-                    if len(l) == 3 and l[2] == "r":
-                        py = sys.executable
-                        os.execl(py, py, *sys.argv)
-
-                    return True, "更新成功~是否重启？输入update r重启（重启指令不返回任何确认信息）。", "update"
-                    
+                    release_data = util.updator.request_release_info()
+                    util.updator.update_project(release_data)
+                    return True, "更新成功，重启生效。可输入「update r」重启", "update"
                 except BaseException as e:
                     return False, "更新失败: "+str(e), "update"
-            if l[1] == "r":
-                py = sys.executable
-                os.execl(py, py, *sys.argv)
-
+            elif l[1] == "r":
+                util.updator._reboot()
+            else:
+                if l[1].lower().startswith('v'):
+                    try:
+                        release_data = util.updator.request_release_info(latest=False)
+                        util.updator.update_project(release_data, latest=False, version=l[1])
+                        return True, "更新成功，重启生效。可输入「update r」重启", "update"
+                    except BaseException as e:
+                        return False, "更新失败: "+str(e), "update"
+                else:
+                    return False, "版本号格式错误", "update"
 
     def reset(self):
         return False
@@ -446,6 +374,4 @@ class Command:
         return False
     
     def draw(self):
-        return False
-    
-    
+        return False

model/command/command_rev_chatgpt.py

@@ -1,39 +0,0 @@
-from model.command.command import Command
-from model.provider.provider_rev_chatgpt import ProviderRevChatGPT
-from model.platform.qq import QQ
-
-class CommandRevChatGPT(Command):
-    def __init__(self, provider: ProviderRevChatGPT):
-        self.provider = provider
-        self.cached_plugins = {}
-
-    def check_command(self, 
-                      message: str, 
-                      role: str, 
-                      platform: str,
-                      message_obj,
-                      cached_plugins: dict,
-                      qq_platform: QQ):
-        self.platform = platform
-        hit, res = super().check_command(message, role, platform, message_obj=message_obj, cached_plugins=cached_plugins, qq_platform=qq_platform)
-        if hit:
-            return True, res
-        if self.command_start_with(message, "help", "帮助"):
-            return True, self.help(cached_plugins)
-        elif self.command_start_with(message, "reset"):
-            return True, self.reset()
-        elif self.command_start_with(message, "update"):
-            return True, self.update(message, role)
-        elif self.command_start_with(message, "keyword"):
-            return True, self.keyword(message, role)
-        
-        if self.command_start_with(message, "/"):
-            return True, (False, "未知指令", "unknown_command")
-        return False, None
-    
-    def reset(self):
-        return False, "此功能暂未开放", "reset"
-    
-    
-    def help(self, cached_plugins: dict):
-        return True, super().help_messager(super().general_commands(), self.platform, cached_plugins), "help"

model/command/command_rev_edgegpt.py

@@ -1,49 +0,0 @@
-from model.command.command import Command
-from model.provider.provider_rev_edgegpt import ProviderRevEdgeGPT
-import asyncio
-from model.platform.qq import QQ
-
-class CommandRevEdgeGPT(Command):
-    def __init__(self, provider: ProviderRevEdgeGPT):
-        self.provider = provider
-        self.cached_plugins = {}
-
-        
-    def check_command(self, 
-                      message: str, 
-                      loop, 
-                      role: str, 
-                      platform: str,
-                      message_obj,
-                      cached_plugins: dict, 
-                      qq_platform: QQ):
-        self.platform = platform
-        hit, res = super().check_command(message, role, platform, message_obj=message_obj, cached_plugins=cached_plugins, qq_platform=qq_platform)
-        if hit:
-            return True, res
-        if self.command_start_with(message, "reset"):
-            return True, self.reset(loop)
-        elif self.command_start_with(message, "help"):
-            return True, self.help(cached_plugins)
-        elif self.command_start_with(message, "update"):
-            return True, self.update(message, role)
-        elif self.command_start_with(message, "keyword"):
-            return True, self.keyword(message, role)
-        
-        if self.command_start_with(message, "/"):
-            return True, (False, "未知指令", "unknown_command")
-        return False, None
-    
-    def reset(self, loop):
-        if self.provider is None:
-            return False, "未启动Bing语言模型.", "reset"
-        res = asyncio.run_coroutine_threadsafe(self.provider.forget(), loop).result()
-        print(res)
-        if res:
-            return res, "重置成功", "reset"
-        else:
-            return res, "重置失败", "reset"
-    
-    def help(self, cached_plugins: dict):
-        return True, super().help_messager(super().general_commands(), self.platform, cached_plugins), "help"
-        

model/command/openai_official.py

@@ -1,61 +1,61 @@
 from model.command.command import Command
-from model.provider.provider_openai_official import ProviderOpenAIOfficial
+from model.provider.openai_official import ProviderOpenAIOfficial
 from cores.qqbot.personality import personalities
-from model.platform.qq import QQ
-from util import general_utils as gu
-
+from cores.qqbot.global_object import GlobalObject
 
 class CommandOpenAIOfficial(Command):
-    def __init__(self, provider: ProviderOpenAIOfficial):
+    def __init__(self, provider: ProviderOpenAIOfficial, global_object: GlobalObject):
         self.provider = provider
         self.cached_plugins = {}
+        self.global_object = global_object
+        self.personality_str = ""
+        super().__init__(provider, global_object)
         
     def check_command(self, 
                       message: str, 
                       session_id: str, 
-                      user_name: str, 
                       role: str, 
                       platform: str,
-                      message_obj,
-                      cached_plugins: dict,
-                      qq_platform: QQ):
+                      message_obj):
         self.platform = platform
-        hit, res = super().check_command(message, role, platform, message_obj=message_obj, cached_plugins=cached_plugins, qq_platform=qq_platform)
+        hit, res = super().check_command(
+            message,
+            session_id,
+            role,
+            platform,
+            message_obj
+        )
+        
         if hit:
             return True, res
         if self.command_start_with(message, "reset", "重置"):
-            return True, self.reset(session_id)
+            return True, self.reset(session_id, message)
         elif self.command_start_with(message, "his", "历史"):
-            return True, self.his(message, session_id, user_name)
+            return True, self.his(message, session_id)
         elif self.command_start_with(message, "token"):
             return True, self.token(session_id)
         elif self.command_start_with(message, "gpt"):
             return True, self.gpt()
         elif self.command_start_with(message, "status"):
             return True, self.status()
-        elif self.command_start_with(message, "count"):
-            return True, self.count()
         elif self.command_start_with(message, "help", "帮助"):
-            return True, self.help(cached_plugins)
+            return True, self.help()
         elif self.command_start_with(message, "unset"):
             return True, self.unset(session_id)
         elif self.command_start_with(message, "set"):
             return True, self.set(message, session_id)
         elif self.command_start_with(message, "update"):
             return True, self.update(message, role)
-        elif self.command_start_with(message, "画"):
+        elif self.command_start_with(message, "画", "draw"):
             return True, self.draw(message)
-        elif self.command_start_with(message, "keyword"):
-            return True, self.keyword(message, role)
         elif self.command_start_with(message, "key"):
-            return True, self.key(message, user_name)
-        
-        if self.command_start_with(message, "/"):
-            return True, (False, "未知指令", "unknown_command")
+            return True, self.key(message)
+        elif self.command_start_with(message, "switch"):
+            return True, self.switch(message)
         
         return False, None
     
-    def help(self, cached_plugins):
+    def help(self):
         commands = super().general_commands()
         commands['画'] = '画画'
         commands['key'] = '添加OpenAI key'
@@ -63,18 +63,25 @@ class CommandOpenAIOfficial(Command):
         commands['gpt'] = '查看gpt配置信息'
         commands['status'] = '查看key使用状态'
         commands['token'] = '查看本轮会话token'
-        return True, super().help_messager(commands, self.platform, cached_plugins), "help"
+        return True, super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"
 
         
-    def reset(self, session_id: str):
+    def reset(self, session_id: str, message: str = "reset"):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "reset"
-        self.provider.forget(session_id)
-        return True, "重置成功", "reset"
+            return False, "未启用 OpenAI 官方 API", "reset"
+        l = message.split(" ")
+        if len(l) == 1:
+            self.provider.forget(session_id)
+            return True, "重置成功", "reset"
+        if len(l) == 2 and l[1] == "p":
+            self.provider.forget(session_id)
+            if self.personality_str != "":
+                self.set(self.personality_str, session_id) # 重新设置人格
+            return True, "重置成功", "reset"
     
-    def his(self, message: str, session_id: str, name: str):
+    def his(self, message: str, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "his"
+            return False, "未启用 OpenAI 官方 API", "his"
         #分页，每页5条
         msg = ''
         size_per_page = 3
@@ -92,17 +99,17 @@ class CommandOpenAIOfficial(Command):
     
     def token(self, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "token"
+            return False, "未启用 OpenAI 官方 API", "token"
         return True, f"会话的token数: {self.provider.get_user_usage_tokens(self.provider.session_dict[session_id])}\n系统最大缓存token数: {self.provider.max_tokens}", "token"
 
     def gpt(self):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "gpt"
+            return False, "未启用 OpenAI 官方 API", "gpt"
         return True, f"OpenAI GPT配置:\n {self.provider.chatGPT_configs}", "gpt"
     
     def status(self):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "status"
+            return False, "未启用 OpenAI 官方 API", "status"
         chatgpt_cfg_str = ""
         key_stat = self.provider.get_key_stat()
         index = 1
@@ -118,45 +125,71 @@ class CommandOpenAIOfficial(Command):
                 continue
             if 'sponsor' in key_stat[key]:
                 sponsor = key_stat[key]['sponsor']
-            chatgpt_cfg_str += f"  |-{index}: {key_stat[key]['used']}/{max} {sponsor}赞助{tag}\n"
+            chatgpt_cfg_str += f"  |-{index}: {key[-8:]} {key_stat[key]['used']}/{max} {sponsor}{tag}\n"
             index += 1
-        return True, f"⭐使用情况({str(gg_count)}个已用):\n{chatgpt_cfg_str}⏰全频道已用{total}tokens", "status"
+        return True, f"⭐使用情况({str(gg_count)}个已用):\n{chatgpt_cfg_str}", "status"
 
-    def count(self):
+    def key(self, message: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "reset"
-        guild_count, guild_msg_count, guild_direct_msg_count, session_count = self.provider.get_stat()
-        return True, f"当前会话数: {len(self.provider.session_dict)}\n共有频道数: {guild_count} \n共有消息数: {guild_msg_count}\n私信数: {guild_direct_msg_count}\n历史会话数: {session_count}", "count"
-
-    def key(self, message: str, user_name: str):
-        if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "reset"
+            return False, "未启用 OpenAI 官方 API", "reset"
         l = message.split(" ")
         if len(l) == 1:
             msg = "感谢您赞助key，key为官方API使用，请以以下格式赞助:\n/key xxxxx"
             return True, msg, "key"
         key = l[1]
         if self.provider.check_key(key):
-            self.provider.append_key(key, user_name)
-            return True, f"*★,°*:.☆(￣▽￣)/$:*.°★* 。\n该Key被验证为有效。感谢{user_name}赞助~"
+            self.provider.append_key(key)
+            return True, f"*★,°*:.☆(￣▽￣)/$:*.°★* 。\n该Key被验证为有效。感谢你的赞助~"
         else:
             return True, "该Key被验证为无效。也许是输入错误了，或者重试。", "key"
 
+    def switch(self, message: str):
+        '''
+        切换账号
+        '''
+        l = message.split(" ")
+        if len(l) == 1:
+            _, ret, _ = self.status()
+            curr_ = self.provider.get_curr_key()
+            if curr_ is None:
+                ret += "当前您未选择账号。输入/switch <账号序号>切换账号。"
+            else:
+                ret += f"当前您选择的账号为：{curr_[-8:]}。输入/switch <账号序号>切换账号。"
+            return True, ret, "switch"
+        elif len(l) == 2:
+            try:
+                key_stat = self.provider.get_key_stat()
+                index = int(l[1])
+                if index > len(key_stat) or index < 1:
+                    return True, "账号序号不合法。", "switch"
+                else:
+                    try:
+                        new_key = list(key_stat.keys())[index-1]
+                        ret = self.provider.check_key(new_key)
+                        self.provider.set_key(new_key)
+                    except BaseException as e:
+                        return True, "账号切换失败，原因: " + str(e), "switch"
+                    return True, f"账号切换成功。", "switch"
+            except BaseException as e:
+                return True, "未知错误: "+str(e), "switch"
+        else:
+            return True, "参数过多。", "switch"
+
     def unset(self, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "unset"
-        self.provider.now_personality = {}
+            return False, "未启用 OpenAI 官方 API", "unset"
+        self.provider.curr_personality = {}
         self.provider.forget(session_id)
         return True, "已清除人格并重置历史记录。", "unset"
 
     def set(self, message: str, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "set"
+            return False, "未启用 OpenAI 官方 API", "set"
         l = message.split(" ")
         if len(l) == 1:
-            return True, f"【由Github项目QQChannelChatGPT支持】\n\n【人格文本由PlexPt开源项目awesome-chatgpt-pr \
-        ompts-zh提供】\n\n这个是人格设置指令。\n设置人格: \n/set 人格名。例如/set 编剧\n人格列表: /set list\n人格详细信息: \
-        /set view 人格名\n自定义人格: /set 人格文本\n清除人格: /unset\n【当前人格】: {str(self.provider.now_personality)}", "set"
+            return True, f"【人格文本由PlexPt开源项目awesome-chatgpt-pr \
+        ompts-zh提供】\n设置人格: \n/set 人格名。例如/set 编剧\n人格列表: /set list\n人格详细信息: \
+        /set view 人格名\n自定义人格: /set 人格文本\n重置会话(清除人格): /reset\n重置会话(保留人格): /reset p\n【当前人格】: {str(self.provider.curr_personality)}", "set"
         elif l[1] == "list":
             msg = "人格列表：\n"
             for key in personalities.keys():
@@ -177,41 +210,53 @@ class CommandOpenAIOfficial(Command):
         else:
             ps = l[1].strip()
             if ps in personalities:
-                self.provider.now_personality = {
+                self.provider.curr_personality = {
                     'name': ps,
                     'prompt': personalities[ps]
                 }
                 self.provider.session_dict[session_id] = []
                 new_record = {
                     "user": {
-                        "role": "system",
+                        "role": "user",
                         "content": personalities[ps],
                     },
+                    "AI": {
+                        "role": "assistant",
+                        "content": "好的，接下来我会扮演这个角色。"
+                    },
+                    'type': "personality",
                     'usage_tokens': 0,
                     'single-tokens': 0
                 }
                 self.provider.session_dict[session_id].append(new_record)
-                return True, f"人格{ps}已设置.", "set"
+                self.personality_str = message
+                return True, f"人格{ps}已设置。", "set"
             else:
-                self.provider.now_personality = {
+                self.provider.curr_personality = {
                     'name': '自定义人格',
                     'prompt': ps
                 }
                 new_record = {
                     "user": {
-                        "role": "system",
+                        "role": "user",
                         "content": ps,
                     },
+                    "AI": {
+                        "role": "assistant",
+                        "content": "好的，接下来我会扮演这个角色。"
+                    },
+                    'type': "personality",
                     'usage_tokens': 0,
                     'single-tokens': 0
                 }
                 self.provider.session_dict[session_id] = []
                 self.provider.session_dict[session_id].append(new_record)
+                self.personality_str = message
                 return True, f"自定义人格已设置。 \n人格信息: {ps}", "set"
             
     def draw(self, message):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "draw"
+            return False, "未启用 OpenAI 官方 API", "draw"
         if message.startswith("/画"):
             message = message[2:]
         elif message.startswith("画"):
@@ -223,9 +268,4 @@ class CommandOpenAIOfficial(Command):
         except Exception as e:
             if 'exceeded' in str(e):
                 return f"OpenAI API错误。原因：\n{str(e)} \n超额了。可自己搭建一个机器人(Github仓库：QQChannelChatGPT)"
-            return False, f"图片生成失败: {e}", "draw"
-        
-    
-
-    
-    
+            return False, f"图片生成失败: {e}", "draw"

model/command/rev_chatgpt.py

@@ -0,0 +1,133 @@
+from model.command.command import Command
+from model.provider.rev_chatgpt import ProviderRevChatGPT
+from cores.qqbot.personality import personalities
+from cores.qqbot.global_object import GlobalObject
+
+class CommandRevChatGPT(Command):
+    def __init__(self, provider: ProviderRevChatGPT, global_object: GlobalObject):
+        self.provider = provider
+        self.cached_plugins = {}
+        self.global_object = global_object
+        self.personality_str = ""
+        super().__init__(provider, global_object)
+
+    def check_command(self, 
+                      message: str, 
+                      session_id: str,
+                      role: str, 
+                      platform: str,
+                      message_obj):
+        self.platform = platform
+        hit, res = super().check_command(
+            message,
+            session_id,
+            role,
+            platform,
+            message_obj
+        )
+        
+        if hit:
+            return True, res
+        if self.command_start_with(message, "help", "帮助"):
+            return True, self.help()
+        elif self.command_start_with(message, "reset"):
+            return True, self.reset(session_id, message)
+        elif self.command_start_with(message, "update"):
+            return True, self.update(message, role)
+        elif self.command_start_with(message, "set"):
+            return True, self.set(message, session_id)
+        elif self.command_start_with(message, "switch"):
+            return True, self.switch(message, session_id)
+        return False, None
+
+    def reset(self, session_id, message: str):
+        l = message.split(" ")
+        if len(l) == 1:
+            self.provider.forget(session_id)
+            return True, "重置完毕。", "reset"
+        if len(l) == 2 and l[1] == "p":
+            self.provider.forget(session_id)
+            ret = self.provider.text_chat(self.personality_str)
+            return True, f"重置完毕（保留人格）。\n\n{ret}", "reset"
+    
+    def set(self, message: str, session_id: str):
+        l = message.split(" ")
+        if len(l) == 1:
+            return True, f"设置人格: \n/set 人格名或人格文本。例如/set 编剧\n人格列表: /set list\n人格详细信息: \
+        /set view 人格名\n重置会话(清除人格): /reset\n重置会话(保留人格): /reset p", "set"
+        elif l[1] == "list":
+            msg = "人格列表：\n"
+            for key in personalities.keys():
+                msg += f"  |-{key}\n"
+            msg += '\n\n*输入/set view 人格名查看人格详细信息'
+            msg += '\n*不定时更新人格库，请及时更新本项目。'
+            return True, msg, "set"
+        elif l[1] == "view":
+            if len(l) == 2:
+                return True, "请输入/set view 人格名", "set"
+            ps = l[2].strip()
+            if ps in personalities:
+                msg = f"人格【{ps}】详细信息：\n"
+                msg += f"{personalities[ps]}\n"
+            else:
+                msg = f"人格【{ps}】不存在。"
+            return True, msg, "set"
+        else:
+            ps = l[1].strip()
+            if ps in personalities:
+                self.reset(session_id, "reset")
+                self.personality_str = personalities[ps]
+                ret = self.provider.text_chat(self.personality_str, session_id)
+                return True, f"人格【{ps}】已设置。\n\n{ret}", "set"
+            else:
+                self.reset(session_id, "reset")
+                self.personality_str = ps
+                ret = self.provider.text_chat(ps, session_id)
+                return True, f"人格信息已设置。\n\n{ret}", "set"
+
+    def switch(self, message: str, session_id: str):
+        '''
+        切换账号
+        '''
+        l = message.split(" ")
+        rev_chatgpt = self.provider.get_revchatgpt()
+        if len(l) == 1:
+            ret = "当前账号：\n"
+            index = 0
+            curr_ = None
+            for revstat in rev_chatgpt:
+                index += 1
+                ret += f"[{index}]. {revstat['id']}\n"
+                # if session_id in revstat['user']:
+                #     curr_ = revstat['id']
+                for user in revstat['user']:
+                    if session_id == user['id']:
+                        curr_ = revstat['id']
+                        break
+            if curr_ is None:
+                ret += "当前您未选择账号。输入/switch <账号序号>切换账号。"
+            else:
+                ret += f"当前您选择的账号为：{curr_}。输入/switch <账号序号>切换账号。"
+            return True, ret, "switch"
+        elif len(l) == 2:
+            try:
+                index = int(l[1])
+                if index > len(self.provider.rev_chatgpt) or index < 1:
+                    return True, "账号序号不合法。", "switch"
+                else:
+                    # pop
+                    for revstat in self.provider.rev_chatgpt:
+                        if session_id in revstat['user']:
+                            revstat['user'].remove(session_id)
+                    # append
+                    self.provider.rev_chatgpt[index - 1]['user'].append(session_id)
+                    return True, f"切换账号成功。当前账号为：{self.provider.rev_chatgpt[index - 1]['id']}", "switch"
+            except BaseException:
+                return True, "账号序号不合法。", "switch"
+        else:
+            return True, "参数过多。", "switch"
+
+    def help(self):
+        commands = super().general_commands()
+        commands['set'] = '设置人格'
+        return True, super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"

model/platform/_message_result.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+from typing import Union, Optional
+
+@dataclass
+class MessageResult():
+    result_message: Union[str, list]
+    is_command_call: Optional[bool] = False
+    callback: Optional[callable] = None

model/platform/_nakuru_translation_layer.py

@@ -0,0 +1,77 @@
+from nakuru.entities.components import Plain, At, Image
+from botpy.message import Message, DirectMessage
+
+class NakuruGuildMember():
+    tiny_id: int # 发送者识别号
+    user_id: int # 发送者识别号
+    title: str 
+    nickname: str # 昵称
+    role: int # 角色
+    icon_url: str # 头像url
+
+class NakuruGuildMessage():
+    type: str = "GuildMessage"
+    self_id: int # bot的qq号
+    self_tiny_id: int # bot的qq号
+    sub_type: str # 消息类型
+    message_id: str # 消息id
+    guild_id: int # 频道号 
+    channel_id: int # 子频道号
+    user_id: int # 发送者qq号
+    message: list # 消息内容
+    sender: NakuruGuildMember # 发送者信息
+    raw_message: Message
+
+    def __str__(self) -> str:
+        return str(self.__dict__)
+
+# gocq-频道SDK兼容层（发）
+def gocq_compatible_send(gocq_message_chain: list):
+    plain_text = ""
+    image_path = None # only one img supported
+    for i in gocq_message_chain:
+        if isinstance(i, Plain):
+            plain_text += i.text
+        elif isinstance(i, Image) and image_path == None:
+            if i.path is not None:
+                image_path = i.path
+            else:
+                image_path = i.file
+    return plain_text, image_path
+
+# gocq-频道SDK兼容层（收）
+def gocq_compatible_receive(message: Message) -> NakuruGuildMessage:
+    ngm = NakuruGuildMessage()
+    try:
+        ngm.self_id = message.mentions[0].id
+        ngm.self_tiny_id = message.mentions[0].id
+    except:
+        ngm.self_id = 0
+        ngm.self_tiny_id = 0
+
+    ngm.sub_type = "normal"
+    ngm.message_id = message.id
+    ngm.guild_id = int(message.guild_id)
+    ngm.channel_id = int(message.channel_id)
+    ngm.user_id = int(message.author.id)
+    msg = []
+    plain_content = message.content.replace("<@!"+str(ngm.self_id)+">", "").strip()
+    msg.append(Plain(plain_content))
+    if message.attachments:
+        for i in message.attachments:
+            if i.content_type.startswith("image"):
+                url = i.url
+                if not url.startswith("http"):
+                    url = "https://"+url
+                img = Image.fromURL(url)
+                msg.append(img)
+    ngm.message = msg
+    ngm.sender = NakuruGuildMember()
+    ngm.sender.tiny_id = int(message.author.id)
+    ngm.sender.user_id = int(message.author.id)
+    ngm.sender.title = ""
+    ngm.sender.nickname = message.author.username
+    ngm.sender.role = 0
+    ngm.sender.icon_url = message.author.avatar
+    ngm.raw_message = message
+    return ngm

model/platform/_platfrom.py

@@ -0,0 +1,82 @@
+import abc
+import threading
+import asyncio
+from typing import Callable, Union
+from nakuru import (
+    GuildMessage,
+    GroupMessage,
+    FriendMessage,
+)
+from ._nakuru_translation_layer import (
+    NakuruGuildMessage,
+)
+from nakuru.entities.components import Plain, At, Image, Node
+
+
+class Platform():
+    def __init__(self, message_handler: callable) -> None:
+        '''
+        初始化平台的各种接口
+        '''
+        self.message_handler = message_handler
+        pass
+
+    @abc.abstractmethod
+    def handle_msg():
+        '''
+        处理到来的消息
+        '''
+        pass
+
+    @abc.abstractmethod
+    def reply_msg():
+        '''
+        回复消息（被动发送）
+        '''
+        pass
+
+    @abc.abstractmethod
+    def send_msg():
+        '''
+        发送消息（主动发送）
+        '''
+        pass
+
+    @abc.abstractmethod
+    def send():
+        '''
+        发送消息（主动发送）同 send_msg()
+        '''
+        pass
+    
+    def parse_message_outline(self, message: Union[GuildMessage, GroupMessage, FriendMessage, str]) -> NakuruGuildMessage:
+        '''
+        将消息解析成大纲消息形式。
+        如: xxxxx[图片]xxxxx
+        '''
+        if isinstance(message, str):
+            return message
+        ret = ''
+        try:
+            for node in message.message:
+                if isinstance(node, Plain):
+                    ret += node.text
+                elif isinstance(node, At):
+                    ret += f'[At: {node.name}/{node.qq}]'
+                elif isinstance(node, Image):
+                    ret += f'[图片]'
+        except Exception as e:
+            pass
+        ret.replace('\n', '')
+        return ret
+
+
+    def new_sub_thread(self, func, args=()):
+        thread = threading.Thread(target=self._runner, args=(func, args), daemon=True)
+        thread.start()
+
+    def _runner(self, func: Callable, args: tuple):
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        loop.run_until_complete(func(*args))
+        loop.close()

model/platform/qq.py

@@ -1,143 +0,0 @@
-from nakuru.entities.components import Plain, At, Image, Node
-from util import general_utils as gu
-from util.cmd_config import CmdConfig
-import asyncio
-from nakuru import (
-    CQHTTP,
-    GuildMessage
-)
-import time
-
-
-class FakeSource:
-    def __init__(self, type, group_id):
-        self.type = type
-        self.group_id = group_id
-    
-class QQ:
-    def __init__(self, is_start: bool, cc: CmdConfig = None, gocq_loop = None) -> None:
-        self.is_start = is_start
-        self.gocq_loop = gocq_loop
-        self.cc = cc
-
-    def run_bot(self, gocq):
-        self.client: CQHTTP = gocq
-        self.client.run()
-
-    def get_msg_loop(self):
-        return self.gocq_loop
-
-    async def send_qq_msg(self, 
-                          source, 
-                          res, 
-                          image_mode: bool = False):
-
-        if not self.is_start:
-            raise Exception("管理员未启动GOCQ平台")
-        """
-         res可以是一个数组, 也就是gocq的消息链。
-         插件开发者请使用send方法, 可以不用直接调用这个方法。
-        """
-        gu.log("回复GOCQ消息: "+str(res), level=gu.LEVEL_INFO, tag="GOCQ", max_len=300)
-
-        if isinstance(source, int):
-            source = FakeSource("GroupMessage", source)
-        
-        # str convert to CQ Message Chain
-        if isinstance(res, str):
-            res_str = res
-            res = []
-            if source.type == "GroupMessage":
-                res.append(At(qq=source.user_id))
-            res.append(Plain(text=res_str))
-
-        # if image mode, put all Plain texts into a new picture.
-        if image_mode and isinstance(res, list):
-            plains = []
-            news = []
-            for i in res:
-                if isinstance(i, Plain):
-                    plains.append(i.text)
-                else:
-                    news.append(i)
-            p = gu.create_markdown_image("".join(plains))
-            news.append(Image.fromFileSystem(p))
-            res = news
-
-
-        # 回复消息链
-        if isinstance(res, list) and len(res) > 0:
-            if source.type == "GuildMessage":
-                await self.client.sendGuildChannelMessage(source.guild_id, source.channel_id, res)
-                return
-            elif source.type == "FriendMessage":
-                await self.client.sendFriendMessage(source.user_id, res)
-                return
-            elif source.type == "GroupMessage":
-                # 过长时forward发送
-                plain_text_len = 0
-                image_num = 0
-                for i in res:
-                    if isinstance(i, Plain):
-                        plain_text_len += len(i.text)
-                    elif isinstance(i, Image):
-                        image_num += 1
-                if plain_text_len > self.cc.get('qq_forward_threshold', 200):
-                    # 删除At
-                    for i in res:
-                        if isinstance(i, At):
-                            res.remove(i)
-                    node = Node(res)
-                    # node.content = res
-                    node.uin = source.self_id
-                    node.name = f"To {source.sender.nickname}:"
-                    node.time = int(time.time())
-                    print(node)
-                    nodes=[node]
-                    await self.client.sendGroupForwardMessage(source.group_id, nodes)
-                    return
-                await self.client.sendGroupMessage(source.group_id, res)
-                return
-
-    def send(self, 
-            to,
-            res,
-            ):
-        '''
-        提供给插件的发送QQ消息接口, 不用在外部await。
-        参数说明：第一个参数可以是消息对象，也可以是QQ群号。第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
-        '''
-        try:
-            asyncio.run_coroutine_threadsafe(self.send_qq_msg(to, res), self.gocq_loop).result()
-        except BaseException as e:
-            raise e
-        
-    def send_guild(self, 
-            message_obj,
-            res,
-            ):
-        '''
-        提供给插件的发送GOCQ QQ频道消息接口, 不用在外部await。
-        参数说明：第一个参数必须是消息对象, 第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
-        '''
-        try:
-            asyncio.run_coroutine_threadsafe(self.send_qq_msg(message_obj, res), self.gocq_loop).result()
-        except BaseException as e:
-            raise e
-
-    def create_text_image(title: str, text: str, max_width=30, font_size=20):
-        '''
-        文本转图片。
-        title: 标题
-        text: 文本内容
-        max_width: 文本宽度最大值（默认30）
-        font_size: 字体大小（默认20）
-
-        返回：文件路径
-        '''
-        try:
-            img = gu.word2img(title, text, max_width, font_size)
-            p = gu.save_temp_img(img)
-            return p
-        except Exception as e:
-            raise e

model/platform/qq_gocq.py

@@ -0,0 +1,324 @@
+from nakuru.entities.components import Plain, At, Image, Node
+from util import general_utils as gu
+from util.cmd_config import CmdConfig
+import asyncio
+from nakuru import (
+    CQHTTP,
+    GuildMessage,
+    GroupMessage,
+    FriendMessage,
+    GroupMemberIncrease,
+    Notify,
+    Member
+)
+from typing import Union
+import time
+
+from ._platfrom import Platform
+
+
+class FakeSource:
+    def __init__(self, type, group_id):
+        self.type = type
+        self.group_id = group_id
+
+    
+class QQGOCQ(Platform):
+    def __init__(self, cfg: dict, message_handler: callable, global_object) -> None:
+        super().__init__(message_handler)
+
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+        self.waiting = {}
+        self.gocq_cnt = 0
+        self.cc = CmdConfig()
+        self.cfg = cfg
+        self.logger: gu.Logger = global_object.logger
+
+        try:
+            self.nick_qq = cfg['nick_qq']
+        except:
+            self.nick_qq = ["ai","!","！"]
+        nick_qq = self.nick_qq
+        if isinstance(nick_qq, str):
+            nick_qq = [nick_qq]
+        
+        self.unique_session = cfg['uniqueSessionMode']
+        self.pic_mode = cfg['qq_pic_mode']
+
+        self.client = CQHTTP(
+            host=self.cc.get("gocq_host", "127.0.0.1"),
+            port=self.cc.get("gocq_websocket_port", 6700),
+            http_port=self.cc.get("gocq_http_port", 5700),
+        )
+        gocq_app = self.client
+
+        self.announcement = self.cc.get("announcement", "欢迎新人！")
+
+        @gocq_app.receiver("GroupMessage")
+        async def _(app: CQHTTP, source: GroupMessage):
+            if self.cc.get("gocq_react_group", True):
+                if isinstance(source.message[0], Plain):
+                    self.new_sub_thread(self.handle_msg, (source, True))
+                elif isinstance(source.message[0], At):
+                    if source.message[0].qq == source.self_id:
+                        self.new_sub_thread(self.handle_msg, (source, True))
+                else:
+                    return
+            
+        @gocq_app.receiver("FriendMessage")
+        async def _(app: CQHTTP, source: FriendMessage):
+            if self.cc.get("gocq_react_friend", True):
+                if isinstance(source.message[0], Plain):
+                    self.new_sub_thread(self.handle_msg, (source, False))
+                else:
+                    return
+            
+        @gocq_app.receiver("GroupMemberIncrease")
+        async def _(app: CQHTTP, source: GroupMemberIncrease):
+            if self.cc.get("gocq_react_group_increase", True):
+
+                await app.sendGroupMessage(source.group_id, [
+                    Plain(text = self.announcement)
+                ])
+
+        @gocq_app.receiver("Notify")
+        async def _(app: CQHTTP, source: Notify):
+            print(source)
+            if source.sub_type == "poke" and source.target_id == source.self_id:
+                # await self.handle_msg(source, False)
+                self.new_sub_thread(self.handle_msg, (source, False))
+
+        @gocq_app.receiver("GuildMessage")
+        async def _(app: CQHTTP, source: GuildMessage):
+            if self.cc.get("gocq_react_guild", True):
+                if isinstance(source.message[0], Plain):
+                    # await self.handle_msg(source, True)
+                    self.new_sub_thread(self.handle_msg, (source, True))
+                elif isinstance(source.message[0], At):
+                    if source.message[0].qq == source.self_tiny_id:
+                        # await self.handle_msg(source, True)
+                        self.new_sub_thread(self.handle_msg, (source, True))
+                else:
+                    return
+        
+    def run(self):
+        self.client.run()
+                
+    async def handle_msg(self, message: Union[GroupMessage, FriendMessage, GuildMessage, Notify], is_group: bool):
+        self.logger.log(f"{message.user_id} -> {self.parse_message_outline(message)}", tag="QQ_GOCQ")
+        # 判断是否响应消息
+        resp = False
+        if not is_group:
+            resp = True
+        else:
+            for i in message.message:
+                if isinstance(i, At):
+                    if message.type == "GuildMessage":
+                        if i.qq == message.user_id or i.qq == message.self_tiny_id:
+                            resp = True
+                    if message.type == "FriendMessage":
+                        if i.qq == message.self_id:
+                            resp = True
+                    if message.type == "GroupMessage":
+                        if i.qq == message.self_id:
+                            resp = True
+                elif isinstance(i, Plain):
+                    for nick in self.nick_qq:
+                        if nick != '' and i.text.strip().startswith(nick):
+                            resp = True
+                            break
+                
+        if not resp: return
+        
+        # 解析 session_id
+        if self.unique_session or not is_group:
+            session_id = message.user_id
+        elif message.type == "GroupMessage":
+            session_id = message.group_id
+        elif message.type == "GuildMessage":
+            session_id = message.channel_id
+        else:
+            session_id = message.user_id
+
+        # 解析 role
+        sender_id = str(message.user_id)
+        if sender_id == self.cc.get('admin_qq', '') or \
+        sender_id == self.cc.get('gocq_qqchan_admin', '') or \
+        sender_id in self.cc.get('other_admins', []):
+            role = 'admin'
+        else:
+            role = 'member'
+
+        message_result = await self.message_handler(
+            message=message,
+            session_id=session_id,
+            role=role,
+            platform='gocq'
+        )
+
+        if message_result is None:
+            return
+        self.reply_msg(message, message_result.result_message)
+        if message_result.callback is not None:
+            message_result.callback()
+        
+        # 如果是等待回复的消息
+        if session_id in self.waiting and self.waiting[session_id] == '':
+            self.waiting[session_id] = message
+
+    def reply_msg(self,
+                        message: Union[GroupMessage, FriendMessage, GuildMessage, Notify],
+                        result_message: list):
+        """
+         插件开发者请使用send方法, 可以不用直接调用这个方法。
+        """
+        source = message
+        res = result_message
+
+        self.gocq_cnt += 1
+        
+        self.logger.log(f"{source.user_id} <- {self.parse_message_outline(res)}", tag="QQ_GOCQ")
+
+        if isinstance(source, int):
+            source = FakeSource("GroupMessage", source)
+        
+        # str convert to CQ Message Chain
+        if isinstance(res, str):
+            res_str = res
+            res = []
+            if source.type == "GroupMessage" and not isinstance(source, FakeSource):
+                res.append(At(qq=source.user_id))
+            res.append(Plain(text=res_str))
+
+        # if image mode, put all Plain texts into a new picture.
+        if self.pic_mode and isinstance(res, list):
+            plains = []
+            news = []
+            for i in res:
+                if isinstance(i, Plain):
+                    plains.append(i.text)
+                else:
+                    news.append(i)
+            plains_str = "".join(plains).strip()
+            if plains_str != "" and len(plains_str) > 50:
+                p = gu.create_markdown_image("".join(plains))
+                news.append(Image.fromFileSystem(p))
+                res = news
+
+        # 回复消息链
+        if isinstance(res, list) and len(res) > 0:
+            if source.type == "GuildMessage":
+                # await self.client.sendGuildChannelMessage(source.guild_id, source.channel_id, res)
+                asyncio.run_coroutine_threadsafe(self.client.sendGuildChannelMessage(source.guild_id, source.channel_id, res), self.loop).result()
+                return
+            elif source.type == "FriendMessage":
+                # await self.client.sendFriendMessage(source.user_id, res)
+                asyncio.run_coroutine_threadsafe(self.client.sendFriendMessage(source.user_id, res), self.loop).result()
+                return
+            elif source.type == "GroupMessage":
+                # 过长时forward发送
+                plain_text_len = 0
+                image_num = 0
+                for i in res:
+                    if isinstance(i, Plain):
+                        plain_text_len += len(i.text)
+                    elif isinstance(i, Image):
+                        image_num += 1
+                if plain_text_len > self.cc.get('qq_forward_threshold', 200):
+                    # 删除At
+                    for i in res:
+                        if isinstance(i, At):
+                            res.remove(i)
+                    node = Node(res)
+                    # node.content = res
+                    node.uin = 123456
+                    node.name = f"bot"
+                    node.time = int(time.time())
+                    # print(node)
+                    nodes=[node]
+                    # await self.client.sendGroupForwardMessage(source.group_id, nodes)
+                    asyncio.run_coroutine_threadsafe(self.client.sendGroupForwardMessage(source.group_id, nodes), self.loop).result()
+                    return
+                # await self.client.sendGroupMessage(source.group_id, res)
+                asyncio.run_coroutine_threadsafe(self.client.sendGroupMessage(source.group_id, res), self.loop).result()
+                return
+
+    def send_msg(self, message: Union[GroupMessage, FriendMessage, GuildMessage, Notify], result_message: list):
+        '''
+        提供给插件的发送QQ消息接口。
+        参数说明：第一个参数可以是消息对象，也可以是QQ群号。第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
+        非异步
+        '''
+        try:
+            # await self.reply_msg(message, result_message)
+            self.reply_msg(message, result_message)
+        except BaseException as e:
+            raise e
+    
+    def send(self, 
+            to,
+            res):
+        '''
+        同 send_msg()
+        非异步
+        '''
+        try:
+            # await self.send_msg(to, res)
+            self.reply_msg(to, res)
+        except BaseException as e:
+            raise e
+
+    def create_text_image(title: str, text: str, max_width=30, font_size=20):
+        '''
+        文本转图片。
+        title: 标题
+        text: 文本内容
+        max_width: 文本宽度最大值（默认30）
+        font_size: 字体大小（默认20）
+
+        返回：文件路径
+        '''
+        try:
+            img = gu.word2img(title, text, max_width, font_size)
+            p = gu.save_temp_img(img)
+            return p
+        except Exception as e:
+            raise e
+
+    def wait_for_message(self, group_id) -> Union[GroupMessage, FriendMessage, GuildMessage]:
+        '''
+        等待下一条消息，超时 300s 后抛出异常
+        '''
+        self.waiting[group_id] = ''
+        cnt = 0
+        while True:
+            if group_id in self.waiting and self.waiting[group_id] != '':
+                # 去掉
+                ret = self.waiting[group_id]
+                del self.waiting[group_id]
+                return ret
+            cnt += 1
+            if cnt > 300:
+                raise Exception("等待消息超时。")
+            time.sleep(1)
+
+    def get_client(self):
+        return self.client
+
+    def nakuru_method_invoker(self, func, *args, **kwargs):
+        """
+        返回一个方法调用器，可以用来立即调用nakuru的方法。
+        """
+        try:
+            ret = asyncio.run_coroutine_threadsafe(func(*args, **kwargs), self.loop).result()
+            return ret
+        except BaseException as e:
+            raise e
+    
+    def get_cnt(self):
+        return self.gocq_cnt
+    
+    def set_cnt(self, cnt):
+        self.gocq_cnt = cnt

model/platform/qq_official.py

@@ -0,0 +1,254 @@
+import io
+import botpy
+from PIL import Image as PILImage
+from botpy.message import Message, DirectMessage
+import re
+import asyncio
+import requests
+from util import general_utils as gu
+
+from botpy.types.message import Reference
+from botpy import Client
+import time
+from ._platfrom import Platform
+from ._nakuru_translation_layer import(
+    NakuruGuildMessage, 
+    NakuruGuildMember,
+    gocq_compatible_receive, 
+    gocq_compatible_send
+) 
+from typing import Union
+
+# QQ 机器人官方框架
+class botClient(Client):
+    def set_platform(self, platform: 'QQOfficial'):
+        self.platform = platform
+
+    # 收到频道消息
+    async def on_at_message_create(self, message: Message):
+        # 转换层
+        nakuru_guild_message = gocq_compatible_receive(message)
+        self.platform.new_sub_thread(self.platform.handle_msg, (nakuru_guild_message, True))
+
+    # 收到私聊消息
+    async def on_direct_message_create(self, message: DirectMessage):
+        # 转换层
+        nakuru_guild_message = gocq_compatible_receive(message)
+        self.platform.new_sub_thread(self.platform.handle_msg, (nakuru_guild_message, False))
+
+class QQOfficial(Platform):
+
+    def __init__(self, cfg: dict, message_handler: callable, global_object) -> None:
+        super().__init__(message_handler)
+
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+        
+        self.qqchan_cnt = 0
+        self.waiting: dict = {}
+
+        self.cfg = cfg
+        self.appid = cfg['qqbot']['appid']
+        self.token = cfg['qqbot']['token']
+        self.secret = cfg['qqbot_secret']
+        self.unique_session = cfg['uniqueSessionMode']
+        self.logger: gu.Logger = global_object.logger
+
+        self.intents = botpy.Intents(
+            public_guild_messages=True,
+            direct_message=cfg['direct_message_mode']
+        )
+        self.client = botClient(
+            intents=self.intents,
+            bot_log=False
+        )
+        self.client.set_platform(self)
+
+    def run(self):
+        try:
+            self.loop.run_until_complete(self.client.run(
+                appid=self.appid, 
+                secret=self.secret
+            ))
+        except BaseException as e:
+            print(e)
+            self.client = botClient(
+                intents=self.intents,
+                bot_log=False
+            )
+            self.client.set_platform(self)
+            self.client.run(
+                appid=self.appid, 
+                token=self.token
+            )
+
+    async def handle_msg(self, message: NakuruGuildMessage, is_group: bool):
+        _t = "/私聊" if not is_group else ""
+        self.logger.log(f"{message.sender.nickname}({message.sender.tiny_id}{_t}) -> {self.parse_message_outline(message)}", tag="QQ_OFFICIAL")
+        # 解析出 session_id
+        if self.unique_session or not is_group:
+            session_id = message.sender.user_id
+        else:
+            session_id = message.channel_id
+
+        # 解析出 role
+        sender_id = str(message.sender.tiny_id)
+        if sender_id == self.cfg['admin_qqchan'] or \
+        sender_id in self.cfg['other_admins']:
+            role = 'admin'
+        else:
+            role = 'member'
+
+        message_result = await self.message_handler(
+            message=message,
+            session_id=session_id,
+            role=role,
+            platform='qqchan'
+        )
+
+        if message_result is None:
+            return
+
+        self.reply_msg(is_group, message, message_result.result_message)
+        if message_result.callback is not None:
+            message_result.callback()
+
+        # 如果是等待回复的消息
+        if session_id in self.waiting and self.waiting[session_id] == '':
+            self.waiting[session_id] = message
+
+    def reply_msg(self, 
+                is_group: bool,
+                message: NakuruGuildMessage, 
+                res: Union[str, list]):
+        '''
+        回复频道消息
+        '''
+        self.logger.log(f"{message.sender.nickname}({message.sender.tiny_id}) <- {self.parse_message_outline(res)}", tag="QQ_OFFICIAL")
+        self.qqchan_cnt += 1
+
+        plain_text = ''
+        image_path = ''
+        msg_ref = None
+
+        if isinstance(res, list):
+            plain_text, image_path = gocq_compatible_send(res)
+        elif isinstance(res, str):
+            plain_text = res
+            
+        if self.cfg['qq_pic_mode']:
+            # 文本转图片，并且加上原来的图片
+            if plain_text != '' or image_path != '':
+                if image_path is not None and image_path != '':
+                    if image_path.startswith("http"):
+                        plain_text += "\n\n" + "![](" + image_path + ")"
+                    else:
+                        plain_text += "\n\n" + "![](file:///" + image_path + ")"
+                image_path = gu.create_markdown_image("".join(plain_text))
+                plain_text = ""
+
+        else:
+            if image_path is not None and image_path != '':
+                msg_ref = None
+                if image_path.startswith("http"):
+                    pic_res = requests.get(image_path, stream = True)
+                    if pic_res.status_code == 200:
+                        image = PILImage.open(io.BytesIO(pic_res.content))
+                        image_path = gu.save_temp_img(image)
+
+        if message.raw_message is not None and image_path == '': # file_image与message_reference不能同时传入
+            msg_ref = Reference(message_id=message.raw_message.id, ignore_get_message_error=False)
+        
+        # 到这里，我们得到了 plain_text，image_path，msg_ref
+        data = {
+            'content': plain_text,
+            'msg_id': message.message_id,
+            'message_reference': msg_ref
+        }
+        if is_group:
+            data['channel_id'] = str(message.channel_id)
+        else:
+            data['guild_id'] = str(message.guild_id)
+        if image_path != '':
+            data['file_image'] = image_path
+
+        try:
+            # await self._send_wrapper(**data)
+            self._send_wrapper(**data)
+        except BaseException as e:
+            print(e)
+            # 分割过长的消息
+            if "msg over length" in str(e):
+                split_res = []
+                split_res.append(plain_text[:len(plain_text)//2])      
+                split_res.append(plain_text[len(plain_text)//2:])
+                for i in split_res:
+                    data['content'] = i
+                    # await self._send_wrapper(**data)
+                    self._send_wrapper(**data)
+            else:
+                # 发送qq信息
+                try:
+                    # 防止被qq频道过滤消息
+                    plain_text = plain_text.replace(".", " . ")
+                    # await self._send_wrapper(**data)
+                    self._send_wrapper(**data)
+
+                except BaseException as e:
+                    try:
+                        data['content'] = str.join(" ", plain_text)
+                        # await self._send_wrapper(**data)
+                        self._send_wrapper(**data)
+                    except BaseException as e:
+                        plain_text = re.sub(r'(https|http)?:\/\/(\w|\.|\/|\?|\=|\&|\%)*\b', '[被隐藏的链接]', str(e), flags=re.MULTILINE)
+                        plain_text = plain_text.replace(".", "·")
+                        data['content'] = plain_text
+                        # await self._send_wrapper(**data)
+                        self._send_wrapper(**data)
+ 
+    def _send_wrapper(self, **kwargs):
+        if 'channel_id' in kwargs:
+            asyncio.run_coroutine_threadsafe(self.client.api.post_message(**kwargs), self.loop).result()
+        else:
+            asyncio.run_coroutine_threadsafe(self.client.api.post_dms(**kwargs), self.loop).result()
+
+
+    def send_msg(self, channel_id: int, message_chain: list, message_id: int = None):
+        '''
+        推送消息, 如果有 message_id，那么就是回复消息。非异步。
+        '''
+        _n = NakuruGuildMessage()
+        _n.channel_id = channel_id
+        _n.message_id = message_id
+        # await self.reply_msg(_n, message_chain)
+        self.reply_msg(_n, message_chain)
+
+    def send(self, message_obj, message_chain: list):
+        '''
+        发送信息。内容同 reply_msg。非异步。
+        '''
+        # await self.reply_msg(message_obj, message_chain)
+        self.reply_msg(message_obj, message_chain)
+
+    def wait_for_message(self, channel_id: int) -> NakuruGuildMessage:
+        '''
+        等待指定 channel_id 的下一条信息，超时 300s 后抛出异常
+        '''
+        self.waiting[channel_id] = ''
+        cnt = 0
+        while True:
+            if channel_id in self.waiting and self.waiting[channel_id] != '':
+                # 去掉
+                ret = self.waiting[channel_id]
+                del self.waiting[channel_id]
+                return ret
+            cnt += 1
+            if cnt > 300:
+                raise Exception("等待消息超时。")
+            time.sleep(1)
+        
+    def get_cnt(self):
+        return self.qqchan_cnt
+    
+    def set_cnt(self, cnt):
+        self.qqchan_cnt = cnt

model/platform/qqchan.py

@@ -1,65 +0,0 @@
-import io
-import botpy
-from PIL import Image
-from botpy.message import Message, DirectMessage
-import re
-import asyncio
-import requests
-from cores.qqbot.personality import personalities
-from util import general_utils as gu
-
-class QQChan():
-
-    def run_bot(self, botclient, appid, token):
-        intents = botpy.Intents(public_guild_messages=True, direct_message=True) 
-        self.client = botclient
-        self.client.run(appid=appid, token=token)
-
-    def send_qq_msg(self, message, res, image_mode=False, msg_ref = None):
-        gu.log("回复QQ频道消息: "+str(res), level=gu.LEVEL_INFO, tag="QQ频道", max_len=30)
-
-        if not image_mode:
-            try:
-                if msg_ref is not None:
-                    reply_res = asyncio.run_coroutine_threadsafe(message.reply(content=str(res), message_reference = msg_ref), self.client.loop)
-                else:
-                    reply_res = asyncio.run_coroutine_threadsafe(message.reply(content=str(res)), self.client.loop)
-                reply_res.result()
-            except BaseException as e:
-                # 分割过长的消息
-                if "msg over length" in str(e):
-                    split_res = []
-                    split_res.append(res[:len(res)//2])      
-                    split_res.append(res[len(res)//2:])
-                    for i in split_res:
-                        if msg_ref is not None:
-                            reply_res = asyncio.run_coroutine_threadsafe(message.reply(content=i, message_reference = msg_ref), self.client.loop)
-                        else:
-                            reply_res = asyncio.run_coroutine_threadsafe(message.reply(content=i), self.client.loop)
-                        reply_res.result()
-                else:
-                    # 发送qq信息
-                    try:
-                        # 防止被qq频道过滤消息
-                        res = res.replace(".", " . ")
-                        asyncio.run_coroutine_threadsafe(message.reply(content=res), self.client.loop).result()
-                        # 发送信息
-                    except BaseException as e:
-                        print("QQ频道API错误: \n"+str(e))
-                        res = str.join(" ", res)
-                        try:
-                            asyncio.run_coroutine_threadsafe(message.reply(content=res), self.client.loop).result()
-                        except BaseException as e:
-                            # 如果还是不行则报出错误
-                            res = re.sub(r'(https|http)?:\/\/(\w|\.|\/|\?|\=|\&|\%)*\b', '[被隐藏的链接]', str(e), flags=re.MULTILINE)
-                            res = res.replace(".", "·")
-                            asyncio.run_coroutine_threadsafe(message.reply(content=res), self.client.loop).result()
-                            # send(message, f"QQ频道API错误：{str(e)}\n下面是格式化后的回答：\n{f_res}")
-        else:
-            pic_res = requests.get(str(res), stream=True)
-            if pic_res.status_code == 200:
-                # 将二进制数据转换成图片对象
-                image = Image.open(io.BytesIO(pic_res.content))
-                # 保存图片到本地
-                image.save('tmp_image.jpg')
-            asyncio.run_coroutine_threadsafe(message.reply(file_image='tmp_image.jpg', content=""), self.client.loop)

model/provider/openai_official.py

@@ -0,0 +1,415 @@
+from openai import OpenAI
+from openai.types.chat.chat_completion import ChatCompletion
+from openai.types.images_response import ImagesResponse
+import json
+import time
+import os
+import sys
+from cores.database.conn import dbConn
+from model.provider.provider import Provider
+import threading
+from util import general_utils as gu
+from util.cmd_config import CmdConfig
+from util.general_utils import Logger
+import traceback
+import tiktoken
+
+
+abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
+
+class ProviderOpenAIOfficial(Provider):
+    def __init__(self, cfg):
+        self.cc = CmdConfig()
+        self.logger = Logger()
+
+        self.key_list = []
+        # 如果 cfg['key'] 中有长度为 1 的字符串，那么是格式错误，直接报错
+        for key in cfg['key']:
+            if len(key) == 1:
+                input("检查到了长度为 1 的Key。配置文件中的 openai.key 处的格式错误 (符号 - 的后面要加空格)，请退出程序并检查配置文件，按回车跳过。")
+                raise BaseException("配置文件格式错误")
+        if cfg['key'] != '' and cfg['key'] != None:
+            self.key_list = cfg['key']
+        else:
+            input("[System] 请先填写 Key。详情请前往 https://beta.openai.com/account/api-keys 或使用中转 Key 方案。")
+        if len(self.key_list) == 0:
+            raise Exception("您打开了 OpenAI 模型服务，但是未填写 key。请前往填写。")
+        
+        self.key_stat = {}
+        for k in self.key_list:
+            self.key_stat[k] = {'exceed': False, 'used': 0}
+
+        self.api_base = None
+        if 'api_base' in cfg and cfg['api_base'] != 'none' and cfg['api_base'] != '':
+            self.api_base = cfg['api_base']
+            self.logger.log(f"设置 api_base 为: {self.api_base}", tag="OpenAI")
+            
+        # 创建 OpenAI Client
+        self.client = OpenAI(
+            api_key=self.key_list[0],
+            base_url=self.api_base
+        )
+
+        self.openai_model_configs: dict = cfg['chatGPTConfigs']
+        self.logger.log(f'加载 OpenAI Chat Configs: {self.openai_model_configs}', tag="OpenAI")
+        self.openai_configs = cfg
+        # 会话缓存
+        self.session_dict = {}
+        # 最大缓存token
+        self.max_tokens = cfg['total_tokens_limit']
+        # 历史记录持久化间隔时间
+        self.history_dump_interval = 20
+
+        self.enc = tiktoken.get_encoding("cl100k_base")
+
+        # 从 SQLite DB 读取历史记录
+        try:
+            db1 = dbConn()
+            for session in db1.get_all_session():
+                self.session_dict[session[0]] = json.loads(session[1])['data']
+            self.logger.log("读取历史记录成功。", tag="OpenAI")
+        except BaseException as e:
+            self.logger.log("读取历史记录失败，但不影响使用。", level=gu.LEVEL_ERROR, tag="OpenAI")
+
+        # 创建转储定时器线程
+        threading.Thread(target=self.dump_history, daemon=True).start()
+
+        # 人格
+        self.curr_personality = {}
+
+    # 转储历史记录
+    def dump_history(self):
+        time.sleep(10)
+        db = dbConn()
+        while True:
+            try:
+                # print("转储历史记录...")
+                for key in self.session_dict:
+                    data = self.session_dict[key]
+                    data_json = {
+                        'data': data
+                    }
+                    if db.check_session(key):
+                        db.update_session(key, json.dumps(data_json))
+                    else:
+                        db.insert_session(key, json.dumps(data_json))
+                # print("转储历史记录完毕")
+            except BaseException as e:
+                print(e)
+            # 每隔10分钟转储一次
+            time.sleep(10*self.history_dump_interval)
+
+    def personality_set(self, default_personality: dict, session_id: str):
+        self.curr_personality = default_personality
+        new_record = {
+            "user": {
+                "role": "user",
+                "content": default_personality['prompt'],
+            },
+            "AI": {
+                "role": "assistant",
+                "content": "好的，接下来我会扮演这个角色。"
+            },
+            'type': "personality",
+            'usage_tokens': 0,
+            'single-tokens': 0
+        }
+        self.session_dict[session_id].append(new_record)
+
+    def text_chat(self, prompt, 
+                  session_id = None, 
+                  image_url = None, 
+                  function_call=None,
+                  extra_conf: dict = None,
+                  default_personality: dict = None):
+        if session_id is None:
+            session_id = "unknown"
+            if "unknown" in self.session_dict:
+                del self.session_dict["unknown"] 
+        # 会话机制
+        if session_id not in self.session_dict:
+            self.session_dict[session_id] = []
+        
+        if len(self.session_dict[session_id]) == 0:
+            # 设置默认人格
+            if default_personality is not None:
+                self.personality_set(default_personality, session_id)
+
+
+        # 使用 tictoken 截断消息
+        _encoded_prompt = self.enc.encode(prompt)
+        if self.openai_model_configs['max_tokens'] < len(_encoded_prompt):
+            prompt = self.enc.decode(_encoded_prompt[:int(self.openai_model_configs['max_tokens']*0.80)])
+            self.logger.log(f"注意，有一部分 prompt 文本由于超出 token 限制而被截断。", level=gu.LEVEL_WARNING, tag="OpenAI")
+
+        cache_data_list, new_record, req = self.wrap(prompt, session_id, image_url)
+        self.logger.log(f"CACHE_DATA_: {str(cache_data_list)}", level=gu.LEVEL_DEBUG, tag="OpenAI")
+        self.logger.log(f"OPENAI REQUEST: {str(req)}", level=gu.LEVEL_DEBUG, tag="OpenAI")
+        retry = 0
+        response = None
+        err = ''
+
+        # 截断倍率
+        truncate_rate = 0.75
+
+        use_gpt4v = False
+        for i in req:
+            if isinstance(i['content'], list):
+                use_gpt4v = True
+                break
+        if image_url is not None:
+            use_gpt4v = True
+        if use_gpt4v:
+            conf = self.openai_model_configs.copy()
+            conf['model'] = 'gpt-4-vision-preview'
+        else:
+            conf = self.openai_model_configs
+
+        if extra_conf is not None:
+            conf.update(extra_conf)
+
+        while retry < 10:
+            try:
+                if function_call is None:
+                    response = self.client.chat.completions.create(
+                        messages=req,
+                        **conf
+                    )
+                else:
+                    response = self.client.chat.completions.create(
+                        messages=req,
+                        tools = function_call,
+                        **conf
+                    )
+                break
+            except Exception as e:
+                print(traceback.format_exc())
+                if 'Invalid content type. image_url is only supported by certain models.' in str(e):
+                    raise e
+                if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str(e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e):
+                    self.logger.log("当前 Key 已超额或异常, 正在切换", level=gu.LEVEL_WARNING, tag="OpenAI")
+                    self.key_stat[self.client.api_key]['exceed'] = True
+                    is_switched = self.handle_switch_key()
+                    if not is_switched:
+                        # 所有Key都超额或不正常
+                        raise e
+                    retry -= 1
+                elif 'maximum context length' in str(e):
+                    self.logger.log("token 超限, 清空对应缓存，并进行消息截断", tag="OpenAI")
+                    self.session_dict[session_id] = []
+                    prompt = prompt[:int(len(prompt)*truncate_rate)]
+                    truncate_rate -= 0.05
+                    cache_data_list, new_record, req = self.wrap(prompt, session_id)
+
+                elif 'Limit: 3 / min. Please try again in 20s.' in str(e) or "OpenAI response error" in str(e):
+                    time.sleep(30)
+                    continue
+                else:
+                    self.logger.log(str(e), level=gu.LEVEL_ERROR, tag="OpenAI")
+                time.sleep(2)
+                err = str(e)
+                retry += 1
+        if retry >= 10:
+            self.logger.log(r"如果报错, 且您的机器在中国大陆内, 请确保您的电脑已经设置好代理软件(梯子), 并在配置文件设置了系统代理地址。详见 https://github.com/Soulter/QQChannelChatGPT/wiki", tag="OpenAI")
+            raise BaseException("连接出错: "+str(err))
+        assert isinstance(response, ChatCompletion)
+        self.logger.log(f"OPENAI RESPONSE: {response.usage}", level=gu.LEVEL_DEBUG, tag="OpenAI")
+
+        # 结果分类
+        choice = response.choices[0]
+        if choice.message.content != None:
+            # 文本形式
+            chatgpt_res = str(choice.message.content).strip()
+        elif choice.message.tool_calls != None and len(choice.message.tool_calls) > 0:
+            # tools call (function calling)
+            return choice.message.tool_calls[0].function
+
+        self.key_stat[self.client.api_key]['used'] += response.usage.total_tokens
+        current_usage_tokens = response.usage.total_tokens
+
+        # 超过指定tokens， 尽可能的保留最多的条目，直到小于max_tokens
+        if current_usage_tokens > self.max_tokens:
+            t = current_usage_tokens
+            index = 0
+            while t > self.max_tokens:
+                if index >= len(cache_data_list):
+                    break
+                # 保留人格信息
+                if cache_data_list[index]['type'] != 'personality':
+                    t -= int(cache_data_list[index]['single_tokens'])
+                    del cache_data_list[index]
+                else:
+                    index += 1
+            # 删除完后更新相关字段
+            self.session_dict[session_id] = cache_data_list
+            # cache_prompt = get_prompts_by_cache_list(cache_data_list)
+
+        # 添加新条目进入缓存的prompt
+        new_record['AI'] = {
+            'role': 'assistant',
+            'content': chatgpt_res,
+        }
+        new_record['usage_tokens'] = current_usage_tokens
+        if len(cache_data_list) > 0:
+            new_record['single_tokens'] = current_usage_tokens - int(cache_data_list[-1]['usage_tokens'])
+        else:
+            new_record['single_tokens'] = current_usage_tokens
+
+        cache_data_list.append(new_record)
+
+        self.session_dict[session_id] = cache_data_list
+
+        return chatgpt_res
+        
+    def image_chat(self, prompt, img_num = 1, img_size = "1024x1024"):
+        retry = 0
+        image_url = ''
+
+        image_generate_configs = self.cc.get("openai_image_generate", None)
+        
+        while retry < 5:
+            try:
+                response: ImagesResponse = self.client.images.generate(
+                    prompt=prompt,
+                    **image_generate_configs
+                )
+                image_url = []
+                for i in range(img_num):
+                    image_url.append(response.data[i].url)
+                break
+            except Exception as e:
+                self.logger.log(str(e), level=gu.LEVEL_ERROR)
+                if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str(
+                        e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e):
+                    self.logger.log("当前 Key 已超额或者不正常, 正在切换", level=gu.LEVEL_WARNING, tag="OpenAI")
+                    self.key_stat[self.client.api_key]['exceed'] = True
+                    is_switched = self.handle_switch_key()
+                    if not is_switched:
+                        # 所有Key都超额或不正常
+                        raise e
+                elif 'Your request was rejected as a result of our safety system.' in str(e):
+                    self.logger.log("您的请求被 OpenAI 安全系统拒绝, 请稍后再试", level=gu.LEVEL_WARNING, tag="OpenAI")
+                    raise e
+                else:
+                    retry += 1
+        if retry >= 5:
+            raise BaseException("连接超时")
+                
+        return image_url
+
+    def forget(self, session_id = None) -> bool:
+        if session_id is None:
+            return False
+        self.session_dict[session_id] = []
+        return True
+    
+    '''
+    获取缓存的会话
+    '''
+    def get_prompts_by_cache_list(self, cache_data_list, divide=False, paging=False, size=5, page=1):
+        prompts = ""
+        if paging:
+            page_begin = (page-1)*size
+            page_end = page*size
+            if page_begin < 0:
+                page_begin = 0
+            if page_end > len(cache_data_list):
+                page_end = len(cache_data_list)
+            cache_data_list = cache_data_list[page_begin:page_end]
+        for item in cache_data_list:
+            prompts += str(item['user']['role']) + ":\n" + str(item['user']['content']) + "\n"
+            prompts += str(item['AI']['role']) + ":\n" + str(item['AI']['content']) + "\n"
+
+            if divide:
+                prompts += "----------\n"
+        return prompts
+    
+        
+    def get_user_usage_tokens(self,cache_list):
+        usage_tokens = 0
+        for item in cache_list:
+            usage_tokens += int(item['single_tokens'])
+        return usage_tokens
+        
+    # 包装信息
+    def wrap(self, prompt, session_id, image_url = None):
+        if image_url is not None:
+            prompt = [
+                {
+                    "type": "text",
+                    "text": prompt
+                },
+                {
+                    "type": "image_url",
+                    "image_url": {
+                        "url": image_url
+                    }
+                }
+            ]
+        # 获得缓存信息
+        context = self.session_dict[session_id]
+        new_record = {
+            "user": {
+                "role": "user",
+                "content": prompt,
+            },
+            "AI": {},
+            'type': "common",
+            'usage_tokens': 0,
+        }
+        req_list = []
+        for i in context:
+            if 'user' in i:
+                req_list.append(i['user'])
+            if 'AI' in i:
+                req_list.append(i['AI'])
+        req_list.append(new_record['user'])
+        return context, new_record, req_list
+    
+    def handle_switch_key(self):
+        # messages = [{"role": "user", "content": prompt}]
+        is_all_exceed = True
+        for key in self.key_stat:
+            if key == None or self.key_stat[key]['exceed']:
+                continue
+            is_all_exceed = False
+            self.client.api_key = key
+            self.logger.log(f"切换到 Key: {key}(已使用 token: {self.key_stat[key]['used']})", level=gu.LEVEL_INFO, tag="OpenAI")
+            break
+        if is_all_exceed:
+            self.logger.log("所有 Key 已超额", level=gu.LEVEL_CRITICAL, tag="OpenAI")
+            return False
+        return True
+        
+    def get_configs(self):
+        return self.openai_configs
+    
+    def get_key_stat(self):
+        return self.key_stat
+    
+    def get_key_list(self):
+        return self.key_list
+    
+    def get_curr_key(self):
+        return self.client.api_key
+    
+    def set_key(self, key):
+        self.client.api_key = key
+    
+    # 添加key
+    def append_key(self, key, sponsor):
+        self.key_list.append(key)
+        self.key_stat[key] = {'exceed': False, 'used': 0, 'sponsor': sponsor}
+
+    # 检查key是否可用
+    def check_key(self, key):
+        client_ = OpenAI(
+            api_key=key,
+            base_url=self.api_base
+        )
+        messages = [{"role": "user", "content": "please just echo `test`"}]
+        client_.chat.completions.create(
+            messages=messages,
+            **self.openai_model_configs
+        )
+        return True

model/provider/provider.py

@@ -3,16 +3,11 @@ import abc
 class Provider:
     def __init__(self, cfg):
         pass
-
-    def text_chat(self, prompt):
-        pass
-
-    def image_chat(self, prompt):
-        pass
-
-    def memory(self):
+    
+    @abc.abstractmethod
+    def text_chat(self, prompt, session_id, image_url: None, function_call: None, extra_conf: dict = None, default_personality: dict = None) -> str:
         pass
 
     @abc.abstractmethod
-    def forget(self) -> bool:
+    def forget(self, session_id = None) -> bool:
         pass

model/provider/provider_openai_official.py

@@ -1,404 +0,0 @@
-import openai
-import json
-import time
-import os
-import sys
-from cores.database.conn import dbConn
-from model.provider.provider import Provider
-import threading
-from util import general_utils as gu
-
-abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
-key_record_path = abs_path+'chatgpt_key_record'
-
-class ProviderOpenAIOfficial(Provider):
-    def __init__(self, cfg):
-        self.key_list = []
-        if 'api_base' in cfg and cfg['api_base'] != 'none' and cfg['api_base'] != '':
-            openai.api_base = cfg['api_base']
-        if cfg['key'] != '' and cfg['key'] != None:
-            gu.log("读取ChatGPT Key成功")
-            self.key_list = cfg['key']
-        else:
-            input("[System] 请先去完善ChatGPT的Key。详情请前往https://beta.openai.com/account/api-keys")
-        
-        # init key record
-        self.init_key_record()
-
-        self.chatGPT_configs = cfg['chatGPTConfigs']
-        gu.log(f'加载ChatGPTConfigs: {self.chatGPT_configs}')
-        self.openai_configs = cfg
-        # 会话缓存
-        self.session_dict = {}
-        # 最大缓存token
-        self.max_tokens = cfg['total_tokens_limit']
-        # 历史记录持久化间隔时间
-        self.history_dump_interval = 20
-
-        # 读取历史记录
-        try:
-            db1 = dbConn()
-            for session in db1.get_all_session():
-                self.session_dict[session[0]] = json.loads(session[1])['data']
-            gu.log("历史记录读取成功喵")
-        except BaseException as e:
-            gu.log("历史记录读取失败喵", level=gu.LEVEL_ERROR)
-
-
-        # 读取统计信息
-        if not os.path.exists(abs_path+"configs/stat"):
-            with open(abs_path+"configs/stat", 'w', encoding='utf-8') as f:
-                    json.dump({}, f)
-        self.stat_file = open(abs_path+"configs/stat", 'r', encoding='utf-8')
-        global count
-        res = self.stat_file.read()
-        if res == '':
-            count = {}
-        else:
-            try: 
-                count = json.loads(res)
-            except BaseException:
-                pass
-
-        # 创建转储定时器线程
-        threading.Thread(target=self.dump_history, daemon=True).start()
-
-        # 人格
-        self.now_personality = {}
-
-
-    # 转储历史记录的定时器~ Soulter
-    def dump_history(self):
-        time.sleep(10)
-        db = dbConn()
-        while True:
-            try:
-                # print("转储历史记录...")
-                for key in self.session_dict:
-                    # print("TEST: "+str(db.get_session(key)))
-                    data = self.session_dict[key]
-                    data_json = {
-                        'data': data
-                    }
-                    if db.check_session(key):
-                        db.update_session(key, json.dumps(data_json))
-                    else:
-                        db.insert_session(key, json.dumps(data_json))
-                # print("转储历史记录完毕")
-            except BaseException as e:
-                print(e)
-            # 每隔10分钟转储一次
-            time.sleep(10*self.history_dump_interval)
-
-    def text_chat(self, prompt, session_id):
-        # 会话机制
-        if session_id not in self.session_dict:
-            self.session_dict[session_id] = []
-
-            fjson = {}
-            try:
-                f = open(abs_path+"configs/session", "r", encoding="utf-8")
-                fjson = json.loads(f.read())
-                f.close()
-            except:
-                pass
-            finally:
-                fjson[session_id] = 'true'
-                f = open(abs_path+"configs/session", "w", encoding="utf-8")
-                f.write(json.dumps(fjson))
-                f.flush()
-                f.close()
-
-        cache_data_list, new_record, req = self.wrap(prompt, session_id)
-        retry = 0
-        response = None
-        err = ''
-        while retry < 5:
-            try:
-                response = openai.ChatCompletion.create(
-                    messages=req,
-                    **self.chatGPT_configs
-                )
-                break
-            except Exception as e:
-                if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str(e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e):
-                    gu.log("当前Key已超额或异常, 正在切换", level=gu.LEVEL_WARNING)
-                    self.key_stat[openai.api_key]['exceed'] = True
-                    self.save_key_record()
-
-                    response, is_switched = self.handle_switch_key(req)
-                    if not is_switched:
-                        # 所有Key都超额或不正常
-                        raise e
-                    else:
-                        break
-                elif 'maximum context length' in str(e):
-                    gu.log("token超限, 清空对应缓存")
-                    self.session_dict[session_id] = []
-                    cache_data_list, new_record, req = self.wrap(prompt, session_id)
-                else:
-                    gu.log(str(e), level=gu.LEVEL_ERROR)
-                err = str(e)
-                retry+=1
-        if retry >= 5:
-            gu.log(r"如果报错, 且您的机器在中国大陆内, 请确保您的电脑已经设置好代理软件(梯子), 并在配置文件设置了系统代理地址。详见https://github.com/Soulter/QQChannelChatGPT/wiki/%E4%BA%8C%E3%80%81%E9%A1%B9%E7%9B%AE%E9%85%8D%E7%BD%AE%E6%96%87%E4%BB%B6%E9%85%8D%E7%BD%AE", max_len=999)
-            raise BaseException("连接出错: "+str(err))
-        
-        self.key_stat[openai.api_key]['used'] += response['usage']['total_tokens']
-        self.save_key_record()
-        # print("[ChatGPT] "+str(response["choices"][0]["message"]["content"]))
-        chatgpt_res = str(response["choices"][0]["message"]["content"]).strip()
-        current_usage_tokens = response['usage']['total_tokens']
-
-        # 超过指定tokens， 尽可能的保留最多的条目，直到小于max_tokens
-        if current_usage_tokens > self.max_tokens:
-            t = current_usage_tokens
-            index = 0
-            while t > self.max_tokens:
-                if index >= len(cache_data_list):
-                    break
-                # 保留人格信息
-                if 'user' in cache_data_list[index] and cache_data_list[index]['user']['role'] != 'system':
-                    t -= int(cache_data_list[index]['single_tokens'])
-                    del cache_data_list[index]
-                else:
-                    index += 1
-            # 删除完后更新相关字段
-            self.session_dict[session_id] = cache_data_list
-            # cache_prompt = get_prompts_by_cache_list(cache_data_list)
-
-        # 添加新条目进入缓存的prompt
-        new_record['AI'] = {
-            'role': 'assistant',
-            'content': chatgpt_res,
-        }
-        new_record['usage_tokens'] = current_usage_tokens
-        if len(cache_data_list) > 0:
-            new_record['single_tokens'] = current_usage_tokens - int(cache_data_list[-1]['usage_tokens'])
-        else:
-            new_record['single_tokens'] = current_usage_tokens
-        cache_data_list.append(new_record)
-
-        self.session_dict[session_id] = cache_data_list
-
-        return chatgpt_res
-        
-    def image_chat(self, prompt, img_num = 1, img_size = "1024x1024"):
-        retry = 0
-        image_url = ''
-        while retry < 5:
-            try:
-                # print("test1")
-                response = openai.Image.create(
-                    prompt=prompt,
-                    n=img_num,
-                    size=img_size
-                )
-                # print("test2")
-                image_url = []
-                for i in range(img_num):
-                    image_url.append(response['data'][i]['url'])
-                break
-            except Exception as e:
-                gu.log(str(e), level=gu.LEVEL_ERROR)
-                if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str(
-                        e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e):
-                    gu.log("当前Key已超额或者不正常, 正在切换", level=gu.LEVEL_WARNING)
-                    self.key_stat[openai.api_key]['exceed'] = True
-                    self.save_key_record()
-
-                    response, is_switched = self.handle_switch_key(req)
-                    if not is_switched:
-                        # 所有Key都超额或不正常
-                        raise e
-                    else:
-                        break
-                retry += 1
-        if retry >= 5:
-            raise BaseException("连接超时")
-                
-        return image_url
-
-    def forget(self, session_id) -> bool:
-        self.session_dict[session_id] = []
-        return True
-    
-    '''
-    获取缓存的会话
-    '''
-    def get_prompts_by_cache_list(self, cache_data_list, divide=False, paging=False, size=5, page=1):
-        prompts = ""
-        if paging:
-            page_begin = (page-1)*size
-            page_end = page*size
-            if page_begin < 0:
-                page_begin = 0
-            if page_end > len(cache_data_list):
-                page_end = len(cache_data_list)
-            cache_data_list = cache_data_list[page_begin:page_end]
-        for item in cache_data_list:
-            prompts += str(item['user']['role']) + ":\n" + str(item['user']['content']) + "\n"
-            prompts += str(item['AI']['role']) + ":\n" + str(item['AI']['content']) + "\n"
-
-            if divide:
-                prompts += "----------\n"
-        return prompts
-    
-        
-    def get_user_usage_tokens(self,cache_list):
-        usage_tokens = 0
-        for item in cache_list:
-            usage_tokens += int(item['single_tokens'])
-        return usage_tokens
-        
-    '''
-    获取统计信息
-    '''
-    def get_stat(self):
-        try:
-            f = open(abs_path+"configs/stat", "r", encoding="utf-8")
-            fjson = json.loads(f.read())
-            f.close()
-            guild_count = 0
-            guild_msg_count = 0
-            guild_direct_msg_count = 0
-
-            for k,v in fjson.items():
-                guild_count += 1
-                guild_msg_count += v['count']
-                guild_direct_msg_count += v['direct_count']
-            
-            session_count = 0
-
-            f = open(abs_path+"configs/session", "r", encoding="utf-8")
-            fjson = json.loads(f.read())
-            f.close()
-            for k,v in fjson.items():
-                session_count += 1
-            return guild_count, guild_msg_count, guild_direct_msg_count, session_count
-        except:
-            return -1, -1, -1, -1
-
-    # 包装信息
-    def wrap(self, prompt, session_id):
-        # 获得缓存信息
-        context = self.session_dict[session_id]
-        new_record = {
-            "user": {
-                "role": "user",
-                "content": prompt,
-            },
-            "AI": {},
-            'usage_tokens': 0,
-        }
-        req_list = []
-        for i in context:
-            if 'user' in i:
-                req_list.append(i['user'])
-            if 'AI' in i:
-                req_list.append(i['AI'])
-        req_list.append(new_record['user'])
-        return context, new_record, req_list
-    
-    def handle_switch_key(self, req):
-        # messages = [{"role": "user", "content": prompt}]
-        while True:
-            is_all_exceed = True
-            for key in self.key_stat:
-                if key == None:
-                    continue
-                if not self.key_stat[key]['exceed']:
-                    is_all_exceed = False
-                    openai.api_key = key
-                    gu.log(f"切换到Key: {key}, 已使用token: {self.key_stat[key]['used']}", level=gu.LEVEL_INFO)
-                    if len(req) > 0:
-                        try:
-                            response = openai.ChatCompletion.create(
-                                messages=req,
-                                **self.chatGPT_configs
-                            )
-                            return response, True
-                        except Exception as e:
-                            if 'You exceeded' in str(e):
-                                gu.log("当前Key已超额, 正在切换")
-                                self.key_stat[openai.api_key]['exceed'] = True
-                                self.save_key_record()
-                                time.sleep(1)
-                                continue
-                            else:
-                                gu.log(str(e), level=gu.LEVEL_ERROR)
-                    else:
-                        return True
-            if is_all_exceed:
-                gu.log("所有Key已超额", level=gu.LEVEL_CRITICAL)
-                return None, False
-            else:
-                gu.log("在切换key时程序异常。", level=gu.LEVEL_ERROR)
-                return None, False
-                
-    def getConfigs(self):
-        return self.openai_configs
-    
-    def save_key_record(self):
-        with open(key_record_path, 'w', encoding='utf-8') as f:
-            json.dump(self.key_stat, f)
-
-    def get_key_stat(self):
-        return self.key_stat
-    def get_key_list(self):
-        return self.key_list
-    
-    # 添加key
-    def append_key(self, key, sponsor):
-        self.key_list.append(key)
-        self.key_stat[key] = {'exceed': False, 'used': 0, 'sponsor': sponsor}
-        self.save_key_record()
-        self.init_key_record()
-
-    # 检查key是否可用
-    def check_key(self, key):
-        pre_key = openai.api_key
-        openai.api_key = key
-        messages = [{"role": "user", "content": "1"}]
-        try:
-            response = openai.ChatCompletion.create(
-                messages=messages,
-                **self.chatGPT_configs
-            )
-            openai.api_key = pre_key
-            return True
-        except Exception as e:
-            pass
-        openai.api_key = pre_key
-        return False
-
-    #将key_list的key转储到key_record中，并记录相关数据
-    def init_key_record(self):
-        if not os.path.exists(key_record_path):
-            with open(key_record_path, 'w', encoding='utf-8') as f:
-                json.dump({}, f)
-        with open(key_record_path, 'r', encoding='utf-8') as keyfile:
-            try:
-                self.key_stat = json.load(keyfile)
-            except Exception as e:
-                gu.log(str(e), level=gu.LEVEL_ERROR)
-                self.key_stat = {}
-            finally:
-                for key in self.key_list:
-                    if key not in self.key_stat:
-                        self.key_stat[key] = {'exceed': False, 'used': 0}
-                        # if openai.api_key is None:
-                        #     openai.api_key = key
-                    else:
-                        # if self.key_stat[key]['exceed']:
-                        #     print(f"Key: {key} 已超额")
-                        #     continue
-                        # else:
-                        #     if openai.api_key is None:
-                        #         openai.api_key = key
-                        #         print(f"使用Key: {key}, 已使用token: {self.key_stat[key]['used']}")
-                        pass
-                if openai.api_key == None:
-                    self.handle_switch_key("")
-            self.save_key_record()
-

model/provider/provider_rev_chatgpt.py

@@ -1,90 +0,0 @@
-from revChatGPT.V1 import Chatbot
-from revChatGPT import typings
-from model.provider.provider import Provider
-from util import general_utils as gu
-
-
-class ProviderRevChatGPT(Provider):
-    def __init__(self, config):
-        self.rev_chatgpt = []
-        for i in range(0, len(config['account'])):
-            try:
-                gu.log(f"创建rev_ChatGPT负载{str(i)}中...", level=gu.LEVEL_INFO, tag="RevChatGPT")
-
-                if 'password' in config['account'][i]:
-                    config['account'][i]['password'] = str(config['account'][i]['password'])
-                revstat = {
-                    'obj': Chatbot(config=config['account'][i]),
-                    'busy': False
-                }
-                self.rev_chatgpt.append(revstat)
-            except BaseException as e:
-                gu.log(f"创建rev_ChatGPT负载{str(i)}失败: {str(e)}", level=gu.LEVEL_ERROR, tag="RevChatGPT")
-
-    def forget(self) -> bool:
-        return False
-    
-    def request_text(self, prompt: str, bot) -> str:
-        resp = ''
-        err_count = 0
-        retry_count = 5
-
-        while err_count < retry_count:
-            try:
-                for data in bot.ask(prompt):
-                    resp = data["message"]
-                break
-            except typings.Error as e:
-                if e.code == typings.ErrorType.RATE_LIMIT_ERROR:
-                    raise e
-                if e.code == typings.ErrorType.INVALID_ACCESS_TOKEN_ERROR:
-                    raise e
-                if e.code == typings.ErrorType.EXPIRED_ACCESS_TOKEN_ERROR:
-                    raise e
-                if e.code == typings.ErrorType.PROHIBITED_CONCURRENT_QUERY_ERROR:
-                    raise e
-                
-                err_count += 1
-                gu.log(f"请求出现问题: {str(e)} | 正在重试: {str(err_count)}", level=gu.LEVEL_WARNING, tag="RevChatGPT")
-                if err_count >= retry_count:
-                    raise e
-            except BaseException as e:
-                err_count += 1
-                gu.log(f"请求出现问题: {str(e)} | 正在重试: {str(err_count)}", level=gu.LEVEL_WARNING, tag="RevChatGPT")
-                if err_count >= retry_count:
-                    raise e
-        if resp == '':
-            resp = "RevChatGPT出现故障."
-        
-        # print("[RevChatGPT] "+str(resp))
-        return resp
-
-    def text_chat(self, prompt) -> str:
-        res = ''
-        err_msg = ''
-        cursor = 0
-        for revstat in self.rev_chatgpt:
-            cursor += 1
-            if not revstat['busy']:
-                try:
-                    revstat['busy'] = True
-                    res = self.request_text(prompt, revstat['obj'])
-                    revstat['busy'] = False
-                    return res.strip()
-                # todo: 细化错误管理
-                except BaseException as e:
-                    revstat['busy'] = False
-                    gu.log(f"请求出现问题: {str(e)}", level=gu.LEVEL_WARNING, tag="RevChatGPT")
-                    err_msg += f"账号{cursor} - 错误原因: {str(e)}"
-                    continue
-            else:
-                err_msg += f"账号{cursor} - 错误原因: 忙碌"
-                continue
-        res = f'回复失败。错误跟踪：{err_msg}'
-        return res
-    
-    def is_all_busy(self) -> bool:
-        for revstat in self.rev_chatgpt:
-            if not revstat['busy']:
-                return False
-        return True

model/provider/provider_rev_edgegpt.py

@@ -1,96 +0,0 @@
-from model.provider.provider import Provider
-from EdgeGPT import Chatbot, ConversationStyle
-import json
-import os
-from util import general_utils as gu
-from util.cmd_config import CmdConfig as cc
-
-
-class ProviderRevEdgeGPT(Provider):
-    def __init__(self):
-        self.busy = False
-        self.wait_stack = []
-        with open('./cookies.json', 'r') as f:
-            cookies = json.load(f)
-        proxy = cc.get("bing_proxy", None)
-        if proxy == "":
-            proxy = None
-        self.bot = Chatbot(cookies=cookies, proxy = proxy)
-
-    def is_busy(self):
-        return self.busy
-
-    async def forget(self):
-        try:
-            await self.bot.reset()
-            return True
-        except BaseException:
-            return False
-        
-    async def text_chat(self, prompt, platform = 'none'):
-        if self.busy:
-             return
-        self.busy = True
-        resp = 'err'
-        err_count = 0
-        retry_count = 5
-        
-        while err_count < retry_count:
-            try:
-                resp = await self.bot.ask(prompt=prompt, conversation_style=ConversationStyle.creative)
-                # print("[RevEdgeGPT] "+str(resp))
-                if 'messages' not in resp['item']:
-                    await self.bot.reset()
-                msj_obj = resp['item']['messages'][len(resp['item']['messages'])-1]
-                reply_msg = msj_obj['text']
-                if 'sourceAttributions' in msj_obj:
-                    reply_source = msj_obj['sourceAttributions']
-                else:
-                    reply_source = []
-                if 'throttling' in resp['item']:
-                    throttling = resp['item']['throttling']
-                    # print(throttling)
-                else:
-                    throttling = None
-                if 'I\'m sorry but I prefer not to continue this conversation. I\'m still learning so I appreciate your understanding and patience.' in reply_msg:
-                    self.busy = False
-                    return '', 0
-                if reply_msg == prompt:
-                    # resp += '\n\n如果你没有让我复述你的话，那代表我可能不想和你继续这个话题了，请输入reset重置会话😶'
-                    await self.forget()
-                    err_count += 1
-                    continue
-                if reply_source is None:
-                    # 不想答复
-                    return '', 0
-                else:
-                    if platform != 'qqchan':
-                        index = 1
-                        if len(reply_source) > 0:
-                            reply_msg += "\n\n信息来源:\n"
-                        for i in reply_source:
-                            reply_msg += f"[{str(index)}]: {i['seeMoreUrl']} | {i['providerDisplayName']}\n"
-                            index += 1
-                if throttling is not None:
-                    if throttling['numUserMessagesInConversation'] == throttling['maxNumUserMessagesInConversation']:
-                        # 达到上限，重置会话
-                        await self.forget()
-                    if throttling['numUserMessagesInConversation'] > throttling['maxNumUserMessagesInConversation']:
-                        await self.forget()
-                        err_count += 1
-                        continue
-                    reply_msg += f"\n[{throttling['numUserMessagesInConversation']}/{throttling['maxNumUserMessagesInConversation']}]"
-                break
-            except BaseException as e:
-                gu.log(str(e), level=gu.LEVEL_WARNING, tag="RevEdgeGPT")
-                err_count += 1
-                if err_count >= retry_count:
-                        gu.log(r"如果报错, 且您的机器在中国大陆内, 请确保您的电脑已经设置好代理软件(梯子), 并在配置文件设置了系统代理地址。详见https://github.com/Soulter/QQChannelChatGPT/wiki/%E4%BA%8C%E3%80%81%E9%A1%B9%E7%9B%AE%E9%85%8D%E7%BD%AE%E6%96%87%E4%BB%B6%E9%85%8D%E7%BD%AE", max_len=999)
-                        self.busy = False
-                        raise e
-                gu.log("请求出现了一些问题, 正在重试。次数"+str(err_count), level=gu.LEVEL_WARNING, tag="RevEdgeGPT")
-        self.busy = False
-        
-        # print("[RevEdgeGPT] "+str(reply_msg))
-        return reply_msg, 1
-    

model/provider/rev_chatgpt.py

@@ -0,0 +1,224 @@
+from revChatGPT.V1 import Chatbot
+from revChatGPT import typings
+from model.provider.provider import Provider
+from util import general_utils as gu
+from util import cmd_config as cc
+import time
+
+
+class ProviderRevChatGPT(Provider):
+    def __init__(self, config, base_url = None):
+        if base_url == "":
+            base_url = None
+        self.rev_chatgpt: list[dict] = []
+        self.cc = cc.CmdConfig()
+        for i in range(0, len(config['account'])):
+            try:
+                gu.log(f"创建逆向ChatGPT负载{str(i+1)}中...", level=gu.LEVEL_INFO, tag="RevChatGPT")
+                
+                if isinstance(config['account'][i], str):
+                    # 默认是 access_token
+                    rev_account_config = {
+                        'access_token': config['account'][i],
+                    }
+                else:
+                    if 'password' in config['account'][i]:
+                        gu.log(f"创建逆向ChatGPT负载{str(i+1)}失败: 已不支持账号密码登录，请使用access_token方式登录。", level=gu.LEVEL_ERROR, tag="RevChatGPT")
+                        continue
+                    rev_account_config = {
+                        'access_token': config['account'][i]['access_token'],
+                    }
+                if self.cc.get("rev_chatgpt_model") != "":
+                    rev_account_config['model'] = self.cc.get("rev_chatgpt_model")
+                if len(self.cc.get("rev_chatgpt_plugin_ids")) > 0:
+                    rev_account_config['plugin_ids'] = self.cc.get("rev_chatgpt_plugin_ids")
+                if self.cc.get("rev_chatgpt_PUID") != "":
+                    rev_account_config['PUID'] = self.cc.get("rev_chatgpt_PUID")
+                if len(self.cc.get("rev_chatgpt_unverified_plugin_domains")) > 0:
+                    rev_account_config['unverified_plugin_domains'] = self.cc.get("rev_chatgpt_unverified_plugin_domains")
+                cb = Chatbot(config=rev_account_config, base_url=base_url)
+                # cb.captcha_solver = self.__captcha_solver
+                # 后八位c
+                g_id = rev_account_config['access_token'][-8:]
+                revstat = {
+                    'id': g_id,
+                    'obj': cb,
+                    'busy': False,
+                    'user': []
+                }
+                self.rev_chatgpt.append(revstat)
+            except BaseException as e:
+                gu.log(f"创建逆向ChatGPT负载{str(i+1)}失败: {str(e)}", level=gu.LEVEL_ERROR, tag="RevChatGPT")
+
+    def forget(self, session_id = None) -> bool:
+        for i in self.rev_chatgpt:
+            for user in i['user']:
+                if session_id == user['id']:
+                    try:
+                        i['obj'].reset_chat()
+                        return True
+                    except BaseException as e:
+                        gu.log(f"重置RevChatGPT失败。原因: {str(e)}", level=gu.LEVEL_ERROR, tag="RevChatGPT")
+                        return False
+        return False
+
+    def get_revchatgpt(self) -> list:
+        return self.rev_chatgpt
+        
+    def request_text(self, prompt: str, bot) -> str:
+        resp = ''
+        err_count = 0
+        retry_count = 5
+
+        while err_count < retry_count:
+            try:
+                for data in bot.ask(prompt):
+                    resp = data["message"]
+                break
+            except typings.Error as e:
+                if e.code == typings.ErrorType.INVALID_ACCESS_TOKEN_ERROR:
+                    raise e
+                if e.code == typings.ErrorType.EXPIRED_ACCESS_TOKEN_ERROR:
+                    raise e
+                if e.code == typings.ErrorType.PROHIBITED_CONCURRENT_QUERY_ERROR:
+                    raise e
+                if "Your authentication token has expired. Please try signing in again." in str(e):
+                    raise e
+                if "The message you submitted was too long" in str(e):
+                    raise e
+                if "You've reached our limit of messages per hour." in str(e):
+                    raise e
+                if "Rate limited by proxy" in str(e):
+                    gu.log(f"触发请求频率限制, 60秒后自动重试。", level=gu.LEVEL_WARNING, tag="RevChatGPT")
+                    time.sleep(60)
+                
+                err_count += 1
+                gu.log(f"请求异常: {str(e)}，正在重试。({str(err_count)})", level=gu.LEVEL_WARNING, tag="RevChatGPT")
+                if err_count >= retry_count:
+                    raise e
+            except BaseException as e:
+                err_count += 1
+                gu.log(f"请求异常: {str(e)}，正在重试。({str(err_count)})", level=gu.LEVEL_WARNING, tag="RevChatGPT")
+                if err_count >= retry_count:
+                    raise e
+        if resp == '':
+            resp = "RevChatGPT请求异常。"
+        
+        # print("[RevChatGPT] "+str(resp))
+        return resp
+
+    def text_chat(self, prompt,
+                   session_id = None,
+                   image_url = None,
+                   function_call=None,
+                   extra_conf: dict = None,
+                   default_personality: dict = None) -> str:
+
+        # 选择一个人少的账号。
+        selected_revstat = None
+        min_revstat = None
+        min_ = None
+        new_user = False
+        conversation_id = ''
+        parent_id = ''
+        for revstat in self.rev_chatgpt:
+            for user in revstat['user']:
+                if session_id == user['id']:
+                    selected_revstat = revstat
+                    conversation_id = user['conversation_id']
+                    parent_id = user['parent_id']
+                    break
+            if min_ is None:
+                min_ = len(revstat['user'])
+                min_revstat = revstat
+            elif len(revstat['user']) < min_:
+                min_ = len(revstat['user'])
+                min_revstat = revstat
+            # if session_id in revstat['user']:
+            #     selected_revstat = revstat
+            #     break
+        
+        if selected_revstat is None:
+            selected_revstat = min_revstat
+            selected_revstat['user'].append({
+                'id': session_id,
+                'conversation_id': '',
+                'parent_id': ''
+            })
+            new_user = True
+
+        gu.log(f"选择账号{str(selected_revstat)}", tag="RevChatGPT", level=gu.LEVEL_DEBUG)
+
+        while selected_revstat['busy']:
+            gu.log(f"账号忙碌，等待中...", tag="RevChatGPT", level=gu.LEVEL_DEBUG)
+            time.sleep(1)
+        selected_revstat['busy'] = True
+        
+        if not new_user:
+            # 非新用户，则使用其专用的会话
+            selected_revstat['obj'].conversation_id = conversation_id
+            selected_revstat['obj'].parent_id = parent_id
+        else:
+            # 新用户，则使用新的会话
+            selected_revstat['obj'].reset_chat()
+
+        res = ''
+        err_msg = ''
+        err_cnt = 0
+        while err_cnt < 15:
+            try:
+                res = self.request_text(prompt, selected_revstat['obj'])
+                selected_revstat['busy'] = False
+                # 记录新用户的会话
+                if new_user:
+                    i = 0
+                    for user in selected_revstat['user']:
+                        if user['id'] == session_id:
+                            selected_revstat['user'][i]['conversation_id'] = selected_revstat['obj'].conversation_id
+                            selected_revstat['user'][i]['parent_id'] = selected_revstat['obj'].parent_id
+                            break
+                        i += 1
+                return res.strip()
+            except BaseException as e:
+                if "Your authentication token has expired. Please try signing in again." in str(e):
+                    raise Exception(f"此账号(access_token后8位为{selected_revstat['id']})的access_token已过期，请重新获取，或者切换账号。")
+                if "The message you submitted was too long" in str(e):
+                    raise Exception("发送的消息太长，请分段发送。")
+                if "You've reached our limit of messages per hour." in str(e):
+                    raise Exception("触发RevChatGPT请求频率限制。请1小时后再试，或者切换账号。")
+                gu.log(f"请求异常: {str(e)}", level=gu.LEVEL_WARNING, tag="RevChatGPT")
+                err_cnt += 1
+                time.sleep(3)
+
+        raise Exception(f'回复失败。原因：{err_msg}。如果您设置了多个账号，可以使用/switch指令切换账号。输入/switch查看详情。')
+            
+
+        # while self.is_all_busy():
+        #     time.sleep(1)
+        # res = ''
+        # err_msg = ''
+        # cursor = 0
+        # for revstat in self.rev_chatgpt:
+        #     cursor += 1
+        #     if not revstat['busy']:
+        #         try:
+        #             revstat['busy'] = True
+        #             res = self.request_text(prompt, revstat['obj'])
+        #             revstat['busy'] = False
+        #             return res.strip()
+        #         # todo: 细化错误管理
+        #         except BaseException as e:
+        #             revstat['busy'] = False
+        #             gu.log(f"请求出现问题: {str(e)}", level=gu.LEVEL_WARNING, tag="RevChatGPT")
+        #             err_msg += f"账号{cursor} - 错误原因: {str(e)}"
+        #             continue
+        #     else:
+        #         err_msg += f"账号{cursor} - 错误原因: 忙碌"
+        #         continue
+        # raise Exception(f'回复失败。错误跟踪：{err_msg}')
+    
+    def is_all_busy(self) -> bool:
+        for revstat in self.rev_chatgpt:
+            if not revstat['busy']:
+                return False
+        return True

requirements.txt

@@ -1,10 +1,17 @@
+pydantic~=1.10.4
 requests~=2.28.1
-openai~=0.27.4
-qq-botpy~=1.1.2
-revChatGPT~=5.0.0
-baidu-aip~=4.16.9
-EdgeGPT~=0.1.22.1
+openai~=1.2.3
+qq-botpy
 chardet~=5.1.0
 Pillow~=9.4.0
 GitPython~=3.1.31
 nakuru-project
+beautifulsoup4
+googlesearch-python
+tiktoken
+readability-lxml
+revChatGPT~=6.8.6
+baidu-aip~=4.16.9
+websockets
+flask
+psutil

test.py

@@ -0,0 +1,8 @@
+from pip._internal.operations.freeze import freeze
+
+# 获取已安装包的信息
+installed_packages = freeze()
+
+# 输出已安装包的信息
+for package in installed_packages:
+    print(package)

util/cmd_config.py

@@ -1,12 +1,13 @@
 import os
 import json
+from typing import Union
 
 cpath = "cmd_config.json"
 
 def check_exist():
     if not os.path.exists(cpath):
-        with open(cpath, "w", encoding="utf-8") as f:
-            json.dump({}, f, indent=4)
+        with open(cpath, "w", encoding="utf-8-sig") as f:
+            json.dump({}, f, indent=4, ensure_ascii=False)
             f.flush()
 
 class CmdConfig():
@@ -14,7 +15,7 @@ class CmdConfig():
     @staticmethod
     def get(key, default=None):
         check_exist()
-        with open(cpath, "r", encoding="utf-8") as f:
+        with open(cpath, "r", encoding="utf-8-sig") as f:
             d = json.load(f)
             if key in d:
                 return d[key]
@@ -24,30 +25,98 @@ class CmdConfig():
     @staticmethod
     def get_all():
         check_exist()
-        with open(cpath, "r", encoding="utf-8") as f:
+        with open(cpath, "r", encoding="utf-8-sig") as f:
             return json.load(f)
         
     @staticmethod
     def put(key, value):
         check_exist()
-        with open(cpath, "r", encoding="utf-8") as f:
+        with open(cpath, "r", encoding="utf-8-sig") as f:
             d = json.load(f)
             d[key] = value
-            with open(cpath, "w", encoding="utf-8") as f:
-                json.dump(d, f, indent=4)
+            with open(cpath, "w", encoding="utf-8-sig") as f:
+                json.dump(d, f, indent=4, ensure_ascii=False)
+                f.flush()
+                
+    @staticmethod
+    def put_by_dot_str(key: str, value):
+        '''
+        根据点分割的字符串，将值写入配置文件
+        '''
+        check_exist()
+        with open(cpath, "r", encoding="utf-8-sig") as f:
+            d = json.load(f)
+            _d = d
+            _ks = key.split(".")
+            for i in range(len(_ks)):
+                if i == len(_ks) - 1:
+                    _d[_ks[i]] = value
+                else:
+                    _d = _d[_ks[i]]
+            with open(cpath, "w", encoding="utf-8-sig") as f:
+                json.dump(d, f, indent=4, ensure_ascii=False)
                 f.flush()
 
     @staticmethod
-    def init_attributes(keys: list, init_val = ""):
+    def init_attributes(key: Union[str, list], init_val = ""):
         check_exist()
-        with open(cpath, "r", encoding="utf-8") as f:
-            d = json.load(f)
-            _tag = False
-            for k in keys:
+        conf_str = ''
+        with open(cpath, "r", encoding="utf-8-sig") as f:
+             conf_str = f.read()
+        if conf_str.startswith(u'/ufeff'):
+            conf_str = conf_str.encode('utf8')[3:].decode('utf8')
+        d = json.loads(conf_str)
+        _tag = False
+
+        if isinstance(key, str):
+            if key not in d:
+                d[key] = init_val
+                _tag = True
+        elif isinstance(key, list):
+            for k in key:
                 if k not in d:
                     d[k] = init_val
                     _tag = True
-            if _tag:
-                with open(cpath, "w", encoding="utf-8") as f:
-                    json.dump(d, f, indent=4)
-                    f.flush()
+        if _tag:
+            with open(cpath, "w", encoding="utf-8-sig") as f:
+                json.dump(d, f, indent=4, ensure_ascii=False)
+                f.flush()
+
+def init_astrbot_config_items():
+    # 加载默认配置
+    cc = CmdConfig()
+    cc.init_attributes("qq_forward_threshold", 200)
+    cc.init_attributes("qq_welcome", "欢迎加入本群！\n欢迎给https://github.com/Soulter/QQChannelChatGPT项目一个Star😊~\n输入help查看帮助~\n")
+    cc.init_attributes("qq_pic_mode", False)
+    cc.init_attributes("rev_chatgpt_model", "")
+    cc.init_attributes("rev_chatgpt_plugin_ids", [])
+    cc.init_attributes("rev_chatgpt_PUID", "")
+    cc.init_attributes("rev_chatgpt_unverified_plugin_domains", [])
+    cc.init_attributes("gocq_host", "127.0.0.1")
+    cc.init_attributes("gocq_http_port", 5700)
+    cc.init_attributes("gocq_websocket_port", 6700)
+    cc.init_attributes("gocq_react_group", True)
+    cc.init_attributes("gocq_react_guild", True)
+    cc.init_attributes("gocq_react_friend", True)
+    cc.init_attributes("gocq_react_group_increase", True)
+    cc.init_attributes("gocq_qqchan_admin", "")
+    cc.init_attributes("other_admins", [])
+    cc.init_attributes("CHATGPT_BASE_URL", "")
+    cc.init_attributes("qqbot_appid", "")
+    cc.init_attributes("qqbot_secret", "")
+    cc.init_attributes("admin_qq", "")
+    cc.init_attributes("nick_qq", ["!", "！", "ai"])
+    cc.init_attributes("admin_qqchan", "")
+    cc.init_attributes("llm_env_prompt", "")
+    cc.init_attributes("llm_wake_prefix", "")
+    cc.init_attributes("default_personality_str", "")
+    cc.init_attributes("openai_image_generate", {
+        "model": "dall-e-3",
+        "size": "1024x1024",
+        "style": "vivid",
+        "quality": "standard",
+    })
+    cc.init_attributes("http_proxy", "")
+    cc.init_attributes("https_proxy", "")
+    cc.init_attributes("dashboard_username", "")
+    cc.init_attributes("dashboard_password", "")

util/errors/errors.py

@@ -1,3 +0,0 @@
-class PromptExceededError(Exception):
-    
-    pass

util/function_calling/func_call.py

@@ -0,0 +1,237 @@
+
+import json
+import util.general_utils as gu
+
+import time
+class FuncCallJsonFormatError(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+    
+class FuncNotFoundError(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+    
+class FuncCall():
+    def __init__(self, provider) -> None:
+        self.func_list = []
+        self.provider = provider
+
+    def add_func(self, name: str = None, func_args: list = None, desc: str = None, func_obj = None) -> None:
+        if name == None or func_args == None or desc == None or func_obj == None:
+            raise FuncCallJsonFormatError("name, func_args, desc must be provided.")
+        params = {
+            "type": "object", # hardcore here
+            "properties": {}
+        }
+        for param in func_args:
+            params['properties'][param['name']] = {
+                "type": param['type'],
+                "description": param['description']
+            }
+        self._func = {
+            "name": name,
+            "parameters": params,
+            "description": desc,
+            "func_obj": func_obj,
+        }
+        self.func_list.append(self._func)
+
+    def func_dump(self, intent: int = 2) -> str:
+        _l = []
+        for f in self.func_list:
+            _l.append({
+                "name": f["name"],
+                "parameters": f["parameters"],
+                "description": f["description"],
+            })
+        return json.dumps(_l, indent=intent, ensur_ascii=False)
+    
+    def get_func(self) -> list:
+        _l = []
+        for f in self.func_list:
+            _l.append({
+                "type": "function",
+                "function": {
+                    "name": f["name"],
+                    "parameters": f["parameters"],
+                    "description": f["description"],
+                }
+            })
+        return _l
+    
+    def func_call(self, question, func_definition, is_task = False, tasks = None, taskindex = -1, is_summary = True, session_id = None):
+
+        funccall_prompt = """
+我正实现function call功能，该功能旨在让你变成给定的问题到给定的函数的解析器（意味着你不是创造函数）。
+下面会给你提供可能用到的函数相关信息和一个问题，你需要将其转换成给定的函数调用。
+- 你的返回信息只含json，请严格仿照以下内容（不含注释），必须含有`res`,`func_call`字段:
+```
+{
+    "res": string // 如果没有找到对应的函数，那么你可以在这里正常输出内容。如果有，这里是空字符串。
+    "func_call": [ // 这是一个数组，里面包含了所有的函数调用，如果没有函数调用，那么这个数组是空数组。
+        {
+            "res": string // 如果没有找到对应的函数，那么你可以在这里正常输出内容。如果有，这里是空字符串。
+            "name": str, // 函数的名字
+            "args_type": {
+                "arg1": str, // 函数的参数的类型
+                "arg2": str,
+                ...
+            },
+            "args": {
+                "arg1": any, // 函数的参数
+                "arg2": any,
+                ...
+            }
+        },
+        ... // 可能在这个问题中会有多个函数调用
+    ],
+}
+```
+- 如果用户的要求较复杂，允许返回多个函数调用，但需保证这些函数调用的顺序正确。
+- 当问题没有提到给定的函数时，相当于提问方不打算使用function call功能，这时你可以在res中正常输出这个问题的回答（以AI的身份正常回答该问题，并将答案输出在res字段中，回答不要涉及到任何函数调用的内容，就只是正常讨论这个问题。）
+
+提供的函数是：
+
+"""
+
+        prompt = f"{funccall_prompt}\n```\n{func_definition}\n```\n"
+        prompt += f"""
+用户的提问是：
+```
+{question}
+```
+"""
+
+        # if is_task:
+        #     # task_prompt = f"\n任务列表为{str(tasks)}\n你目前进行到了任务{str(taskindex)}, **你不需要重新进行已经进行过的任务, 不要生成已经进行过的**"
+        #     prompt += task_prompt
+
+        # provider.forget()
+
+        _c = 0
+        while _c < 3:
+            try:
+                res = self.provider.text_chat(prompt, session_id)
+                if res.find('```') != -1:
+                    res = res[res.find('```json') + 7: res.rfind('```')]
+                gu.log("REVGPT func_call json result", bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
+                print(res)
+                res = json.loads(res)
+                break
+            except Exception as e:
+                _c += 1
+                if _c == 3:
+                    raise e
+                if "The message you submitted was too long" in str(e):
+                    raise e
+
+        invoke_func_res = ""
+
+        if "func_call" in res and len(res["func_call"]) > 0:
+            task_list = res["func_call"]
+
+            invoke_func_res_list = []
+
+            for res in task_list:
+                # 说明有函数调用
+                func_name = res["name"]
+                # args_type = res["args_type"]
+                args = res["args"]
+                # 调用函数
+                # func = eval(func_name)
+                func_target = None
+                for func in self.func_list:
+                    if func["name"] == func_name:
+                        func_target = func["func_obj"]
+                        break
+                if func_target == None:
+                    raise FuncNotFoundError(f"Request function {func_name} not found.")
+                t_res = str(func_target(**args))
+                invoke_func_res += f"{func_name} 调用结果：\n```\n{t_res}\n```\n"
+                invoke_func_res_list.append(invoke_func_res)
+                gu.log(f"[FUNC| {func_name} invoked]", bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
+                # print(str(t_res))
+
+            if is_summary:
+
+                # 生成返回结果
+                after_prompt = """
+有以下内容："""+invoke_func_res+"""
+请以AI助手的身份结合返回的内容对用户提问做详细全面的回答。
+用户的提问是：
+```""" + question + """```
+- 在res字段中，不要输出函数的返回值，也不要针对返回值的字段进行分析，也不要输出用户的提问，而是理解这一段返回的结果，并以AI助手的身份回答问题，只需要输出回答的内容，不需要在回答的前面加上身份词。
+- 你的返回信息必须只能是json，且需严格遵循以下内容（不含注释）:
+```json
+{
+    "res": string, // 回答的内容
+    "func_call_again": bool // 如果函数返回的结果有错误或者问题，可将其设置为true，否则为false
+}
+```
+- 如果func_call_again为true，res请你设为空值，否则请你填写回答的内容。"""
+
+                _c = 0
+                while _c < 5:
+                    try:
+                        res = self.provider.text_chat(after_prompt, session_id)
+                        # 截取```之间的内容
+                        gu.log("DEBUG BEGIN", bg=gu.BG_COLORS["yellow"], fg=gu.FG_COLORS["white"])
+                        print(res)
+                        gu.log("DEBUG END", bg=gu.BG_COLORS["yellow"], fg=gu.FG_COLORS["white"])
+                        if res.find('```') != -1:
+                            res = res[res.find('```json') + 7: res.rfind('```')]
+                        gu.log("REVGPT after_func_call json result", bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
+                        after_prompt_res = res
+                        after_prompt_res = json.loads(after_prompt_res)
+                        break
+                    except Exception as e:
+                        _c += 1
+                        if _c == 5:
+                            raise e
+                        if "The message you submitted was too long" in str(e):
+                            # 如果返回的内容太长了，那么就截取一部分
+                            time.sleep(3)
+                            invoke_func_res = invoke_func_res[:int(len(invoke_func_res) / 2)]
+                            after_prompt = """
+函数返回以下内容："""+invoke_func_res+"""
+请以AI助手的身份结合返回的内容对用户提问做详细全面的回答。
+用户的提问是：
+```""" + question + """```
+- 在res字段中，不要输出函数的返回值，也不要针对返回值的字段进行分析，也不要输出用户的提问，而是理解这一段返回的结果，并以AI助手的身份回答问题，只需要输出回答的内容，不需要在回答的前面加上身份词。
+- 你的返回信息必须只能是json，且需严格遵循以下内容（不含注释）:
+```json
+{
+    "res": string, // 回答的内容
+    "func_call_again": bool // 如果函数返回的结果有错误或者问题，可将其设置为true，否则为false
+}
+```
+- 如果func_call_again为true，res请你设为空值，否则请你填写回答的内容。"""
+                        else:
+                            raise e
+
+                if "func_call_again" in after_prompt_res and after_prompt_res["func_call_again"]:
+                    # 如果需要重新调用函数
+                    # 重新调用函数
+                    gu.log("REVGPT func_call_again", bg=gu.BG_COLORS["purple"], fg=gu.FG_COLORS["white"])
+                    res = self.func_call(question, func_definition)
+                    return res, True
+
+                gu.log("REVGPT func callback:", bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
+                # print(after_prompt_res["res"])
+                return after_prompt_res["res"], True
+            else:
+                return str(invoke_func_res_list), True
+        else:
+            # print(res["res"])
+            return res["res"], False
+
+
+
+
+

util/function_calling/gplugin.py

@@ -0,0 +1,270 @@
+import requests
+import util.general_utils as gu
+from bs4 import BeautifulSoup
+import time
+from util.function_calling.func_call import (
+    FuncCall, 
+    FuncCallJsonFormatError, 
+    FuncNotFoundError
+)
+from openai.types.chat.chat_completion_message_tool_call import Function
+import traceback
+from googlesearch import search, SearchResult
+from model.provider.provider import Provider
+import json
+from readability import Document
+
+
+def tidy_text(text: str) -> str:
+    '''
+    清理文本，去除空格、换行符等
+    '''
+    return text.strip().replace("\n", " ").replace("\r", " ").replace("  ", " ")
+
+def special_fetch_zhihu(link: str) -> str:
+    '''
+    function-calling 函数, 用于获取知乎文章的内容
+    '''
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) \
+            AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+    }
+    response = requests.get(link, headers=headers)
+    response.encoding = "utf-8"
+    soup = BeautifulSoup(response.text, "html.parser")
+
+    if "zhuanlan.zhihu.com" in link:
+        r = soup.find(class_="Post-RichTextContainer")
+    else:
+        r = soup.find(class_="List-item").find(class_="RichContent-inner")
+    if r is None:
+        print("debug: zhihu none")
+        raise Exception("zhihu none")
+    return tidy_text(r.text)
+
+def google_web_search(keyword) -> str:
+    '''
+    获取 google 搜索结果, 得到 title、desc、link
+    '''
+    ret = ""
+    index = 1
+    try:
+        ls = search(keyword, advanced=True, num_results=4)
+        for i in ls:
+            desc = i.description
+            try:
+                gu.log(f"搜索网页: {i.url}", tag="网页搜索", level=gu.LEVEL_INFO)
+                desc = fetch_website_content(i.url)
+            except BaseException as e:
+                print(f"(google) fetch_website_content err: {str(e)}")
+            gu.log(f"# No.{str(index)}\ntitle: {i.title}\nurl: {i.url}\ncontent: {desc}\n\n", level=gu.LEVEL_DEBUG, max_len=9999)
+            ret += f"# No.{str(index)}\ntitle: {i.title}\nurl: {i.url}\ncontent: {desc}\n\n"
+            index += 1
+    except Exception as e:
+        print(f"google search err: {str(e)}")
+        return web_keyword_search_via_bing(keyword)
+    return ret
+
+def web_keyword_search_via_bing(keyword) -> str:
+    '''
+    获取bing搜索结果, 得到 title、desc、link
+    '''
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) \
+            AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+    }
+    url = "https://www.bing.com/search?q="+keyword
+    _cnt = 0
+    # _detail_store = []
+    while _cnt < 5:
+        try:
+            response = requests.get(url, headers=headers)
+            response.encoding = "utf-8"
+            gu.log(f"bing response: {response.text}", tag="bing", level=gu.LEVEL_DEBUG, max_len=9999)
+            soup = BeautifulSoup(response.text, "html.parser")
+            res = ""
+            result_cnt = 0
+            ols = soup.find(id="b_results")
+            for i in ols.find_all("li", class_="b_algo"):
+                try:
+                    title = i.find("h2").text
+                    desc = i.find("p").text
+                    link = i.find("h2").find("a").get("href")
+                    # res.append({
+                    #     "title": title,
+                    #     "desc": desc,
+                    #     "link": link,
+                    # })
+                    try:
+                        gu.log(f"搜索网页: {link}", tag="网页搜索", level=gu.LEVEL_INFO)
+                        desc = fetch_website_content(link)
+                    except BaseException as e:
+                        print(f"(bing) fetch_website_content err: {str(e)}")
+
+                    res += f"# No.{str(result_cnt + 1)}\ntitle: {title}\nurl: {link}\ncontent: {desc}\n\n"
+                    result_cnt += 1
+                    if result_cnt > 5: break
+
+                    # if len(_detail_store) >= 3:
+                    #     continue
+                    # # 爬取前两条的网页内容
+                    # if "zhihu.com" in link:
+                    #     try:
+                    #         _detail_store.append(special_fetch_zhihu(link))
+                    #     except BaseException as e:
+                    #         print(f"zhihu parse err: {str(e)}")
+                    # else:
+                    #     try:
+                    #         _detail_store.append(fetch_website_content(link))
+                    #     except BaseException as e:
+                    #         print(f"fetch_website_content err: {str(e)}")
+
+                except Exception as e:
+                    print(f"bing parse err: {str(e)}")
+            if result_cnt == 0: break
+            return res
+        except Exception as e:
+            gu.log(f"bing fetch err: {str(e)}")
+            _cnt += 1
+            time.sleep(1)
+            
+    gu.log("fail to fetch bing info, using sougou.")
+    return web_keyword_search_via_sougou(keyword)
+
+def web_keyword_search_via_sougou(keyword) -> str:
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) \
+            AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+    }
+    url = f"https://sogou.com/web?query={keyword}"
+    response = requests.get(url, headers=headers)
+    response.encoding = "utf-8"
+    soup = BeautifulSoup(response.text, "html.parser")
+    
+    res = []
+    results = soup.find("div", class_="results")
+    for i in results.find_all("div", class_="vrwrap"):
+        try:
+            title = tidy_text(i.find("h3").text)
+            link = tidy_text(i.find("h3").find("a").get("href"))
+            if link.startswith("/link?url="):
+                link = "https://www.sogou.com" + link
+            res.append({
+                "title": title,
+                "link": link,
+            })
+            if len(res) >= 5: # 限制5条
+                break
+        except Exception as e:
+            pass
+            gu.log(f"sougou parse err: {str(e)}", tag="web_keyword_search_via_sougou", level=gu.LEVEL_ERROR)
+    # 爬取网页内容
+    _detail_store = []
+    for i in res:
+        if _detail_store >= 3:
+            break
+        try:
+            _detail_store.append(fetch_website_content(i["link"]))
+        except BaseException as e:
+            print(f"fetch_website_content err: {str(e)}")
+    ret = f"{str(res)}"
+    if len(_detail_store) > 0:
+        ret += f"\n网页内容: {str(_detail_store)}"
+    return ret
+
+def fetch_website_content(url):
+    gu.log(f"fetch_website_content: {url}", tag="fetch_website_content", level=gu.LEVEL_DEBUG)
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) \
+            AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+    }
+    response = requests.get(url, headers=headers, timeout=3)
+    response.encoding = "utf-8"
+    doc = Document(response.content)
+    # print('title:', doc.title())
+    ret = doc.summary(html_partial=True)
+    soup = BeautifulSoup(ret, 'html.parser')
+    ret = tidy_text(soup.get_text())
+    return ret
+
+def web_search(question, provider: Provider, session_id, official_fc=False):
+    '''
+    official_fc: 使用官方 function-calling
+    '''
+    new_func_call = FuncCall(provider)
+    new_func_call.add_func("google_web_search", [{
+        "type": "string",
+        "name": "keyword",
+        "description": "google search query (分词，尽量保留所有信息)"
+        }],
+    "通过搜索引擎搜索。如果问题需要在网页上搜索(如天气、新闻或任何需要通过网页获取信息的问题)，则调用此函数；如果没有，不要调用此函数。",
+    web_keyword_search_via_bing
+    )
+    new_func_call.add_func("fetch_website_content", [{
+        "type": "string",
+        "name": "url",
+        "description": "网址"
+        }],
+    "获取网页的内容。如果问题带有合法的网页链接(例如: `帮我总结一下https://github.com的内容`), 就调用此函数。如果没有，不要调用此函数。",
+    fetch_website_content
+    )
+    question1 = f"{question} \n> hint: 最多只能调用1个function, 并且存在不会调用任何function的可能性。"
+    has_func = False
+    function_invoked_ret = ""
+    if official_fc:
+        func = provider.text_chat(question1, session_id, function_call=new_func_call.get_func())
+        if isinstance(func, Function):
+            # arguments='{\n  "keyword": "北京今天的天气"\n}', name='google_web_search'
+            # 执行对应的结果：
+            func_obj = None
+            for i in new_func_call.func_list:
+                if i["name"] == func.name:
+                    func_obj = i["func_obj"]
+                    break
+            if not func_obj:
+                gu.log("找不到返回的 func name " + func.name, level=gu.LEVEL_ERROR)
+                return provider.text_chat(question1, session_id) + "\n(网页搜索失败, 此为默认回复)"
+            try:
+                args = json.loads(func.arguments)
+                function_invoked_ret = func_obj(**args)
+                has_func = True
+            except BaseException as e:
+                traceback.print_exc()
+                return provider.text_chat(question1, session_id) + "\n(网页搜索失败, 此为默认回复)"
+        else:
+            # now func is a string
+            return func
+    else:
+        try:
+            function_invoked_ret, has_func = new_func_call.func_call(question1, new_func_call.func_dump(), is_task=False, is_summary=False)
+        except BaseException as e:
+            res = provider.text_chat(question) + "\n(网页搜索失败, 此为默认回复)"
+            return res
+        has_func = True
+
+    if has_func:
+        provider.forget(session_id)
+        question3 = f"""
+以下是相关材料，你的任务是：
+1. 根据材料对问题`{question}`做切题的总结回答;
+2. 发表你对这个问题的看法.
+你的总结末尾应当有对材料的引用, 如果有链接, 请在末尾附上引用网页链接。引用格式严格按照 `\n[1] title url \n`。
+不要提到任何函数调用的信息。以下是相关材料：
+"""
+        
+        gu.log(f"web_search: {question3}", tag="web_search", level=gu.LEVEL_DEBUG, max_len=99999)
+        _c = 0
+        while _c < 3:
+            try:
+                print('text chat')
+                final_ret = provider.text_chat(question3 + "```" + function_invoked_ret + "```", session_id)
+                return final_ret
+            except Exception as e:
+                print(e)
+                _c += 1
+                if _c == 3: raise e
+                if "The message you submitted was too long" in str(e):
+                    provider.forget(session_id)
+                    function_invoked_ret = function_invoked_ret[:int(len(function_invoked_ret) / 2)]
+                    time.sleep(3)
+    return function_invoked_ret

util/general_utils.py

@@ -5,6 +5,12 @@ from PIL import Image, ImageDraw, ImageFont
 import os
 import re
 import requests
+from util.cmd_config import CmdConfig
+import socket
+from cores.qqbot.global_object import GlobalObject
+import platform
+import requests
+import logging
 
 PLATFORM_GOCQ = 'gocq'
 PLATFORM_QQCHAN = 'qqchan'
@@ -33,55 +39,100 @@ BG_COLORS = {
     "default": "49",
 }
 
+LEVEL_DEBUG = "DEBUG"
 LEVEL_INFO = "INFO"
-LEVEL_WARNING = "WARNING"
+LEVEL_WARNING = "WARN"
 LEVEL_ERROR = "ERROR"
 LEVEL_CRITICAL = "CRITICAL"
 
+# 为了兼容旧版
+level_codes = {
+    LEVEL_DEBUG: logging.DEBUG,
+    LEVEL_INFO: logging.INFO,
+    LEVEL_WARNING: logging.WARNING,
+    LEVEL_ERROR: logging.ERROR,
+    LEVEL_CRITICAL: logging.CRITICAL,
+}
+
 level_colors = {
     "INFO": "green",
-    "WARNING": "yellow",
+    "WARN": "yellow",
     "ERROR": "red",
     "CRITICAL": "purple",
 }
 
-def log(
-        msg: str,
-        level: str = "INFO",
-        tag: str = "System",
-        fg: str = None,
-        bg: str = None,
-        max_len: int = 100):
-    """
-    日志记录函数
-    """
-    if len(msg) > max_len:
-        msg = msg[:max_len] + "..."
-    now = datetime.datetime.now().strftime("%m-%d %H:%M:%S")
-    pre = f"[{now}] [{level}] [{tag}]: {msg}"
-    if level == "INFO":
-        if fg is None:
-            fg = FG_COLORS["green"]
-        if bg is None:
-            bg = BG_COLORS["default"]
-    elif level == "WARNING":
-        if fg is None:
-            fg = FG_COLORS["yellow"]
-        if bg is None:
-            bg = BG_COLORS["default"]
-    elif level == "ERROR":
-        if fg is None:
-            fg = FG_COLORS["red"]
-        if bg is None:
-            bg = BG_COLORS["default"]
-    elif level == "CRITICAL":
-        if fg is None:
-            fg = FG_COLORS["purple"]
-        if bg is None:
-            bg = BG_COLORS["default"]
+class Logger:
+    def __init__(self) -> None:
+        self.history = []
     
-    print(f"\033[{fg};{bg}m{pre}\033[0m")
+    def log(
+            self,
+            msg: str,
+            level: str = "INFO",
+            tag: str = "System",
+            fg: str = None,
+            bg: str = None,
+            max_len: int = 50000,
+            err: Exception = None,):
+        """
+        日志打印函数
+        """
+        _set_level_code = level_codes[LEVEL_INFO]
+        if 'LOG_LEVEL' in os.environ and os.environ['LOG_LEVEL'] in level_codes:
+            _set_level_code = level_codes[os.environ['LOG_LEVEL']]
 
+        if level in level_codes and level_codes[level] < _set_level_code:
+            return
+        
+        if err is not None:
+            msg += "\n异常原因: " + str(err)
+            level = LEVEL_ERROR
+
+        if len(msg) > max_len:
+            msg = msg[:max_len] + "..."
+        now = datetime.datetime.now().strftime("%H:%M:%S")
+        
+        pres = []
+        for line in msg.split("\n"):
+            if line == "\n":
+                pres.append("")
+            else:
+                pres.append(f"[{now}] [{tag}/{level}] {line}")
+
+        if level == "INFO":
+            if fg is None:
+                fg = FG_COLORS["green"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+        elif level == "WARN":
+            if fg is None:
+                fg = FG_COLORS["yellow"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+        elif level == "ERROR":
+            if fg is None:
+                fg = FG_COLORS["red"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+        elif level == "CRITICAL":
+            if fg is None:
+                fg = FG_COLORS["purple"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+                
+        ret = ""
+        for line in pres:
+            ret += f"\033[{fg};{bg}m{line}\033[0m\n"
+        try:
+            requests.post("http://localhost:6185/api/log", data=ret[:-1].encode(), timeout=1)
+        except BaseException as e:
+            pass
+        self.history.append(ret)
+        if len(self.history) > 100:
+            self.history = self.history[-100:]
+        print(ret[:-1])
+
+log = Logger()
 
 def port_checker(port: int, host: str = "localhost"):
     sk = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
@@ -94,18 +145,23 @@ def port_checker(port: int, host: str = "localhost"):
         sk.close()
         return False
     
-def word2img(title: str, text: str, max_width=30, font_size=20):
+def get_font_path() -> str:
     if os.path.exists("resources/fonts/syst.otf"):
         font_path = "resources/fonts/syst.otf"
     elif os.path.exists("QQChannelChatGPT/resources/fonts/syst.otf"):
         font_path = "QQChannelChatGPT/resources/fonts/syst.otf"
+    elif os.path.exists("AstrBot/resources/fonts/syst.otf"):
+        font_path = "AstrBot/resources/fonts/syst.otf"
     elif os.path.exists("C:/Windows/Fonts/simhei.ttf"):
         font_path = "C:/Windows/Fonts/simhei.ttf"
     elif os.path.exists("/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"):
         font_path = "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"
     else:
         raise Exception("找不到字体文件")
+    return font_path
     
+def word2img(title: str, text: str, max_width=30, font_size=20):
+    font_path = get_font_path()
     width_factor = 1.0
     height_factor = 1.5
     # 格式化文本宽度最大为30
@@ -114,8 +170,6 @@ def word2img(title: str, text: str, max_width=30, font_size=20):
     length = len(lines)
     for l in lines:
         if len(l) > max_width:
-            # lines[i] = l[:max_width] + '\n' + l[max_width:]
-            # for
             cp = l
             for ii in range(len(l)):
                 if ii % max_width == 0:
@@ -179,24 +233,9 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
     # 用于匹配图片的正则表达式
     IMAGE_REGEX = r"!\s*\[.*?\]\s*\((.*?)\)"
 
-    
-    if os.path.exists("resources/fonts/syst.otf"):
-        font_path = "resources/fonts/syst.otf"
-    elif os.path.exists("QQChannelChatGPT/resources/fonts/syst.otf"):
-        font_path = "QQChannelChatGPT/resources/fonts/syst.otf"
-    elif os.path.exists("C:/Windows/Fonts/simhei.ttf"):
-        font_path = "C:/Windows/Fonts/simhei.ttf"
-    elif os.path.exists("/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"):
-        font_path = "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"
-    else:
-        raise Exception("找不到字体文件")
-    # backup
-    if os.path.exists("resources/fonts/simhei.ttf"):
-        font_path1 = "resources/fonts/simhei.ttf"
-    elif os.path.exists("QQChannelChatGPT/resources/fonts/simhei.ttf"):
-        font_path1 = "QQChannelChatGPT/resources/fonts/simhei.ttf"
-    else:
-        font_path1 = font_path
+    font_path = get_font_path()
+    font_path1 = font_path
+
     # 加载字体
     font = ImageFont.truetype(font_path, font_size)
     
@@ -443,7 +482,7 @@ def save_temp_img(img: Image) -> str:
                 if time.time() - ctime > 3600:
                     os.remove(path)
     except Exception as e:
-        log(f"清除临时文件失败: {e}", level=LEVEL_WARNING, tag="GeneralUtils")
+        print(f"清除临时文件失败: {e}", level=LEVEL_WARNING, tag="GeneralUtils")
 
     # 获得时间戳
     timestamp = int(time.time())
@@ -480,14 +519,38 @@ def create_markdown_image(text: str):
         return p
     except Exception as e:
         raise e
-    
-def test_markdown():
-    # 示例使用
-    markdown_text = """# Help Center
-    ! [] (https://soulter.top/helpme.jpg)
-    """
-    image = render_markdown(markdown_text)
-    image.show()
 
-test_markdown()
 
+# 迁移配置文件到 cmd_config.json    
+def try_migrate_config(old_config: dict):
+    cc = CmdConfig()
+    if cc.get("qqbot", None) is None:
+        # 未迁移过
+        for k in old_config:
+            cc.put(k, old_config[k])
+
+def get_local_ip_addresses():
+    ip = ''
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.connect(('8.8.8.8', 80))
+        ip = s.getsockname()[0]
+    except BaseException as e:
+        pass
+    finally:
+        s.close()
+    return ip
+
+def get_sys_info(global_object: GlobalObject):
+    mem = None
+    stats = global_object.dashboard_data.stats
+    os_name = platform.system()
+    os_version = platform.version()
+
+    if 'sys_perf' in stats and 'memory' in stats['sys_perf']:
+        mem = stats['sys_perf']['memory']
+    return {
+        'mem': mem,
+        'os': os_name + '_' + os_version,
+        'py': platform.python_version(),
+    }

util/plugin_util.py

@@ -1,22 +1,174 @@
+'''
+插件工具函数
+'''
 import os
 import inspect
+try:
+    import git.exc
+    from git.repo import Repo
+except ImportError:
+    pass
+import shutil
+from pip._internal import main as pipmain
+import importlib
+import stat
+import traceback
+from types import ModuleType
 
 # 找出模块里所有的类名
-def get_classes(p_name, arg):
+def get_classes(p_name, arg: ModuleType):
     classes = []
     clsmembers = inspect.getmembers(arg, inspect.isclass)
     for (name, _) in clsmembers:
-        # print(name, p_name)
-        if p_name.lower() == name.lower()[:-6]:
+        if name.lower().endswith("plugin") or name.lower() == "main":
             classes.append(name)
             break
+        # if p_name.lower() == name.lower()[:-6] or name.lower() == "main":
     return classes
 
-# 获取一个文件夹下所有的模块
+# 获取一个文件夹下所有的模块, 文件名和文件夹名相同
 def get_modules(path):
     modules = []
-    for root, dirs, files in os.walk(path):
-        for file in files:
-            if file.endswith(".py") and not file.startswith("__"):
-                modules.append(file[:-3])
-    return modules
+
+    # 得到其下的所有文件夹
+    dirs = os.listdir(path)
+    # 遍历文件夹，找到 main.py 或者和文件夹同名的文件
+    for d in dirs:
+        if os.path.isdir(os.path.join(path, d)):
+            if os.path.exists(os.path.join(path, d, "main.py")):
+                module_str = 'main'
+            elif os.path.exists(os.path.join(path, d, d + ".py")):
+                module_str = d
+            else:
+                print(f"插件 {d} 未找到 main.py 或者 {d}.py，跳过。")
+                continue
+            if os.path.exists(os.path.join(path, d, "main.py")) or os.path.exists(os.path.join(path, d, d + ".py")):
+                modules.append({
+                    "pname": d,
+                    "module": module_str
+                })
+    return modules
+
+def get_plugin_store_path():
+    if os.path.exists("addons/plugins"):
+        return "addons/plugins"
+    elif os.path.exists("QQChannelChatGPT/addons/plugins"):
+        return "QQChannelChatGPT/addons/plugins"
+    elif os.path.exists("AstrBot/addons/plugins"):
+        return "AstrBot/addons/plugins"
+    else:
+        raise FileNotFoundError("插件文件夹不存在。")
+            
+def get_plugin_modules():
+    plugins = []
+    try:
+        if os.path.exists("addons/plugins"):
+            plugins = get_modules("addons/plugins")
+            return plugins
+        elif os.path.exists("QQChannelChatGPT/addons/plugins"):
+            plugins = get_modules("QQChannelChatGPT/addons/plugins")
+            return plugins
+        else:
+            return None
+    except BaseException as e:
+        raise e
+
+def plugin_reload(cached_plugins: dict, target: str = None, all: bool = False):
+    plugins = get_plugin_modules()
+    if plugins is None:
+        return False, "未找到任何插件模块"
+    fail_rec = ""
+    for plugin in plugins:
+        try:
+            p = plugin['module']
+            root_dir_name = plugin['pname']
+            if p not in cached_plugins or p == target or all:
+                module = __import__("addons.plugins." + root_dir_name + "." + p, fromlist=[p])
+                if p in cached_plugins:
+                    module = importlib.reload(module)
+                cls = get_classes(p, module)
+                obj = getattr(module, cls[0])()
+                try:
+                    info = obj.info()
+                    if 'name' not in info or 'desc' not in info or 'version' not in info or 'author' not in info:
+                        fail_rec += f"载入插件{p}失败，原因: 插件信息不完整\n"
+                        continue
+                    if isinstance(info, dict) == False:
+                        fail_rec += f"载入插件{p}失败，原因: 插件信息格式不正确\n"
+                        continue
+                except BaseException as e:
+                    fail_rec += f"调用插件{p} info失败, 原因: {str(e)}\n"
+                    continue
+                cached_plugins[info['name']] = {
+                    "module": module,
+                    "clsobj": obj,
+                    "info": info,
+                    "name": info['name'],
+                    "root_dir_name": root_dir_name,
+                }
+        except BaseException as e:
+            traceback.print_exc()
+            fail_rec += f"加载{p}插件出现问题，原因 {str(e)}\n"
+    if fail_rec == "":
+        return True, None
+    else:
+        return False, fail_rec
+
+def install_plugin(repo_url: str, cached_plugins: dict):
+    ppath = get_plugin_store_path()
+    # 删除末尾的 /
+    if repo_url.endswith("/"):
+        repo_url = repo_url[:-1]
+    # 得到 url 的最后一段
+    d = repo_url.split("/")[-1]
+    # 转换非法字符：-
+    d = d.replace("-", "_")
+    # 创建文件夹
+    plugin_path = os.path.join(ppath, d)
+    if os.path.exists(plugin_path):
+        remove_dir(plugin_path)
+    Repo.clone_from(repo_url, to_path=plugin_path, branch='master')
+    # 读取插件的requirements.txt
+    if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
+        if pipmain(['install', '-r', os.path.join(plugin_path, "requirements.txt"), '--quiet']) != 0:
+            raise Exception("插件的依赖安装失败, 需要您手动 pip 安装对应插件的依赖。")
+    ok, err = plugin_reload(cached_plugins, target=d)
+    if not ok: raise Exception(err)
+
+def uninstall_plugin(plugin_name: str, cached_plugins: dict):
+    if plugin_name not in cached_plugins:
+        raise Exception("插件不存在。")
+    root_dir_name = cached_plugins[plugin_name]["root_dir_name"]
+    ppath = get_plugin_store_path()
+    del cached_plugins[plugin_name]
+    if not remove_dir(os.path.join(ppath, root_dir_name)):
+        raise Exception("移除插件成功，但是删除插件文件夹失败。您可以手动删除该文件夹，位于 addons/plugins/ 下。")
+
+def update_plugin(plugin_name: str, cached_plugins: dict):
+    if plugin_name not in cached_plugins:
+        raise Exception("插件不存在。")
+    ppath = get_plugin_store_path()
+    root_dir_name = cached_plugins[plugin_name]["root_dir_name"]
+    plugin_path = os.path.join(ppath, root_dir_name)
+    repo = Repo(path = plugin_path)
+    repo.remotes.origin.pull()
+    # 读取插件的requirements.txt
+    if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
+        if pipmain(['install', '-r', os.path.join(plugin_path, "requirements.txt"), '--quiet']) != 0:
+            raise Exception("插件依赖安装失败, 需要您手动pip安装对应插件的依赖。")
+    ok, err = plugin_reload(cached_plugins, target=plugin_name)
+    if not ok: raise Exception(err)
+
+def remove_dir(file_path) -> bool:
+    try_cnt = 50
+    while try_cnt > 0:
+        if not os.path.exists(file_path):
+            return False
+        try:
+            shutil.rmtree(file_path)
+            return True
+        except PermissionError as e:
+            err_file_path = str(e).split("\'", 2)[1]
+            if os.path.exists(err_file_path):
+                os.chmod(err_file_path, stat.S_IWUSR)
+            try_cnt -= 1

util/updator.py

@@ -0,0 +1,145 @@
+has_git = True
+try:
+    import git.exc
+    from git.repo import Repo
+except BaseException as e:
+    has_git = False
+import sys, os
+import requests
+
+def _reboot():
+    py = sys.executable
+    os.execl(py, py, *sys.argv)
+    
+def find_repo() -> Repo:
+    if not has_git:
+        raise Exception("未安装 GitPython 库，无法进行更新。")
+    repo = None
+    
+    # 由于项目更名过，因此这里需要多次尝试。
+    try:
+        repo = Repo()
+    except git.exc.InvalidGitRepositoryError:
+        try:
+            repo = Repo(path="QQChannelChatGPT")  
+        except git.exc.InvalidGitRepositoryError:
+            repo = Repo(path="AstrBot")
+    if not repo:
+        raise Exception("在已知的目录下未找到项目位置。请联系项目维护者。")
+    return repo
+    
+def request_release_info(latest: bool = True) -> list:
+    '''
+    请求版本信息。
+    返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
+    '''
+    api_url1 = "https://api.github.com/repos/Soulter/AstrBot/releases"
+    api_url2 = "https://api.soulter.top/releases" # 0-10 分钟的缓存时间
+    try:
+        result = requests.get(api_url2).json()
+    except BaseException as e:
+        result = requests.get(api_url1).json()
+    try:
+        if latest:
+            ret = github_api_release_parser([result[0]])
+        else:
+            ret = github_api_release_parser(result)
+    except BaseException as e:
+        raise Exception(f"解析版本信息失败: {result}")
+    return ret
+        
+def github_api_release_parser(releases: list) -> list:
+    '''
+    解析 GitHub API 返回的 releases 信息。
+    返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
+    '''
+    ret = []
+    for release in releases:
+        version = release['name']
+        commit_hash = ''
+        # 规范是: v3.0.7.xxxxxx，其中xxxxxx为 commit hash
+        _t = version.split(".")
+        if len(_t) == 4:
+            commit_hash = _t[3]
+        ret.append({
+            "version": release['name'],
+            "published_at": release['published_at'],
+            "body": release['body'],
+            "commit_hash": commit_hash,
+            "tag_name": release['tag_name']
+        })
+    return ret
+
+def check_update() -> str:
+    repo = find_repo()
+    curr_commit = repo.commit().hexsha
+    update_data = request_release_info()
+    new_commit = update_data[0]['commit_hash']
+    print(f"当前版本: {curr_commit}")
+    print(f"最新版本: {new_commit}")
+    if curr_commit.startswith(new_commit):
+        return "当前已经是最新版本。"
+    else:
+        update_info = f"""有新版本可用。
+=== 当前版本 ===
+{curr_commit}
+
+=== 新版本 ===
+{update_data[0]['version']}
+
+=== 发布时间 ===
+{update_data[0]['published_at']}
+
+=== 更新内容 ===
+{update_data[0]['body']}"""
+        return update_info
+    
+def update_project(update_data: list,
+                   reboot: bool = False, 
+                   latest: bool = True,
+                   version: str = ''):
+    repo = find_repo()
+    # update_data = request_release_info(latest)
+    if latest:
+        # 检查本地commit和最新commit是否一致
+        curr_commit = repo.head.commit.hexsha
+        new_commit = update_data[0]['commit_hash']
+        if curr_commit == '':
+            raise Exception("无法获取当前版本号对应的版本位置。请联系项目维护者。")
+        if curr_commit.startswith(new_commit):
+            raise Exception("当前已经是最新版本。")
+        else:
+            # 更新到最新版本对应的commit
+            try:
+                repo.remotes.origin.fetch()
+                repo.git.checkout(update_data[0]['tag_name'])
+                if reboot: _reboot()
+            except BaseException as e:
+                raise e
+    else:
+        # 更新到指定版本
+        flag = False
+        for data in update_data:
+            if data['tag_name'] == version:
+                try:
+                    repo.remotes.origin.fetch()
+                    repo.git.checkout(data['tag_name'])
+                    flag = True
+                    if reboot: _reboot()
+                except BaseException as e:
+                    raise e
+            else:
+                continue
+        if not flag:
+            raise Exception("未找到指定版本。")
+    
+def checkout_branch(branch_name: str):
+    repo = find_repo()
+    try:
+        origin = repo.remotes.origin
+        origin.fetch()
+        repo.git.checkout(branch_name)
+        repo.git.pull("origin", branch_name, "-f")
+        return True
+    except BaseException as e:
+        raise e

webapp_replit.py

@@ -1,25 +0,0 @@
-from flask import Flask
-from threading import Thread
-import datetime
-
-app = Flask(__name__)
-
-
-@app.route('/')
-def main_func():
-  content = "<h1>QQChannelChatGPT Web APP</h1>"
-
-  content += "<p>" + "Online @ " + str(datetime.datetime.now()) + "</p>"
-  content += "<p>欢迎Star本项目！！！</p>"
-  return content
-
-
-def run():
-  app.run(host="0.0.0.0", port=8080)
-  
-
-
-
-def keep_alive():
-  server = Thread(target=run)
-  server.start()