From f6ee4a4c1ba56144e6e8be819255005d5b048d42 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 10:24:42 +0800 Subject: [PATCH] :arrow_up: auto update by pre-commit hooks (#416) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :arrow_up: auto update by pre-commit hooks updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.292 → v0.1.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.292...v0.1.9) - [github.com/pycqa/isort: 5.12.0 → 5.13.2](https://github.com/pycqa/isort/compare/5.12.0...5.13.2) - [github.com/psf/black: 23.9.1 → 23.12.1](https://github.com/psf/black/compare/23.9.1...23.12.1) - [github.com/pre-commit/mirrors-prettier: v3.0.3 → v4.0.0-alpha.8](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.3...v4.0.0-alpha.8) - [github.com/pre-commit/mirrors-eslint: v8.50.0 → v9.0.0-alpha.0](https://github.com/pre-commit/mirrors-eslint/compare/v8.50.0...v9.0.0-alpha.0) * :lipstick: auto fix by pre-commit hooks --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 10 ++-- nonebot_bison/config/config_legacy.py | 52 ++++++++----------- .../config/migrations/0571870f5222_init_db.py | 1 + .../migrations/4a46ba54a3f3_alter_type.py | 1 + .../migrations/5da28f6facb3_rename_tables.py | 1 + .../5f3370328e44_add_time_weight_table.py | 1 + .../632b8086bc2b_add_user_target.py | 1 + ...38b3f39c2_make_user_target_not_nullable.py | 1 + .../8d3863e9d74b_remove_uid_and_type.py | 1 + .../a333d6224193_add_last_scheduled_time.py | 1 + .../migrations/a5466912fad0_map_user.py | 1 + .../aceef470d69c_alter_fields_not_null.py | 1 + .../bd92923c218f_alter_json_not_null.py | 1 + .../migrations/c97c445e2bdb_add_constraint.py | 1 + .../f9baef347cc8_remove_old_target.py | 1 + nonebot_bison/utils/get_bot.py | 1 + tests/platforms/test_platform.py | 44 +++++++--------- tests/scheduler/test_scheduler.py | 10 ++-- 18 files changed, 63 insertions(+), 67 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3f5b513..edfe8da 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,26 +7,26 @@ ci: autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks" repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.292 + rev: v0.1.9 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] stages: [commit] - repo: https://github.com/pycqa/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort stages: [commit] - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.12.1 hooks: - id: black stages: [commit] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v4.0.0-alpha.8 hooks: - id: prettier types_or: [javascript, jsx, ts, tsx, markdown, yaml, json] @@ -34,7 +34,7 @@ repos: stages: [commit] - repo: https://github.com/pre-commit/mirrors-eslint - rev: v8.50.0 + rev: v9.0.0-alpha.0 hooks: - id: eslint additional_dependencies: diff --git a/nonebot_bison/config/config_legacy.py b/nonebot_bison/config/config_legacy.py index 24e7e4d..7ccbef5 100644 --- a/nonebot_bison/config/config_legacy.py +++ b/nonebot_bison/config/config_legacy.py @@ -99,33 +99,27 @@ class Config(metaclass=Singleton): # update assert not isinstance(user_data, list) subs: list = user_data.get("subs", []) - subs.append( - { + subs.append({ + "target": target, + "target_type": target_type, + "target_name": target_name, + "cats": cats, + "tags": tags, + }) + self.user_target.update({"subs": subs}, query) + else: + # insert + self.user_target.insert({ + "user": user, + "user_type": user_type, + "subs": [{ "target": target, "target_type": target_type, "target_name": target_name, "cats": cats, "tags": tags, - } - ) - self.user_target.update({"subs": subs}, query) - else: - # insert - self.user_target.insert( - { - "user": user, - "user_type": user_type, - "subs": [ - { - "target": target, - "target_type": target_type, - "target_name": target_name, - "cats": cats, - "tags": tags, - } - ], - } - ) + }], + }) self.update_send_cache() def list_subscribe(self, user, user_type) -> list[SubscribeContent]: @@ -186,14 +180,12 @@ class Config(metaclass=Singleton): for user in self.user_target.all(): for sub in user.get("subs", []): if sub.get("target_type") not in supported_target_type: - to_del.append( - { - "user": user["user"], - "user_type": user["user_type"], - "target": sub["target"], - "target_type": sub["target_type"], - } - ) + to_del.append({ + "user": user["user"], + "user_type": user["user_type"], + "target": sub["target"], + "target_type": sub["target_type"], + }) continue res[sub["target_type"]][sub["target"]].append(User(user["user"], user["user_type"])) cat_res[sub["target_type"]][sub["target"]]["{}-{}".format(user["user_type"], user["user"])] = sub[ diff --git a/nonebot_bison/config/migrations/0571870f5222_init_db.py b/nonebot_bison/config/migrations/0571870f5222_init_db.py index 347212a..391433f 100644 --- a/nonebot_bison/config/migrations/0571870f5222_init_db.py +++ b/nonebot_bison/config/migrations/0571870f5222_init_db.py @@ -5,6 +5,7 @@ Revises: Create Date: 2022-03-21 19:18:13.762626 """ + import sqlalchemy as sa from alembic import op diff --git a/nonebot_bison/config/migrations/4a46ba54a3f3_alter_type.py b/nonebot_bison/config/migrations/4a46ba54a3f3_alter_type.py index 2acbefa..4dbeefe 100644 --- a/nonebot_bison/config/migrations/4a46ba54a3f3_alter_type.py +++ b/nonebot_bison/config/migrations/4a46ba54a3f3_alter_type.py @@ -5,6 +5,7 @@ Revises: c97c445e2bdb Create Date: 2022-03-27 21:50:10.911649 """ + import sqlalchemy as sa from alembic import op diff --git a/nonebot_bison/config/migrations/5da28f6facb3_rename_tables.py b/nonebot_bison/config/migrations/5da28f6facb3_rename_tables.py index 20e7544..dd86893 100644 --- a/nonebot_bison/config/migrations/5da28f6facb3_rename_tables.py +++ b/nonebot_bison/config/migrations/5da28f6facb3_rename_tables.py @@ -5,6 +5,7 @@ Revises: 5f3370328e44 Create Date: 2023-01-15 19:04:54.987491 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/nonebot_bison/config/migrations/5f3370328e44_add_time_weight_table.py b/nonebot_bison/config/migrations/5f3370328e44_add_time_weight_table.py index b6d9d4a..696dfa7 100644 --- a/nonebot_bison/config/migrations/5f3370328e44_add_time_weight_table.py +++ b/nonebot_bison/config/migrations/5f3370328e44_add_time_weight_table.py @@ -5,6 +5,7 @@ Revises: a333d6224193 Create Date: 2022-05-31 22:05:13.235981 """ + import sqlalchemy as sa from alembic import op diff --git a/nonebot_bison/config/migrations/632b8086bc2b_add_user_target.py b/nonebot_bison/config/migrations/632b8086bc2b_add_user_target.py index 716aa22..a6f5e3a 100644 --- a/nonebot_bison/config/migrations/632b8086bc2b_add_user_target.py +++ b/nonebot_bison/config/migrations/632b8086bc2b_add_user_target.py @@ -5,6 +5,7 @@ Revises: aceef470d69c Create Date: 2023-03-20 00:39:30.199915 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.dialects.postgresql import JSONB diff --git a/nonebot_bison/config/migrations/67c38b3f39c2_make_user_target_not_nullable.py b/nonebot_bison/config/migrations/67c38b3f39c2_make_user_target_not_nullable.py index 8d4daf1..1f3e07a 100644 --- a/nonebot_bison/config/migrations/67c38b3f39c2_make_user_target_not_nullable.py +++ b/nonebot_bison/config/migrations/67c38b3f39c2_make_user_target_not_nullable.py @@ -5,6 +5,7 @@ Revises: a5466912fad0 Create Date: 2023-03-20 11:08:42.883556 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.dialects.postgresql import JSONB diff --git a/nonebot_bison/config/migrations/8d3863e9d74b_remove_uid_and_type.py b/nonebot_bison/config/migrations/8d3863e9d74b_remove_uid_and_type.py index 18890dd..649e7f6 100644 --- a/nonebot_bison/config/migrations/8d3863e9d74b_remove_uid_and_type.py +++ b/nonebot_bison/config/migrations/8d3863e9d74b_remove_uid_and_type.py @@ -5,6 +5,7 @@ Revises: 67c38b3f39c2 Create Date: 2023-03-20 15:38:20.220599 """ + import sqlalchemy as sa from alembic import op diff --git a/nonebot_bison/config/migrations/a333d6224193_add_last_scheduled_time.py b/nonebot_bison/config/migrations/a333d6224193_add_last_scheduled_time.py index 154ef81..ad0892b 100644 --- a/nonebot_bison/config/migrations/a333d6224193_add_last_scheduled_time.py +++ b/nonebot_bison/config/migrations/a333d6224193_add_last_scheduled_time.py @@ -5,6 +5,7 @@ Revises: 4a46ba54a3f3 Create Date: 2022-03-29 21:01:38.213153 """ + import sqlalchemy as sa from alembic import op diff --git a/nonebot_bison/config/migrations/a5466912fad0_map_user.py b/nonebot_bison/config/migrations/a5466912fad0_map_user.py index 0c3dc05..c89098f 100644 --- a/nonebot_bison/config/migrations/a5466912fad0_map_user.py +++ b/nonebot_bison/config/migrations/a5466912fad0_map_user.py @@ -5,6 +5,7 @@ Revises: 632b8086bc2b Create Date: 2023-03-20 01:14:42.623789 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.orm import Session diff --git a/nonebot_bison/config/migrations/aceef470d69c_alter_fields_not_null.py b/nonebot_bison/config/migrations/aceef470d69c_alter_fields_not_null.py index ce93f19..c51a400 100644 --- a/nonebot_bison/config/migrations/aceef470d69c_alter_fields_not_null.py +++ b/nonebot_bison/config/migrations/aceef470d69c_alter_fields_not_null.py @@ -5,6 +5,7 @@ Revises: bd92923c218f Create Date: 2023-03-09 19:10:42.168133 """ + import sqlalchemy as sa from alembic import op diff --git a/nonebot_bison/config/migrations/bd92923c218f_alter_json_not_null.py b/nonebot_bison/config/migrations/bd92923c218f_alter_json_not_null.py index 501fa6c..aa3f2ff 100644 --- a/nonebot_bison/config/migrations/bd92923c218f_alter_json_not_null.py +++ b/nonebot_bison/config/migrations/bd92923c218f_alter_json_not_null.py @@ -5,6 +5,7 @@ Revises: 5da28f6facb3 Create Date: 2023-03-02 14:04:16.492133 """ + import sqlalchemy as sa from alembic import op from sqlalchemy import select diff --git a/nonebot_bison/config/migrations/c97c445e2bdb_add_constraint.py b/nonebot_bison/config/migrations/c97c445e2bdb_add_constraint.py index 807699e..0388316 100644 --- a/nonebot_bison/config/migrations/c97c445e2bdb_add_constraint.py +++ b/nonebot_bison/config/migrations/c97c445e2bdb_add_constraint.py @@ -5,6 +5,7 @@ Revises: 0571870f5222 Create Date: 2022-03-26 19:46:50.910721 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/nonebot_bison/config/migrations/f9baef347cc8_remove_old_target.py b/nonebot_bison/config/migrations/f9baef347cc8_remove_old_target.py index 04348cb..fbed082 100644 --- a/nonebot_bison/config/migrations/f9baef347cc8_remove_old_target.py +++ b/nonebot_bison/config/migrations/f9baef347cc8_remove_old_target.py @@ -5,6 +5,7 @@ Revises: 8d3863e9d74b Create Date: 2023-08-25 00:20:51.511329 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.orm import Session diff --git a/nonebot_bison/utils/get_bot.py b/nonebot_bison/utils/get_bot.py index c2baa17..c85e5b5 100644 --- a/nonebot_bison/utils/get_bot.py +++ b/nonebot_bison/utils/get_bot.py @@ -1,4 +1,5 @@ """ 提供获取 Bot 的方法 """ + from typing import Any from collections import defaultdict diff --git a/tests/platforms/test_platform.py b/tests/platforms/test_platform.py index f2dce29..eb1fefd 100644 --- a/tests/platforms/test_platform.py +++ b/tests/platforms/test_platform.py @@ -540,22 +540,18 @@ async def test_batch_fetch_new_message(app: App): platform_obj = BatchNewMessage(ProcessContext(), None) # type:ignore - res1 = await platform_obj.batch_fetch_new_post( - [ - SubUnit(Target("target1"), [user1]), - SubUnit(Target("target2"), [user1, user2]), - SubUnit(Target("target3"), [user2]), - ] - ) + res1 = await platform_obj.batch_fetch_new_post([ + SubUnit(Target("target1"), [user1]), + SubUnit(Target("target2"), [user1, user2]), + SubUnit(Target("target3"), [user2]), + ]) assert len(res1) == 0 - res2 = await platform_obj.batch_fetch_new_post( - [ - SubUnit(Target("target1"), [user1]), - SubUnit(Target("target2"), [user1, user2]), - SubUnit(Target("target3"), [user2]), - ] - ) + res2 = await platform_obj.batch_fetch_new_post([ + SubUnit(Target("target1"), [user1]), + SubUnit(Target("target2"), [user1, user2]), + SubUnit(Target("target3"), [user2]), + ]) assert len(res2) == 3 send_set = set() for platform_target, posts in res2: @@ -617,20 +613,16 @@ async def test_batch_fetch_compare_status(app: App): user1 = UserSubInfo(TargetQQGroup(group_id=123), [1, 2, 3], []) user2 = UserSubInfo(TargetQQGroup(group_id=234), [1, 2, 3], []) - res1 = await batch_status_change.batch_fetch_new_post( - [ - SubUnit(Target("target1"), [user1]), - SubUnit(Target("target2"), [user1, user2]), - ] - ) + res1 = await batch_status_change.batch_fetch_new_post([ + SubUnit(Target("target1"), [user1]), + SubUnit(Target("target2"), [user1, user2]), + ]) assert len(res1) == 0 - res2 = await batch_status_change.batch_fetch_new_post( - [ - SubUnit(Target("target1"), [user1]), - SubUnit(Target("target2"), [user1, user2]), - ] - ) + res2 = await batch_status_change.batch_fetch_new_post([ + SubUnit(Target("target1"), [user1]), + SubUnit(Target("target2"), [user1, user2]), + ]) send_set = set() for platform_target, posts in res2: diff --git a/tests/scheduler/test_scheduler.py b/tests/scheduler/test_scheduler.py index df50601..69bd1bb 100644 --- a/tests/scheduler/test_scheduler.py +++ b/tests/scheduler/test_scheduler.py @@ -83,12 +83,10 @@ async def test_scheduler_batch_api(init_scheduler, mocker: MockerFixture): await scheduler_dict[BilibiliSchedConf].exec_fetch() - batch_fetch_mock.assert_called_once_with( - [ - (T_Target("t1"), [UserSubInfo(user=TargetQQGroup(group_id=123), categories=[], tags=[])]), - (T_Target("t2"), [UserSubInfo(user=TargetQQGroup(group_id=123), categories=[], tags=[])]), - ] - ) + batch_fetch_mock.assert_called_once_with([ + (T_Target("t1"), [UserSubInfo(user=TargetQQGroup(group_id=123), categories=[], tags=[])]), + (T_Target("t2"), [UserSubInfo(user=TargetQQGroup(group_id=123), categories=[], tags=[])]), + ]) async def test_scheduler_with_time(app: App, init_scheduler, mocker: MockerFixture):