kryten-webqueue 0.28.0__tar.gz → 0.30.0__tar.gz

{kryten_webqueue-0.28.0 → kryten_webqueue-0.30.0}/CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.30.0] — 2026-07-04
+
+### Fixed
+
+- **Clean shutdown when a catalog sync (or other job) is in progress.** Previously, shutting the server down while a background job was running caused a cascade of WARNING/ERROR log lines as the database connection and HTTP client were closed underneath the still-running job task. Three changes fix this:
+  - `JobManager` gains a `stop()` method that cancels all in-flight task and awaits them.
+  - The lifespan shutdown now calls `job_manager.stop()` *before* closing the database, HTTP clients, or any other shared resource, so the cancelled tasks can still record their final status cleanly.
+  - Background loop tasks (`bg_tasks`) are now properly awaited after cancellation, preventing "Task exception was never retrieved" warnings.
+  - `JobManager._execute` wraps every database write in a defensive `try/except` so that a race between task teardown and resource teardown never produces an unhandled exception or spurious ERROR log.
+  - `CatalogSync.sync` adds an explicit `asyncio.CancelledError` handler that logs a clean info message and re-raises (letting `JobManager` record the `cancelled` status), and wraps the error-path `finish_sync_log` calls defensively for the same reason.
+
+[0.30.0]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.30.0
+
+## [0.29.0] — 2026-07-04
+
+### Changed
+
+- **Admin JavaScript moved to external static files.** All inline `{% block scripts %}` JavaScript has been extracted from the five admin templates into individual per-page files under `static/js/` (`admin.js`, `admin-playlists.js`, `admin-promos.js`, `admin-schedules.js`, `admin-queue-mgmt.js`). Shared utilities `showModal`/`closeModal` and `fmtDur` were promoted to `main.js` (previously only defined per-page). Duplicate `escapeHtml`/`fmtDur`/`showModal`/`closeModal` definitions are removed from per-page files. Each template now references its JS via a single `<script src="/static/js/...">` tag — no functional changes, better cacheability and maintainability.
+
+[0.29.0]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.29.0
+
 ## [0.28.0] — 2026-07-04
 
 ### Added

{kryten_webqueue-0.28.0 → kryten_webqueue-0.30.0}/PKG-INFO

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

{kryten_webqueue-0.28.0 → kryten_webqueue-0.30.0}/kryten_webqueue/app.py

@@ -227,9 +227,11 @@ async def lifespan(app: FastAPI):
 
     yield
 
-    # Shutdown
+    # Shutdown — order matters: cancel in-flight work before closing resources.
     for task in bg_tasks:
         task.cancel()
+    await asyncio.gather(*bg_tasks, return_exceptions=True)
+    await job_manager.stop()  # cancel running jobs while DB/client still open
     await poller.stop()
     await race_poller.stop()
     await scheduler.stop()

{kryten_webqueue-0.28.0 → kryten_webqueue-0.30.0}/kryten_webqueue/catalog/sync.py

@@ -96,14 +96,25 @@ class CatalogSync:
 
             await self._db.finish_sync_log(log_id, stats, "completed")
             logger.info(f"Catalog sync complete: {stats} ({page} pages)")
+        except asyncio.CancelledError:
+            # Server is shutting down — propagate cleanly so JobManager can
+            # record the cancelled status while the DB is still open.
+            logger.info("Catalog sync cancelled (shutdown in progress)")
+            raise
         except httpx.TransportError as exc:
             logger.error(_describe_httpx_error(exc, f"{self._url}/api/v1/media"))
             stats["errors"] += 1
-            await self._db.finish_sync_log(log_id, stats, "error")
+            try:
+                await self._db.finish_sync_log(log_id, stats, "error")
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist sync error status (DB unavailable)")
         except Exception as exc:
             logger.exception(f"Catalog sync failed: {type(exc).__name__}: {exc}")
             stats["errors"] += 1
-            await self._db.finish_sync_log(log_id, stats, "error")
+            try:
+                await self._db.finish_sync_log(log_id, stats, "error")
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist sync error status (DB unavailable)")
 
     async def _process_item(self, media: dict, stats: dict):
         token = media.get("friendly_token")

{kryten_webqueue-0.28.0 → kryten_webqueue-0.30.0}/kryten_webqueue/jobs/manager.py

@@ -158,6 +158,20 @@ class JobManager:
     def is_running(self, name: str) -> bool:
         return name in self._running
 
+    async def stop(self) -> None:
+        """Cancel all running job tasks and wait for them to finish.
+
+        Call this during application shutdown *before* closing shared resources
+        (database, HTTP clients) so that in-progress tasks receive
+        ``CancelledError`` while those resources are still usable.
+        """
+        if not self._running:
+            return
+        logger.info("Stopping %d running job(s) for shutdown", len(self._running))
+        for task in list(self._running.values()):
+            task.cancel()
+        await asyncio.gather(*self._running.values(), return_exceptions=True)
+
     async def run(self, name: str, *, triggered_by: str | None = None,
                   params: dict | None = None) -> dict:
         """Start a job in the background. Returns immediately.
@@ -191,19 +205,28 @@ class JobManager:
             detail = json.dumps(result) if result is not None else None
             await self._db.finish_job_run(run_id, "completed", detail)
         except asyncio.CancelledError:
-            await self._db.finish_job_run(run_id, "cancelled", None)
+            try:
+                await self._db.finish_job_run(run_id, "cancelled", None)
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist 'cancelled' status for job '%s' (DB unavailable)", name)
             raise
         except JobError as exc:
             # Expected, user-facing failure (bad input/config): record a clean
             # message and log without a stack trace.
             logger.warning("Job '%s' failed: %s", name, exc)
-            await self._db.finish_job_run(
-                run_id, "failed", json.dumps({"error": str(exc)})
-            )
+            try:
+                await self._db.finish_job_run(
+                    run_id, "failed", json.dumps({"error": str(exc)})
+                )
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist 'failed' status for job '%s' (DB unavailable)", name)
         except Exception as exc:  # noqa: BLE001 - record any failure
             logger.exception("Job '%s' failed", name)
-            await self._db.finish_job_run(
-                run_id, "failed", json.dumps({"error": f"{type(exc).__name__}: {exc}"})
-            )
+            try:
+                await self._db.finish_job_run(
+                    run_id, "failed", json.dumps({"error": f"{type(exc).__name__}: {exc}"})
+                )
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist 'failed' status for job '%s' (DB unavailable)", name)
         finally:
             self._running.pop(name, None)

kryten_webqueue-0.28.0/kryten_webqueue/templates/admin/playlists.html → kryten_webqueue-0.30.0/kryten_webqueue/static/js/admin-playlists.js

@@ -1,83 +1,7 @@
-{% extends "base.html" %}
-{% block title %}Playlists - Admin{% endblock %}
-{% block body_class %}admin-page{% endblock %}
-
-{% block content %}
-<div class="admin-dashboard">
-    <h1>Playlists</h1>
-    <p><a href="/admin">&larr; Back to Admin</a></p>
-
-    <!-- LIST VIEW -->
-    <div id="list-view">
-        <div class="admin-section">
-            <div class="section-head">
-                <h2>Saved Playlists</h2>
-                <button class="btn btn-primary" onclick="showCreateModal()">+ New Playlist</button>
-            </div>
-            <div id="playlists-list">Loading…</div>
-        </div>
-    </div>
-
-    <!-- EDITOR VIEW -->
-    <div id="editor-view" class="hidden">
-        <div class="admin-section">
-            <div class="section-head">
-                <h2 id="editor-title">Edit Playlist</h2>
-                <div class="btn-group">
-                    <button class="btn btn-secondary" onclick="closeEditor()">&larr; Back</button>
-                    <button class="btn" onclick="editMeta()">Rename</button>
-                    <button class="btn btn-primary" onclick="saveItems()">Save Items</button>
-                    <button class="btn" onclick="importToLive()" title="Load this playlist into the live CyTube queue">Import to Live</button>
-                </div>
-            </div>
-            <p id="editor-meta" class="muted"></p>
-
-            <div class="editor-grid">
-                <!-- Working item list -->
-                <div>
-                    <h3>Items (<span id="item-count">0</span>)</h3>
-                    <ul id="editor-items" class="editor-list"></ul>
-                </div>
-
-                <!-- Add panel -->
-                <div>
-                    <h3>Add from Catalog</h3>
-                    <div class="search-form">
-                        <input type="text" id="cat-search" placeholder="Search catalog…" onkeydown="if(event.key==='Enter')catalogSearch()">
-                        <button class="btn btn-sm" onclick="catalogSearch()">Search</button>
-                    </div>
-                    <div id="cat-results" class="cat-results"></div>
-
-                    <h3 style="margin-top:1.5rem;">Bulk Text Import</h3>
-                    <p class="muted" style="font-size:0.8rem;">One entry per line: a <strong>dropsugar.co</strong> link, a <strong>YouTube</strong>/<strong>youtu.be</strong> link (playlist &amp; start-time args are stripped), <code>cm:token</code>, <code>yt:id</code>, or a bare catalog token. <code>#</code> starts a comment (whole-line or trailing). Unknown sites are skipped.</p>
-                    <textarea id="import-text" class="import-text" rows="5" placeholder="https://www.dropsugar.co/view?m=abc123def&#10;https://youtu.be/dQw4w9WgXcQ?t=42  # start time is stripped&#10;yt:dQw4w9WgXcQ&#10;abc123def"></textarea>
-                    <div class="btn-group" style="margin-top:0.25rem;">
-                        <button class="btn btn-sm" onclick="parseImport()">Append Parsed Items</button>
-                        <input type="file" id="import-file" accept=".txt,.csv,text/plain" style="display:none" onchange="loadImportFile(event)">
-                        <button class="btn btn-sm" onclick="document.getElementById('import-file').click()">Choose text file…</button>
-                    </div>
-                    <div id="import-errors" class="import-errors"></div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-{% block scripts %}
-<script>
 let editorId = null;
 let editorItems = [];   // working list: {media_type, media_id, title, duration_sec}
 let editorImmutable = false;
 
-function fmtDur(sec) {
-    sec = Math.floor(sec || 0);
-    const h = Math.floor(sec / 3600), m = Math.floor((sec % 3600) / 60), s = sec % 60;
-    if (h > 0) return `${h}:${m.toString().padStart(2,'0')}:${s.toString().padStart(2,'0')}`;
-    return `${m}:${s.toString().padStart(2,'0')}`;
-}
-function escapeHtml(str) { const d = document.createElement('div'); d.textContent = str == null ? '' : str; return d.innerHTML; }
-
 // ---------- LIST ----------
 async function loadPlaylists() {
     const resp = await fetch('/admin/playlists/');
@@ -327,16 +251,4 @@ async function saveMeta() {
 }
 
 // ---------- generic modal ----------
-function showModal(html) {
-    closeModal();
-    const o = document.createElement('div');
-    o.className = 'modal-overlay'; o.id = 'admin-modal';
-    o.innerHTML = `<div class="modal-box">${html}</div>`;
-    o.addEventListener('click', e => { if (e.target === o) closeModal(); });
-    document.body.appendChild(o);
-}
-function closeModal() { const m = document.getElementById('admin-modal'); if (m) m.remove(); }
-
-loadPlaylists();
-</script>
-{% endblock %}
+loadPlaylists();

kryten_webqueue-0.28.0/kryten_webqueue/templates/admin/promos.html → kryten_webqueue-0.30.0/kryten_webqueue/static/js/admin-promos.js

@@ -1,47 +1,3 @@
-{% extends "base.html" %}
-{% block title %}Promos - Admin{% endblock %}
-{% block body_class %}admin-page{% endblock %}
-
-{% block content %}
-<div class="admin-dashboard">
-    <h1>Promos</h1>
-    <p><a href="/admin">&larr; Back to Admin</a></p>
-
-    <!-- POOL DESIGNATION -->
-    <div class="admin-section">
-        <div class="section-head">
-            <h2>Promo Pools</h2>
-            <a href="/admin/playlists" class="btn btn-sm">Manage Playlist Items &rarr;</a>
-        </div>
-        <p class="muted">
-            Designate a saved playlist as a promo pool by choosing its type. Pool
-            items are hidden from the public catalog and excluded from pay-to-play,
-            and are drawn from automatically by the promo director. Edit a pool's
-            clips on the <a href="/admin/playlists">Playlists</a> page.
-        </p>
-        <div id="pools-list">Loading…</div>
-    </div>
-
-    <!-- SETTINGS (editable) -->
-    <div class="admin-section">
-        <div class="section-head">
-            <h2>Promo Settings</h2>
-            <span class="badge badge-accent" title="Saved to the service config file and applied live">editable</span>
-        </div>
-        <p class="muted">
-            Promo cadence and per-type behaviour. Changes are saved to the service
-            config file and applied to the running promo director immediately — no
-            restart required.
-        </p>
-        <form id="settings-form">
-            <div id="settings-view">Loading…</div>
-        </form>
-    </div>
-</div>
-{% endblock %}
-
-{% block scripts %}
-<script>
 const PROMO_TYPE_LABELS = {
     channel_identity: 'Channel Identity',
     event: 'Event',
@@ -53,8 +9,6 @@ const PROMO_TYPE_LABELS = {
 let ALL_PLAYLISTS = [];
 let PROMO_META = { promo_types: [], general_types: [], lead_in_types: [] };
 
-function escapeHtml(str) { const d = document.createElement('div'); d.textContent = str == null ? '' : str; return d.innerHTML; }
-
 function typeLabel(t) { return PROMO_TYPE_LABELS[t] || t; }
 
 // ---------- POOLS ----------
@@ -207,6 +161,4 @@ document.getElementById('settings-form').addEventListener('submit', async (e) =>
 });
 
 loadPools();
-loadSettings();
-</script>
-{% endblock %}
+loadSettings();

kryten_webqueue-0.28.0/kryten_webqueue/templates/admin/queue_mgmt.html → kryten_webqueue-0.30.0/kryten_webqueue/static/js/admin-queue-mgmt.js

@@ -1,47 +1,5 @@
-{% extends "base.html" %}
-{% block title %}Queue Management - Admin{% endblock %}
-{% block body_class %}admin-page{% endblock %}
-
-{% block content %}
-<div class="admin-dashboard">
-    <h1>Queue Management</h1>
-    <p><a href="/admin">&larr; Back to Admin</a></p>
-
-    <div class="admin-section">
-        <div class="section-head">
-            <h2>Live Queue</h2>
-            <div class="btn-group">
-                <button class="btn btn-sm" onclick="showAddModal()">+ Add Item</button>
-                <button class="btn btn-sm" onclick="loadQueue()">Refresh</button>
-                <button class="btn btn-sm btn-danger" onclick="clearAll()">Clear Queue</button>
-            </div>
-        </div>
-        <div id="np-line" class="muted" style="margin-bottom:0.75rem;"></div>
-        <div id="queue-table">Loading…</div>
-    </div>
-
-    <div class="admin-section">
-        <div class="section-head">
-            <h2>Catalog Sync</h2>
-            <button class="btn btn-sm" onclick="syncNow()">Sync Now</button>
-        </div>
-        <div id="sync-logs">Loading…</div>
-    </div>
-</div>
-{% endblock %}
-
-{% block scripts %}
-<script>
 let refreshTimer = null;
 
-function escapeHtml(str) { const d = document.createElement('div'); d.textContent = str == null ? '' : str; return d.innerHTML; }
-function fmtDur(sec) {
-    sec = Math.floor(sec || 0);
-    const h = Math.floor(sec / 3600), m = Math.floor((sec % 3600) / 60), s = sec % 60;
-    if (h > 0) return `${h}:${m.toString().padStart(2,'0')}:${s.toString().padStart(2,'0')}`;
-    return `${m}:${s.toString().padStart(2,'0')}`;
-}
-
 async function loadQueue() {
     const resp = await fetch('/queue/state');
     const el = document.getElementById('queue-table');
@@ -168,19 +126,7 @@ async function loadSyncLogs() {
     </table>`;
 }
 
-function showModal(html) {
-    closeModal();
-    const o = document.createElement('div');
-    o.className = 'modal-overlay'; o.id = 'admin-modal';
-    o.innerHTML = `<div class="modal-box">${html}</div>`;
-    o.addEventListener('click', e => { if (e.target === o) closeModal(); });
-    document.body.appendChild(o);
-}
-function closeModal() { const m = document.getElementById('admin-modal'); if (m) m.remove(); }
-
 loadQueue();
 loadSyncLogs();
 refreshTimer = setInterval(loadQueue, 5000);
-window.addEventListener('beforeunload', () => clearInterval(refreshTimer));
-</script>
-{% endblock %}
+window.addEventListener('beforeunload', () => clearInterval(refreshTimer));

kryten_webqueue-0.28.0/kryten_webqueue/templates/admin/schedules.html → kryten_webqueue-0.30.0/kryten_webqueue/static/js/admin-schedules.js

@@ -1,32 +1,6 @@
-{% extends "base.html" %}
-{% block title %}Schedules - Admin{% endblock %}
-{% block body_class %}admin-page{% endblock %}
-
-{% block content %}
-<div class="admin-dashboard">
-    <h1>Schedules</h1>
-    <p><a href="/admin">&larr; Back to Admin</a></p>
-
-    <div id="lock-banner" class="lock-banner hidden"></div>
-    <div id="active-banner" class="schedule-info hidden" style="margin-bottom:1.5rem;"></div>
-
-    <div class="admin-section">
-        <div class="section-head">
-            <h2>Scheduled Events</h2>
-            <button class="btn btn-primary" onclick="showScheduleModal()">+ New Schedule</button>
-        </div>
-        <div id="schedules-list">Loading…</div>
-    </div>
-</div>
-{% endblock %}
-
-{% block scripts %}
-<script>
 let playlistMap = {};
 let playlistRows = [];
 
-function escapeHtml(str) { const d = document.createElement('div'); d.textContent = str == null ? '' : str; return d.innerHTML; }
-
 async function loadPlaylistsForSelect() {
     const resp = await fetch('/admin/playlists/');
     if (!resp.ok) return [];
@@ -257,16 +231,6 @@ async function deleteSchedule(id, label) {
     loadSchedules();
 }
 
-function showModal(html) {
-    closeModal();
-    const o = document.createElement('div');
-    o.className = 'modal-overlay'; o.id = 'admin-modal';
-    o.innerHTML = `<div class="modal-box">${html}</div>`;
-    o.addEventListener('click', e => { if (e.target === o) closeModal(); });
-    document.body.appendChild(o);
-}
-function closeModal() { const m = document.getElementById('admin-modal'); if (m) m.remove(); }
-
 loadSchedules();
 
 // Keep the lock indicator and active-event banner fresh without a reload:
@@ -277,6 +241,4 @@ setInterval(() => {
         loadLockStatus();
         loadActive();
     }
-}, 15000);
-</script>
-{% endblock %}
+}, 15000);