394d5d9056
Enable ANN rules in ruff.toml (flake8-annotations) and resolve all 221 violations: ANN201/ANN202 — return types on 168 public/private functions: - All 28 FastAPI routers: endpoints annotated with dict/list/specific schema/ StreamingResponse/FileResponse/JSONResponse as appropriate - main.py: lifespan→AsyncGenerator[None,None], exception handlers→JSONResponse - database.py: get_db→Generator[Session,None,None], proxy methods→correct types - middleware/request_context.py: dispatch→Response with Callable call_next type ANN001/ANN002/ANN003 — 32 missing argument types: - seed_demo.py: all db parameters typed as Session - domain/unit_of_work.py: __aexit__ exc_type/exc_val/exc_tb typed with TracebackType - services: audit_service user_id→UUID|None, heatmap_service query/model/builder, notification_service test→Test, tempo_service test→Test/user→User, test_workflow_service test_id→UUID, campaign_crud **fields→object, test_crud **fields→object (4 sites) ANN401 — 16 Any usages resolved: - Domain entities (campaign/technique/threat_actor/test_entity): replaced Any with actual ORM types via TYPE_CHECKING guards to avoid circular imports - detection_rule_service: test_id/detection_rule_id/evaluator_id→UUID - score_cache: kept Any with # noqa: ANN401 (genuinely generic cache) - jira_service/tempo_service: kept Any with # noqa: ANN401 (lazy optional deps) - d3fend_import_service: _to_str(v: Any) kept with # noqa: ANN401 ANN204/ANN205/ANN206 — special/static/class methods: - database.py proxy __call__/__getattr__: *args: object/**kwargs: object - schemas/test.py model_validate: obj→object, **kwargs→object - sa_technique_repository._int_type→type All 439 unit tests pass. ruff check app/ → All checks passed! Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
87 lines
2.7 KiB
Python
87 lines
2.7 KiB
Python
"""In-memory TTL cache for expensive scoring and metrics calculations.
|
|
|
|
The cache is a simple dict with timestamps. It is invalidated when tests
|
|
are validated, scores change, or an explicit ``invalidate`` call is made.
|
|
|
|
Thread-safe: each worker process has its own dict, and the TTL ensures
|
|
stale data does not persist longer than ``CACHE_TTL`` seconds.
|
|
"""
|
|
|
|
import time
|
|
from typing import Any, Optional
|
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
CACHE_TTL = 300 # 5 minutes
|
|
|
|
_cache: dict[str, dict[str, Any]] = {}
|
|
|
|
|
|
def get(key: str) -> Optional[Any]: # noqa: ANN401 # generic cache returns whatever was stored
|
|
"""Return cached value if present and not expired, else None."""
|
|
entry = _cache.get(key)
|
|
if entry is None:
|
|
return None
|
|
if time.time() - entry["ts"] > CACHE_TTL:
|
|
_cache.pop(key, None)
|
|
return None
|
|
return entry["data"]
|
|
|
|
|
|
def put(key: str, data: Any) -> None: # noqa: ANN401 # generic cache accepts any serialisable value
|
|
"""Store *data* under *key* with the current timestamp."""
|
|
_cache[key] = {"data": data, "ts": time.time()}
|
|
|
|
|
|
def invalidate(key: Optional[str] = None) -> None:
|
|
"""Remove one key or clear the whole cache."""
|
|
if key is None:
|
|
_cache.clear()
|
|
else:
|
|
_cache.pop(key, None)
|
|
|
|
|
|
# ── High-level helpers ────────────────────────────────────────────────
|
|
|
|
|
|
def get_organization_score_cached(db: Session) -> dict:
|
|
"""Cached wrapper around ``calculate_organization_score``."""
|
|
from app.services.scoring_service import calculate_organization_score
|
|
|
|
cached = get("org_score")
|
|
if cached is not None:
|
|
return cached
|
|
|
|
result = calculate_organization_score(db)
|
|
put("org_score", result)
|
|
return result
|
|
|
|
|
|
def get_operational_metrics_cached(db: Session) -> dict:
|
|
"""Cached wrapper around operational metrics (MTTD, MTTR, efficacy)."""
|
|
from app.services.operational_metrics_service import (
|
|
calculate_alert_fidelity,
|
|
calculate_coverage_velocity,
|
|
calculate_detection_efficacy,
|
|
calculate_mttd,
|
|
calculate_mttr,
|
|
calculate_rejection_rate,
|
|
calculate_validation_throughput,
|
|
)
|
|
|
|
cached = get("op_metrics")
|
|
if cached is not None:
|
|
return cached
|
|
|
|
result = {
|
|
"mttd": calculate_mttd(db),
|
|
"mttr": calculate_mttr(db),
|
|
"detection_efficacy": calculate_detection_efficacy(db),
|
|
"alert_fidelity": calculate_alert_fidelity(db),
|
|
"coverage_velocity": calculate_coverage_velocity(db),
|
|
"validation_throughput": calculate_validation_throughput(db),
|
|
"rejection_rate": calculate_rejection_rate(db),
|
|
}
|
|
put("op_metrics", result)
|
|
return result
|