mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-11-01 21:07:01 +08:00
refactor(types): declare plugin data model query results
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
from typing import Any, Optional
|
||||
from typing import Any, Optional, Self
|
||||
|
||||
from sqlalchemy import JSON, Index, String, delete, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -21,14 +21,14 @@ class PluginData(Base):
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def get_plugin_data(cls, db: Session, plugin_id: str):
|
||||
def get_plugin_data(cls, db: Session, plugin_id: str) -> list[Self]:
|
||||
"""在调用方 Session 中读取插件全部数据。"""
|
||||
return list(db.execute(select(cls).where(cls.plugin_id == plugin_id)).scalars().all())
|
||||
|
||||
@classmethod
|
||||
async def async_get_plugin_data(
|
||||
cls, db: AsyncSession, plugin_id: str
|
||||
):
|
||||
) -> list[Self]:
|
||||
"""在调用方 AsyncSession 中读取插件全部数据。"""
|
||||
result = await db.execute(select(cls).where(cls.plugin_id == plugin_id))
|
||||
return list(result.scalars().all())
|
||||
@@ -36,43 +36,45 @@ class PluginData(Base):
|
||||
@classmethod
|
||||
def get_plugin_data_by_key(
|
||||
cls, db: Session, plugin_id: str, key: str
|
||||
):
|
||||
) -> Optional[Self]:
|
||||
"""在调用方 Session 中按键读取插件数据。"""
|
||||
return db.execute(
|
||||
data: Optional[Self] = db.execute(
|
||||
select(cls).where(cls.plugin_id == plugin_id, cls.key == key)
|
||||
).scalars().first()
|
||||
return data
|
||||
|
||||
@classmethod
|
||||
async def async_get_plugin_data_by_key(
|
||||
cls, db: AsyncSession, plugin_id: str, key: str
|
||||
):
|
||||
) -> Optional[Self]:
|
||||
"""在调用方 AsyncSession 中按键读取插件数据。"""
|
||||
result = await db.execute(
|
||||
select(cls).where(cls.plugin_id == plugin_id, cls.key == key)
|
||||
)
|
||||
return result.scalar_one_or_none()
|
||||
data: Optional[Self] = result.scalar_one_or_none()
|
||||
return data
|
||||
|
||||
@classmethod
|
||||
def del_plugin_data_by_key(cls, db: Session, plugin_id: str, key: str):
|
||||
def del_plugin_data_by_key(cls, db: Session, plugin_id: str, key: str) -> None:
|
||||
"""在调用方事务中暂存单个插件键删除。"""
|
||||
db.execute(delete(cls).where(cls.plugin_id == plugin_id, cls.key == key))
|
||||
|
||||
@classmethod
|
||||
def del_plugin_data(cls, db: Session, plugin_id: str):
|
||||
def del_plugin_data(cls, db: Session, plugin_id: str) -> None:
|
||||
"""在调用方事务中暂存插件全部数据删除。"""
|
||||
db.execute(delete(cls).where(cls.plugin_id == plugin_id))
|
||||
|
||||
@classmethod
|
||||
def get_plugin_data_by_plugin_id(
|
||||
cls, db: Session, plugin_id: str
|
||||
):
|
||||
) -> list[Self]:
|
||||
"""在调用方 Session 中按插件 ID 读取数据。"""
|
||||
return list(db.execute(select(cls).where(cls.plugin_id == plugin_id)).scalars().all())
|
||||
|
||||
@classmethod
|
||||
async def async_get_plugin_data_by_plugin_id(
|
||||
cls, db: AsyncSession, plugin_id: str
|
||||
):
|
||||
) -> list[Self]:
|
||||
"""在调用方 AsyncSession 中按插件 ID 读取数据。"""
|
||||
result = await db.execute(select(cls).where(cls.plugin_id == plugin_id))
|
||||
return list(result.scalars().all())
|
||||
|
||||
@@ -75,7 +75,7 @@ uv run --locked --no-sync python scripts/architecture/complexity.py
|
||||
回调和返回值类型;全仓错误计数为零并不保证单独纳入 strict frontier 后也为零。
|
||||
|
||||
2026-10-16 开始逐文件清理类型债务,`app/domain/title.py` 通过局部可空类型声明保留
|
||||
既有搜索解析行为,并纳入严格清单;当前清单共 113 个文件(112 个生产文件和 1 个脚本)。
|
||||
既有搜索解析行为,并纳入严格清单;当前清单共 114 个文件(113 个生产文件和 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,330 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 |
|
||||
| Python 源码量 | 372,332 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 |
|
||||
| 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`;61 个超过 150 行,17 个超过 250 行;新增函数仍受 C901/嵌套深度门禁约束 |
|
||||
| 全量 mypy 历史债务 | 8,787 / 441 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 |
|
||||
| 全量 mypy 历史债务 | 8,779 / 440 文件 | 通知排版补齐 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
@@ -102,6 +102,7 @@ files =
|
||||
app/db/decorators.py,
|
||||
app/db/base.py,
|
||||
app/db/oper/plugindata.py,
|
||||
app/db/models/plugindata.py,
|
||||
app/db/models/siteicon.py,
|
||||
app/db/models/sitestatistic.py,
|
||||
app/db/models/userconfig.py,
|
||||
|
||||
@@ -1009,9 +1009,6 @@
|
||||
"app/db/models/passkey.py": {
|
||||
"no-untyped-def": 12
|
||||
},
|
||||
"app/db/models/plugindata.py": {
|
||||
"no-untyped-def": 8
|
||||
},
|
||||
"app/db/models/site.py": {
|
||||
"no-untyped-def": 10
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user