kryten-webqueue 0.9.8__tar.gz → 0.9.9__tar.gz

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/CHANGELOG.md

@@ -6,6 +6,14 @@ 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).
 ## [Unreleased]
 
+## [0.9.9] — 2026-06-12
+
+### Changed
+
+- **Graceful handling of expected job failures.** Misconfiguration and bad-input errors (e.g. `fetchurls` not finding this weekend's worksheet, a missing/unauthenticated workbook, or a missing optional dependency) are now recorded as a clean, actionable message in the job-run history and logged at WARNING — no stack trace. A new internal `JobError` distinguishes these expected failures from unexpected bugs (which still log a full traceback and keep their exception-type prefix).
+- The `fetchurls` "sheet not found" message now reads as guidance ("This weekend's worksheet 'M.D-M.D' was not found…") and lists only the date-format weekend sheets instead of every tab in the workbook.
+- The admin Jobs history table now shows a **Detail** column — the failure message for failed runs, or a compact summary (sheet, imported playlists, counts) for successful ones.
+
 ## [0.9.8] — 2026-06-12
 
 ### Added
@@ -33,7 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - **Richer Bulk Text Import on the admin Playlists editor.** The text import now accepts, one entry per line:
-  - **dropsugar.co / dropsugar.com links** (watch `?m=TOKEN` or manifest `/api/v1/media/cytube/TOKEN.json`) — resolved against the catalog for title/duration, falling back to a constructed manifest URL when the token isn't catalogued yet.
+  - **dropsugar.co links** (watch `?m=TOKEN` or manifest `/api/v1/media/cytube/TOKEN.json`) — resolved against the catalog for title/duration, falling back to a constructed manifest URL when the token isn't catalogued yet.
   - **YouTube / youtu.be links** — playlist (`list=`), start-time (`t`/`start`) and all other arguments are stripped, leaving a clean `yt:VIDEOID` item.
   - Legacy `cm:token`, `yt:id`, and bare catalog tokens (unchanged).
   - Trailing free text after a URL (e.g. `URL - My Title`) is used as a title hint.

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/PKG-INFO

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

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/kryten_webqueue/integrations/cmsutils/fetchurls.py

@@ -1379,9 +1379,13 @@ def run(params: dict, *, config, progress=None) -> dict:
     all_sheets = wb_peek.sheetnames
     wb_peek.close()
     if sheet_name not in all_sheets:
+        # Suggest only date-format weekend sheets (ignore Sheet1/Played Movies/etc).
+        weekend_sheets = [s for s in all_sheets if _SHEET_DATE_RE.match(s.strip())]
+        available = ", ".join(weekend_sheets) if weekend_sheets else ", ".join(all_sheets)
         raise RuntimeError(
-            f"Sheet '{sheet_name}' (upcoming weekend) not found. "
-            f"Available: {', '.join(all_sheets)}"
+            f"This weekend's worksheet '{sheet_name}' was not found in the workbook. "
+            f"Add a sheet named '{sheet_name}' (Friday.date-Saturday.date), or check "
+            f"the sheet name matches. Available weekend sheets: {available}"
         )
 
     _emit({"phase": "parsing", "sheet": sheet_name})

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/kryten_webqueue/jobs/manager.py

@@ -24,6 +24,15 @@ logger = logging.getLogger(__name__)
 JobFunc = Callable[[dict, "JobContext"], Awaitable[dict | None]]
 
 
+class JobError(Exception):
+    """An expected, user-facing job failure (bad input / config, not a bug).
+
+    Raising this from a job records a clean ``failed`` run with the message and
+    logs it at WARNING without a stack trace, so misconfiguration (e.g. a
+    missing workbook sheet) reads as actionable guidance rather than a crash.
+    """
+
+
 def _option_values(field: dict) -> list:
     """Return the allowed values for an enum field's ``options``.
 
@@ -184,6 +193,13 @@ class JobManager:
         except asyncio.CancelledError:
             await self._db.finish_job_run(run_id, "cancelled", None)
             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)})
+            )
         except Exception as exc:  # noqa: BLE001 - record any failure
             logger.exception("Job '%s' failed", name)
             await self._db.finish_job_run(

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/kryten_webqueue/jobs/tasks.py

@@ -15,6 +15,8 @@ import functools
 import importlib
 import logging
 
+from .manager import JobError
+
 logger = logging.getLogger(__name__)
 
 
@@ -44,14 +46,23 @@ def _thread_safe_progress(ctx, loop):
 
 
 async def _run_vendored(module_path: str, params: dict, ctx, *, deps: list[str]):
-    """Import a vendored module, verify deps, and run its ``run()`` off-loop."""
-    for dep in deps:
-        _require(dep)
-    module = importlib.import_module(module_path)
-    loop = asyncio.get_running_loop()
-    progress = _thread_safe_progress(ctx, loop)
-    fn = functools.partial(module.run, params, config=ctx.config, progress=progress)
-    return await asyncio.to_thread(fn)
+    """Import a vendored module, verify deps, and run its ``run()`` off-loop.
+
+    The vendored tools raise ``RuntimeError`` for expected, user-facing failures
+    (missing/unauthenticated workbook, a sheet that isn't present, a missing
+    optional dependency). Surface those as :class:`JobError` so the run history
+    shows a clean, actionable message instead of a stack trace.
+    """
+    try:
+        for dep in deps:
+            _require(dep)
+        module = importlib.import_module(module_path)
+        loop = asyncio.get_running_loop()
+        progress = _thread_safe_progress(ctx, loop)
+        fn = functools.partial(module.run, params, config=ctx.config, progress=progress)
+        return await asyncio.to_thread(fn)
+    except RuntimeError as exc:
+        raise JobError(str(exc)) from exc
 
 
 # ── Enrich jobs ────────────────────────────────────────────────────────────────

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/kryten_webqueue/templates/admin/index.html

@@ -212,13 +212,14 @@ async function loadJobs() {
         const el = document.getElementById('job-runs');
         if (runs.length > 0) {
             el.innerHTML = `<table class="admin-table">
-                <tr><th>Job</th><th>Started</th><th>Ended</th><th>Status</th></tr>
+                <tr><th>Job</th><th>Started</th><th>Ended</th><th>Status</th><th>Detail</th></tr>
                 ${runs.map(r => `
                     <tr>
                         <td>${escapeHtml(r.job_name || '')}</td>
                         <td>${formatLocalDateTime(r.started_at)}</td>
                         <td>${r.ended_at ? formatLocalDateTime(r.ended_at) : '—'}</td>
                         <td><span class="job-status job-status-${escapeHtml(r.status || '')}">${escapeHtml(r.status || '')}</span></td>
+                        <td class="job-detail">${escapeHtml(summarizeRunDetail(r.detail))}</td>
                     </tr>
                 `).join('')}
             </table>`;
@@ -269,6 +270,27 @@ function escapeHtml(str) {
     return div.innerHTML;
 }
 
+// Summarize a job_runs.detail JSON blob for the history table. Prefers a
+// failure message, otherwise a compact success summary.
+function summarizeRunDetail(detail) {
+    if (!detail) return '';
+    let d;
+    try { d = typeof detail === 'string' ? JSON.parse(detail) : detail; }
+    catch { return String(detail).slice(0, 160); }
+    if (d && d.error) return d.error;
+    if (d && typeof d === 'object') {
+        const parts = [];
+        if (d.sheet) parts.push(d.sheet);
+        if (d.imported_playlists && d.imported_playlists.length) parts.push(`imported: ${d.imported_playlists.join(', ')}`);
+        if (typeof d.resolved === 'number') parts.push(`resolved ${d.resolved}`);
+        if (typeof d.failures === 'number' && d.failures) parts.push(`${d.failures} failed`);
+        if (typeof d.committed === 'number') parts.push(`committed ${d.committed}`);
+        if (typeof d.added_to_playlist !== 'undefined' && d.added_to_playlist) parts.push(`→ playlist ${d.added_to_playlist}`);
+        if (parts.length) return parts.join(' · ');
+    }
+    return '';
+}
+
 loadAdminData();
 loadJobs();
 </script>

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/pyproject.toml

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

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/tests/test_fetchurls_sharepoint.py

@@ -71,6 +71,21 @@ def test_run_no_source_raises(tmp_path):
         fetchurls.run({}, config=_config(), progress=None)
 
 
+# --- vendored RuntimeError → JobError translation ---
+
+async def test_run_vendored_translates_runtimeerror_to_joberror(db, monkeypatch):
+    from kryten_webqueue.jobs.manager import JobError
+
+    def boom(params, *, config, progress):
+        raise RuntimeError("This weekend's worksheet was not found.")
+
+    fake_mod = SimpleNamespace(run=boom)
+    monkeypatch.setattr(tasks.importlib, "import_module", lambda name, *a, **k: fake_mod)
+
+    with pytest.raises(JobError, match="worksheet was not found"):
+        await tasks._run_vendored("whatever", {}, _ctx(db), deps=[])
+
+
 # --- fixed section-label playlist names + immutable preserve ---
 
 async def _add_catalog(db, token, title="T"):

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/tests/test_phase2_jobs.py

@@ -135,6 +135,36 @@ async def test_unknown_job_raises_keyerror(db):
         await jm.run("nope")
 
 
+async def test_job_error_records_clean_message(db):
+    from kryten_webqueue.jobs.manager import JobError
+
+    async def job(params, ctx):
+        raise JobError("This weekend's worksheet '6.12-6.13' was not found.")
+
+    jm = JobManager(db)
+    jm.register("fetchurls", job)
+    await jm.run("fetchurls")
+    run = await _wait_terminal(db, "fetchurls")
+    assert run["status"] == "failed"
+    # Clean message, no "RuntimeError:"/"JobError:" type prefix or traceback.
+    assert json.loads(run["detail"]) == {
+        "error": "This weekend's worksheet '6.12-6.13' was not found."
+    }
+
+
+async def test_unexpected_error_keeps_type_prefix(db):
+    async def job(params, ctx):
+        raise ValueError("boom")
+
+    jm = JobManager(db)
+    jm.register("crashy", job)
+    await jm.run("crashy")
+    run = await _wait_terminal(db, "crashy")
+    assert run["status"] == "failed"
+    # Unexpected (bug) failures retain the exception type for debugging.
+    assert json.loads(run["detail"]) == {"error": "ValueError: boom"}
+
+
 async def test_already_running_guard(db):
     started = asyncio.Event()
     release = asyncio.Event()

{kryten_webqueue-0.9.8 → kryten_webqueue-0.9.9}/tests/test_phase3_jobs.py

@@ -69,6 +69,7 @@ def test_extract_manifest_token():
 async def test_fetch_job_missing_ytdlp_fails_fast(db, monkeypatch):
     # Simulate yt_dlp absent regardless of the host environment.
     import importlib
+    from kryten_webqueue.jobs.manager import JobError
     real_import = importlib.import_module
 
     def fake_import(name, *a, **k):
@@ -77,7 +78,8 @@ async def test_fetch_job_missing_ytdlp_fails_fast(db, monkeypatch):
         return real_import(name, *a, **k)
 
     monkeypatch.setattr(tasks.importlib, "import_module", fake_import)
-    with pytest.raises(RuntimeError, match="yt_dlp"):
+    # A missing optional dependency is a clean, user-facing JobError.
+    with pytest.raises(JobError, match="yt_dlp"):
         await tasks.fetch_job({"url": "http://x"}, _ctx(db))