-
+
-
-
{{ CPUDATA | tojson }}
-
{{ MEMDATA | tojson }}
-
{{ SWAPDATA | tojson }}
-
{{ BOT_TAGS | tojson }}
-
{{ CPU_TAGS | tojson }}
-
{{ MEM_TAGS | tojson }}
-
{{ SWAP_TAGS | tojson }}
+
+
+
+
{{ data | tojson }}
diff --git a/liteyuki/utils/htmlrender.py b/liteyuki/utils/htmlrender.py
index 5d8bd1e1..7347ae0e 100644
--- a/liteyuki/utils/htmlrender.py
+++ b/liteyuki/utils/htmlrender.py
@@ -31,6 +31,21 @@ from nonebot_plugin_htmlrender import *
# """
# return await html_to_pic(html, wait=wait, template_path=template_path, scale_factor=scale_factor)
+async def template2html(
+ template: str,
+ templates: dict,
+) -> str:
+ """
+ Args:
+ template: str: 模板文件
+ **templates: dict: 模板参数
+ Returns:
+ HTML 正文
+ """
+ template_path = os.path.dirname(template)
+ template_name = os.path.basename(template)
+ return await template_to_html(template_path, template_name, **templates)
+
async def template2image(
template: str,
@@ -81,3 +96,32 @@ async def template2image(
wait=wait,
device_scale_factor=scale_factor,
)
+
+
+async def url2image(
+ url: str,
+ wait: int = 0,
+ scale_factor: float = 1,
+ type: str = "png",
+ quality: int = 100,
+ **kwargs
+) -> bytes:
+ """
+ Args:
+ quality:
+ type:
+ url: str: URL
+ wait: int: 等待时间
+ scale_factor: float: 缩放因子
+ **kwargs: page 参数
+ Returns:
+ 图片二进制数据
+ """
+ async with get_new_page(scale_factor) as page:
+ await page.goto(url)
+ await page.wait_for_timeout(wait)
+ return await page.screenshot(
+ full_page=True,
+ type=type,
+ quality=quality
+ )
diff --git a/liteyuki/utils/log.py b/liteyuki/utils/log.py
index 9e1db87c..f692f9ae 100644
--- a/liteyuki/utils/log.py
+++ b/liteyuki/utils/log.py
@@ -67,8 +67,8 @@ def init_log():
warning = lang.get("log.warning", default="WARNING")
error = lang.get("log.error", default="==ERROR")
- logger.level("DEBUG", color="
", icon=f"{'*️⃣' if show_icon else ''}{debug}")
- logger.level("INFO", color="", icon=f"{'ℹ️' if show_icon else ''}{info}")
+ logger.level("DEBUG", color="", icon=f"{'🐛' if show_icon else ''}{debug}")
+ logger.level("INFO", color="", icon=f"{'ℹ️' if show_icon else ''}{info}")
logger.level("SUCCESS", color="", icon=f"{'✅' if show_icon else ''}{success}")
logger.level("WARNING", color="", icon=f"{'⚠️' if show_icon else ''}{warning}")
logger.level("ERROR", color="", icon=f"{'⭕' if show_icon else ''}{error}")
diff --git a/liteyuki/utils/tools.py b/liteyuki/utils/tools.py
index 4b1ef66a..9def663a 100644
--- a/liteyuki/utils/tools.py
+++ b/liteyuki/utils/tools.py
@@ -15,13 +15,13 @@ def clamp(value: float, min_value: float, max_value: float) -> float | int:
return max(min(value, max_value), min_value)
-def convert_size(size: int, precision: int = 2, add_unit: bool = True, suffix: str = "iB") -> str:
+def convert_size(size: int, precision: int = 2, add_unit: bool = True, suffix: str = " XiB") -> str | float:
"""把字节数转换为人类可读的字符串，计算正负
Args:
add_unit: 是否添加单位，False后则suffix无效
- suffix: iB或B
+ suffix: XiB或XB
precision: 浮点数的小数点位数
size (int): 字节数
@@ -29,23 +29,18 @@ def convert_size(size: int, precision: int = 2, add_unit: bool = True, suffix: s
str: The human-readable string, e.g. "1.23 GB".
"""
- is_negative = False
- if size < 0:
- is_negative = True
- size = -size
-
- for unit in ["", "K", "M", "G", "T", "P", "E", "Z", "Y"]:
+ is_negative = size < 0
+ size = abs(size)
+ for unit in ("", "K", "M", "G", "T", "P", "E", "Z"):
if size < 1024:
- if add_unit:
- result = f"{size:.{precision}f} {unit}" + suffix
- return f"-{result}" if is_negative else result
- else:
- return f"{size:.{precision}f}"
+ break
size /= 1024
+ if is_negative:
+ size = -size
if add_unit:
- return f"{size:.{precision}f} Y" + suffix
+ return f"{size:.{precision}f}{suffix.replace('X', unit)}"
else:
- return f"{size:.{precision}f}"
+ return size
def keywords_in_text(keywords: list[str], text: str, all_matched: bool) -> bool:
diff --git a/requirements.txt b/requirements.txt
index cc38fb72..59bcee80 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,10 @@
aiohttp==3.9.3
aiofiles==23.2.1
-arclet-alconna==1.8.5
-arclet-alconna-tools==0.7.0
colored==2.2.4
dash==2.16.1
GitPython==3.1.42
-jinja2==3.1.3
-markdown==3.3.6
-nonebot2[fastapi]==2.2.1
+nonebot2[fastapi,httpx,websockets]==2.2.1
+nonebot-plugin-htmlrender==0.3.1
nonebot-adapter-onebot==2.4.3
nonebot-plugin-alconna==0.41.0
playwright==1.17.2
@@ -16,13 +13,9 @@ py-cpuinfo==9.0.0
pydantic==1.10.14
Pygments==2.17.2
pytz==2024.1
-python-markdown-math==0.8
-pymdown-extensions==10.7.1
PyYAML~=6.0.1
starlette~=0.36.3
loguru==0.7.2
importlib_metadata==7.0.2
requests==2.31.0
pillow==10.2.0
-pyppeteer==2.0.0
-weasyprint==61.2