Merge branch 'fix/pyright-env-and-type-guards' into dev

web/backend/services/automation/jobs/douyu_tasks_retention.py

@@ -41,10 +41,10 @@ from __future__ import annotations
 
 import json
 from datetime import UTC, datetime, timedelta
-from typing import Any
+from typing import Any, cast
 
 from loguru import logger
-from sqlalchemy import text
+from sqlalchemy import CursorResult, text
 from sqlalchemy.orm import Session
 
 from ....models import AutomationJob
@@ -133,7 +133,9 @@ def _delete_batch(
         ),
         params,
     )
-    return int(result.rowcount or 0)
+    # Session.execute 的静态返回类型是 Result[Any]，但 DML 语句实际拿到的是
+    # CursorResult（rowcount 只定义在它上面）。运行期行为不变，只是把这一点写实。
+    return int(cast(CursorResult[Any], result).rowcount or 0)
 
 
 def run_douyu_tasks_retention(db: Session, job: AutomationJob) -> dict[str, Any]:

web/backend/services/douyu_runner_manual.py

@@ -221,9 +221,11 @@ class ManualMixin:
         account.esports_opened = manual_type is not None and manual_type >= 1
         # 到期时间也落库 —— 否则界面只能显示"已开通"，看不到什么时候到期
         expire_raw = result.get("expire_time")
-        expire_int = (
-            int(expire_raw) if str(expire_raw or "").strip().isdigit() else None
-        )
+        # 先规整成字符串再判 isdigit：原来写 `int(expire_raw) if str(expire_raw
+        # or "").strip().isdigit()` —— 判的是 A、转的是 B，类型检查器收窄不了，
+        # 而且同一份值取了两遍。规整到一个局部变量后两个问题一起没了。
+        expire_text = str(expire_raw or "").strip()
+        expire_int = int(expire_text) if expire_text.isdigit() else None
         # ⚠️ 斗鱼用 0 表示「没有到期时间」。直接存 0 的话界面会显示 1970/1/1
         # （这个坑在积分到期上踩过一次，这里别再踩）。
         account.esports_expire_time = (

web/backend/services/douyu_runner_overview.py

@@ -67,9 +67,12 @@ def _match_suit_item(want: str, rows: list[dict[str, Any]]) -> dict[str, Any] |
     # 优先找带「套装」前缀的
     for it in rows:
         cname = str(it.get("commodityName") or "").strip()
-        if core in cname and not any(k in cname for k in SUIT_EXCLUDE_KEYWORDS):
-            if "套装" in cname:
-                return it
+        if (
+            core in cname
+            and not any(k in cname for k in SUIT_EXCLUDE_KEYWORDS)
+            and "套装" in cname
+        ):
+            return it
 
     # 3. 兜底匹配不带排除词的项
     for it in rows:

web/backend/services/huya_runner_core.py

@@ -7,7 +7,7 @@ import copy
 import threading
 import time
 from datetime import UTC, datetime
-from typing import Any
+from typing import Any, Literal
 
 from loguru import logger
 from sqlalchemy.orm import Session
@@ -51,7 +51,9 @@ class HuyaBatchRunnerCore:
     def stop(self):
         self._stop.set()
 
-    def _open_wss_session(self, uid: int, cookie: str, kind: str):
+    def _open_wss_session(
+        self, uid: int, cookie: str, kind: Literal["activity", "shop"]
+    ):
         """在当前任务线程创建并登记 WSS 会话，统一由 finally 回收。"""
         from core.huya.elite_session import HuyaEliteWssSession
 

web/backend/services/huya_runner_recharge.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import time
 from datetime import UTC, datetime
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
 from sqlalchemy.orm import Session
 
@@ -40,7 +40,9 @@ class RechargeMixin:
         def _push_log(self, level: str, message: str) -> None: ...
         def _mark_task(self, *args: Any, **kwargs: Any) -> None: ...
         def _update_task_progress(self, *args: Any, **kwargs: Any) -> None: ...
-        def _open_wss_session(self, uid: int, cookie: str, kind: str): ...
+        def _open_wss_session(
+            self, uid: int, cookie: str, kind: Literal["activity", "shop"]
+        ): ...
         def _shop_client(self, uid: int, cookie: str): ...
 
         @staticmethod