Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ auto update by pre-commit hooks #1819

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ci:
autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.2
rev: v0.9.4
hooks:
- id: ruff
args: [--fix]
Expand Down
17 changes: 8 additions & 9 deletions tests/builtin_plugins/check/test_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,20 +136,20 @@ async def test_check(
+ f"- {mock_psutil.cpu_freq.return_value.current}Ghz "
+ f"[{mock_psutil.cpu_count.return_value} core]",
"cpu_process": mock_psutil.cpu_percent.return_value,
"ram_info": f"{round(mock_psutil.virtual_memory.return_value.used / (1024 ** 3), 1)}" # noqa: E501
+ f" / {round(mock_psutil.virtual_memory.return_value.total / (1024 ** 3), 1)}"
"ram_info": f"{round(mock_psutil.virtual_memory.return_value.used / (1024**3), 1)}" # noqa: E501
+ f" / {round(mock_psutil.virtual_memory.return_value.total / (1024**3), 1)}"
+ " GB",
"ram_process": mock_psutil.virtual_memory.return_value.percent,
"swap_info": f"{round(mock_psutil.swap_memory.return_value.used / (1024 ** 3), 1)}" # noqa: E501
+ f" / {round(mock_psutil.swap_memory.return_value.total / (1024 ** 3), 1)} GB",
"swap_info": f"{round(mock_psutil.swap_memory.return_value.used / (1024**3), 1)}" # noqa: E501
+ f" / {round(mock_psutil.swap_memory.return_value.total / (1024**3), 1)} GB",
"swap_process": mock_psutil.swap_memory.return_value.percent,
"disk_info": f"{round(mock_psutil.disk_usage.return_value.used / (1024 ** 3), 1)}" # noqa: E501
+ f" / {round(mock_psutil.disk_usage.return_value.total / (1024 ** 3), 1)} GB",
"disk_info": f"{round(mock_psutil.disk_usage.return_value.used / (1024**3), 1)}" # noqa: E501
+ f" / {round(mock_psutil.disk_usage.return_value.total / (1024**3), 1)} GB",
"disk_process": mock_psutil.disk_usage.return_value.percent,
"brand_raw": cpuinfo_get_cpu_info["brand_raw"],
"baidu": "red",
"google": "red",
"system": f"{platform_uname.system} " f"{platform_uname.release}",
"system": f"{platform_uname.system} {platform_uname.release}",
"version": __get_version(),
"plugin_count": len(nonebot.get_loaded_plugins()),
"nickname": BotConfig.self_nickname,
Expand Down Expand Up @@ -244,8 +244,7 @@ async def test_check_arm(
"brand_raw": "",
"baidu": "red",
"google": "red",
"system": f"{platform_uname_arm.system} "
f"{platform_uname_arm.release}",
"system": f"{platform_uname_arm.system} {platform_uname_arm.release}",
"version": __get_version(),
"plugin_count": len(nonebot.get_loaded_plugins()),
"nickname": BotConfig.self_nickname,
Expand Down
6 changes: 3 additions & 3 deletions zhenxun/builtin_plugins/admin/plugin_switch/_data_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ async def set_all_plugin_status(
await PluginInfo.filter(plugin_type=PluginType.NORMAL).update(
default_status=status
)
return f'成功将所有功能进群默认状态修改为: {"开启" if status else "关闭"}'
return f"成功将所有功能进群默认状态修改为: {'开启' if status else '关闭'}"
if group_id:
if group := await GroupConsole.get_or_none(
group_id=group_id, channel_id__isnull=True
Expand All @@ -213,12 +213,12 @@ async def set_all_plugin_status(
module_list = [f"<{module}" for module in module_list]
group.block_plugin = ",".join(module_list) + "," # type: ignore
await group.save(update_fields=["block_plugin"])
return f'成功将此群组所有功能状态修改为: {"开启" if status else "关闭"}'
return f"成功将此群组所有功能状态修改为: {'开启' if status else '关闭'}"
return "获取群组失败..."
await PluginInfo.filter(plugin_type=PluginType.NORMAL).update(
status=status, block_type=None if status else BlockType.ALL
)
return f'成功将所有功能全局状态修改为: {"开启" if status else "关闭"}'
return f"成功将所有功能全局状态修改为: {'开启' if status else '关闭'}"

@classmethod
async def is_wake(cls, group_id: str) -> bool:
Expand Down
2 changes: 1 addition & 1 deletion zhenxun/builtin_plugins/platform/qq_api/ug_watch.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async def do_something(session: Uninfo):
if session.group:
if not await GroupConsole.exists(group_id=session.group.id):
await GroupConsole.create(group_id=session.group.id)
logger.info("添加当前群组ID信息" "", session=session)
logger.info("添加当前群组ID信息", session=session)

if not await GroupInfoUser.exists(
user_id=session.user.id, group_id=session.group.id
Expand Down
2 changes: 1 addition & 1 deletion zhenxun/builtin_plugins/sign_in/_data_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ async def rank(
)
data_list.append(
[
f"{i+1}",
f"{i + 1}",
(bytes, 30, 30) if user[3] == "qq" else "",
uid2name.get(user[0]),
user[1],
Expand Down
6 changes: 3 additions & 3 deletions zhenxun/builtin_plugins/sign_in/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
lik2relation,
)

assert (
len(level2attitude) == len(lik2level) == len(lik2relation)
), "好感度态度、等级、关系长度不匹配!"
assert len(level2attitude) == len(lik2level) == len(lik2relation), (
"好感度态度、等级、关系长度不匹配!"
)

AVA_URL = "http://q1.qlogo.cn/g?b=qq&nk={}&s=160"

Expand Down
3 changes: 1 addition & 2 deletions zhenxun/models/level_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ async def _run_script(cls):
return [
# 将user_id改为user_id
"ALTER TABLE level_users RENAME COLUMN user_qq TO user_id;",
"ALTER TABLE level_users "
"ALTER COLUMN user_id TYPE character varying(255);",
"ALTER TABLE level_users ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE level_users "
"ALTER COLUMN group_id TYPE character varying(255);",
Expand Down
Loading