Pre-merge sanity per devops checklist (ruff format --check, mypy --strict). Type fixes: - ORM models: `Mapped[dict]` → `Mapped[dict[str, Any]]` (audit, scenario, run, report, ttp, detection.artifact_files_json). Equivalent on Pydantic DTOs (TtpBase.params_schema_json, ScenarioStepBase.params_override_json). - Rename `TtpRead.current_version` → `TtpRead.version` to mirror the ORM column (which itself was renamed in D-009 cleanup). - Flask blueprints: add `-> ResponseReturnValue` to every view, plus typed UUID params on `_validate_step_consistency`. - `templating/filters.py`: rewrite the conditional re2 import so mypy can narrow the union (`ModuleType | None`); the runtime branch on `_re2 is not None` removes the unused-ignore that was triggered by warn_unused_ignores. - `pyproject.toml`: add `flask_login.*` and `pythonjsonlogger.*` to the `[[tool.mypy.overrides]]` `ignore_missing_imports` list (both ship without typed marker). - Misc: drop stale `# type: ignore` comments (`app.py:36`, `rbac/decorators.py:35`) flagged by `warn_unused_ignores`. Keep `logging.JsonFormatter` ignore because the symbol exists at runtime but is not re-exported through the typed surface. Formatting: - `ruff format` applied (15 files normalized; line-length unchanged at 100). Verification on this commit: - `ruff check` → All checks passed. - `ruff format --check` → 68 files already formatted. - `mypy --strict src` → Success: no issues found in 54 source files. - `pytest tests/unit` → 49 passed.
45 lines
1.4 KiB
Python
45 lines
1.4 KiB
Python
"""Mission report (PDF / JSON / Markdown bundle)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import datetime
|
|
from typing import TYPE_CHECKING, Any
|
|
from uuid import UUID
|
|
|
|
from sqlalchemy import (
|
|
JSON,
|
|
DateTime,
|
|
ForeignKey,
|
|
Integer,
|
|
String,
|
|
)
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from mimic.db.base import Base, TimestampsMixin, UuidPkMixin
|
|
|
|
if TYPE_CHECKING:
|
|
from mimic.db.models.engagement import Engagement
|
|
|
|
|
|
class Report(UuidPkMixin, TimestampsMixin, Base):
|
|
__tablename__ = "report"
|
|
|
|
engagement_id: Mapped[UUID] = mapped_column(
|
|
ForeignKey("engagement.id", ondelete="CASCADE"),
|
|
nullable=False,
|
|
)
|
|
version: Mapped[int] = mapped_column(Integer, default=1, nullable=False)
|
|
|
|
content_json: Mapped[dict[str, Any]] = mapped_column(JSON, nullable=False, default=dict)
|
|
content_sha256: Mapped[str] = mapped_column(String(64), nullable=False)
|
|
# SHA-256 of canonical JSON. Identical hash referenced in PDF footer, JSON
|
|
# export and Markdown export (spec H19 / F9 / F14).
|
|
|
|
pdf_path: Mapped[str | None] = mapped_column(String(512))
|
|
md_path: Mapped[str | None] = mapped_column(String(512))
|
|
|
|
generated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
|
generated_by_id: Mapped[UUID | None] = mapped_column(ForeignKey("user.id", ondelete="SET NULL"))
|
|
|
|
engagement: Mapped[Engagement] = relationship()
|