truthound-dashboard 1.4.3__py3-none-any.whl → 1.5.0__py3-none-any.whl

truthound_dashboard/api/alerts.py

@@ -13,12 +13,12 @@ from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from ..core.unified_alerts import UnifiedAlertsService
-from ..db import get_session
-from ..schemas.base import DataResponse
+from ..db import get_db_session
 from ..schemas.unified_alerts import (
     AcknowledgeAlertRequest,
     AlertCorrelation,
     AlertCorrelationResponse,
+    AlertCountResponse,
     AlertSeverity,
     AlertSource,
     AlertStatus,
@@ -33,7 +33,7 @@ from ..schemas.unified_alerts import (
 router = APIRouter(prefix="/alerts", tags=["alerts"])
 
 
-def get_service(session: AsyncSession = Depends(get_session)) -> UnifiedAlertsService:
+def get_service(session: AsyncSession = Depends(get_db_session)) -> UnifiedAlertsService:
     """Get unified alerts service instance."""
     return UnifiedAlertsService(session)
 
@@ -43,7 +43,7 @@ def get_service(session: AsyncSession = Depends(get_session)) -> UnifiedAlertsSe
 # =============================================================================
 
 
-@router.get("", response_model=DataResponse[UnifiedAlertListResponse])
+@router.get("", response_model=UnifiedAlertListResponse)
 async def list_alerts(
     source: AlertSource | None = None,
     severity: AlertSeverity | None = None,
@@ -53,7 +53,7 @@ async def list_alerts(
     offset: int = Query(0, ge=0),
     limit: int = Query(50, ge=1, le=200),
     service: UnifiedAlertsService = Depends(get_service),
-):
+) -> UnifiedAlertListResponse:
     """List all unified alerts from all sources.
 
     Aggregates alerts from:
@@ -72,34 +72,31 @@ async def list_alerts(
         limit=limit,
     )
 
-    return DataResponse(
-        data=UnifiedAlertListResponse(
-            items=alerts,
-            total=total,
-            offset=offset,
-            limit=limit,
-        )
+    return UnifiedAlertListResponse(
+        items=alerts,
+        total=total,
+        offset=offset,
+        limit=limit,
     )
 
 
-@router.get("/summary", response_model=DataResponse[AlertSummary])
+@router.get("/summary", response_model=AlertSummary)
 async def get_alert_summary(
     time_range_hours: int = Query(24, ge=1, le=720, description="Time range for summary"),
     service: UnifiedAlertsService = Depends(get_service),
-):
+) -> AlertSummary:
     """Get alert summary statistics.
 
     Returns counts by severity, source, status, and trend data.
     """
-    summary = await service.get_alert_summary(time_range_hours=time_range_hours)
-    return DataResponse(data=summary)
+    return await service.get_alert_summary(time_range_hours=time_range_hours)
 
 
-@router.get("/count")
+@router.get("/count", response_model=AlertCountResponse)
 async def get_alert_count(
     status: AlertStatus | None = Query(None, description="Filter by status"),
     service: UnifiedAlertsService = Depends(get_service),
-):
+) -> AlertCountResponse:
     """Get quick alert count (for badges).
 
     Returns just the count of alerts matching the criteria.
@@ -110,25 +107,66 @@ async def get_alert_count(
         limit=1,  # We only need the count
     )
 
-    return DataResponse(
-        data={
-            "count": total,
-            "status_filter": status.value if status else "all",
-        }
+    return AlertCountResponse(
+        count=total,
+        status_filter=status.value if status else "all",
     )
 
 
-@router.get("/{alert_id}", response_model=DataResponse[UnifiedAlertResponse])
+@router.get("/{alert_id}", response_model=UnifiedAlertResponse)
 async def get_alert(
     alert_id: str,
     service: UnifiedAlertsService = Depends(get_service),
-):
+) -> UnifiedAlertResponse:
     """Get a specific alert by unified ID."""
     alert = await service.get_alert_by_id(alert_id)
     if not alert:
         raise HTTPException(status_code=404, detail="Alert not found")
 
-    return DataResponse(data=alert)
+    return alert
+
+
+# =============================================================================
+# Bulk Action Endpoints (must be before /{alert_id} routes to avoid path conflict)
+# =============================================================================
+
+
+@router.post("/bulk/acknowledge", response_model=BulkAlertActionResponse)
+async def bulk_acknowledge_alerts(
+    request: BulkAlertActionRequest,
+    service: UnifiedAlertsService = Depends(get_service),
+) -> BulkAlertActionResponse:
+    """Bulk acknowledge multiple alerts."""
+    success, failed, failed_ids = await service.bulk_acknowledge(
+        request.alert_ids,
+        request.actor,
+        request.message,
+    )
+
+    return BulkAlertActionResponse(
+        success_count=success,
+        failed_count=failed,
+        failed_ids=failed_ids,
+    )
+
+
+@router.post("/bulk/resolve", response_model=BulkAlertActionResponse)
+async def bulk_resolve_alerts(
+    request: BulkAlertActionRequest,
+    service: UnifiedAlertsService = Depends(get_service),
+) -> BulkAlertActionResponse:
+    """Bulk resolve multiple alerts."""
+    success, failed, failed_ids = await service.bulk_resolve(
+        request.alert_ids,
+        request.actor,
+        request.message,
+    )
+
+    return BulkAlertActionResponse(
+        success_count=success,
+        failed_count=failed,
+        failed_ids=failed_ids,
+    )
 
 
 # =============================================================================
@@ -136,12 +174,12 @@ async def get_alert(
 # =============================================================================
 
 
-@router.post("/{alert_id}/acknowledge", response_model=DataResponse[UnifiedAlertResponse])
+@router.post("/{alert_id}/acknowledge", response_model=UnifiedAlertResponse)
 async def acknowledge_alert(
     alert_id: str,
     request: AcknowledgeAlertRequest,
     service: UnifiedAlertsService = Depends(get_service),
-):
+) -> UnifiedAlertResponse:
     """Acknowledge an alert.
 
     Note: Not all alert types support acknowledgement.
@@ -154,15 +192,15 @@ async def acknowledge_alert(
             detail="Alert not found or not eligible for acknowledgement",
         )
 
-    return DataResponse(data=alert)
+    return alert
 
 
-@router.post("/{alert_id}/resolve", response_model=DataResponse[UnifiedAlertResponse])
+@router.post("/{alert_id}/resolve", response_model=UnifiedAlertResponse)
 async def resolve_alert(
     alert_id: str,
     request: ResolveAlertRequest,
     service: UnifiedAlertsService = Depends(get_service),
-):
+) -> UnifiedAlertResponse:
     """Resolve an alert.
 
     Note: Not all alert types support resolution.
@@ -175,54 +213,7 @@ async def resolve_alert(
             detail="Alert not found or not eligible for resolution",
         )
 
-    return DataResponse(data=alert)
-
-
-# =============================================================================
-# Bulk Action Endpoints
-# =============================================================================
-
-
-@router.post("/bulk/acknowledge", response_model=DataResponse[BulkAlertActionResponse])
-async def bulk_acknowledge_alerts(
-    request: BulkAlertActionRequest,
-    service: UnifiedAlertsService = Depends(get_service),
-):
-    """Bulk acknowledge multiple alerts."""
-    success, failed, failed_ids = await service.bulk_acknowledge(
-        request.alert_ids,
-        request.actor,
-        request.message,
-    )
-
-    return DataResponse(
-        data=BulkAlertActionResponse(
-            success_count=success,
-            failed_count=failed,
-            failed_ids=failed_ids,
-        )
-    )
-
-
-@router.post("/bulk/resolve", response_model=DataResponse[BulkAlertActionResponse])
-async def bulk_resolve_alerts(
-    request: BulkAlertActionRequest,
-    service: UnifiedAlertsService = Depends(get_service),
-):
-    """Bulk resolve multiple alerts."""
-    success, failed, failed_ids = await service.bulk_resolve(
-        request.alert_ids,
-        request.actor,
-        request.message,
-    )
-
-    return DataResponse(
-        data=BulkAlertActionResponse(
-            success_count=success,
-            failed_count=failed,
-            failed_ids=failed_ids,
-        )
-    )
+    return alert
 
 
 # =============================================================================
@@ -230,12 +221,12 @@ async def bulk_resolve_alerts(
 # =============================================================================
 
 
-@router.get("/{alert_id}/correlations", response_model=DataResponse[AlertCorrelationResponse])
+@router.get("/{alert_id}/correlations", response_model=AlertCorrelationResponse)
 async def get_alert_correlations(
     alert_id: str,
     time_window_hours: int = Query(1, ge=1, le=24, description="Correlation time window"),
     service: UnifiedAlertsService = Depends(get_service),
-):
+) -> AlertCorrelationResponse:
     """Get correlated alerts for a given alert.
 
     Finds alerts that are related by:
@@ -250,9 +241,7 @@ async def get_alert_correlations(
 
     total_correlated = sum(len(c.related_alerts) for c in correlations)
 
-    return DataResponse(
-        data=AlertCorrelationResponse(
-            correlations=correlations,
-            total_correlated=total_correlated,
-        )
+    return AlertCorrelationResponse(
+        correlations=correlations,
+        total_correlated=total_correlated,
     )

truthound_dashboard/api/anomaly.py

@@ -115,7 +115,7 @@ async def run_anomaly_detection(
 
 
 @router.get(
-    "/anomaly/{detection_id}",
+    "/anomaly/detection/{detection_id}",
     response_model=AnomalyDetectionResponse,
     summary="Get detection result",
     description="Get a specific anomaly detection result by ID",
@@ -182,14 +182,14 @@ async def list_detections(
 
 @router.get(
     "/sources/{source_id}/anomaly/latest",
-    response_model=AnomalyDetectionResponse,
+    response_model=AnomalyDetectionResponse | None,
     summary="Get latest detection",
     description="Get the latest anomaly detection result for a source",
 )
 async def get_latest_detection(
     service: AnomalyDetectionServiceDep,
     source_id: Annotated[str, Path(description="Source ID")],
-) -> AnomalyDetectionResponse:
+) -> AnomalyDetectionResponse | None:
     """Get the latest detection for a source.
 
     Args:
@@ -197,17 +197,11 @@ async def get_latest_detection(
         source_id: Source ID.
 
     Returns:
-        Latest detection result.
-
-    Raises:
-        HTTPException: 404 if no detections found.
+        Latest detection result, or None if no detections found.
     """
     detection = await service.get_latest_detection(source_id)
     if detection is None:
-        raise HTTPException(
-            status_code=404,
-            detail="No detections found for this source",
-        )
+        return None
     return _detection_to_response(detection)
 
 
@@ -246,7 +240,7 @@ async def list_algorithms(
 
 
 @router.post(
-    "/anomaly/{detection_id}/explain",
+    "/anomaly/detection/{detection_id}/explain",
     response_model=ExplainabilityResponse,
     summary="Generate anomaly explanations",
     description="Generate SHAP/LIME explanations for specific anomaly rows",
@@ -314,7 +308,7 @@ async def explain_anomaly(
 
 
 @router.get(
-    "/anomaly/{detection_id}/explanations",
+    "/anomaly/detection/{detection_id}/explanations",
     response_model=CachedExplanationsListResponse,
     summary="Get cached explanations",
     description="Get cached SHAP/LIME explanations for a detection",

truthound_dashboard/api/cross_alerts.py

@@ -2,11 +2,17 @@
 
 This module provides REST API endpoints for cross-feature integration
 between Anomaly Detection and Drift Monitoring alerts.
+
+API Design: Direct Response Style
+- Single resources return the resource directly
+- List endpoints return PaginatedResponse with data, total, offset, limit
+- Errors are handled via HTTPException
+- Success is indicated by HTTP status codes (200, 201, 204)
 """
 
 from __future__ import annotations
 
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, HTTPException, Query
 
@@ -14,6 +20,7 @@ from truthound_dashboard.core.cross_alerts import CrossAlertService
 from truthound_dashboard.schemas.cross_alerts import (
     CrossAlertCorrelation,
     CrossAlertCorrelationListResponse,
+    CorrelationSearchResult,
     AutoTriggerConfig,
     AutoTriggerConfigCreate,
     AutoTriggerConfigUpdate,
@@ -70,7 +77,6 @@ async def get_correlations(
     )
 
     return CrossAlertCorrelationListResponse(
-        success=True,
         data=[CrossAlertCorrelation(**c) for c in correlations],
         total=total,
         offset=offset,
@@ -80,7 +86,7 @@ async def get_correlations(
 
 @router.get(
     "/cross-alerts/correlations/{source_id}",
-    response_model=dict,
+    response_model=CorrelationSearchResult,
     summary="Find correlations for source",
     description="Find correlated anomaly and drift alerts for a specific source.",
 )
@@ -89,7 +95,7 @@ async def find_correlations_for_source(
     service: CrossAlertServiceDep,
     time_window_hours: int = Query(24, ge=1, le=168, description="Time window in hours"),
     limit: int = Query(50, ge=1, le=100, description="Maximum items to return"),
-) -> dict:
+) -> CorrelationSearchResult:
     """Find correlations for a specific source.
 
     This actively searches for correlations between recent anomaly
@@ -102,7 +108,7 @@ async def find_correlations_for_source(
         limit: Maximum correlations to return.
 
     Returns:
-        Dictionary with correlations found.
+        Search result with found correlations.
     """
     correlations = await service.correlate_anomaly_drift(
         source_id=source_id,
@@ -110,11 +116,10 @@ async def find_correlations_for_source(
         limit=limit,
     )
 
-    return {
-        "success": True,
-        "data": correlations,
-        "total": len(correlations),
-    }
+    return CorrelationSearchResult(
+        correlations=[CrossAlertCorrelation(**c) for c in correlations],
+        total=len(correlations),
+    )
 
 
 # =============================================================================
@@ -124,14 +129,14 @@ async def find_correlations_for_source(
 
 @router.get(
     "/cross-alerts/config",
-    response_model=dict,
+    response_model=AutoTriggerConfig,
     summary="Get auto-trigger config",
     description="Get auto-trigger configuration (global or source-specific).",
 )
 async def get_config(
     service: CrossAlertServiceDep,
     source_id: str | None = Query(None, description="Source ID for source-specific config"),
-) -> dict:
+) -> AutoTriggerConfig:
     """Get auto-trigger configuration.
 
     Args:
@@ -139,18 +144,15 @@ async def get_config(
         source_id: Optional source ID for source-specific config.
 
     Returns:
-        Configuration dictionary.
+        Configuration object.
     """
-    config = service.get_config(source_id)
-    return {
-        "success": True,
-        "data": config,
-    }
+    config = await service.get_config(source_id)
+    return AutoTriggerConfig(**config)
 
 
 @router.post(
     "/cross-alerts/config",
-    response_model=dict,
+    response_model=AutoTriggerConfig,
     status_code=201,
     summary="Create/update auto-trigger config",
     description="Create or update auto-trigger configuration.",
@@ -158,7 +160,7 @@ async def get_config(
 async def update_config(
     request: AutoTriggerConfigCreate,
     service: CrossAlertServiceDep,
-) -> dict:
+) -> AutoTriggerConfig:
     """Create or update auto-trigger configuration.
 
     Args:
@@ -171,17 +173,14 @@ async def update_config(
     update_data = request.model_dump(exclude_unset=True)
     source_id = update_data.pop("source_id", None)
 
-    config = service.update_config(source_id, **update_data)
+    config = await service.update_config(source_id, **update_data)
 
-    return {
-        "success": True,
-        "data": config,
-    }
+    return AutoTriggerConfig(**config)
 
 
 @router.put(
     "/cross-alerts/config",
-    response_model=dict,
+    response_model=AutoTriggerConfig,
     summary="Update auto-trigger config",
     description="Update existing auto-trigger configuration.",
 )
@@ -189,7 +188,7 @@ async def patch_config(
     request: AutoTriggerConfigUpdate,
     service: CrossAlertServiceDep,
     source_id: str | None = Query(None, description="Source ID for source-specific config"),
-) -> dict:
+) -> AutoTriggerConfig:
     """Update auto-trigger configuration.
 
     Args:
@@ -201,12 +200,9 @@ async def patch_config(
         Updated configuration.
     """
     update_data = request.model_dump(exclude_unset=True)
-    config = service.update_config(source_id, **update_data)
+    config = await service.update_config(source_id, **update_data)
 
-    return {
-        "success": True,
-        "data": config,
-    }
+    return AutoTriggerConfig(**config)
 
 
 # =============================================================================
@@ -244,7 +240,6 @@ async def list_events(
     )
 
     return AutoTriggerEventListResponse(
-        success=True,
         data=[AutoTriggerEvent(**e) for e in events],
         total=total,
         offset=offset,
@@ -259,14 +254,14 @@ async def list_events(
 
 @router.post(
     "/cross-alerts/trigger/drift-on-anomaly/{detection_id}",
-    response_model=dict,
+    response_model=AutoTriggerEvent,
     summary="Trigger drift check on anomaly",
     description="Manually trigger a drift check based on an anomaly detection result.",
 )
 async def trigger_drift_on_anomaly(
     detection_id: str,
     service: CrossAlertServiceDep,
-) -> dict:
+) -> AutoTriggerEvent:
     """Manually trigger drift check after anomaly detection.
 
     Args:
@@ -284,22 +279,19 @@ async def trigger_drift_on_anomaly(
     if not event:
         raise HTTPException(status_code=404, detail="Detection not found")
 
-    return {
-        "success": True,
-        "data": event,
-    }
+    return AutoTriggerEvent(**event)
 
 
 @router.post(
     "/cross-alerts/trigger/anomaly-on-drift/{monitor_id}",
-    response_model=dict,
+    response_model=AutoTriggerEvent,
     summary="Trigger anomaly check on drift",
     description="Manually trigger an anomaly check based on drift detection.",
 )
 async def trigger_anomaly_on_drift(
     monitor_id: str,
     service: CrossAlertServiceDep,
-) -> dict:
+) -> AutoTriggerEvent:
     """Manually trigger anomaly check after drift detection.
 
     Args:
@@ -317,10 +309,7 @@ async def trigger_anomaly_on_drift(
     if not event:
         raise HTTPException(status_code=404, detail="Monitor not found")
 
-    return {
-        "success": True,
-        "data": event,
-    }
+    return AutoTriggerEvent(**event)
 
 
 # =============================================================================
@@ -330,23 +319,20 @@ async def trigger_anomaly_on_drift(
 
 @router.get(
     "/cross-alerts/summary",
-    response_model=dict,
+    response_model=CrossAlertSummary,
     summary="Get cross-alert summary",
     description="Get summary statistics for cross-alert correlations.",
 )
 async def get_summary(
     service: CrossAlertServiceDep,
-) -> dict:
+) -> CrossAlertSummary:
     """Get cross-alert summary statistics.
 
     Args:
         service: Injected cross-alert service.
 
     Returns:
-        Summary statistics dictionary.
+        Summary statistics.
     """
     summary = await service.get_summary()
-    return {
-        "success": True,
-        "data": summary,
-    }
+    return CrossAlertSummary(**summary)