From b8b49a5ce532e15a7effccc27e0f3a89d32b0661 Mon Sep 17 00:00:00 2001 From: Azide Date: Sun, 1 Sep 2024 22:30:02 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20B=E7=AB=99=E8=AF=B7=E6=B1=82=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E9=98=B6=E6=AE=B5=E8=A1=8C=E4=B8=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20(#610)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :bug: 调整ruff的pytest警告 * :bug: 调整导入关系警告 * :bug: 删除奇怪无用的赋值和取值逻辑 * :white_check_mark: 不同测试部分所用变量应加以区分 * :bug: subs_io model添加默认值 * :bug: 修完所有的 ruff PT001 警告 * :wrench: 按ruff建议修改ruff配置 warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `pyproject.toml`: - 'ignore' -> 'lint.ignore' - 'select' -> 'lint.select' * :loud_sound: 降低B站请求策略非Raise阶段API352的日志等级 * :bug: Raise阶段应该 raise err * :loud_sound: 日志添加平台名 * :bug: bzhanhan调度继续降低至60s --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- nonebot_bison/platform/bilibili/retry.py | 10 +++++++--- nonebot_bison/platform/bilibili/scheduler.py | 2 +- tests/platforms/test_bilibili.py | 9 ++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nonebot_bison/platform/bilibili/retry.py b/nonebot_bison/platform/bilibili/retry.py index e9c1597..94d0cb0 100644 --- a/nonebot_bison/platform/bilibili/retry.py +++ b/nonebot_bison/platform/bilibili/retry.py @@ -236,15 +236,19 @@ def retry_for_352(api_func: Callable[[TBilibili, Target], Awaitable[list[DynRawP case RetryState.NROMAL | RetryState.REFRESH | RetryState.RAISE: try: res = await api_func(bls, *args, **kwargs) - except ApiCode352Error: - logger.error("API 352 错误") + except ApiCode352Error as e: + logger.warning("本次 Bilibili API 请求返回 352 错误码") await _retry_fsm.emit(RetryEvent.REQUEST_AND_RAISE) + + if _retry_fsm.current_state == RetryState.RAISE: + raise e + return [] else: await _retry_fsm.emit(RetryEvent.REQUEST_AND_SUCCESS) return res case RetryState.BACKOFF: - logger.warning("回避中，不请求") + logger.warning("本次 Bilibili 请求回避中，不请求") await _retry_fsm.emit(RetryEvent.IN_BACKOFF_TIME) return [] case _: diff --git a/nonebot_bison/platform/bilibili/scheduler.py b/nonebot_bison/platform/bilibili/scheduler.py index 2c0f2a3..0380683 100644 --- a/nonebot_bison/platform/bilibili/scheduler.py +++ b/nonebot_bison/platform/bilibili/scheduler.py @@ -68,7 +68,7 @@ class BilibiliClientManager(ClientManager): class BilibiliSite(Site): name = "bilibili.com" - schedule_setting = {"seconds": 50} + schedule_setting = {"seconds": 60} schedule_type = "interval" client_mgr = BilibiliClientManager require_browser = True diff --git a/tests/platforms/test_bilibili.py b/tests/platforms/test_bilibili.py index 0cc6534..ac54005 100644 --- a/tests/platforms/test_bilibili.py +++ b/tests/platforms/test_bilibili.py @@ -183,7 +183,7 @@ async def test_retry_for_352(app: App, mocker: MockerFixture): fakebili.set_raise352(True) - for state in test_state_list: + for state in test_state_list[:-3]: logger.info(f"\n\nnow state should be {state}") assert _retry_fsm.current_state == state @@ -194,6 +194,13 @@ async def test_retry_for_352(app: App, mocker: MockerFixture): if state == RetryState.BACKOFF: freeze_start += timedelta_length * (_retry_fsm.addon.backoff_count + 1) ** 2 + for state in test_state_list[-3:]: + logger.info(f"\n\nnow state should be {state}") + assert _retry_fsm.current_state == state + + with pytest.raises(ApiCode352Error): + await fakebili.get_sub_list(Target("t1")) # type: ignore + assert client_mgr.refresh_client_call_count == 4 * 3 + 3 # refresh + raise assert client_mgr.get_client_call_count == 2 + 4 * 3 + 3 # previous + refresh + raise