mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-11-02 13:28:32 +08:00
refactor(types): declare site model query results
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
from datetime import datetime
|
||||
from typing import Any, Optional
|
||||
from typing import Any, Optional, Self
|
||||
|
||||
from sqlalchemy import JSON, Boolean, Integer, String, delete, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -57,50 +57,53 @@ class Site(Base):
|
||||
downloader: Mapped[Optional[str]] = mapped_column(String)
|
||||
|
||||
@classmethod
|
||||
def get_by_domain(cls, db: Session, domain: str):
|
||||
def get_by_domain(cls, db: Session, domain: str) -> Optional[Self]:
|
||||
"""在调用方 Session 中按域名查询站点。"""
|
||||
return db.execute(select(cls).where(cls.domain == domain)).scalars().first()
|
||||
site: Optional[Self] = db.execute(select(cls).where(cls.domain == domain)).scalars().first()
|
||||
return site
|
||||
|
||||
@classmethod
|
||||
async def async_get_by_domain(
|
||||
cls,
|
||||
db: AsyncSession,
|
||||
domain: str,
|
||||
):
|
||||
) -> Optional[Self]:
|
||||
"""在调用方 AsyncSession 中按域名查询站点。"""
|
||||
result = await db.execute(select(cls).where(cls.domain == domain))
|
||||
return result.scalar_one_or_none()
|
||||
site: Optional[Self] = result.scalar_one_or_none()
|
||||
return site
|
||||
|
||||
@classmethod
|
||||
async def async_get_by_name(
|
||||
cls,
|
||||
db: AsyncSession,
|
||||
name: str,
|
||||
):
|
||||
) -> Optional[Self]:
|
||||
"""在调用方 AsyncSession 中按站点名称查询。"""
|
||||
result = await db.execute(select(cls).where(cls.name == name))
|
||||
return result.scalar_one_or_none()
|
||||
site: Optional[Self] = result.scalar_one_or_none()
|
||||
return site
|
||||
|
||||
@classmethod
|
||||
def get_actives(cls, db: Session):
|
||||
def get_actives(cls, db: Session) -> list[Self]:
|
||||
"""在调用方 Session 中查询启用站点。"""
|
||||
return list(db.execute(
|
||||
select(cls).where(cls.is_active.is_(True))
|
||||
).scalars().all())
|
||||
|
||||
@classmethod
|
||||
async def async_get_actives(cls, db: AsyncSession):
|
||||
async def async_get_actives(cls, db: AsyncSession) -> list[Self]:
|
||||
"""在调用方 AsyncSession 中查询启用站点。"""
|
||||
result = await db.execute(select(cls).where(cls.is_active.is_(True)))
|
||||
return list(result.scalars().all())
|
||||
|
||||
@classmethod
|
||||
def list_order_by_pri(cls, db: Session):
|
||||
def list_order_by_pri(cls, db: Session) -> list[Self]:
|
||||
"""在调用方 Session 中按优先级升序查询站点。"""
|
||||
return list(db.execute(select(cls).order_by(cls.pri)).scalars().all())
|
||||
|
||||
@classmethod
|
||||
async def async_list_order_by_pri(cls, db: AsyncSession):
|
||||
async def async_list_order_by_pri(cls, db: AsyncSession) -> list[Self]:
|
||||
"""在调用方 AsyncSession 中按优先级升序查询站点。"""
|
||||
result = await db.execute(select(cls).order_by(cls.pri))
|
||||
return list(result.scalars().all())
|
||||
@@ -110,7 +113,7 @@ class Site(Base):
|
||||
cls,
|
||||
db: Session,
|
||||
ids: list[int],
|
||||
):
|
||||
) -> list[Optional[str]]:
|
||||
"""在调用方 Session 中按 ID 查询域名。"""
|
||||
if not ids:
|
||||
return []
|
||||
@@ -119,11 +122,11 @@ class Site(Base):
|
||||
).scalars().all())
|
||||
|
||||
@classmethod
|
||||
def reset(cls, db: Session):
|
||||
def reset(cls, db: Session) -> None:
|
||||
"""在调用方持有的同步事务中暂存清空操作。"""
|
||||
db.execute(delete(cls))
|
||||
|
||||
@classmethod
|
||||
async def async_reset(cls, db: AsyncSession):
|
||||
async def async_reset(cls, db: AsyncSession) -> None:
|
||||
"""在调用方持有的异步事务中暂存清空操作。"""
|
||||
await db.execute(delete(cls))
|
||||
|
||||
@@ -75,7 +75,7 @@ uv run --locked --no-sync python scripts/architecture/complexity.py
|
||||
回调和返回值类型;全仓错误计数为零并不保证单独纳入 strict frontier 后也为零。
|
||||
|
||||
2026-10-16 开始逐文件清理类型债务,`app/domain/title.py` 通过局部可空类型声明保留
|
||||
既有搜索解析行为,并纳入严格清单;当前清单共 119 个文件(118 个生产文件和 1 个脚本)。
|
||||
既有搜索解析行为,并纳入严格清单;当前清单共 120 个文件(119 个生产文件和 1 个脚本)。
|
||||
每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。
|
||||
验收同时检查完整严格清单与全宿主 Linux 分析,避免 `follow_imports = skip` 隐藏依赖
|
||||
签名冲突;不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准,
|
||||
|
||||
@@ -106,9 +106,9 @@ ARCH-201 至 ARCH-204 均达到实现、验证、提交、推送和远端门禁
|
||||
| Model/Oper 事务债务 | 0 | 自建 Session、自动事务装饰器、直接 commit/rollback 等基线均为零 |
|
||||
| Module Contract | 215 specs / 211 methods / 263 calls | 动态方法名为 0;分类事实富化通过显式合同进入插件调度,旧 YAML 分类方法已移除;download 新增 custom_words 可选参数,旧 provider 签名通过显式合同兼容 |
|
||||
| Event Contract | 53 | 均已有 payload model,但当前全部是 diagnostic enforcement |
|
||||
| Python 源码量 | 372,595 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 |
|
||||
| Python 源码量 | 372,598 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 |
|
||||
| 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`;61 个超过 150 行,17 个超过 250 行;新增函数仍受 C901/嵌套深度门禁约束 |
|
||||
| 全量 mypy 历史债务 | 8,742 / 436 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 |
|
||||
| 全量 mypy 历史债务 | 8,732 / 435 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 |
|
||||
| Ruff 历史诊断 | 98 | 低水位门禁通过,但规则集只覆盖 `E4/E7/E9/F/I` |
|
||||
| 覆盖率固定基线 | Application 80.00%,Domain 80.00% | Chain、Runtime、Agent、Adapter、Startup 未进入包级覆盖率门禁 |
|
||||
|
||||
|
||||
1
mypy.ini
1
mypy.ini
@@ -106,6 +106,7 @@ files =
|
||||
app/db/models/mediaserver.py,
|
||||
app/db/models/passkey.py,
|
||||
app/db/models/plugindata.py,
|
||||
app/db/models/site.py,
|
||||
app/db/models/siteicon.py,
|
||||
app/db/models/sitestatistic.py,
|
||||
app/db/models/siteuserdata.py,
|
||||
|
||||
@@ -998,9 +998,6 @@
|
||||
"app/db/models/message.py": {
|
||||
"type-arg": 1
|
||||
},
|
||||
"app/db/models/site.py": {
|
||||
"no-untyped-def": 10
|
||||
},
|
||||
"app/db/models/subscribe.py": {
|
||||
"arg-type": 8,
|
||||
"no-untyped-def": 18
|
||||
|
||||
Reference in New Issue
Block a user