threadmill 0.5.0__tar.gz → 0.6.0__tar.gz

{threadmill-0.5.0 → threadmill-0.6.0}/PKG-INFO

@@ -1,32 +1,30 @@
 Metadata-Version: 2.4
 Name: threadmill
-Version: 0.5.0
+Version: 0.6.0
 Summary: The most reliable backend for Django's task framework.
 Keywords: Django,tasks,worker
 Author-email: Johannes Maron <johannes@maron.family>
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
-Classifier: License :: OSI Approved :: BSD License
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 6.1
 Classifier: Intended Audience :: Developers
-Classifier: Operating System :: Microsoft :: Windows
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
-Classifier: Topic :: Communications :: Email
-Classifier: Topic :: Text Processing :: Markup :: Markdown
-Classifier: Topic :: Software Development
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.14
-Classifier: Framework :: Django
-Classifier: Framework :: Django :: 6.1
+Classifier: Topic :: Communications :: Email
+Classifier: Topic :: Software Development
+Classifier: Topic :: Text Processing :: Markup :: Markdown
 License-File: LICENSE
-Requires-Dist: django>=6.0
+Requires-Dist: django>=6.1
 Requires-Dist: textual>=8.2.7 ; extra == "inspector"
-Requires-Dist: redis>=5.0 ; extra == "redis"
+Requires-Dist: redis>=5 ; extra == "redis"
 Project-URL: Changelog, https://github.com/codingjoe/threadmill/releases
 Project-URL: Documentation, https://github.com/codingjoe/threadmill/
 Project-URL: Funding, https://github.com/sponsors/codingjoe

threadmill-0.6.0/pyproject.toml

@@ -0,0 +1,102 @@
+[build-system]
+build-backend = "flit_scm:buildapi"
+requires = [ "flit-core>=3.2", "flit-scm", "wheel" ]
+
+[project]
+name = "threadmill"
+readme = "README.md"
+keywords = [ "Django", "tasks", "worker" ]
+license = { file = "LICENSE" }
+authors = [
+  { name = "Johannes Maron", email = "johannes@maron.family" },
+]
+requires-python = ">=3.14"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Web Environment",
+  "Framework :: Django",
+  "Framework :: Django :: 6.1",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: BSD License",
+  "Operating System :: MacOS :: MacOS X",
+  "Operating System :: Microsoft :: Windows",
+  "Operating System :: POSIX",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.14",
+  "Topic :: Communications :: Email",
+  "Topic :: Software Development",
+  "Topic :: Text Processing :: Markup :: Markdown",
+]
+dynamic = [ "description", "version" ]
+dependencies = [ "django>=6.1" ]
+optional-dependencies.inspector = [
+  "textual>=8.2.7",
+]
+optional-dependencies.redis = [ "redis>=5" ]
+urls.Changelog = "https://github.com/codingjoe/threadmill/releases"
+urls.Documentation = "https://github.com/codingjoe/threadmill/"
+urls.Funding = "https://github.com/sponsors/codingjoe"
+# https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-labels
+urls.Homepage = "https://github.com/codingjoe/threadmill"
+urls.Issues = "https://github.com/codingjoe/threadmill/issues"
+urls.Releasenotes = "https://github.com/codingjoe/threadmill/releases/latest"
+urls.Source = "https://github.com/codingjoe/threadmill"
+
+[dependency-groups]
+dev = [
+  { include-group = "test" },
+]
+test = [
+  "pytest",
+  "pytest-asyncio",
+  "pytest-benchmark",
+  "pytest-cov",
+  "pytest-django",
+  "redis>=5",
+]
+
+[tool.setuptools_scm]
+write_to = "threadmill/_version.py"
+
+[tool.flit]
+module.name = "threadmill"
+
+[tool.ruff]
+src = [ "tests", "threadmill" ]
+lint.select = [
+  "B",  # flake8-bugbear
+  "C",  # flake8-comprehensions
+  "D",  # pydocstyle
+  "E",  # pycodestyle errors
+  "F",  # pyflakes
+  "I",  # isort
+  "S",  # flake8-bandit
+  "UP", # pyupgrade
+  "W",  # pycodestyle warnings
+]
+lint.ignore = [ "B904", "D1", "E501", "S101" ]
+lint.isort.combine-as-imports = true
+lint.isort.force-wrap-aliases = true
+lint.isort.known-first-party = [ "threadmill", "tests" ]
+lint.isort.section-order = [ "future", "standard-library", "third-party", "first-party", "local-folder" ]
+lint.isort.split-on-trailing-comma = true
+lint.pydocstyle.convention = "pep257"
+
+[tool.pytest]
+ini_options.minversion = "6.1"
+ini_options.testpaths = [ "tests" ]
+ini_options.addopts = """\
+  --cov --cov-report=xml --cov-report=term --tb=short -rxs --benchmark-autosave --benchmark-group-by=fullname \
+  --benchmark-min-rounds=10\
+  """
+ini_options.markers = [
+  "benchmark: mark benchmark tests.",
+]
+ini_options.asyncio_mode = "auto"
+ini_options.DJANGO_SETTINGS_MODULE = "tests.testapp.settings"
+
+[tool.coverage]
+run.source = [ "threadmill" ]
+report.show_missing = true
+report.skip_covered = true

{threadmill-0.5.0 → threadmill-0.6.0}/threadmill/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.5.0'
-__version_tuple__ = version_tuple = (0, 5, 0)
+__version__ = version = '0.6.0'
+__version_tuple__ = version_tuple = (0, 6, 0)
 
-__commit_id__ = commit_id = 'g190acbe27'
+__commit_id__ = commit_id = 'g2842de1d6'

{threadmill-0.5.0 → threadmill-0.6.0}/threadmill/backends/base.py

@@ -1,6 +1,7 @@
 import collections.abc
 import dataclasses
 import datetime
+import enum
 import json
 import threading
 import typing
@@ -95,6 +96,21 @@ class BackendTelemetry:
     queues: dict[str, QueueStats]
 
 
+class TelemetryDirection(enum.Enum):
+    """Direction of a telemetry event: a task entering or leaving a queue."""
+
+    INGRESS = "ingress"
+    EGRESS = "egress"
+
+
+@dataclasses.dataclass(frozen=True, slots=True)
+class TelemetryEvent:
+    """A single ingress/egress event published by a worker via pub/sub."""
+
+    direction: TelemetryDirection
+    queue_name: str
+
+
 class Broker(threading.Thread):
     """Backend maintenance thread launched by the task executor."""
 
@@ -242,14 +258,16 @@ class ThreadmillTaskBackend(BaseTaskBackend, ABC):
         """
         raise NotImplementedError
 
-    def telemetry(
+    async def queue_stats(
         self, *, interval: datetime.timedelta = datetime.timedelta(seconds=60)
     ) -> BackendTelemetry:
-        """Return a snapshot of stats for all configured queues.
+        """Return per-queue task counts for all configured queues."""
+        raise NotImplementedError
 
-        Args:
-            interval: The time window for rolling rates.
-        """
+    async def worker_telemetry(
+        self,
+    ) -> collections.abc.AsyncIterator[TelemetryEvent]:
+        """Yield ingress/egress telemetry events from the backend's pub/sub stream."""
         raise NotImplementedError
 
     def dequeue(self, task_result: TaskResult) -> None:

{threadmill-0.5.0 → threadmill-0.6.0}/threadmill/backends/lua/acknowledge.lua

@@ -3,7 +3,8 @@
 -- per-status results history set. Evicts results whose finish score falls
 -- outside the retention window (result_ttl). The per-status history sets are
 -- the time series the inspector counts over for telemetry, so no separate
--- egress window or status counters are needed here.
+-- egress window or status counters are needed here. A pub/sub event is
+-- published so the inspector can track live egress throughput.
 --
 -- KEYS[1]  -- running set (ZSET)
 -- KEYS[2]  -- result key (STRING, stores serialized TaskResult)
@@ -15,6 +16,8 @@
 -- ARGV[3]  -- result TTL in seconds
 -- ARGV[4]  -- finish timestamp in milliseconds (score for the history set)
 -- ARGV[5]  -- status (SUCCESSFUL or FAILED)
+-- ARGV[6]  -- telemetry pub/sub channel
+-- ARGV[7]  -- queue name
 -- Returns: 1 on success, 0 if task was not in the running set
 
 local removed = redis.call('ZREM', KEYS[1], ARGV[1])
@@ -31,4 +34,5 @@ if ARGV[5] ~= 'SUCCESSFUL' then
 end
 redis.call('ZADD', results_key, finish, ARGV[1])
 redis.call('ZREMRANGEBYSCORE', results_key, 0, cutoff)
+redis.call('PUBLISH', ARGV[6], 'egress:' .. ARGV[7])
 return 1

{threadmill-0.5.0 → threadmill-0.6.0}/threadmill/backends/redis.py

@@ -1,5 +1,6 @@
 """Redis-backed durable priority queue backend for Django's task framework."""
 
+import collections.abc
 import dataclasses
 import datetime
 import logging
@@ -10,6 +11,7 @@ from collections.abc import Generator, Sequence
 from pathlib import Path
 
 import redis
+import redis.asyncio
 from django.tasks import DEFAULT_TASK_QUEUE_NAME, TaskResult, TaskResultStatus
 from django.tasks.exceptions import TaskResultDoesNotExist
 from django.tasks.signals import task_enqueued
@@ -21,6 +23,8 @@ from threadmill.backends.base import (
     QueueCounts,
     QueueRates,
     QueueStats,
+    TelemetryDirection,
+    TelemetryEvent,
     ThreadmillTaskBackend,
 )
 
@@ -88,7 +92,6 @@ class RedisBroker(Broker):
 
     def main(self) -> None:
         """Run mover and running reaper passes for all queues."""
-        now_ms = time.time() * 1000
         for queue_name in self.backend.queues:
             try:
                 self._move_queue(queue_name)
@@ -100,11 +103,6 @@ class RedisBroker(Broker):
             except Exception:  # noqa: BLE001
                 logger.exception("Running reaper error for queue %r", queue_name)
 
-            try:
-                self.backend._trim_telemetry(queue_name, now_ms=now_ms)
-            except Exception:  # noqa: BLE001
-                logger.exception("Telemetry trim error for queue %r", queue_name)
-
 
 class RedisTaskBackend(ThreadmillTaskBackend):
     """Redis-backed durable priority queue backend.
@@ -126,7 +124,7 @@ class RedisTaskBackend(ThreadmillTaskBackend):
     SEGMENT_KEY = "{prefix}:{queue_name}:{status}"
     DEFERRED_KEY = "{prefix}:{queue_name}:deferred"
 
-    INGRESS_KEY = "{prefix}:{queue_name}:ingress:events"
+    TELEMETRY_CHANNEL = "{prefix}:telemetry"
 
     ACQUIRE_SCRIPT = _load_lua("acquire")
     """Pop the next task from a priority queue and move it directly to the running set."""
@@ -150,13 +148,23 @@ class RedisTaskBackend(ThreadmillTaskBackend):
                 f"REDIS_URL must be specified in your settings for the {type(self).__name__}."
             ) from e
         self.client = redis.from_url(redis_url)
+        self._async_client: redis.asyncio.Redis | None = None
+        self.redis_url = redis_url
         self.key_prefix = f"threadmill:{{{alias}}}"
+        self.telemetry_channel = self.TELEMETRY_CHANNEL.format(prefix=self.key_prefix)
         self.lease_ttl = self.options.get("lease_ttl", datetime.timedelta(hours=1))
         self.result_ttl = self.options.get("result_ttl", datetime.timedelta(days=1))
         self.batch_size = self.options.get("batch_size", 100)
         self._acquire_script = self.client.register_script(self.ACQUIRE_SCRIPT)
         self._acknowledge_script = self.client.register_script(self.ACKNOWLEDGE_SCRIPT)
 
+    @property
+    def async_client(self) -> redis.asyncio.Redis:
+        """Lazily-created async Redis client, reused across calls."""
+        if self._async_client is None:
+            self._async_client = redis.asyncio.Redis.from_url(self.redis_url)
+        return self._async_client
+
     def _compute_score(self, priority: int, enqueued_at: datetime.datetime) -> float:
         """Compute a ZSET score for priority-ordered FIFO queueing.
 
@@ -182,7 +190,7 @@ class RedisTaskBackend(ThreadmillTaskBackend):
         enqueued_at = timezone.now()
         task_result = TaskResult(
             task=task,
-            id=str(uuid.uuid4()),
+            id=str(uuid.uuid7()),
             status=TaskResultStatus.READY,
             enqueued_at=enqueued_at,
             started_at=None,
@@ -196,15 +204,11 @@ class RedisTaskBackend(ThreadmillTaskBackend):
         )
 
         score = self._compute_score(task.priority, enqueued_at)
-        enqueued_at_ms = enqueued_at.timestamp() * 1000
         serialized = self.serialize_task_result(task_result)
         task_key = self.TASK_KEY.format(prefix=self.key_prefix, task_id=task_result.id)
         task_data_ttl = int(
             self.lease_ttl.total_seconds() * 3 + self.result_ttl.total_seconds()
         )
-        ingress_key = self.INGRESS_KEY.format(
-            prefix=self.key_prefix, queue_name=task.queue_name
-        )
 
         pipe = self.client.pipeline()
         pipe.hset(
@@ -216,7 +220,7 @@ class RedisTaskBackend(ThreadmillTaskBackend):
             },
         )
         pipe.expire(task_key, task_data_ttl)
-        pipe.zadd(ingress_key, {task_result.id: enqueued_at_ms})
+        pipe.publish(self.telemetry_channel, f"ingress:{task.queue_name}")
 
         if task.run_after is not None:
             deferred_key = self.DEFERRED_KEY.format(
@@ -310,6 +314,8 @@ class RedisTaskBackend(ThreadmillTaskBackend):
                 str(int(self.result_ttl.total_seconds())),
                 str(finish_score),
                 task_result.status.name,
+                self.telemetry_channel,
+                task_result.task.queue_name,
             ],
         )
 
@@ -347,6 +353,7 @@ class RedisTaskBackend(ThreadmillTaskBackend):
         pipe.hset(task_key, mapping={"data": serialized, "score": str(score)})
         pipe.expire(task_key, task_data_ttl)
         pipe.zadd(deferred_key, {task_result.id: run_after_ms})
+        pipe.publish(self.telemetry_channel, f"ingress:{task_result.task.queue_name}")
         pipe.execute()
 
     def dequeue(self, task_result: TaskResult) -> None:
@@ -416,84 +423,61 @@ class RedisTaskBackend(ThreadmillTaskBackend):
             return self.deserialize_task_result(data)
         raise TaskResultDoesNotExist(f"Task result {result_id!r} does not exist.")
 
-    def _trim_telemetry(self, queue_name: str, *, now_ms: float) -> None:
-        cutoff = now_ms - self.result_ttl.total_seconds() * 1000
-        pipe = self.client.pipeline()
-        pipe.zremrangebyscore(
-            self.INGRESS_KEY.format(prefix=self.key_prefix, queue_name=queue_name),
-            0,
-            cutoff,
-        )
-        pipe.zremrangebyscore(
-            self._segment_key(TaskResultStatus.SUCCESSFUL, queue_name),
-            0,
-            cutoff,
-        )
-        pipe.zremrangebyscore(
-            self._segment_key(TaskResultStatus.FAILED, queue_name),
-            0,
-            cutoff,
-        )
-        pipe.execute()
-
-    def telemetry(
+    async def queue_stats(
         self, *, interval: datetime.timedelta = datetime.timedelta(seconds=60)
     ) -> BackendTelemetry:
-        now_ms = time.time() * 1000
-        window_start_ms = now_ms - interval.total_seconds() * 1000
-        exclusive_start = f"({window_start_ms}"
-        retention_start_ms = now_ms - self.result_ttl.total_seconds() * 1000
-        pipe = self.client.pipeline()
+        client = self.async_client
+        pipe = client.pipeline()
         for queue_name in self.queues:
             pipe.zcard(self._segment_key(TaskResultStatus.READY, queue_name))
             pipe.zcard(self._segment_key(TaskResultStatus.RUNNING, queue_name))
             pipe.zcard(
                 self.DEFERRED_KEY.format(prefix=self.key_prefix, queue_name=queue_name)
             )
-            successful_results_key = self._segment_key(
-                TaskResultStatus.SUCCESSFUL, queue_name
-            )
-            failed_results_key = self._segment_key(TaskResultStatus.FAILED, queue_name)
-            pipe.zcard(successful_results_key)
-            pipe.zcard(failed_results_key)
-            ingress_key = self.INGRESS_KEY.format(
-                prefix=self.key_prefix, queue_name=queue_name
-            )
-            pipe.zcount(ingress_key, exclusive_start, now_ms)
-            pipe.zcount(successful_results_key, exclusive_start, now_ms)
-            pipe.zcount(failed_results_key, exclusive_start, now_ms)
-            pipe.zremrangebyscore(ingress_key, 0, retention_start_ms)
-        results = pipe.execute()
+            pipe.zcard(self._segment_key(TaskResultStatus.SUCCESSFUL, queue_name))
+            pipe.zcard(self._segment_key(TaskResultStatus.FAILED, queue_name))
+        results = await pipe.execute()
+        zero_rates = QueueRates(interval=interval, ingress=0, egress=0)
         queues: dict[str, QueueStats] = {}
         for index, queue_name in enumerate(self.queues):
-            base = index * 9
-            (
-                ready,
-                running,
-                deferred,
-                successful,
-                failed,
-                ingress,
-                successful_rate,
-                failed_rate,
-                _,
-            ) = (int(c or 0) for c in results[base : base + 9])
+            base = index * 5
             queues[queue_name] = QueueStats(
                 counts=QueueCounts(
-                    ready=ready,
-                    running=running,
-                    deferred=deferred,
-                    successful=successful,
-                    failed=failed,
-                ),
-                rates=QueueRates(
-                    interval=interval,
-                    ingress=ingress,
-                    egress=successful_rate + failed_rate,
+                    ready=int(results[base] or 0),
+                    running=int(results[base + 1] or 0),
+                    deferred=int(results[base + 2] or 0),
+                    successful=int(results[base + 3] or 0),
+                    failed=int(results[base + 4] or 0),
                 ),
+                rates=zero_rates,
             )
         return BackendTelemetry(queues=queues)
 
+    async def worker_telemetry(
+        self,
+    ) -> collections.abc.AsyncGenerator[TelemetryEvent]:
+        client = self.async_client
+        pubsub = client.pubsub()
+        await pubsub.subscribe(self.telemetry_channel)
+        pubsub.ignore_subscribe_messages = True
+        try:
+            async for message in pubsub.listen():
+                if (data := message.get("data")) is not None:
+                    payload = data.decode() if isinstance(data, bytes) else data
+                    direction, _, queue_name = payload.partition(":")
+                    try:
+                        event = TelemetryEvent(
+                            direction=TelemetryDirection(direction),
+                            queue_name=queue_name,
+                        )
+                    except ValueError:
+                        continue
+                    yield event
+        finally:
+            await pubsub.unsubscribe(self.telemetry_channel)
+            await pubsub.aclose()
+
     def close(self) -> None:
-        """Close the Redis connection."""
+        """Close the Redis connections."""
         self.client.close()
+        self._async_client = None

{threadmill-0.5.0 → threadmill-0.6.0}/threadmill/inspector/app.py

@@ -1,8 +1,11 @@
 """Textual app for the inspector TUI."""
 
+import asyncio
+import dataclasses
 import datetime
 import logging
 import math
+import time
 import typing
 from typing import Any
 
@@ -13,6 +16,7 @@ from django.tasks import (
     TaskResultStatus,
     task_backends,
 )
+from textual import work
 from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.containers import Horizontal, Vertical
@@ -24,18 +28,27 @@ from textual.widgets import (
     ListItem,
     ListView,
     Select,
+    Sparkline,
     Static,
     TabbedContent,
     TabPane,
 )
 
-from ..backends.base import BackendTelemetry, ThreadmillTaskBackend
+from ..backends.base import (
+    BackendTelemetry,
+    TelemetryDirection,
+    ThreadmillTaskBackend,
+)
 from .screens import ConfirmScreen, PurgeScreen
+from .telemetry import TelemetryBuffer
 
 logger = logging.getLogger(__name__)
 
-TELEMETRY_INTERVAL_SECONDS = 2.0
-"""Seconds between automatic queue-stat refreshes; the task list stays manual."""
+TELEMETRY_INTERVAL = datetime.timedelta(seconds=2)
+"""Between automatic queue-stat refreshes; the task list stays manual."""
+
+SPARKLINE_INTERVAL = datetime.timedelta(seconds=1)
+"""Between sparkline refreshes from the rolling telemetry buffer."""
 
 TAB_STATUSES: list[tuple[str, TaskResultStatus | None]] = [
     ("Running", TaskResultStatus.RUNNING),
@@ -230,7 +243,7 @@ class TaskList(Vertical):
 
     def action_refresh(self) -> None:
         """Refresh telemetry and re-fetch the task list."""
-        self.app._refresh_telemetry()
+        self.app._poll_queue_stats()
         self.refresh_tasks()
 
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
@@ -275,15 +288,14 @@ class TaskList(Vertical):
             )
 
     def _do_requeue(self, confirmed: bool, task: TaskResult) -> None:
-        if not confirmed:
-            return
-        try:
-            self.backend.requeue(task, datetime.datetime.now(datetime.UTC))
-        except Exception:  # noqa: BLE001
-            logger.exception("Requeue failed for task %s", task.id)
-            self.app.notify("Requeue failed.", severity="error")
-            return
-        self.app._after_action("Task requeued.")
+        if confirmed:
+            try:
+                self.backend.requeue(task, datetime.datetime.now(datetime.UTC))
+            except Exception:  # noqa: BLE001
+                logger.exception("Requeue failed for task %s", task.id)
+                self.app.notify("Requeue failed.", severity="error")
+            else:
+                self.app._after_action("Task requeued.")
 
     def action_dequeue(self) -> None:
         """Remove the selected task from its current segment after confirmation."""
@@ -298,15 +310,14 @@ class TaskList(Vertical):
             )
 
     def _do_dequeue(self, confirmed: bool, task: TaskResult) -> None:
-        if not confirmed:
-            return
-        try:
-            self.backend.dequeue(task)
-        except Exception:  # noqa: BLE001
-            logger.exception("Delete failed for task %s", task.id)
-            self.app.notify("Delete failed.", severity="error")
-            return
-        self.app._after_action("Task deleted.")
+        if confirmed:
+            try:
+                self.backend.dequeue(task)
+            except Exception:  # noqa: BLE001
+                logger.exception("Delete failed for task %s", task.id)
+                self.app.notify("Delete failed.", severity="error")
+            else:
+                self.app._after_action("Task deleted.")
 
     def _refresh_data(self) -> None:
         """Fetch and display tasks for the current queue and active tab."""
@@ -413,24 +424,22 @@ class QueueList(ListView):
 
     def action_purge(self) -> None:
         item = self.highlighted_child
-        if not isinstance(item, QueueItem):
-            return
-        queue_name = item.queue_name
-        self.app.push_screen(
-            PurgeScreen(queue_name),
-            lambda confirmed: self._do_purge(confirmed, queue_name),
-        )
+        if isinstance(item, QueueItem):
+            queue_name = item.queue_name
+            self.app.push_screen(
+                PurgeScreen(queue_name),
+                lambda confirmed: self._do_purge(confirmed, queue_name),
+            )
 
     def _do_purge(self, confirmed: bool, queue_name: str) -> None:
-        if not confirmed:
-            return
-        try:
-            self.app.backend.purge(queue_name)
-        except Exception:  # noqa: BLE001
-            logger.exception("Purge failed for %r", queue_name)
-            self.app.notify("Purge failed.", severity="error")
-            return
-        self.app._after_action(f"Purged queue {queue_name}.")
+        if confirmed:
+            try:
+                self.app.backend.purge(queue_name)
+            except Exception:  # noqa: BLE001
+                logger.exception("Purge failed for %r", queue_name)
+                self.app.notify("Purge failed.", severity="error")
+            else:
+                self.app._after_action(f"Purged queue {queue_name}.")
 
 
 class InspectorApp(App):
@@ -459,8 +468,10 @@ class InspectorApp(App):
         self._task_list: TaskList | None = None
         self._task_detail: TaskDetail | None = None
         self._options_static: Static | None = None
+        self._sparkline_timer = None
         self._telemetry_timer = None
         self._auto_refresh = auto_refresh
+        self.telemetry_buffer = TelemetryBuffer()
         self.set_reactive(InspectorApp.backend, backend)
 
     def compose(self) -> ComposeResult:
@@ -481,6 +492,9 @@ class InspectorApp(App):
                         telemetry=InspectorApp.telemetry
                     )
                 with Vertical(id="right-pane"):
+                    with Horizontal(id="sparkline-row"):
+                        yield Sparkline(id="ingress-sparkline")
+                        yield Sparkline(id="egress-sparkline")
                     yield TaskList(id="task-list").data_bind(
                         backend=InspectorApp.backend,
                         telemetry=InspectorApp.telemetry,
@@ -496,13 +510,21 @@ class InspectorApp(App):
         self._task_detail = self.query_one("#task-detail", TaskDetail)
         self._options_static = self.query_one("#backend-options", Static)
         self._refresh_options()
-        self._refresh_telemetry()
+        self.query_one("#ingress-sparkline", Sparkline).border_title = "Ingress"
+        self.query_one("#egress-sparkline", Sparkline).border_title = "Egress"
+        self._poll_queue_stats()
+        self._listen_telemetry()
         if self._auto_refresh:
             self._telemetry_timer = self.set_interval(
-                TELEMETRY_INTERVAL_SECONDS,
-                self._refresh_telemetry,
+                TELEMETRY_INTERVAL.total_seconds(),
+                self._poll_queue_stats,
                 name="telemetry-refresh",
             )
+            self._sparkline_timer = self.set_interval(
+                SPARKLINE_INTERVAL.total_seconds(),
+                self._refresh_sparklines,
+                name="sparkline-refresh",
+            )
         self._queue_list.focus()
 
     def action_quit(self) -> None:
@@ -512,7 +534,7 @@ class InspectorApp(App):
     def _after_action(self, message: str) -> None:
         """Refresh telemetry and tasks after a mutating queue action."""
         self.notify(message)
-        self._refresh_telemetry()
+        self._poll_queue_stats()
         self._task_list.refresh_tasks()
 
     def action_switch_tab(self, tab_id: str) -> None:
@@ -521,7 +543,9 @@ class InspectorApp(App):
 
     def watch_backend(self) -> None:
         self._refresh_options()
-        self._refresh_telemetry()
+        self.telemetry_buffer = TelemetryBuffer()
+        self._poll_queue_stats()
+        self._listen_telemetry()
 
     def on_select_changed(self, event: Select.Changed) -> None:
         """Switch backend when the user selects a different alias."""
@@ -548,9 +572,53 @@ class InspectorApp(App):
         ]
         self._options_static.update(" ".join(parts) or "No options")
 
-    def _refresh_telemetry(self) -> None:
-        """Poll the backend for fresh telemetry."""
+    @work(exclusive=True, group="queue-stats")
+    async def _poll_queue_stats(self) -> None:
+        """Fetch queue counts and merge live pub/sub rates into the telemetry."""
         try:
-            self.telemetry = self.backend.telemetry()
+            telemetry = await self.backend.queue_stats()
         except Exception:  # noqa: BLE001
-            logger.exception("Failed to refresh telemetry")
+            logger.exception("Failed to refresh queue stats")
+        else:
+            for queue_name, stats in telemetry.queues.items():
+                live_rates = self.telemetry_buffer.rates_for(queue_name)
+                telemetry.queues[queue_name] = dataclasses.replace(
+                    stats, rates=live_rates
+                )
+            self.telemetry = telemetry
+
+    def _refresh_sparklines(self) -> None:
+        """Push the latest 60-second rolling series into the ingress/egress sparklines."""
+        queue_name = self._task_list.queue_name
+        ingress = self.query_one("#ingress-sparkline", Sparkline)
+        egress = self.query_one("#egress-sparkline", Sparkline)
+        now = time.monotonic()
+        ingress.data = (
+            self.telemetry_buffer.series(
+                queue_name, TelemetryDirection.INGRESS, now=now
+            )
+            if queue_name
+            else [0.0] * 60
+        )
+        egress.data = (
+            self.telemetry_buffer.series(queue_name, TelemetryDirection.EGRESS, now=now)
+            if queue_name
+            else [0.0] * 60
+        )
+
+    @work(exclusive=True, group="telemetry")
+    async def _listen_telemetry(self) -> None:
+        """Feed the telemetry buffer from the backend's pub/sub stream."""
+        try:
+            stream = self.backend.worker_telemetry()
+            if asyncio.iscoroutine(stream):
+                stream = await stream
+        except NotImplementedError:
+            pass
+        else:
+            if stream is not None:
+                try:
+                    async for event in stream:
+                        self.telemetry_buffer.record(event, now=time.monotonic())
+                except asyncio.CancelledError:
+                    raise

{threadmill-0.5.0 → threadmill-0.6.0}/threadmill/inspector/inspector.scss

@@ -42,6 +42,29 @@ Select {
     width: 42;
 }
 
+#sparkline-row {
+    height: 5;
+    margin-bottom: 0;
+}
+
+#ingress-sparkline,
+#egress-sparkline {
+    width: 1fr;
+    height: 1fr;
+    padding: 0;
+    margin: 0;
+    border: round $accent 40%;
+    border-title-color: $primary;
+}
+
+#ingress-sparkline > .sparkline--max-color {
+    color: $success;
+}
+
+#egress-sparkline > .sparkline--max-color {
+    color: $error;
+}
+
 #backend-row {
     height: 3;
 }
@@ -76,7 +99,7 @@ QueueList ListItem {
 }
 
 TaskList {
-    height: 60%;
+    height: 1fr;
 
     TabbedContent,
     ContentSwitcher,
@@ -104,7 +127,7 @@ DataTable {
 }
 
 TaskDetail {
-    height: 40%;
+    height: 1fr;
     width: 100%;
     overflow: scroll;
     padding: 0 1;

threadmill-0.6.0/threadmill/inspector/telemetry.py

@@ -0,0 +1,81 @@
+"""In-memory rolling telemetry buffer fed by backend pub/sub events."""
+
+import collections
+import datetime
+import time
+
+from threadmill.backends.base import QueueRates, TelemetryDirection, TelemetryEvent
+
+WINDOW_SECONDS = 60
+"""Rolling window the inspector displays for ingress/egress sparklines."""
+
+
+class TelemetryBuffer:
+    """Per-(queue, direction) rolling 60-second count buffer."""
+
+    def __init__(self, *, window: int = WINDOW_SECONDS) -> None:
+        self._window = window
+        self._counts: dict[
+            tuple[str, TelemetryDirection], collections.OrderedDict[int, int]
+        ] = collections.defaultdict(collections.OrderedDict)
+
+    def record(self, event: TelemetryEvent, *, now: float | None = None) -> None:
+        """Increment the current-second bucket for the event's queue+direction."""
+        second = int(now if now is not None else time.monotonic())
+        buckets = self._counts[event.queue_name, event.direction]
+        buckets[second] = buckets.get(second, 0) + 1
+        self._evict(buckets, second)
+
+    def series(
+        self,
+        queue_name: str,
+        direction: TelemetryDirection,
+        *,
+        now: float | None = None,
+    ) -> list[float]:
+        """Return ``window`` per-second counts, oldest to newest, for the pair."""
+        second = int(now if now is not None else time.monotonic())
+        buckets = self._counts.get((queue_name, direction))
+        if buckets is not None:
+            self._evict(buckets, second)
+        return [
+            float(buckets.get(second - offset, 0)) if buckets else 0.0
+            for offset in reversed(range(self._window))
+        ]
+
+    def rates_for(
+        self,
+        queue_name: str,
+        *,
+        interval: datetime.timedelta = datetime.timedelta(seconds=WINDOW_SECONDS),
+        now: float | None = None,
+    ) -> QueueRates:
+        """Sum the last ``interval`` of events into per-second ingress/egress rates."""
+        second = int(now if now is not None else time.monotonic())
+        span = min(int(interval.total_seconds()), self._window)
+        ingress = self._sum_direction(
+            queue_name, TelemetryDirection.INGRESS, second, span
+        )
+        egress = self._sum_direction(
+            queue_name, TelemetryDirection.EGRESS, second, span
+        )
+        return QueueRates(
+            interval=datetime.timedelta(seconds=span), ingress=ingress, egress=egress
+        )
+
+    def _sum_direction(
+        self, queue_name: str, direction: TelemetryDirection, second: int, span: int
+    ) -> int:
+        buckets = self._counts.get((queue_name, direction))
+        if buckets is None:
+            return 0
+        self._evict(buckets, second)
+        return sum(buckets.get(second - offset, 0) for offset in range(span))
+
+    def _evict(
+        self, buckets: collections.OrderedDict[int, int], now_second: int
+    ) -> None:
+        """Drop buckets older than the window (LRU pop from front)."""
+        cutoff = now_second - self._window
+        while buckets and next(iter(buckets)) <= cutoff:
+            buckets.popitem(last=False)

threadmill-0.5.0/pyproject.toml

@@ -1,114 +0,0 @@
-[build-system]
-requires = ["flit_core>=3.2", "flit_scm", "wheel"]
-build-backend = "flit_scm:buildapi"
-
-[project]
-name = "threadmill"
-authors = [
-  { name = "Johannes Maron", email = "johannes@maron.family" },
-]
-readme = "README.md"
-license = { file = "LICENSE" }
-keywords = ["Django", "tasks", "worker"]
-dynamic = ["version", "description"]
-classifiers = [
-  "Development Status :: 4 - Beta",
-  "Programming Language :: Python",
-  "Environment :: Web Environment",
-  "License :: OSI Approved :: BSD License",
-  "Intended Audience :: Developers",
-  "Operating System :: Microsoft :: Windows",
-  "Operating System :: MacOS :: MacOS X",
-  "Operating System :: POSIX",
-  "Topic :: Communications :: Email",
-  "Topic :: Text Processing :: Markup :: Markdown",
-  "Topic :: Software Development",
-  "Programming Language :: Python",
-  "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.14",
-  "Framework :: Django",
-  "Framework :: Django :: 6.1",
-]
-requires-python = ">=3.14"
-dependencies = ["django>=6.0"]
-
-[project.optional-dependencies]
-redis = ["redis>=5.0"]
-inspector = [
-    "textual>=8.2.7",
-]
-
-[project.urls]
-# https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-labels
-Homepage = "https://github.com/codingjoe/threadmill"
-Changelog = "https://github.com/codingjoe/threadmill/releases"
-Source = "https://github.com/codingjoe/threadmill"
-Releasenotes = "https://github.com/codingjoe/threadmill/releases/latest"
-Documentation = "https://github.com/codingjoe/threadmill/"
-Issues = "https://github.com/codingjoe/threadmill/issues"
-Funding = "https://github.com/sponsors/codingjoe"
-
-[tool.flit.module]
-name = "threadmill"
-
-[tool.setuptools_scm]
-write_to = "threadmill/_version.py"
-
-[tool.pytest.ini_options]
-minversion = "6.1a1"
-addopts = "--cov --cov-report=xml --cov-report=term --tb=short -rxs --benchmark-autosave --benchmark-group-by=fullname --benchmark-min-rounds=10"
-testpaths = ["tests"]
-DJANGO_SETTINGS_MODULE = "tests.testapp.settings"
-asyncio_mode = "auto"
-markers = [
-  "benchmark: mark benchmark tests.",
-]
-
-[tool.coverage.run]
-source = ["threadmill"]
-
-[tool.coverage.report]
-show_missing = true
-skip_covered = true
-
-[tool.ruff]
-src = ["threadmill", "tests"]
-
-[tool.ruff.lint]
-select = [
-    "E", # pycodestyle errors
-    "W", # pycodestyle warnings
-    "F", # pyflakes
-    "I", # isort
-    "S", # flake8-bandit
-    "D", # pydocstyle
-    "UP", # pyupgrade
-    "B", # flake8-bugbear
-    "C", # flake8-comprehensions
-]
-
-ignore = ["B904", "D1", "E501", "S101"]
-
-[tool.ruff.lint.isort]
-combine-as-imports = true
-split-on-trailing-comma = true
-section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
-force-wrap-aliases = true
-known-first-party = ["threadmill", "tests"]
-
-[tool.ruff.lint.pydocstyle]
-convention = "pep257"
-
-[dependency-groups]
-dev = [
-  { include-group = "test" },
-]
-test = [
-  "pytest",
-  "pytest-benchmark",
-  "pytest-asyncio",
-  "pytest-cov",
-  "pytest-django",
-  "redis>=5.0",
-]