mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-11-04 06:15:14 +08:00
refactor(types): declare message adapter contracts
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import time
|
||||
from typing import Optional, Union
|
||||
from typing import Any, Optional, Union
|
||||
|
||||
from sqlalchemy import and_, or_, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -7,8 +7,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.db.base import DbOper
|
||||
from app.db.models.message import Message
|
||||
from app.schemas.message import MessageType
|
||||
from app.schemas.notification import NotificationChannel
|
||||
from app.schemas.types import MessageType, NotificationChannel
|
||||
|
||||
|
||||
class MessageOper(DbOper):
|
||||
@@ -29,8 +28,8 @@ class MessageOper(DbOper):
|
||||
link: Optional[str] = None,
|
||||
userid: Optional[str] = None,
|
||||
action: Optional[int] = 1,
|
||||
note: Optional[Union[list, dict]] = None,
|
||||
**kwargs) -> dict:
|
||||
note: Optional[Union[list[Any], dict[str, Any]]] = None,
|
||||
**kwargs: Any) -> dict[str, Any]:
|
||||
"""
|
||||
新增消息
|
||||
:param channel: 消息渠道
|
||||
@@ -64,7 +63,8 @@ class MessageOper(DbOper):
|
||||
kwargs.pop(k)
|
||||
|
||||
message = Message(**kwargs)
|
||||
return self._execute_sync_write(message.create_and_to_dict)
|
||||
result: dict[str, Any] = self._execute_sync_write(message.create_and_to_dict)
|
||||
return result
|
||||
|
||||
async def async_add(self,
|
||||
channel: Optional[NotificationChannel] = None,
|
||||
@@ -76,8 +76,8 @@ class MessageOper(DbOper):
|
||||
link: Optional[str] = None,
|
||||
userid: Optional[str] = None,
|
||||
action: Optional[int] = 1,
|
||||
note: Optional[Union[list, dict]] = None,
|
||||
**kwargs) -> Message:
|
||||
note: Optional[Union[list[Any], dict[str, Any]]] = None,
|
||||
**kwargs: Any) -> Message:
|
||||
"""
|
||||
异步新增消息
|
||||
"""
|
||||
@@ -106,7 +106,7 @@ class MessageOper(DbOper):
|
||||
"""
|
||||
分页获取消息记录。
|
||||
"""
|
||||
return self._execute_sync_query(
|
||||
messages: list[Message] = self._execute_sync_query(
|
||||
lambda session: list(session.execute(
|
||||
select(Message)
|
||||
.order_by(Message.reg_time.desc(), Message.id.desc())
|
||||
@@ -114,6 +114,7 @@ class MessageOper(DbOper):
|
||||
.limit(count)
|
||||
).scalars().all())
|
||||
)
|
||||
return messages
|
||||
|
||||
def exists_by_source(self, source: str) -> bool:
|
||||
"""
|
||||
@@ -122,11 +123,12 @@ class MessageOper(DbOper):
|
||||
:param source: 消息来源唯一标识
|
||||
:return: 是否存在匹配记录
|
||||
"""
|
||||
return self._execute_sync_query(
|
||||
exists: bool = self._execute_sync_query(
|
||||
lambda session: session.execute(
|
||||
select(Message.id).where(Message.source == source).limit(1)
|
||||
).scalars().first() is not None
|
||||
)
|
||||
return exists
|
||||
|
||||
async def async_list_by_page(
|
||||
self, page: int = 1, count: int = 30
|
||||
@@ -144,7 +146,8 @@ class MessageOper(DbOper):
|
||||
)
|
||||
return list(result.scalars().all())
|
||||
|
||||
return await self._execute_async_query(query)
|
||||
messages: list[Message] = await self._execute_async_query(query)
|
||||
return messages
|
||||
|
||||
async def async_list_sent_by_page(
|
||||
self,
|
||||
@@ -181,4 +184,5 @@ class MessageOper(DbOper):
|
||||
)
|
||||
return list(result.scalars().all())
|
||||
|
||||
return await self._execute_async_query(query)
|
||||
messages: list[Message] = await self._execute_async_query(query)
|
||||
return messages
|
||||
|
||||
@@ -75,7 +75,7 @@ uv run --locked --no-sync python scripts/architecture/complexity.py
|
||||
回调和返回值类型;全仓错误计数为零并不保证单独纳入 strict frontier 后也为零。
|
||||
|
||||
2026-10-16 开始逐文件清理类型债务,`app/domain/title.py` 通过局部可空类型声明保留
|
||||
既有搜索解析行为,并纳入严格清单;当前清单共 142 个文件(141 个生产文件和 1 个脚本)。
|
||||
既有搜索解析行为,并纳入严格清单;当前清单共 143 个文件(142 个生产文件和 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,664 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 |
|
||||
| Python 源码量 | 372,668 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 |
|
||||
| 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`;61 个超过 150 行,17 个超过 250 行;新增函数仍受 C901/嵌套深度门禁约束 |
|
||||
| 全量 mypy 历史债务 | 8,560 / 418 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 |
|
||||
| 全量 mypy 历史债务 | 8,551 / 417 文件 | 通知排版补齐 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/session.py,
|
||||
app/db/base.py,
|
||||
app/db/oper/agentchat.py,
|
||||
app/db/oper/message.py,
|
||||
app/db/oper/plugindata.py,
|
||||
app/db/oper/subscribe.py,
|
||||
app/db/oper/user.py,
|
||||
|
||||
@@ -984,11 +984,6 @@
|
||||
"no-untyped-def": 7,
|
||||
"type-arg": 1
|
||||
},
|
||||
"app/db/oper/message.py": {
|
||||
"attr-defined": 2,
|
||||
"no-untyped-def": 2,
|
||||
"type-arg": 5
|
||||
},
|
||||
"app/db/oper/site.py": {
|
||||
"arg-type": 1,
|
||||
"no-any-return": 3,
|
||||
|
||||
Reference in New Issue
Block a user