mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-01 09:39:59 +08:00
版本更新 (#1666)
* ✨ 父级插件加载 * ✅ 添加测试：更新与添加插件 (#1594) * ✅ 测试更新与添加插件 * ✅ Sourcery建议 * 👷 添加pytest * 🎨 优化代码 * 🐛 bug修复 * 🐛修复添加插件返回403的问题 (#1595) * 完善测试方法 * vscode测试配置 * 重构插件安装过程 * 🎨 修改readme * Update README.md * 🐛 修改bug与版本锁定 * 🐛 修复超级用户对群组功能开关 * 🐛 修复插件商店检查插件更新问题 (#1597) * 🐛 修复插件商店检查插件更新问题 * 🐛 恶意命令检测问题 * 🐛 增加插件状态检查 (#1598) * ✅ 优化测试用例 * 🐛 更改插件更新与安装逻辑 * 🐛 修复更新群组成员信息 * 🎨 代码优化 * 🚀 更新Dockerfile (#1599) * 🎨 更新requirements * ➕ 添加依赖aiocache * ⚡ 添加github镜像 * ✨ 添加仓库目录多获取渠道 * 🐛 修复测试用例 * ✨ 添加API缓存 * 🎨 采取Sourcery建议 * 🐛 文件下载逻辑修改 * 🎨 优化代码 * 🐛 修复插件开关有时出现错误 * ✨ 重构自检ui * 🐛 自检html修正 * 修复签到逻辑bug，并使代码更灵活以适应签到好感度等级配置 (#1606) * 修复签到功能已知问题 * 修复签到功能已知问题 * 修改参数名称 * 修改uid判断 --------- Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🎨 代码结构优化 * 🐛 私聊时修改插件时删除私聊帮助 * 🐛 过滤父插件 * 🐛 修复自检在ARM上的问题 (#1607) * 🐛 修复自检在ARM上的问题 * ✅ 优化测试 * ✨ 支持mysql，psql，sqlite随机函数 * 🔧 VSCode配置修改 * 🔧 VSCode配置修改 * ✨ 添加金币排行 Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 📝 修改README Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🔨 提取GitHub相关操作 (#1609) * 🔨 提取GitHub相关操作 * 🔨 重构API策略 * ✨ 签到/金币排行限制最大数量 (#1616) * ✨ 签到/金币排行限制最大数量 * 🐛 修复超级用户id获取问题 * 🐛 修复路径解压与挂载 (#1619) * 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620) * 🐛 签到文本适应 (#1622) * 🐛 好感度排行提供默认值 (#1624) * 🎈 优先使用github api (#1625) * ✨ 重构帮助，限制普通用户查询管理插件 (#1626) * 🐛 修复群权限与插件等级匹配 (#1627) * ✨ 当管理员尝试ban真寻时将被反杀 (#1628) * ✨ 群组发言时间检测提供开关配置 (#1630) * 🐳 chore: 支持自动修改版本号 (#1629) * 🎈 perf(github_utils): 支持github url下载遍历 (#1632) * 🎈 perf(github_utils): 支持github url下载遍历 * 🐞 fix(http_utils): 修复一些下载问题 * 🦄 refactor(http_utils): 部分重构 * chore(version): Update version to v0.2.2-e6f17c4 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🧪 test(auto_update): 修复测试用例 (#1633) * 🐛 修复商店商品为空时报错 (#1634) * 🐛 修复群权限与插件等级匹配 (#1635) * ✨ message_build支持AtAll (#1639) * 🎈 perf: 使用commit号下载插件 (#1641) * 🎈 perf: 使用commit号下载插件 * chore(version): Update version to v0.2.2-f9c7360 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🐳 chore: 修改运行检查触发路径 (#1642) * 🐳 chore: 修改运行检查触发路径 * 🐳 chore: 添加tests目录 * ✨ 重构qq群事件处理 (#1643) * 🐛 签到名称自适应 (#1644) * 🎨 更新README (#1645) * 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647) * 🐛 修复群组中帮助功能状态显示问题 (#1650) * 🐛 修复群欢迎消息设置 (#1651) * 🐛 修复webui下载后首次启动错误 (#1652) * 🐛 修复webui下载后首次启动错误 * chore(version): Update version to v0.2.2-4a8ef85 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 移除默认图片文件夹：爬 (#1653) * ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654) * ✨ 新增超级用户与管理员帮助模板 (#1655) * ✨ 新增个人信息命令 (#1657) * ✨ 修改个人信息菜单名称 (#1658) * ✨ 新增插件商店api (#1659) * ✨ 新增插件商店api * chore(version): Update version to v0.2.2-7e15f20 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 将cd，block，count限制复原配置文件 (#1662) * 🎨 修改README (#1663) * 🎨 修改版本号 (#1664) * 🎨 修改requirements (#1665) --------- Co-authored-by: AkashiCoin <l1040186796@gmail.com> Co-authored-by: fanyinrumeng <42991257+fanyinrumeng@users.noreply.github.com> Co-authored-by: AkashiCoin <i@loli.vet> Co-authored-by: Elaga <1728903318@qq.com> Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>
This commit is contained in:
HibiKier
co-authored by
AkashiCoin
HibiKier
AkashiCoin
fanyinrumeng
AkashiCoin
Elaga
AkashiCoin
HibiKier
AkashiCoin
fanyinrumeng
AkashiCoin
Elaga
parent
daa40ae8b8
commit
4e33bf3a50
@@ -0,0 +1,209 @@
|
||||
import os
|
||||
import platform
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
from dataclasses import dataclass
|
||||
|
||||
import psutil
|
||||
import cpuinfo
|
||||
import nonebot
|
||||
from pydantic import BaseModel
|
||||
from nonebot.utils import run_sync
|
||||
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.configs.config import BotConfig
|
||||
from zhenxun.utils.http_utils import AsyncHttpx
|
||||
|
||||
BAIDU_URL = "https://www.baidu.com/"
|
||||
GOOGLE_URL = "https://www.google.com/"
|
||||
|
||||
VERSION_FILE = Path() / "__version__"
|
||||
ARM_KEY = "aarch64"
|
||||
|
||||
|
||||
@dataclass
|
||||
class CPUInfo:
|
||||
core: int
|
||||
"""CPU 物理核心数"""
|
||||
usage: float
|
||||
"""CPU 占用百分比，取值范围(0,100]"""
|
||||
freq: float
|
||||
"""CPU 的时钟速度（单位：GHz）"""
|
||||
|
||||
@classmethod
|
||||
def get_cpu_info(cls):
|
||||
cpu_core = psutil.cpu_count(logical=False)
|
||||
cpu_usage = psutil.cpu_percent(interval=0.1)
|
||||
if _cpu_freq := psutil.cpu_freq():
|
||||
cpu_freq = round(_cpu_freq.current / 1000, 2)
|
||||
else:
|
||||
cpu_freq = 0
|
||||
return CPUInfo(core=cpu_core, usage=cpu_usage, freq=cpu_freq)
|
||||
|
||||
|
||||
@dataclass
|
||||
class RAMInfo:
|
||||
"""RAM 信息（单位：GB）"""
|
||||
|
||||
total: float
|
||||
"""RAM 总量"""
|
||||
usage: float
|
||||
"""当前 RAM 占用量/GB"""
|
||||
|
||||
@classmethod
|
||||
def get_ram_info(cls):
|
||||
ram_total = round(psutil.virtual_memory().total / (1024**3), 2)
|
||||
ram_usage = round(psutil.virtual_memory().used / (1024**3), 2)
|
||||
|
||||
return RAMInfo(total=ram_total, usage=ram_usage)
|
||||
|
||||
|
||||
@dataclass
|
||||
class SwapMemory:
|
||||
"""Swap 信息（单位：GB）"""
|
||||
|
||||
total: float
|
||||
"""Swap 总量"""
|
||||
usage: float
|
||||
"""当前 Swap 占用量/GB"""
|
||||
|
||||
@classmethod
|
||||
def get_swap_info(cls):
|
||||
swap_total = round(psutil.swap_memory().total / (1024**3), 2)
|
||||
swap_usage = round(psutil.swap_memory().used / (1024**3), 2)
|
||||
|
||||
return SwapMemory(total=swap_total, usage=swap_usage)
|
||||
|
||||
|
||||
@dataclass
|
||||
class DiskInfo:
|
||||
"""硬盘信息"""
|
||||
|
||||
total: float
|
||||
"""硬盘总量"""
|
||||
usage: float
|
||||
"""当前硬盘占用量/GB"""
|
||||
|
||||
@classmethod
|
||||
def get_disk_info(cls):
|
||||
disk_total = round(psutil.disk_usage("/").total / (1024**3), 2)
|
||||
disk_usage = round(psutil.disk_usage("/").used / (1024**3), 2)
|
||||
|
||||
return DiskInfo(total=disk_total, usage=disk_usage)
|
||||
|
||||
|
||||
class SystemInfo(BaseModel):
|
||||
"""系统信息"""
|
||||
|
||||
cpu: CPUInfo
|
||||
"""CPU信息"""
|
||||
ram: RAMInfo
|
||||
"""RAM信息"""
|
||||
swap: SwapMemory
|
||||
"""SWAP信息"""
|
||||
disk: DiskInfo
|
||||
"""DISK信息"""
|
||||
|
||||
def get_system_info(self):
|
||||
return {
|
||||
"cpu_info": f"{self.cpu.usage}% - {self.cpu.freq}Ghz "
|
||||
f"[{self.cpu.core} core]",
|
||||
"cpu_process": self.cpu.usage,
|
||||
"ram_info": f"{self.ram.usage} / {self.ram.total} GB",
|
||||
"ram_process": (
|
||||
0 if self.ram.total == 0 else (self.ram.usage / self.ram.total * 100)
|
||||
),
|
||||
"swap_info": f"{self.swap.usage} / {self.swap.total} GB",
|
||||
"swap_process": (
|
||||
0 if self.swap.total == 0 else (self.swap.usage / self.swap.total * 100)
|
||||
),
|
||||
"disk_info": f"{self.disk.usage} / {self.disk.total} GB",
|
||||
"disk_process": (
|
||||
0 if self.disk.total == 0 else (self.disk.usage / self.disk.total * 100)
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
@run_sync
|
||||
def __build_status() -> SystemInfo:
|
||||
"""获取 `CPU` `RAM` `SWAP` `DISK` 信息"""
|
||||
cpu = CPUInfo.get_cpu_info()
|
||||
ram = RAMInfo.get_ram_info()
|
||||
swap = SwapMemory.get_swap_info()
|
||||
disk = DiskInfo.get_disk_info()
|
||||
|
||||
return SystemInfo(cpu=cpu, ram=ram, swap=swap, disk=disk)
|
||||
|
||||
|
||||
async def __get_network_info():
|
||||
"""网络请求"""
|
||||
baidu, google = True, True
|
||||
try:
|
||||
await AsyncHttpx.get(BAIDU_URL, timeout=5)
|
||||
except Exception as e:
|
||||
logger.warning("自检：百度无法访问...", e=e)
|
||||
baidu = False
|
||||
try:
|
||||
await AsyncHttpx.get(GOOGLE_URL, timeout=5)
|
||||
except Exception as e:
|
||||
logger.warning("自检：谷歌无法访问...", e=e)
|
||||
google = False
|
||||
return baidu, google
|
||||
|
||||
|
||||
def __get_version() -> str | None:
|
||||
"""获取版本信息"""
|
||||
if VERSION_FILE.exists():
|
||||
with open(VERSION_FILE, encoding="utf-8") as f:
|
||||
if text := f.read():
|
||||
return text.split(":")[-1]
|
||||
return None
|
||||
|
||||
|
||||
def __get_arm_cpu():
|
||||
env = os.environ.copy()
|
||||
env["LC_ALL"] = "en_US.UTF-8"
|
||||
cpu_info = subprocess.check_output(["lscpu"], env=env).decode()
|
||||
model_name = ""
|
||||
cpu_freq = 0
|
||||
for line in cpu_info.splitlines():
|
||||
if "Model name" in line:
|
||||
model_name = line.split(":")[1].strip()
|
||||
if "CPU MHz" in line:
|
||||
cpu_freq = float(line.split(":")[1].strip())
|
||||
return model_name, cpu_freq
|
||||
|
||||
|
||||
def __get_arm_oracle_cpu_freq():
|
||||
cpu_freq = subprocess.check_output(
|
||||
["dmidecode", "-s", "processor-frequency"]
|
||||
).decode()
|
||||
return round(float(cpu_freq.split()[0]) / 1000, 2)
|
||||
|
||||
|
||||
async def get_status_info() -> dict:
|
||||
"""获取信息"""
|
||||
data = await __build_status()
|
||||
|
||||
system = platform.uname()
|
||||
if system.machine == ARM_KEY and not (
|
||||
cpuinfo.get_cpu_info().get("brand_raw") and data.cpu.freq
|
||||
):
|
||||
model_name, cpu_freq = __get_arm_cpu()
|
||||
if not data.cpu.freq:
|
||||
data.cpu.freq = cpu_freq or __get_arm_oracle_cpu_freq()
|
||||
data = data.get_system_info()
|
||||
data["brand_raw"] = model_name
|
||||
else:
|
||||
data = data.get_system_info()
|
||||
data["brand_raw"] = cpuinfo.get_cpu_info().get("brand_raw", "Unknown")
|
||||
|
||||
baidu, google = await __get_network_info()
|
||||
data["baidu"] = "#8CC265" if baidu else "red"
|
||||
data["google"] = "#8CC265" if google else "red"
|
||||
|
||||
data["system"] = f"{system.system} {system.release}"
|
||||
data["version"] = __get_version()
|
||||
data["plugin_count"] = len(nonebot.get_loaded_plugins())
|
||||
data["nickname"] = BotConfig.self_nickname
|
||||
return data
|
||||
Reference in New Issue
Block a user