detectkit 0.47.0__tar.gz → 0.48.0__tar.gz

{detectkit-0.47.0/detectkit.egg-info → detectkit-0.48.0}/PKG-INFO

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

{detectkit-0.47.0 → detectkit-0.48.0}/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.47.0"
+__version__ = "0.48.0"
 
 from detectkit.core.interval import Interval
 from detectkit.core.models import ColumnDefinition, TableModel

{detectkit-0.47.0 → detectkit-0.48.0}/detectkit/cli/assets/claude/rules/cli.md

@@ -97,7 +97,14 @@ anomalies**) and the **y = 0** toggle — stay visible in every mode. The chart
 **zoomable** (scroll/drag + navigator strip) with a **"Points shown"** trim slider.
 Clicking **Apply** writes the chosen
 config back into the metric YAML **in place** (autotune, by contrast, writes a new
-`__tuned_<id>.yml` and never edits the original). Reads the metric's loaded
+`__tuned_<id>.yml` and never edits the original). Apply **merges** — it rewrites
+only the detector(s) you tuned and keeps every **other** detector unchanged, so a
+`manual_bounds` floor alongside a `mad` detector (and a `min_detectors: 2` alert)
+survives a retune. If a metric configures **more than one detector**, a **Tuning
+detector** picker in the Tune rail lets you choose which one to tune (the cockpit
+shows one band at a time); switching re-seeds every knob from that detector, and
+non-tunable detectors (`prophet`/`timesfm`) plus the ones you didn't touch are
+listed as "preserved on Apply". Reads the metric's loaded
 datapoints (run `dtk run --steps load` first if empty); the selector must resolve
 to a single metric.
 
@@ -155,8 +162,11 @@ relative to zero.
 
 Safe write-back: the config is validated before anything is written, the previous
 YAML is archived under `metrics/.history/<metric>/`, and only then is the metric
-overwritten. Takes **no pipeline lock** (it only edits a config file); re-run
-`dtk run` afterward to recompute detections under the new config.
+overwritten (the merge keeps your other detectors verbatim; the re-emitted header
+names what was updated vs preserved). The `.history/` archive is **not** discovered
+as a live metric, so a tuned metric never collides with its own snapshots as a
+"duplicate metric name". Takes **no pipeline lock** (it only edits a config file);
+re-run `dtk run` afterward to recompute detections under the new config.
 `--no-serve` writes a static read-only preview HTML instead (no write-back —
 **Save incidents** downloads the labels file); `--from` / `--to` bound the window;
 `--no-open` prints the URL without opening a browser.

{detectkit-0.47.0 → detectkit-0.48.0}/detectkit/cli/assets/claude/skills/dtk-tune/SKILL.md

@@ -146,9 +146,17 @@ false-alert rate exceeds it (tuning-only; labeling stays optional).
 When the user is happy, they click **Apply to metric**. detectkit then, in order:
 **validates** the config (a bad/untunable config is rejected and **nothing is
 written**), **archives** the current YAML verbatim under
-`metrics/.history/<metric>/`, and **re-emits** the metric in place with the tuned
-detector (and updates the first alerting block's `consecutive_anomalies` if it has
-one). Applying ends the session; saving incidents does not.
+`metrics/.history/<metric>/`, and **re-emits** the metric in place, **merging** the
+tuned detector(s) back in (and updating the first alerting block's
+`consecutive_anomalies` if it has one). Applying ends the session; saving incidents
+does not. **Merge, not replace:** only the detector(s) the user tuned are
+rewritten; every other detector is kept **verbatim** — so a metric with a
+`manual_bounds` floor alongside a `mad` detector (and a `min_detectors: 2` alert)
+keeps both. When a metric has more than one detector, the Tune rail shows a
+**Tuning detector** picker to choose which one to tune. If the user asks to tune a
+metric that has several detectors, reassure them the others are preserved. (The
+`.history/` archive is not discovered as a live metric, so it never causes a
+"duplicate metric name" error.)
 
 ## Step 5 — Recompute under the new config
 

{detectkit-0.47.0 → detectkit-0.48.0}/detectkit/cli/commands/run.py

@@ -12,7 +12,11 @@ import click
 from detectkit.config.metric_config import MetricConfig
 from detectkit.config.profile import ProfilesConfig
 from detectkit.config.project_config import ProjectConfig
-from detectkit.config.validator import validate_metric_uniqueness
+from detectkit.config.validator import (
+    discover_metric_files,
+    is_discoverable_metric_file,
+    validate_metric_uniqueness,
+)
 from detectkit.database.internal_tables import InternalTablesManager
 from detectkit.orchestration.error_dispatch import dispatch_project_error_alert
 from detectkit.orchestration.task_manager import PipelineStep, TaskManager
@@ -433,17 +437,16 @@ def select_metrics(selector: str, project_root: Path) -> list[tuple[Path, Metric
         if selector == "*":
             # "all metrics" — search recursively so nested metrics are included
             # (mirrors validate_project_metrics); a plain glob of "metrics/*"
-            # would only see the top level.
-            metric_paths = [p for sub in ("**/*.yml", "**/*.yaml") for p in metrics_dir.glob(sub)]
+            # would only see the top level. Excludes the metrics/.history/ archive.
+            metric_paths = discover_metric_files(metrics_dir)
         else:
             pattern = selector if selector.startswith("metrics/") else f"metrics/{selector}"
             # Keep only metric files: a bare glob also matches the `.gitkeep`
-            # stub created by `dtk init`, any other non-YAML files, and
-            # directories — all of which would crash the YAML parser.
+            # stub created by `dtk init`, any other non-YAML files, directories, and
+            # the metrics/.history/ archive dtk tune writes (whose snapshots keep the
+            # original name:) — all of which would crash the parser or collide on name.
             metric_paths = [
-                p
-                for p in project_root.glob(pattern)
-                if p.is_file() and p.suffix in (".yml", ".yaml")
+                p for p in project_root.glob(pattern) if is_discoverable_metric_file(p, metrics_dir)
             ]
     # Metric name selector
     else:
@@ -485,26 +488,25 @@ def find_metrics_by_tag(metrics_dir: Path, tag: str) -> list[Path]:
 
     matching_metrics = []
 
-    # Search both .yml and .yaml extensions (consistent with find_metric_by_name)
-    for pattern in ["**/*.yml", "**/*.yaml"]:
-        for metric_file in metrics_dir.glob(pattern):
-            try:
-                with open(metric_file) as f:
-                    config = yaml.safe_load(f)
-
-                if config and "tags" in config:
-                    if tag in config["tags"]:
-                        matching_metrics.append(metric_file)
-            except Exception as e:
-                # Warn about unparseable files but continue searching
-                click.echo(
-                    click.style(
-                        f"Warning: Skipping {metric_file.relative_to(metrics_dir.parent)}: {e}",
-                        fg="yellow",
-                    ),
-                    err=True,
-                )
-                continue
+    # Live metric files only (excludes the metrics/.history/ archive).
+    for metric_file in discover_metric_files(metrics_dir):
+        try:
+            with open(metric_file) as f:
+                config = yaml.safe_load(f)
+
+            if config and "tags" in config:
+                if tag in config["tags"]:
+                    matching_metrics.append(metric_file)
+        except Exception as e:
+            # Warn about unparseable files but continue searching
+            click.echo(
+                click.style(
+                    f"Warning: Skipping {metric_file.relative_to(metrics_dir.parent)}: {e}",
+                    fg="yellow",
+                ),
+                err=True,
+            )
+            continue
 
     return matching_metrics
 
@@ -522,25 +524,24 @@ def find_metric_by_name(metrics_dir: Path, name: str) -> Path | None:
     """
     import yaml
 
-    # Search both .yml and .yaml extensions
-    for pattern in ["**/*.yml", "**/*.yaml"]:
-        for metric_file in metrics_dir.glob(pattern):
-            try:
-                with open(metric_file) as f:
-                    config = yaml.safe_load(f)
-
-                if config and config.get("name") == name:
-                    return metric_file
-            except Exception as e:
-                # Warn about unparseable files but continue searching
-                click.echo(
-                    click.style(
-                        f"Warning: Skipping {metric_file.relative_to(metrics_dir.parent)}: {e}",
-                        fg="yellow",
-                    ),
-                    err=True,
-                )
-                continue
+    # Live metric files only (excludes the metrics/.history/ archive).
+    for metric_file in discover_metric_files(metrics_dir):
+        try:
+            with open(metric_file) as f:
+                config = yaml.safe_load(f)
+
+            if config and config.get("name") == name:
+                return metric_file
+        except Exception as e:
+            # Warn about unparseable files but continue searching
+            click.echo(
+                click.style(
+                    f"Warning: Skipping {metric_file.relative_to(metrics_dir.parent)}: {e}",
+                    fg="yellow",
+                ),
+                err=True,
+            )
+            continue
 
     return None
 

{detectkit-0.47.0 → detectkit-0.48.0}/detectkit/cli/commands/tune.py

@@ -153,6 +153,11 @@ def run_tune(
         return False
 
     click.echo(f"  Archived previous config: {applied.archived.relative_to(project_root)}")
-    echo_done(f"{name}: applied tuned detector → {applied.saved.relative_to(project_root)}")
+    updated = ", ".join(applied.updated) or "detector"
+    echo_done(
+        f"{name}: applied tuned detector(s) [{updated}] → {applied.saved.relative_to(project_root)}"
+    )
+    if applied.preserved:
+        click.echo(f"  Preserved the metric's other detector(s): {', '.join(applied.preserved)}")
     click.echo(f"  Re-run `dtk run --select {name}` to recompute detections under the new config.")
     return True

{detectkit-0.47.0 → detectkit-0.48.0}/detectkit/config/validator.py

@@ -10,6 +10,44 @@ from pathlib import Path
 from detectkit.config.metric_config import MetricConfig
 
 
+def is_discoverable_metric_file(path: Path, metrics_dir: Path) -> bool:
+    """True for a *live* metric YAML — excludes the ``metrics/.history/`` archive.
+
+    ``dtk tune`` archives the previous metric config under
+    ``metrics/.history/<metric>/`` before writing the tuned version in place. Those
+    snapshots keep the original ``name:``, so discovering them as live metrics would
+    (a) flag every tuned metric as a duplicate-name conflict and (b) run stale
+    configs. Python's ``pathlib`` glob traverses hidden directories (unlike shell
+    globbing), so they must be filtered out explicitly. Any hidden path component
+    (a leading dot) *under* ``metrics/`` is skipped — this covers ``.history`` and
+    any editor/VCS scratch dir a user drops there, while a project rooted under a
+    dot-directory (checked only below ``metrics/``) is unaffected.
+    """
+    if not path.is_file() or path.suffix not in (".yml", ".yaml"):
+        return False
+    try:
+        parts = path.relative_to(metrics_dir).parts
+    except ValueError:
+        parts = path.parts
+    return not any(part.startswith(".") for part in parts)
+
+
+def discover_metric_files(metrics_dir: Path) -> list[Path]:
+    """All live metric YAMLs under ``metrics/`` (recursive), excluding the ``.history`` archive.
+
+    The single discovery seam shared by project validation and CLI metric selection,
+    so the ``.history`` exclusion can't drift between them. Returns a sorted list for
+    deterministic ordering.
+    """
+    files = [
+        p
+        for pattern in ("**/*.yml", "**/*.yaml")
+        for p in metrics_dir.glob(pattern)
+        if is_discoverable_metric_file(p, metrics_dir)
+    ]
+    return sorted(set(files))
+
+
 def validate_metric_uniqueness(metric_paths: list[Path]) -> list[tuple[Path, MetricConfig]]:
     """
     Load all metrics and validate that metric names are unique.
@@ -106,10 +144,8 @@ def validate_project_metrics(project_root: Path) -> list[tuple[Path, MetricConfi
             f"      your_metric.yml\n"
         )
 
-    # Find all metric files recursively
-    metric_paths = []
-    for pattern in ["**/*.yml", "**/*.yaml"]:
-        metric_paths.extend(metrics_dir.glob(pattern))
+    # Find all metric files recursively (excluding the metrics/.history/ archive).
+    metric_paths = discover_metric_files(metrics_dir)
 
     if not metric_paths:
         raise ValueError(