refactor(Dockerfile): 使用requirements.txt替代硬编码依赖 将Dockerfile中的硬编码pip包列表替换为通过requirements.txt文件安装, 提高依赖管理的灵活性和可维护性。 feat(scheduling): 移除内置APScheduler,采用独立调度系统 移除app/core/background/scheduler.py中原来的APScheduler实现, 改为使用新的应用级调度系统app.application.scheduling。 refactor(task_queue): 调整任务队列模块结构和导入路径 将任务队列相关常量从app.core.background.task_queue.constants迁移至 app.tasks.constants,并更新所有相关导入路径和引用。 refactor(events): 将事件服务重构为独立的应用层组件 将事件分发逻辑从核心层迁移到应用层,使用app.application.events.EventDispatchService 替代原有的app.modules.events.services.EventService。 feat(ai_memory): 增强AI记忆自动写入的安全策略 新增ai_memory_blocked_content_terms配置项用于阻止敏感内容, 添加TTL过期机制控制自动写入条目的生命周期。 fix(security): 强化生产环境安全验证机制 增加model_validator确保生产环境中数据库连接、API密钥、CORS设置等 关键安全配置符合要求。 feat(risks): 优化风险事件操作动作的外键约束 为RiskEventAction模型的风险事件ID字段添加外键约束, 防止孤立记录并增强数据完整性。 refactor(audit): 优化审计服务方法命名和事务处理 将AuditService的log方法重命名为record以反映其阶段行为, 并调整事务提交时机以提高性能。 feat(events): 增强领域事件并发处理和响应模型 添加事件锁定机制防止重复处理,更新API响应模型以提供 更准确的数据类型定义。 ```
112 lines
3.4 KiB
Python
112 lines
3.4 KiB
Python
from typing import Any
|
|
|
|
from fastapi import HTTPException, status
|
|
from sqlalchemy import select
|
|
|
|
from app.core.http.pagination import bounded_limit
|
|
from app.core.utils.time import utc_now
|
|
from app.modules.business.models import (
|
|
ReportPushRun,
|
|
)
|
|
from app.modules.business.service import serialize_model
|
|
from app.modules.reports.constants import (
|
|
ReportErrorDetail,
|
|
ReportPushStatus,
|
|
)
|
|
|
|
from app.modules.reports.services.common import _json_safe, _next_code
|
|
|
|
|
|
class ReportPushRunMixin:
|
|
def create_push_run(
|
|
self,
|
|
report_type: str,
|
|
title: str | None,
|
|
receive_id: str | None,
|
|
receive_id_type: str,
|
|
actor: str,
|
|
status: str = ReportPushStatus.PENDING,
|
|
idempotency_key: str | None = None,
|
|
) -> ReportPushRun:
|
|
if idempotency_key:
|
|
existing = self.db.execute(
|
|
select(ReportPushRun).where(
|
|
ReportPushRun.idempotency_key == idempotency_key
|
|
)
|
|
).scalar_one_or_none()
|
|
if existing is not None:
|
|
return existing
|
|
record = ReportPushRun(
|
|
code=_next_code("PUSH"),
|
|
report_type=report_type,
|
|
title=title,
|
|
receive_id=receive_id,
|
|
receive_id_type=receive_id_type,
|
|
status=status,
|
|
actor=actor,
|
|
queued_at=utc_now(),
|
|
idempotency_key=idempotency_key,
|
|
)
|
|
self.db.add(record)
|
|
self.db.commit()
|
|
self.db.refresh(record)
|
|
return record
|
|
|
|
def update_push_run(
|
|
self,
|
|
code: str,
|
|
status: str,
|
|
task_id: str | None = None,
|
|
provider_response: dict[str, Any] | None = None,
|
|
error_message: str | None = None,
|
|
sent: bool = False,
|
|
commit: bool = True,
|
|
) -> ReportPushRun:
|
|
record = self._get_push_run(code)
|
|
record.status = status
|
|
if task_id is not None:
|
|
record.task_id = task_id
|
|
if provider_response is not None:
|
|
record.provider_response = _json_safe(provider_response)
|
|
record.error_message = error_message
|
|
if sent:
|
|
record.sent_at = utc_now()
|
|
if commit:
|
|
self.db.commit()
|
|
self.db.refresh(record)
|
|
else:
|
|
self.db.flush()
|
|
return record
|
|
|
|
def list_push_runs(
|
|
self,
|
|
status_filter: str | None = None,
|
|
limit: int = 100,
|
|
) -> list[dict[str, Any]]:
|
|
stmt = select(ReportPushRun).order_by(ReportPushRun.id.desc()).limit(
|
|
bounded_limit(limit)
|
|
)
|
|
if status_filter:
|
|
stmt = (
|
|
select(ReportPushRun)
|
|
.where(ReportPushRun.status == status_filter)
|
|
.order_by(ReportPushRun.id.desc())
|
|
.limit(bounded_limit(limit))
|
|
)
|
|
return [serialize_model(item) for item in self.db.execute(stmt).scalars()]
|
|
|
|
def get_push_run(self, code: str) -> dict[str, Any]:
|
|
return serialize_model(self._get_push_run(code))
|
|
|
|
def _get_push_run(self, code: str) -> ReportPushRun:
|
|
|
|
record = self.db.execute(
|
|
select(ReportPushRun).where(ReportPushRun.code == code)
|
|
).scalar_one_or_none()
|
|
if record is None:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_404_NOT_FOUND,
|
|
detail=ReportErrorDetail.PUSH_RUN_NOT_FOUND,
|
|
)
|
|
return record
|