nthlayer-workers 1.6.0__tar.gz → 2.0.0__tar.gz

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: nthlayer-workers
-Version: 1.6.0
+Version: 2.0.0
 Summary: NthLayer workers — Tier 2 background computation (observe, measure, correlate, respond, learn)
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: nthlayer-common<2.0.0,>=1.5.0
+Requires-Dist: nthlayer-common<3.0.0,>=2.1.2
 Requires-Dist: httpx>=0.27
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: structlog>=24.1.0
@@ -13,6 +13,8 @@ Requires-Dist: numpy>=1.24
 Requires-Dist: starlette>=0.40
 Requires-Dist: uvicorn>=0.30
 Requires-Dist: python-multipart>=0.0.18
+Requires-Dist: ruamel.yaml>=0.18
+Requires-Dist: textual>=1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.2; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.23; extra == "dev"

nthlayer_workers-2.0.0/pyproject.toml

@@ -0,0 +1,84 @@
+[build-system]
+requires = ["setuptools>=61"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "nthlayer-workers"
+version = "2.0.0"
+description = "NthLayer workers — Tier 2 background computation (observe, measure, correlate, respond, learn)"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    # >=2.1.2, NOT >=2.1.0 or 2.1.1. 2.1.0 introduced foreign_yaml_reason with an
+    # INERT body-recovery step: it tested spec.slos as a list, but v1 writes
+    # a mapping and v2 has no spec.slos at all, so a header-stripped manifest
+    # was dropped with parse_failures == 0 — the exact silent drop this
+    # package uses the gate to prevent. Fixed across 2.1.1 and 2.1.2;
+    # 2.1.1 still counted every Backstage catalog-info.yaml as a broken
+    # manifest, which 2.1.2 corrected.
+    #
+    # CI resolves nthlayer-common from a sibling checkout, so it would not
+    # notice a bad resolve. tests/observe/test_slo_spec_loader.py's
+    # TestSharedGateResolvesCorrectly exists for that: it uses the shapes the
+    # PARSERS produce and fails against 2.1.0.
+    "nthlayer-common>=2.1.2,<3.0.0",
+    "httpx>=0.27",
+    "pyyaml>=6.0",
+    "structlog>=24.1.0",
+    "scipy>=1.11",
+    "numpy>=1.24",
+    "starlette>=0.40",
+    "uvicorn>=0.30",
+    # Required by ApprovalServer's Slack interaction endpoint at
+    # `respond/server.py:197` — `await request.form()` hard-imports
+    # python-multipart via Starlette. Operators running with
+    # `slack_signing_secret` set need this at runtime, not just for
+    # tests; declared as a top-level production dep.
+    "python-multipart>=0.0.18",
+    "ruamel.yaml>=0.18",
+    "textual>=1.0",
+]
+
+[project.scripts]
+nthlayer-workers = "nthlayer_workers.cli:main"
+nthlayer-learn = "nthlayer_workers.learn.cli:main"
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.2",
+    "pytest-asyncio>=0.23",
+    "respx>=0.21",
+    "ruff>=0.8",
+]
+
+[tool.uv.sources]
+nthlayer-common = { path = "../nthlayer-common", editable = true }
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+testpaths = ["tests"]
+
+# Ruff configuration (opensrm-d96q floor). Explicit defaults so future
+# violations show up as new findings rather than blending in. Tightening
+# beyond E/F (isort/pyupgrade/simplify/bugbear) is tracked in
+# opensrm-d96q.1 .. d96q.4 — each rule family is its own bead because
+# the cumulative diff across all four is ~640 findings.
+[tool.ruff]
+target-version = "py311"
+line-length = 100
+
+[tool.ruff.lint]
+# Mirrors ruff's literal default select (E4/E7/E9 + F) plus I (isort,
+# opensrm-ncy0), UP (pyupgrade, opensrm-6nn1), SIM (simplify,
+# opensrm-y7dd), and B (bugbear, opensrm-po23). E501 / W are separate
+# hygiene calls (line-too-long has 393 hits today).
+select = ["E4", "E7", "E9", "F", "I", "UP", "SIM", "B"]
+
+[tool.ruff.lint.per-file-ignores]
+# Correlate test files defer some imports until after pytest.importorskip
+# / pytestmark blocks (the modules under test optional-import heavy deps).
+# Pin E402 here instead of scattering noqa: E402 across the call sites.
+"tests/correlate/test_*.py" = ["E402"]

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/__init__.py

@@ -3,3 +3,7 @@
 Internal modules: observe, measure, correlate, respond, learn.
 Communicates with nthlayer-core exclusively via HTTP API.
 """
+
+from importlib.metadata import version
+
+__version__ = version("nthlayer-workers")

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/cli.py

@@ -4,12 +4,13 @@ import argparse
 import asyncio
 import sys
 
+from nthlayer_workers import __version__
 from nthlayer_workers.runner import ModuleRunner
 
 
 def main():
     parser = argparse.ArgumentParser(description="NthLayer workers")
-    parser.add_argument("-V", "--version", action="version", version="%(prog)s 1.5.0")
+    parser.add_argument("-V", "--version", action="version", version=f"%(prog)s {__version__}")
     sub = parser.add_subparsers(dest="command")
 
     # -- serve: start all worker modules --
@@ -60,6 +61,7 @@ def main():
 
     if args.command == "serve":
         from nthlayer_common.api_client import CoreAPIClient
+
         from nthlayer_workers.observe.worker import (
             ObserveCollectModule,
             ObserveDriftModule,

nthlayer_workers-2.0.0/src/nthlayer_workers/cli_output.py

@@ -0,0 +1,26 @@
+"""Operator-facing CLI output shared across worker modules."""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+
+def warn_parse_failures(parse_failures: int, specs_dir: str | Path) -> None:
+    """Tell the operator when the SLOs that follow cover only part of a directory.
+
+    Surfaced on stderr rather than only logged: whoever reads SLO output is
+    the one who needs to know the view is partial, and a warning in a log
+    they are not tailing does not reach them (opensrm-3470).
+
+    Takes the count, not a ``LoadedSpecs`` — observe and measure each have
+    their own, carrying differently-shaped SLOs under differently-named
+    fields (``service_slos`` vs ``slos``). The only thing they share is this
+    number, so that is the whole parameter (opensrm-fxln).
+    """
+    if parse_failures:
+        print(
+            f"Warning: {parse_failures} manifest(s) in {specs_dir} "
+            f"failed to parse and were not evaluated",
+            file=sys.stderr,
+        )

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/cli.py

@@ -9,7 +9,7 @@ import signal
 import sys
 import tempfile
 from dataclasses import replace
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from typing import Any
 
 import structlog
@@ -30,7 +30,7 @@ from nthlayer_workers.correlate.types import AgentState, EventType, SitRepEvent
 
 logger = structlog.get_logger()
 
-REFERENCE_TIME = datetime(2026, 1, 1, tzinfo=timezone.utc)
+REFERENCE_TIME = datetime(2026, 1, 1, tzinfo=UTC)
 
 # Confidence decay window for temporal proximity heuristic (30 minutes)
 _PROXIMITY_WINDOW_SECONDS = 1800.0
@@ -245,10 +245,7 @@ def status_command(config_path: str | None, store_dir: str | None = None) -> int
     config = load_config(config_path) if config_path else SitRepConfig()
 
     # Use store_dir if provided (for testing), otherwise use config path
-    if store_dir:
-        db_path = os.path.join(store_dir, "sitrep-events.db")
-    else:
-        db_path = config.store_path
+    db_path = os.path.join(store_dir, "sitrep-events.db") if store_dir else config.store_path
 
     store = SQLiteEventStore(db_path)
     try:
@@ -332,7 +329,7 @@ async def _serve_loop(config: SitRepConfig) -> None:
             try:
                 await asyncio.wait_for(shutdown.wait(), timeout=interval)
                 break  # shutdown requested
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 pass  # normal cycle
 
             # Drain buffered events into store (single-threaded, safe)
@@ -481,7 +478,7 @@ def correlate_command(
         if trace_backend is not None:
             try:
                 baseline_td = _parse_duration(trace_baseline_window)
-                end = datetime.now(tz=timezone.utc)
+                end = datetime.now(tz=UTC)
                 start = end - timedelta(minutes=30)
                 trace_evidence = await trace_backend.get_trace_evidence(
                     services=sorted(affected),
@@ -540,7 +537,10 @@ def correlate_command(
     reasoning_mode = "heuristic"
 
     if reasoning:
-        from nthlayer_workers.correlate.reasoning import reason_about_correlations, reasoning_available
+        from nthlayer_workers.correlate.reasoning import (
+            reason_about_correlations,
+            reasoning_available,
+        )
 
         if reasoning_available():
             kwargs = {}
@@ -629,6 +629,7 @@ def correlate_command(
     # canonical primitive). correlation_snapshot is in ASSESSMENT_KINDS;
     # producing a "correlation"-typed verdict here was a category error.
     import uuid as _uuid
+
     from nthlayer_workers.observe.assessment import Assessment as _Assessment
     from nthlayer_workers.observe.sqlite_store import SQLiteAssessmentStore
 
@@ -656,7 +657,7 @@ def correlate_command(
     }
     corr_assessment = _Assessment(
         id=corr_assessment_id,
-        created_at=datetime.now(timezone.utc),
+        created_at=datetime.now(UTC),
         kind="correlation_snapshot",
         service=trigger_service,
         producer="nthlayer-correlate",

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/correlation/changes.py

@@ -1,7 +1,7 @@
 """Change candidate indexing. Deterministic transport."""
 from __future__ import annotations
 
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from nthlayer_workers.correlate.store.protocol import EventStore
 from nthlayer_workers.correlate.types import ChangeCandidate, TemporalGroup
@@ -11,7 +11,7 @@ def _parse_ts(ts: str) -> datetime:
     """Parse ISO 8601 timestamp. Always returns timezone-aware (UTC default)."""
     dt = datetime.fromisoformat(ts.replace("Z", "+00:00"))
     if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=timezone.utc)
+        dt = dt.replace(tzinfo=UTC)
     return dt
 
 

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/correlation/engine.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import uuid
 from dataclasses import replace
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 from nthlayer_workers.correlate.correlation.changes import find_change_candidates
 from nthlayer_workers.correlate.correlation.dedup import deduplicate
@@ -36,7 +36,7 @@ class CorrelationEngine:
         7. Assemble CorrelationGroups with priority scoring
         """
         # Step 1: Query store for events in window
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         start = (now - timedelta(minutes=window_minutes)).isoformat()
         end = now.isoformat()
 

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/correlation/temporal.py

@@ -1,7 +1,7 @@
 """Temporal grouping — windowed aggregation by service. Deterministic transport."""
 from __future__ import annotations
 
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from nthlayer_workers.correlate.types import SitRepEvent, TemporalGroup
 
@@ -10,7 +10,7 @@ def _parse_ts(ts: str) -> datetime:
     """Parse ISO 8601 timestamp. Always returns timezone-aware (UTC default)."""
     dt = datetime.fromisoformat(ts.replace("Z", "+00:00"))
     if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=timezone.utc)
+        dt = dt.replace(tzinfo=UTC)
     return dt
 
 

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/ingestion/protocol.py

@@ -1,10 +1,13 @@
 """Ingester protocol — the ingestion contract for SitRep."""
 from __future__ import annotations
-from typing import Awaitable, Callable, Protocol, Union
+
+from collections.abc import Awaitable, Callable
+from typing import Protocol
+
 from nthlayer_workers.correlate.types import SitRepEvent
 
 
 class Ingester(Protocol):
     async def start(self) -> None: ...
     async def stop(self) -> None: ...
-    def on_event(self, handler: Callable[[SitRepEvent], Union[Awaitable[None], None]]) -> None: ...
+    def on_event(self, handler: Callable[[SitRepEvent], Awaitable[None] | None]) -> None: ...

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/ingestion/severity.py

@@ -1,5 +1,6 @@
 """Severity pre-scoring from SLO targets. Pure arithmetic, no judgment."""
 from __future__ import annotations
+
 from nthlayer_workers.correlate.types import SitRepEvent
 
 

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/ingestion/webhook.py

@@ -2,11 +2,12 @@
 from __future__ import annotations
 
 import asyncio
+import contextlib
 import json
 import uuid
+from collections.abc import Awaitable, Callable
 from dataclasses import replace
-from datetime import datetime, timezone
-from typing import Callable, Awaitable
+from datetime import UTC, datetime
 
 from nthlayer_workers.correlate.ingestion import severity as _severity
 from nthlayer_workers.correlate.types import EventType, SitRepEvent
@@ -65,12 +66,12 @@ class WebhookIngester:
         raw_type = data["type"]
         try:
             event_type = EventType(raw_type)
-        except ValueError:
-            raise ValueError(f"Unknown event type: {raw_type!r}")
+        except ValueError as exc:
+            raise ValueError(f"Unknown event type: {raw_type!r}") from exc
 
         # Auto-generate id and timestamp when absent
         event_id = data.get("id") or str(uuid.uuid4())
-        timestamp = data.get("timestamp") or datetime.now(timezone.utc).isoformat()
+        timestamp = data.get("timestamp") or datetime.now(UTC).isoformat()
 
         event = SitRepEvent(
             id=event_id,
@@ -101,12 +102,10 @@ class WebhookIngester:
             await asyncio.wait_for(
                 self._handle_request(reader, writer), timeout=_CONNECTION_TIMEOUT
             )
-        except asyncio.TimeoutError:
+        except TimeoutError:
             writer.close()
-            try:
+            with contextlib.suppress(Exception):
                 await writer.wait_closed()
-            except Exception:
-                pass
 
     async def _handle_request(
         self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter
@@ -191,7 +190,5 @@ class WebhookIngester:
 
         finally:
             writer.close()
-            try:
+            with contextlib.suppress(Exception):
                 await writer.wait_closed()
-            except Exception:
-                pass

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/prometheus.py

@@ -2,7 +2,8 @@
 from __future__ import annotations
 
 import uuid
-from datetime import datetime, timezone
+from datetime import UTC, datetime
+
 import httpx
 import structlog
 
@@ -31,7 +32,7 @@ async def fetch_alerts(
                 continue
             events.append(SitRepEvent(
                 id=f"prom-alert-{uuid.uuid4().hex[:8]}",
-                timestamp=alert.get("activeAt", datetime.now(timezone.utc).isoformat()),
+                timestamp=alert.get("activeAt", datetime.now(UTC).isoformat()),
                 source="prometheus",
                 type=EventType.ALERT,
                 service=service,
@@ -56,7 +57,7 @@ async def fetch_metric_breaches(
 ) -> list[SitRepEvent]:
     """Query Prometheus for SLO metric breaches on given services."""
     events: list[SitRepEvent] = []
-    now = datetime.now(timezone.utc)
+    now = datetime.now(UTC)
 
     for service in services:
         # Check error budget
@@ -152,9 +153,10 @@ def load_dependency_graph(specs_dir: str) -> dict[str, dict]:
 
     Returns dict mapping service name → {tier, dependencies, dependents}.
     """
-    import yaml
     from pathlib import Path
 
+    import yaml
+
     graph: dict[str, dict] = {}
     specs_path = Path(specs_dir)
     if not specs_path.is_dir():

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/session.py

@@ -13,7 +13,7 @@ are what make correlation novel vs. simple alert aggregation.
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from nthlayer_workers.correlate.types import SitRepEvent
 
@@ -39,8 +39,8 @@ class SessionWindow:
 
     domain: CorrelationDomain
     events: list[SitRepEvent] = field(default_factory=list)
-    opened_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
-    last_event_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
+    opened_at: datetime = field(default_factory=lambda: datetime.now(UTC))
+    last_event_at: datetime = field(default_factory=lambda: datetime.now(UTC))
     has_trigger: bool = False
 
     def _close_flags(
@@ -119,7 +119,7 @@ class SessionWindowManager:
             # Cap opened_at at now — a stale backlogged event should not
             # push opened_at into the past (which would trigger instant
             # max_duration closure on the next cycle).
-            now = datetime.now(timezone.utc)
+            now = datetime.now(UTC)
             self._windows[domain] = SessionWindow(
                 domain=domain,
                 events=[],
@@ -141,7 +141,7 @@ class SessionWindowManager:
     def close_ready(self, now: datetime | None = None) -> list[SessionWindow]:
         """Close and return all windows that meet their close conditions."""
         if now is None:
-            now = datetime.now(timezone.utc)
+            now = datetime.now(UTC)
 
         closed: list[SessionWindow] = []
         for domain in list(self._windows):
@@ -182,8 +182,8 @@ def _parse_event_ts(event: SitRepEvent) -> datetime:
     """Parse event timestamp to datetime. Always timezone-aware (UTC)."""
     ts = event.timestamp
     if isinstance(ts, datetime):
-        return ts if ts.tzinfo else ts.replace(tzinfo=timezone.utc)
+        return ts if ts.tzinfo else ts.replace(tzinfo=UTC)
     dt = datetime.fromisoformat(ts.replace("Z", "+00:00"))
     if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=timezone.utc)
+        dt = dt.replace(tzinfo=UTC)
     return dt

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/snapshot/generator.py

@@ -51,9 +51,12 @@ class SnapshotGenerator:
         content_hash = self._compute_hash(groups)
 
         # Check cache (skip in INCIDENT mode)
-        if not force_refresh and state != AgentState.INCIDENT:
-            if self._is_cache_valid(content_hash, state):
-                return self._cached_prompt or "", True
+        if (
+            not force_refresh
+            and state != AgentState.INCIDENT
+            and self._is_cache_valid(content_hash, state)
+        ):
+            return self._cached_prompt or "", True
 
         # Sort groups by priority (P0 first)
         sorted_groups = sorted(groups, key=lambda g: g.priority)

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/snapshot/model.py

@@ -13,12 +13,12 @@ from __future__ import annotations
 
 import json
 import uuid
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from pathlib import Path
 
 import structlog
-
 from nthlayer_common.prompts import load_prompt
+
 from nthlayer_workers.correlate.types import CorrelationGroup
 from nthlayer_workers.observe.assessment import Assessment
 
@@ -28,7 +28,7 @@ logger = structlog.get_logger()
 
 
 def _now() -> datetime:
-    return datetime.now(timezone.utc)
+    return datetime.now(UTC)
 
 
 def _new_id(service: str | None) -> str:
@@ -155,6 +155,7 @@ class ModelInterface:
     async def _call_model(self, prompt: str) -> str:
         """Call the LLM via the shared nthlayer-common wrapper."""
         import asyncio
+
         from nthlayer_common.llm import llm_call
 
         result = await asyncio.to_thread(

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/state.py

@@ -1,7 +1,7 @@
 """Agent state machine for SitRep."""
 from __future__ import annotations
 
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from nthlayer_workers.correlate.types import AgentState, CorrelationGroup
 
@@ -20,7 +20,7 @@ class StateMachine:
         model_healthy: bool = True,
     ) -> AgentState:
         """Evaluate state transition based on correlation output."""
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
 
         # Model failure → DEGRADED (from any state except INCIDENT)
         if not model_healthy and self.state != AgentState.INCIDENT:
@@ -65,7 +65,7 @@ class StateMachine:
         """Incident resolved → WATCHING."""
         self.state = AgentState.WATCHING
         self._alert_start = None
-        self._calm_since = datetime.now(timezone.utc)
+        self._calm_since = datetime.now(UTC)
 
     def get_interval(self) -> int:
         """Snapshot interval in seconds for current state."""

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/traces/tempo.py

@@ -11,7 +11,7 @@ import asyncio
 import os
 import time
 from dataclasses import dataclass, field
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 import httpx
 
@@ -631,7 +631,7 @@ class TempoTraceBackend:
     @staticmethod
     def _parse_tempo_timestamp(nanos: int) -> datetime:
         """Convert nanosecond unix timestamp to datetime."""
-        return datetime.fromtimestamp(nanos / 1_000_000_000, tz=timezone.utc)
+        return datetime.fromtimestamp(nanos / 1_000_000_000, tz=UTC)
 
     @staticmethod
     def _traceql_service_filter(services: list[str]) -> str:

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/types.py

@@ -2,11 +2,11 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 
-class EventType(str, Enum):
+class EventType(StrEnum):
     ALERT = "alert"
     METRIC_BREACH = "metric_breach"
     CHANGE = "change"
@@ -70,7 +70,7 @@ class CorrelationGroup:
     event_count: int
 
 
-class AgentState(str, Enum):
+class AgentState(StrEnum):
     WATCHING = "watching"
     ALERT = "alert"
     INCIDENT = "incident"

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/verdict_chain.py

@@ -38,11 +38,9 @@ Deferred:
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from datetime import datetime, timedelta
-from typing import Any
+from datetime import datetime
 
 import structlog
-
 from nthlayer_common.verdicts.models import Verdict
 from nthlayer_common.verdicts.store import VerdictFilter, VerdictStore
 

{nthlayer_workers-1.6.0 → nthlayer_workers-2.0.0}/src/nthlayer_workers/correlate/worker.py

@@ -10,11 +10,10 @@ from __future__ import annotations
 
 import uuid
 from dataclasses import dataclass
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from typing import Any
 
 import structlog
-
 from nthlayer_common.api_client import CoreAPIClient
 from nthlayer_common.cloudevents import wrap_assessment
 
@@ -147,7 +146,7 @@ class CorrelateSessionModule:
             # Orphaned window from crash recovery with no re-fetched events.
             # Skip rather than producing a phantom empty snapshot.
             return
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         reason = window.close_reason(now, self.gap_seconds, self.max_duration_seconds)
 
         # Verdict IDs of QUALITY_SCORE events that triggered this snapshot.
@@ -222,7 +221,7 @@ def verdict_to_event(verdict: dict) -> SitRepEvent:
     """Convert a core verdict dict to a SitRepEvent."""
     return SitRepEvent(
         id=verdict.get("id", "unknown"),
-        timestamp=verdict.get("created_at", datetime.now(timezone.utc).isoformat()),
+        timestamp=verdict.get("created_at", datetime.now(UTC).isoformat()),
         source=f"verdict:{verdict.get('type', 'unknown')}",
         type=EventType.QUALITY_SCORE if verdict.get("type") == "quality_breach" else EventType.VERDICT,
         service=verdict.get("service", "unknown"),
@@ -236,7 +235,7 @@ def assessment_to_event(assessment: dict) -> SitRepEvent:
     """Convert a core assessment dict to a SitRepEvent."""
     return SitRepEvent(
         id=assessment.get("id", "unknown"),
-        timestamp=assessment.get("created_at", datetime.now(timezone.utc).isoformat()),
+        timestamp=assessment.get("created_at", datetime.now(UTC).isoformat()),
         source=f"assessment:{assessment.get('kind', 'unknown')}",
         type=EventType.METRIC_BREACH if _is_breach(assessment) else EventType.ALERT,
         service=assessment.get("service", "unknown"),
@@ -350,7 +349,7 @@ class CorrelateTopologyModule:
         # Get trace evidence for all services
         service_names = list(declared_deps.keys())
         try:
-            end = datetime.now(timezone.utc)
+            end = datetime.now(UTC)
             start = end - timedelta(hours=1)
             evidence = await self.trace_backend.get_trace_evidence(
                 services=service_names,
@@ -380,7 +379,7 @@ class CorrelateTopologyModule:
             return
 
         # Emit one assessment per divergence (org-level)
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         assessment = {
             "id": f"tdr-topology-{uuid.uuid4().hex[:8]}",
             "created_at": now.isoformat(),
@@ -581,7 +580,7 @@ class CorrelateContractModule:
             if not divergences:
                 continue
 
-            now = datetime.now(timezone.utc)
+            now = datetime.now(UTC)
             assessment = {
                 "id": f"cdv-{service}-{uuid.uuid4().hex[:8]}",
                 "created_at": now.isoformat(),