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

This commit is contained in:
yml2213
2026-10-08 12:34:11 +08:00
31 changed files with 599 additions and 96 deletions
+31 -31
View File
@@ -20,7 +20,7 @@ class YybTaskCreateRequest(BaseModel):
class YybLoginRequest(BaseModel):
provider: str = Field(..., pattern="^(qq|wechat)$")
timeout: int = Field(600, ge=60, le=1800)
timeout: int = Field(default=600, ge=60, le=1800)
class YybSelectionRequest(BaseModel):
@@ -28,7 +28,7 @@ class YybSelectionRequest(BaseModel):
points: int = Field(..., gt=0)
product_id: str = Field(..., min_length=1, max_length=128)
zone_id: str = Field(..., min_length=1, max_length=64)
zone_name: str = Field("", max_length=128)
zone_name: str = Field(default="", max_length=128)
role_id: str = Field(..., min_length=1, max_length=64)
role_name: str = Field(..., min_length=1, max_length=128)
@@ -91,7 +91,7 @@ class UserInfo(BaseModel):
class UserCreate(BaseModel):
username: str = Field(..., min_length=2, max_length=64)
password: str = Field(..., min_length=6, max_length=128)
role: str = Field("support", pattern="^(super_admin|operation|support)$")
role: str = Field(default="support", pattern="^(super_admin|operation|support)$")
remark: str = ""
@@ -153,7 +153,7 @@ class AccountBulkSelection(BaseModel):
class AccountExportRequest(AccountBulkSelection):
"""账号导出请求:支持纯账号名单(txt)或结构化明细(csv)。"""
format: str = Field("txt", pattern="^(txt|csv)$")
format: str = Field(default="txt", pattern="^(txt|csv)$")
class BatchAssign(AccountBulkSelection):
@@ -295,7 +295,7 @@ class LoginBatchRequest(BaseModel):
concurrency: int = 3 # 并发数,1-10
api_strategy: str = "wgapi" # 接口策略: wgapi(新版)或 iframe(旧版备选)
mode: str = Field(
"login", pattern="^(login|check)$"
default="login", pattern="^(login|check)$"
) # login=登录取CK,check=账号状态检测
@@ -352,9 +352,9 @@ class AccountCheckBatchRequest(BaseModel):
status: str = ""
ck_status: str = ""
bind_status: str = ""
concurrency: int = Field(3, ge=1, le=10)
max_login_retries: int = Field(0, ge=0, le=50)
max_total_time: float = Field(300, ge=0, le=3600)
concurrency: int = Field(default=3, ge=1, le=10)
max_login_retries: int = Field(default=0, ge=0, le=50)
max_total_time: float = Field(default=300, ge=0, le=3600)
use_proxy: bool = False
# 登录接口策略,与登录任务同一套取值:wgapi(默认,保持原行为)或 iframe。
# 有些人只有其中一套能收到邮箱验证码,所以要能选。
@@ -446,11 +446,11 @@ class HuyaAutoRegisterRequest(BaseModel):
text: str = Field(..., min_length=1)
tag: str = ""
concurrency: int = Field(1, ge=1, le=5)
wait_seconds: float = Field(180, ge=15, le=600)
poll_interval: float = Field(5, ge=1, le=30)
password_prefix: str = Field("hy", max_length=8)
fixed_password: str = Field("", max_length=64)
concurrency: int = Field(default=1, ge=1, le=5)
wait_seconds: float = Field(default=180, ge=15, le=600)
poll_interval: float = Field(default=5, ge=1, le=30)
password_prefix: str = Field(default="hy", max_length=8)
fixed_password: str = Field(default="", max_length=64)
use_proxy: bool = False
@@ -463,12 +463,12 @@ class HuyaAutoRegisterRetryRequest(BaseModel):
- all_unfinished: 失败+未完成都跑
"""
mode: str = Field("continue", max_length=32)
concurrency: int | None = Field(None, ge=1, le=5)
wait_seconds: float | None = Field(None, ge=15, le=600)
poll_interval: float | None = Field(None, ge=1, le=30)
password_prefix: str | None = Field(None, max_length=8)
fixed_password: str | None = Field(None, max_length=64)
mode: str = Field(default="continue", max_length=32)
concurrency: int | None = Field(default=None, ge=1, le=5)
wait_seconds: float | None = Field(default=None, ge=15, le=600)
poll_interval: float | None = Field(default=None, ge=1, le=30)
password_prefix: str | None = Field(default=None, max_length=8)
fixed_password: str | None = Field(default=None, max_length=64)
use_proxy: bool | None = None
@@ -550,9 +550,9 @@ class HuyaPasswordLoginSelectedRequest(BaseModel):
assigned_only: bool = False
has_cookie: bool = False
force_new_device: bool = False
max_attempts: int = Field(2, ge=1, le=3)
interval_seconds: float = Field(8, ge=0, le=60)
retry_delay_seconds: float = Field(3, ge=0, le=30)
max_attempts: int = Field(default=2, ge=1, le=3)
interval_seconds: float = Field(default=8, ge=0, le=60)
retry_delay_seconds: float = Field(default=3, ge=0, le=30)
class HuyaDeviceBindingsBatchDeleteRequest(BaseModel):
@@ -647,7 +647,7 @@ class HuyaConfigUpdate(BaseModel):
class HuyaTaskBatchRequest(BaseModel):
account_ids: list[int]
task_type: str
handbook_scope: str = Field("legacy", pattern="^(legacy|elite)$")
handbook_scope: str = Field(default="legacy", pattern="^(legacy|elite)$")
concurrency: int = 3
payload: dict[str, Any] = Field(default_factory=dict)
@@ -660,7 +660,7 @@ class HuyaWorkbenchAccountsUpdate(BaseModel):
class HuyaBrowserExchangeRequest(BaseModel):
"""浏览器兑换的目标页选择(常量见 services/huya_exchange_targets.py)。"""
target: str | None = Field(None, pattern="^(live_room|elite|esports)$")
target: str | None = Field(default=None, pattern="^(live_room|elite|esports)$")
class HuyaTaskOut(BaseModel):
@@ -833,10 +833,10 @@ class DouyuConfigUpdate(BaseModel):
confirm_act_alias: str | None = None
legacy_act_alias: str | None = None
room_id: str | None = None
elite_amount: int | None = Field(None, ge=1)
elite_amount: int | None = Field(default=None, ge=1)
esports_manual_id: str | None = None
esports_act_alias: str | None = None
esports_amount: int | None = Field(None, ge=1)
esports_amount: int | None = Field(default=None, ge=1)
esports_chicken_gift_id: str | None = None
esports_chicken_skin_id: str | None = None
esports_firework_gift_id: str | None = None
@@ -845,12 +845,12 @@ class DouyuConfigUpdate(BaseModel):
xpd_act_alias: str | None = None
xpd_act_id: str | None = None
xpd_rid: str | None = None
gold_pay_type: int | None = Field(None, ge=1, le=9)
gold_pay_type: int | None = Field(default=None, ge=1, le=9)
gold_recharge_channel: str | None = Field(
None, pattern="^(wechat_qr|supplier_api)$"
default=None, pattern="^(wechat_qr|supplier_api)$"
)
gold_api_product_id: str | None = Field(None, max_length=128)
gold_api_account_template_name: str | None = Field(None, max_length=64)
gold_api_product_id: str | None = Field(default=None, max_length=128)
gold_api_account_template_name: str | None = Field(default=None, max_length=64)
gift_id: str | None = None
skin_id: str | None = None
@@ -859,7 +859,7 @@ class DouyuTaskBatchRequest(BaseModel):
account_ids: list[int]
task_type: str
handbook_scope: str = Field(..., pattern="^(elite|esports|peace)$")
concurrency: int = Field(3, ge=1, le=10)
concurrency: int = Field(default=3, ge=1, le=10)
payload: dict[str, Any] = Field(default_factory=dict)