detectkit 0.3.9__tar.gz → 0.3.11__tar.gz

{detectkit-0.3.9/detectkit.egg-info → detectkit-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: detectkit
-Version: 0.3.9
+Version: 0.3.11
 Summary: Metric monitoring with automatic anomaly detection
 Author: detectkit team
 License: MIT

{detectkit-0.3.9 → detectkit-0.3.11}/detectkit/__init__.py

@@ -4,7 +4,7 @@ detectk - Anomaly Detection for Time-Series Metrics
 A Python library for data analysts and engineers to monitor metrics with automatic anomaly detection.
 """
 
-__version__ = "0.3.9"
+__version__ = "0.3.10"
 
 from detectkit.core.interval import Interval
 from detectkit.core.models import ColumnDefinition, TableModel

{detectkit-0.3.9 → detectkit-0.3.11}/detectkit/alerting/orchestrator.py

@@ -519,15 +519,21 @@ class AlertOrchestrator:
                 )
                 detection_records.append(record)
 
-        # Count consecutive anomalies (same logic as should_alert)
-        consecutive = self._count_consecutive_anomalies(
-            detections=detection_records,
-            min_detectors=self.conditions.min_detectors,
-            direction=self.conditions.direction
-        )
+        # Group by timestamp and sort (same format as should_alert uses)
+        detections_by_time = self._group_by_timestamp(detection_records)
+        timestamps_sorted = sorted(detections_by_time.keys(), reverse=True)
+
+        # Check that latest post-alert point is NOT anomalous
+        # (prevents false recovery when there are fewer post-alert points
+        # than consecutive_anomalies threshold)
+        latest_ts = timestamps_sorted[0]
+        latest_detections = detections_by_time[latest_ts]
+        latest_anomalies = [d for d in latest_detections if d.is_anomaly]
+        if len(latest_anomalies) >= self.conditions.min_detectors:
+            # Latest point is still anomalous — no recovery
+            return False
 
-        # Recovery = consecutive dropped below threshold
-        return consecutive < self.conditions.consecutive_anomalies
+        return True
 
     def should_send_recovery(
         self,

{detectkit-0.3.9 → detectkit-0.3.11}/detectkit/database/clickhouse_manager.py

@@ -343,15 +343,48 @@ class ClickHouseDatabaseManager(BaseDatabaseManager):
         """
         from detectkit.database.tables import TABLE_TASKS
 
+        full_table = self.get_full_table_name(TABLE_TASKS, use_internal=True)
+
         # Get current UTC time (convert to naive UTC for numpy compatibility)
         now = datetime.now(timezone.utc).replace(tzinfo=None)
 
-        # First, delete existing record (if any)
+        # Read existing alert tracking fields before delete (preserve across upsert)
+        existing_last_alert_sent = None
+        existing_last_recovery_sent = None
+        existing_alert_count = 0
+
+        preserve_query = f"""
+        SELECT last_alert_sent, last_recovery_sent, alert_count
+        FROM {full_table}
+        WHERE metric_name = %(metric_name)s
+          AND detector_id = %(detector_id)s
+          AND process_type = %(process_type)s
+        ORDER BY updated_at DESC
+        LIMIT 1
+        """
+        try:
+            preserve_results = self.execute_query(
+                preserve_query,
+                params={
+                    "metric_name": metric_name,
+                    "detector_id": detector_id,
+                    "process_type": process_type,
+                }
+            )
+            if preserve_results:
+                existing_last_alert_sent = preserve_results[0].get("last_alert_sent")
+                existing_last_recovery_sent = preserve_results[0].get("last_recovery_sent")
+                existing_alert_count = preserve_results[0].get("alert_count", 0) or 0
+        except Exception:
+            pass  # If read fails, proceed with defaults
+
+        # Delete existing record (if any), sync to ensure old row is gone before insert
         delete_query = f"""
-        ALTER TABLE {self.get_full_table_name(TABLE_TASKS, use_internal=True)}
+        ALTER TABLE {full_table}
         DELETE WHERE metric_name = %(metric_name)s
           AND detector_id = %(detector_id)s
           AND process_type = %(process_type)s
+        SETTINGS mutations_sync = 1
         """
 
         self._client.execute(
@@ -371,7 +404,7 @@ class ClickHouseDatabaseManager(BaseDatabaseManager):
             else:
                 last_ts_naive = last_processed_timestamp
 
-        # Then insert new record
+        # Then insert new record (preserving alert tracking fields)
         insert_data = {
             "metric_name": np.array([metric_name]),
             "detector_id": np.array([detector_id]),
@@ -382,10 +415,13 @@ class ClickHouseDatabaseManager(BaseDatabaseManager):
             "last_processed_timestamp": np.array([last_ts_naive], dtype="datetime64[ms]") if last_ts_naive else np.array([None]),
             "error_message": np.array([error_message]),
             "timeout_seconds": np.array([timeout_seconds], dtype=np.int32),
+            "last_alert_sent": np.array([existing_last_alert_sent], dtype="datetime64[ms]") if existing_last_alert_sent else np.array([None]),
+            "alert_count": np.array([existing_alert_count], dtype=np.uint32),
+            "last_recovery_sent": np.array([existing_last_recovery_sent], dtype="datetime64[ms]") if existing_last_recovery_sent else np.array([None]),
         }
 
         self.insert_batch(
-            self.get_full_table_name(TABLE_TASKS, use_internal=True),
+            full_table,
             insert_data,
             conflict_strategy="ignore"
         )

{detectkit-0.3.9 → detectkit-0.3.11}/detectkit/database/internal_tables.py

@@ -954,6 +954,7 @@ class InternalTablesManager:
             WHERE metric_name = %(metric_name)s
               AND detector_id = 'pipeline'
               AND process_type = 'pipeline'
+            SETTINGS mutations_sync = 1
             """
         else:
             # Update without alert_count increment
@@ -965,6 +966,7 @@ class InternalTablesManager:
             WHERE metric_name = %(metric_name)s
               AND detector_id = 'pipeline'
               AND process_type = 'pipeline'
+            SETTINGS mutations_sync = 1
             """
 
         self._manager.execute_query(
@@ -975,7 +977,6 @@ class InternalTablesManager:
             }
         )
 
-        # ClickHouse ALTER TABLE UPDATE is async, return 1 (optimistic)
         return 1
 
     def get_last_recovery_timestamp(
@@ -1049,6 +1050,7 @@ class InternalTablesManager:
         WHERE metric_name = %(metric_name)s
           AND detector_id = 'pipeline'
           AND process_type = 'pipeline'
+        SETTINGS mutations_sync = 1
         """
 
         self._manager.execute_query(

{detectkit-0.3.9 → detectkit-0.3.11}/detectkit/orchestration/task_manager.py

@@ -189,20 +189,13 @@ class TaskManager:
                     result["anomalies_detected"] = detect_result["anomalies_count"]
                     result["steps_completed"].append(PipelineStep.DETECT)
 
-                # Step 3: Send alerts
+                # Step 3: Send alerts (also handles recovery notifications)
                 if PipelineStep.ALERT in steps:
-                    # Skip alert if no anomalies detected in current run
-                    if result.get("anomalies_detected", 0) == 0:
-                        click.echo()
-                        click.echo(click.style("  ┌─ ALERT", fg="cyan", bold=True))
-                        click.echo("  │   No anomalies detected in current run, skipping alerts")
-                        result["alerts_sent"] = 0
-                    else:
-                        click.echo()
-                        click.echo(click.style("  ┌─ ALERT", fg="cyan", bold=True))
-                        alert_result = self._run_alert_step(config)
-                        result["alerts_sent"] = alert_result["alerts_sent"]
-                        result["steps_completed"].append(PipelineStep.ALERT)
+                    click.echo()
+                    click.echo(click.style("  ┌─ ALERT", fg="cyan", bold=True))
+                    alert_result = self._run_alert_step(config)
+                    result["alerts_sent"] = alert_result["alerts_sent"]
+                    result["steps_completed"].append(PipelineStep.ALERT)
 
             finally:
                 # Always release lock
@@ -600,7 +593,7 @@ class TaskManager:
                 metric_name=config.name,
                 interval=interval,
                 conditions=AlertConditions(
-                    min_detectors=1,  # At least one detector must flag anomaly
+                    min_detectors=alerting_config.min_detectors,
                     direction=alerting_config.direction,
                     consecutive_anomalies=alerting_config.consecutive_anomalies,
                 ),

{detectkit-0.3.9 → detectkit-0.3.11/detectkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: detectkit
-Version: 0.3.9
+Version: 0.3.11
 Summary: Metric monitoring with automatic anomaly detection
 Author: detectkit team
 License: MIT

{detectkit-0.3.9 → detectkit-0.3.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "detectkit"
-version = "0.3.9"
+version = "0.3.11"
 description = "Metric monitoring with automatic anomaly detection"
 readme = "README.md"
 requires-python = ">=3.10"