unique-toolkit 2026.24.0.dev6__tar.gz → 2026.24.0.dev7__tar.gz

{unique_toolkit-2026.24.0.dev6 → unique_toolkit-2026.24.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-toolkit
-Version: 2026.24.0.dev6
+Version: 2026.24.0.dev7
 Summary: 
 Author: Cedric Klinkert, Martin Fadler, Sadique Sheik, Fabian Schläpfer, Pascal Hauri, Ejiroghene Oki-Peter, Rami Azouz, Ricardo Visini, Sanzio Monti
 Author-email: Cedric Klinkert <cedric.klinkert@unique.ch>, Martin Fadler <martin.fadler@unique.ch>, Sadique Sheik <sadique@unique.ch>, Fabian Schläpfer <fabian@unique.ch>, Pascal Hauri <pascal@unique.ch>, Ejiroghene Oki-Peter <oki-peter.ejiroghene@unique.ai>, Rami Azouz <rami.ext@unique.ch>, Ricardo Visini <ricardo.visini@unique.ch>, Sanzio Monti <sanzio.monti@unique.ai>

{unique_toolkit-2026.24.0.dev6 → unique_toolkit-2026.24.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_toolkit"
-version = "2026.24.0.dev6"
+version = "2026.24.0.dev7"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12"

unique_toolkit-2026.24.0.dev7/unique_toolkit/monitoring/gunicorn.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+import os
+
+
+def child_exit(server, worker) -> None:
+    """Gunicorn child_exit hook: clean up dead worker's per-PID metric files.
+
+    Wire this up in gunicorn.conf.py:
+
+        from unique_toolkit.monitoring.gunicorn import child_exit  # noqa: F401
+
+    Gunicorn calls any function named child_exit(server, worker) in the
+    config file whenever a worker process exits. Without this, dead workers'
+    .db files accumulate in PROMETHEUS_MULTIPROC_DIR and inflate aggregated
+    metric values on every future scrape.
+
+    No-ops when PROMETHEUS_MULTIPROC_DIR is not set (single-process mode).
+    """
+    if not os.environ.get("PROMETHEUS_MULTIPROC_DIR"):
+        return
+    from prometheus_client import multiprocess  # pyright: ignore[reportMissingImports]
+
+    multiprocess.mark_process_dead(worker.pid)

{unique_toolkit-2026.24.0.dev6 → unique_toolkit-2026.24.0.dev7}/unique_toolkit/monitoring/middleware.py

@@ -11,22 +11,23 @@ from prometheus_client import (  # pyright: ignore[reportMissingImports]
 from .registry import REGISTRY
 
 _http_requests_total = Counter(
-    "http_requests_total",
+    "python_http_requests_total",
     "Total HTTP requests",
     ["method", "path", "status_code"],
     registry=REGISTRY,
 )
 _http_request_duration_seconds = Histogram(
-    "http_request_duration_seconds",
+    "python_http_request_duration_seconds",
     "HTTP request duration",
     ["method", "path"],
     registry=REGISTRY,
 )
 _http_requests_in_progress = Gauge(
-    "http_requests_in_progress",
+    "python_http_requests_in_progress",
     "In-flight HTTP requests",
     ["method"],
     registry=REGISTRY,
+    multiprocess_mode="livesum",
 )
 
 _DEFAULT_EXCLUDED_PATHS = frozenset({"/health", "/metrics", "/"})

{unique_toolkit-2026.24.0.dev6 → unique_toolkit-2026.24.0.dev7}/unique_toolkit/monitoring/registry.py

@@ -2,9 +2,11 @@ from __future__ import annotations
 
 import asyncio
 import functools
+import os
 import time
+import warnings
 from contextlib import contextmanager
-from typing import Any, Callable
+from typing import Any, Callable, Literal
 
 from prometheus_client import (  # pyright: ignore[reportMissingImports]
     CollectorRegistry,
@@ -18,7 +20,36 @@ REGISTRY = CollectorRegistry()
 
 
 def get_metrics() -> bytes:
-    """Returns all registered metrics in Prometheus text format."""
+    """Returns all registered metrics in Prometheus text format.
+
+    In multiprocess mode (PROMETHEUS_MULTIPROC_DIR is set), aggregates
+    per-PID .db files from all Gunicorn workers via MultiProcessCollector.
+    In single-process mode, returns metrics from the in-process REGISTRY.
+
+    NOTE: PROMETHEUS_MULTIPROC_DIR must be set in the shell/entrypoint
+    *before* Python starts. Setting it from Python after prometheus_client
+    has been imported has no effect — metrics will silently bypass per-PID
+    files and this function will emit a warning.
+    """
+    if os.environ.get("PROMETHEUS_MULTIPROC_DIR"):
+        from prometheus_client import (  # pyright: ignore[reportMissingImports]
+            multiprocess,
+            values,
+        )
+
+        if not getattr(values.ValueClass, "_multiprocess", False):
+            warnings.warn(
+                "PROMETHEUS_MULTIPROC_DIR is set but prometheus_client was imported "
+                "before the env var — metrics will silently bypass per-PID files. "
+                "Set PROMETHEUS_MULTIPROC_DIR in the shell/entrypoint before launching Python.",
+                RuntimeWarning,
+                stacklevel=2,
+            )
+
+        registry = CollectorRegistry()
+        multiprocess.MultiProcessCollector(registry)
+        return generate_latest(registry)
+
     return generate_latest(REGISTRY)
 
 
@@ -43,8 +74,31 @@ class MetricNamespace:
     def counter(self, name: str, description: str, labels: list[str]) -> Counter:
         return Counter(f"{self._prefix}_{name}", description, labels, registry=REGISTRY)
 
-    def gauge(self, name: str, description: str, labels: list[str]) -> Gauge:
-        return Gauge(f"{self._prefix}_{name}", description, labels, registry=REGISTRY)
+    def gauge(
+        self,
+        name: str,
+        description: str,
+        labels: list[str],
+        multiprocess_mode: Literal[
+            "all",
+            "liveall",
+            "min",
+            "livemin",
+            "max",
+            "livemax",
+            "sum",
+            "livesum",
+            "mostrecent",
+            "livemostrecent",
+        ] = "all",
+    ) -> Gauge:
+        return Gauge(
+            f"{self._prefix}_{name}",
+            description,
+            labels,
+            registry=REGISTRY,
+            multiprocess_mode=multiprocess_mode,
+        )
 
 
 @contextmanager