bump dependencies and update authors

Author: tulioz

.github/workflows/ci.yml

@@ -0,0 +1,45 @@
+name: ci
+
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@v6
+        with:
+          python-version-file: ".python-version"
+      - uses: pre-commit/action@v3.0.1
+
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@v6
+        with:
+          python-version-file: ".python-version"
+      - uses: astral-sh/setup-uv@v7
+      - run: uv sync --locked
+      - run: uv run mypy celerymon/
+
+  zizmor:
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: zizmorcore/zizmor-action@v0.5.2

.github/workflows/image-build.yaml

@@ -16,17 +16,19 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v4
-      - uses: docker/login-action@v3
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - uses: docker/build-push-action@v5
+      - uses: docker/build-push-action@v7
         with:
           context: .
           push: true

.github/zizmor.yml

@@ -0,0 +1,9 @@
+rules:
+  unpinned-uses:
+    config:
+      policies:
+        actions/*: ref-pin
+        docker/*: ref-pin
+        pre-commit/action: ref-pin
+        astral-sh/setup-uv: ref-pin
+        zizmorcore/zizmor-action: ref-pin

celerymon/event_watcher.py

@@ -8,7 +8,7 @@
 from collections import OrderedDict, defaultdict
 from typing import Any, Sequence
 
-import celery  # type: ignore[import]
+import celery
 
 from .timer import RepeatTimer
 
@@ -40,7 +40,7 @@ def run() -> None:
             while True:
                 try:
                     with app.connection() as conn:
-                        recv = app.events.Receiver(conn, handlers={"*": store.on_event})  # type: ignore[attr-defined]
+                        recv = app.events.Receiver(conn, handlers={"*": store.on_event})
                         logger.info("EventWatcher connected, capturing events")
                         backoff = 1.0
                         recv.capture(limit=None)
@@ -59,7 +59,9 @@ def update_enable_event() -> None:
         timer.daemon = True
         timer.start()
 
-        thread = threading.Thread(target=run, daemon=True, name="celerymon-event-watcher")
+        thread = threading.Thread(
+            target=run, daemon=True, name="celerymon-event-watcher"
+        )
         thread.start()
 
         return store

celerymon/redis_watcher.py

@@ -60,4 +60,4 @@ def _format_key(self, queue_name: str, priority: int) -> str:
         """
         if not priority:
             return queue_name
-        return "{0}{1}{2}".format(queue_name, PRIORITY_SEP, priority)
+        return "{}{}{}".format(queue_name, PRIORITY_SEP, priority)

celerymon/worker_watcher.py

@@ -39,8 +39,7 @@ def _update(self) -> None:
         oldest_timestamp: dict[str, datetime.datetime] = dict()
         task_count: dict[tuple[str, str], int] = defaultdict(int)
 
-        # active(), reserved() and scheduled() have wrong type annotations.
-        for tasks in (self._inspect.active() or {}).values():  # type: ignore[union-attr]
+        for tasks in (self._inspect.active() or {}).values():
             for task in tasks:
                 if isinstance(task["time_start"], str):
                     start_time = datetime.datetime.fromisoformat(task["time_start"])
@@ -54,10 +53,10 @@ def _update(self) -> None:
                     oldest_timestamp[task_name] = min(
                         oldest_timestamp[task_name], start_time
                     )
-        for tasks in (self._inspect.reserved() or {}).values():  # type: ignore[union-attr]
+        for tasks in (self._inspect.reserved() or {}).values():
             for task in tasks:
                 task_count[("reserved", task["type"])] += 1
-        for scheduled_tasks in (self._inspect.scheduled() or {}).values():  # type: ignore[union-attr]
+        for scheduled_tasks in (self._inspect.scheduled() or {}).values():
             for scheduled_task in scheduled_tasks:
                 task_count[("scheduled", scheduled_task["request"]["type"])] += 1
 

pyproject.toml

@@ -2,8 +2,14 @@
 name = "celerymon"
 version = "0.1.3"
 description = ""
-authors = [{ name = "Masaya Suzuki", email = "masaya@aviator.co" }]
-dependencies = ["celery[redis]>=5.4.0", "prometheus-client>=0.21.0"]
+authors = [
+    { name = "Masaya Suzuki", email = "masaya@aviator.co" },
+    { name = "Ofer Goldstein", email = "ofer@aviator.co" },
+]
+dependencies = [
+    "celery[redis]>=5.6.3",
+    "prometheus-client>=0.24.1",
+]
 readme = "README.md"
 license = "MIT"
 requires-python = ">= 3.13"
@@ -12,7 +18,12 @@ requires-python = ">= 3.13"
 celerymon = 'celerymon.cli:run'
 
 [dependency-groups]
-dev = ["celery-types>=0.22.0", "pyright", "types-redis>=4.6.0.6"]
+dev = [
+    "celery-types>=0.26.0",
+    "mypy>=1.20.0",
+    "pyright>=1.1.408",
+    "types-redis>=4.6.0.6",
+]
 
 [build-system]
 requires = ["hatchling"]