kryten-webqueue 0.34.0__tar.gz → 0.34.2__tar.gz

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.34.2] - 2026-08-12
+
+### Removed
+
+- Job chaining: removed the "Run next" chain feature entirely.
+  Removed `_on_job_complete()` from `JobScheduler`, `set_post_run_hook()` and
+  `_post_run_hook` from `JobManager`, `run_next_job` from `upsert_job_schedule()`,
+  the `run_next_job` field from POST/PUT API bodies, and the "Run next"
+  dropdown from the schedule edit modal. The `run_next_job` DB column is
+  preserved (unused) for schema compatibility.
+
+## [0.34.1] - 2026-08-12
+
+### Fixed
+
+- `JobScheduler._register()`: bad cron expressions in the DB (e.g. hour=27)
+  are now logged at WARNING and skipped rather than raising `ValueError` during
+  startup and preventing the service from starting.
+- `JobScheduler.upsert()`: validates the cron expression via APScheduler before
+  persisting; raises `ValueError` with a clear message so the API route can
+  return HTTP 400 instead of saving an unrunnable schedule.
+- `/admin/job-schedules` POST and PUT: APScheduler validation errors now surface
+  as HTTP 400 with the rejection reason.
+
 ## [0.34.0] - 2026-08-11
 
 ### Added

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: kryten-webqueue
-Version: 0.34.0
+Version: 0.34.2
 Summary: Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube
 Author: grobertson
 License-Expression: MIT

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/kryten_webqueue/catalog/db/_catalog.py

@@ -926,23 +926,21 @@ class _CatalogMixin:
         label: str | None = None,
         params_json: str | None = None,
         is_active: bool = True,
-        run_next_job: str | None = None,
         created_by: str | None = None,
     ) -> None:
         await self._db.execute(
             """
             INSERT INTO job_schedules
-                (job_name, label, cron_expression, params_json, is_active, run_next_job, created_by)
-            VALUES (?, ?, ?, ?, ?, ?, ?)
+                (job_name, label, cron_expression, params_json, is_active, created_by)
+            VALUES (?, ?, ?, ?, ?, ?)
             ON CONFLICT(job_name) DO UPDATE SET
                 label            = excluded.label,
                 cron_expression  = excluded.cron_expression,
                 params_json      = excluded.params_json,
                 is_active        = excluded.is_active,
-                run_next_job     = excluded.run_next_job,
                 updated_at       = datetime('now')
             """,
-            [job_name, label, cron_expression, params_json, int(is_active), run_next_job, created_by],
+            [job_name, label, cron_expression, params_json, int(is_active), created_by],
         )
 
     async def delete_job_schedule(self, job_name: str) -> None:

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/kryten_webqueue/jobs/job_scheduler.py

@@ -3,10 +3,6 @@
 Persists schedules to the ``job_schedules`` table and fires them via
 APScheduler's ``CronTrigger``. Completely separate from ``PlaylistScheduler``,
 which fires playlists onto the live queue.
-
-Chain support: when a job finishes with status ``completed`` and was triggered
-by the scheduler, the scheduler checks ``run_next_job`` on that schedule and
-immediately launches the next job using its own saved params.
 """
 
 from __future__ import annotations
@@ -30,7 +26,6 @@ class JobScheduler:
 
     async def start(self) -> None:
         self._aps.start()
-        self._jm.set_post_run_hook(self._on_job_complete)
         await self._reload()
         logger.info("JobScheduler started")
 
@@ -57,21 +52,30 @@ class JobScheduler:
             )
             return False
         minute, hour, day, month, day_of_week = parts
-        trigger = CronTrigger(
-            minute=minute,
-            hour=hour,
-            day=day,
-            month=month,
-            day_of_week=day_of_week,
-            timezone="UTC",
-        )
-        self._aps.add_job(
-            self._fire,
-            trigger=trigger,
-            args=[job_name],
-            id=f"jsch_{job_name}",
-            replace_existing=True,
-        )
+        try:
+            trigger = CronTrigger(
+                minute=minute,
+                hour=hour,
+                day=day,
+                month=month,
+                day_of_week=day_of_week,
+                timezone="UTC",
+            )
+            self._aps.add_job(
+                self._fire,
+                trigger=trigger,
+                args=[job_name],
+                id=f"jsch_{job_name}",
+                replace_existing=True,
+            )
+        except (ValueError, Exception) as exc:  # noqa: BLE001 - bad stored cron must not crash startup
+            logger.warning(
+                "JobScheduler: skipping invalid cron %r for %r: %s",
+                cron_expression,
+                job_name,
+                exc,
+            )
+            return False
         logger.info("JobScheduler: registered %r cron=%r", job_name, cron_expression)
         return True
 
@@ -95,32 +99,6 @@ class JobScheduler:
         except ValueError as exc:
             logger.warning("JobScheduler: %r invalid params: %s", job_name, exc)
 
-    async def _on_job_complete(
-        self, job_name: str, status: str, triggered_by: str | None
-    ) -> None:
-        """Post-run hook: chain to run_next_job if the scheduler triggered this run."""
-        if triggered_by != "scheduler" or status != "completed":
-            return
-        sched = await self._db.get_job_schedule(job_name)
-        if not sched or not sched.get("run_next_job"):
-            return
-        next_job: str = sched["run_next_job"]
-        next_sched = await self._db.get_job_schedule(next_job)
-        params = (
-            json.loads(next_sched["params_json"])
-            if next_sched and next_sched.get("params_json")
-            else None
-        )
-        try:
-            await self._jm.run(next_job, triggered_by="scheduler", params=params)
-            logger.info("JobScheduler: chained %r → %r", job_name, next_job)
-        except KeyError:
-            logger.warning("JobScheduler: chain target %r is not registered", next_job)
-        except ValueError as exc:
-            logger.warning(
-                "JobScheduler: chain %r → %r invalid params: %s", job_name, next_job, exc
-            )
-
     # ── Public API ─────────────────────────────────────────────────────────────
 
     async def upsert(
@@ -130,11 +108,29 @@ class JobScheduler:
         *,
         params: dict | None = None,
         label: str | None = None,
-        run_next_job: str | None = None,
         is_active: bool = True,
         created_by: str | None = None,
     ) -> None:
-        """Persist a schedule and (re)register it with APScheduler."""
+        """Persist a schedule and (re)register it with APScheduler.
+
+        Raises ValueError if cron_expression is rejected by APScheduler.
+        """
+        # Validate before persisting so a bad expression is rejected at save time.
+        if is_active:
+            parts = (cron_expression or "").strip().split()
+            if len(parts) != 5:
+                raise ValueError(
+                    f"cron_expression must have exactly 5 fields (min hour dom mon dow), got: {cron_expression!r}"
+                )
+            minute, hour, day, month, day_of_week = parts
+            try:
+                CronTrigger(
+                    minute=minute, hour=hour, day=day,
+                    month=month, day_of_week=day_of_week, timezone="UTC",
+                )
+            except Exception as exc:
+                raise ValueError(f"Invalid cron expression {cron_expression!r}: {exc}") from exc
+
         params_json = json.dumps(params) if params is not None else None
         await self._db.upsert_job_schedule(
             job_name,
@@ -142,7 +138,6 @@ class JobScheduler:
             label=label,
             params_json=params_json,
             is_active=is_active,
-            run_next_job=run_next_job,
             created_by=created_by,
         )
         self._unregister(job_name)

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/kryten_webqueue/jobs/manager.py

@@ -139,14 +139,6 @@ class JobManager:
         self._config = config
         self._jobs: dict[str, dict] = {}
         self._running: dict[str, asyncio.Task] = {}
-        self._post_run_hook: Callable | None = None
-
-    def set_post_run_hook(self, hook: "Callable[[str, str, str | None], Any]") -> None:
-        """Register a coroutine called after each job finishes.
-
-        Signature: async hook(job_name, status, triggered_by) -> None
-        """
-        self._post_run_hook = hook
 
     def register(
         self,
@@ -232,14 +224,11 @@ class JobManager:
             run_id=run_id,
             triggered_by=triggered_by,
         )
-        _final_status = "failed"
         try:
             result = await func(params, ctx)
             detail = json.dumps(result) if result is not None else None
             await self._db.finish_job_run(run_id, "completed", detail)
-            _final_status = "completed"
         except asyncio.CancelledError:
-            _final_status = "cancelled"
             try:
                 await self._db.finish_job_run(run_id, "cancelled", None)
             except Exception:  # noqa: BLE001
@@ -276,9 +265,3 @@ class JobManager:
                 )
         finally:
             self._running.pop(name, None)
-            hook = self._post_run_hook
-            if hook:
-                try:
-                    await hook(name, _final_status, triggered_by)
-                except Exception:  # noqa: BLE001
-                    logger.debug("post_run_hook failed for '%s'", name, exc_info=True)

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/kryten_webqueue/routes/admin_job_schedules.py

@@ -26,7 +26,7 @@ async def get_job_schedule(
 async def upsert_job_schedule(request: Request, user: dict = Depends(require_admin)):
     """Create or update a job schedule.
 
-    Body: {job_name, cron_expression, params?, label?, run_next_job?, is_active?}
+    Body: {job_name, cron_expression, params?, label?, is_active?}
     cron_expression must be a standard 5-field cron string (min hour dom mon dow).
     """
     body = await request.json()
@@ -40,15 +40,17 @@ async def upsert_job_schedule(request: Request, user: dict = Depends(require_adm
         raise HTTPException(400, "cron_expression must have exactly 5 fields (min hour dom mon dow)")
 
     job_scheduler = request.app.state.job_scheduler
-    await job_scheduler.upsert(
-        job_name,
-        cron_expression,
-        params=body.get("params") or None,
-        label=body.get("label") or None,
-        run_next_job=body.get("run_next_job") or None,
-        is_active=bool(body.get("is_active", True)),
-        created_by=user["username"],
-    )
+    try:
+        await job_scheduler.upsert(
+            job_name,
+            cron_expression,
+            params=body.get("params") or None,
+            label=body.get("label") or None,
+            is_active=bool(body.get("is_active", True)),
+            created_by=user["username"],
+        )
+    except ValueError as exc:
+        raise HTTPException(400, str(exc))
     return {"success": True}
 
 
@@ -65,15 +67,17 @@ async def update_job_schedule(
         raise HTTPException(400, "cron_expression must have exactly 5 fields (min hour dom mon dow)")
 
     job_scheduler = request.app.state.job_scheduler
-    await job_scheduler.upsert(
-        job_name,
-        cron_expression,
-        params=body.get("params") or None,
-        label=body.get("label") or None,
-        run_next_job=body.get("run_next_job") or None,
-        is_active=bool(body.get("is_active", True)),
-        created_by=user["username"],
-    )
+    try:
+        await job_scheduler.upsert(
+            job_name,
+            cron_expression,
+            params=body.get("params") or None,
+            label=body.get("label") or None,
+            is_active=bool(body.get("is_active", True)),
+            created_by=user["username"],
+        )
+    except ValueError as exc:
+        raise HTTPException(400, str(exc))
     return {"success": True}
 
 

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/kryten_webqueue/static/js/admin.js

@@ -145,19 +145,12 @@ async function openScheduleModal(jobName) {
 
     const cronVal = existing ? escapeHtml(existing.cron_expression || '') : '';
     const isActive = existing ? !!existing.is_active : true;
-    const runNextVal = existing ? (existing.run_next_job || '') : '';
 
     const paramFields = job.schema.map(f => {
         const savedVal = existingParams[f.name] !== undefined ? existingParams[f.name] : f.default;
         return _jobFieldHtml({...f, default: savedVal}, 'schedparam-');
     }).join('');
 
-    const otherJobs = JOBS_CACHE.filter(j => j.name !== jobName);
-    const nextOpts = '<option value="">\u2014 none (no chain) \u2014</option>' +
-        otherJobs.map(j =>
-            `<option value="${escapeHtml(j.name)}" ${j.name === runNextVal ? 'selected' : ''}>${escapeHtml(j.label)}</option>`
-        ).join('');
-
     const overlay = document.createElement('div');
     overlay.id = 'schedule-modal';
     overlay.className = 'modal-overlay';
@@ -173,10 +166,6 @@ async function openScheduleModal(jobName) {
                 <span>Active</span>
             </label>
             ${paramFields ? `<details ${existing ? 'open' : ''}><summary style="cursor:pointer;margin:.5rem 0">Job parameters</summary><div class="job-params">${paramFields}</div></details>` : ''}
-            <label class="field">
-                <span>Run next (chain)</span>
-                <select id="sched-run-next">${nextOpts}</select>
-            </label>
             <div class="modal-actions">
                 <button class="btn btn-secondary" data-action="cancel">Cancel</button>
                 <button class="btn btn-primary" data-action="save">Save</button>
@@ -196,7 +185,6 @@ async function _submitScheduleModal(jobName, job, overlay) {
     const cron = (document.getElementById('sched-cron').value || '').trim();
     if (!cron) { showToast('Cron expression is required', 'error'); return; }
     const isActive = document.getElementById('sched-active').checked;
-    const runNext = document.getElementById('sched-run-next').value || null;
 
     const params = {};
     for (const f of job.schema) {
@@ -216,7 +204,6 @@ async function _submitScheduleModal(jobName, job, overlay) {
             job_name: jobName,
             cron_expression: cron,
             is_active: isActive,
-            run_next_job: runNext,
             params: Object.keys(params).length ? params : null,
             label: job.label,
         }),

{kryten_webqueue-0.34.0 → kryten_webqueue-0.34.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kryten-webqueue"
-version = "0.34.0"
+version = "0.34.2"
 description = "Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube"
 readme = "README.md"
 license = "MIT"