kryten-webqueue 0.35.2__tar.gz → 0.35.4__tar.gz

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 ## [Unreleased]
 
+## [0.35.4] - 2026-08-13
+
+### Fixed
+
+- **JSON decode error handling in enrichment pipeline.** All API calls to TMDB,
+  OMDB, and MediaCMS now catch `json.JSONDecodeError` in addition to HTTP errors,
+  preventing malformed responses from crashing enrichment jobs.
+  - Added error handling to `TMDBProvider` search methods
+  - Added error handling to `OMDBProvider` search methods  
+  - Added error handling to CMS API calls in meta, title, and tags steps
+  - Enhanced `parse_meta_json` logging to capture malformed JSON for debugging
+
+## [0.35.3] - 2026-08-13
+
+### Added
+
+- **Job run detail view.** Every row in the "Recent Job Runs" table now has an
+  ℹ button that opens a modal with the full output for that run.
+  - **Pipeline enrichment reports** are rendered as a per-step table
+    (Processed / Changed / Skipped / Failed) with any per-step error messages
+    shown inline beneath their row.
+  - **In-progress snapshots** are clearly labelled as such with a ⏳ indicator
+    and show the last heartbeat values while the job is still running.
+  - **Legacy / other job results** fall back to pretty-printed JSON.
+- **Summary column** now understands the `catalog_enrich` report format and
+  shows a compact per-step summary (e.g. `classify: 5200✓ · meta: 1500✓ (42s)`).
+  An ⏳ prefix marks an in-progress heartbeat.
+- Runs table shows 15 rows (up from 10) and marks still-running rows with an
+  amber "running…" indicator instead of a blank ended-at cell.
+
 ## [0.35.2] - 2026-08-13
 
 ### Fixed

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/PKG-INFO

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

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/kryten_webqueue/catalog/db/_enrichment.py

@@ -110,5 +110,12 @@ class _EnrichmentMixin:
             return None
         try:
             return json.loads(raw)
-        except (ValueError, TypeError):
+        except (ValueError, TypeError) as exc:
+            import logging
+            logger = logging.getLogger(__name__)
+            token = (row or {}).get("friendly_token", "?")
+            logger.warning(
+                "Failed to parse meta_json for %s: %s. Raw value (first 200 chars): %r",
+                token, exc, raw[:200] if isinstance(raw, str) else raw
+            )
             return None

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/kryten_webqueue/catalog/enrichment/providers.py

@@ -8,6 +8,7 @@ includes poster_url so art and meta steps can share a single provider call.
 from __future__ import annotations
 
 import difflib
+import json
 import logging
 import re
 from dataclasses import dataclass, field
@@ -144,7 +145,7 @@ class TMDBProvider:
                         movie = self._pick(resp2.json().get("results", []), title, None)
                 if movie:
                     return await self._fetch_details(movie, headers, auth)
-        except httpx.HTTPError as exc:
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError) as exc:
             logger.debug("TMDB search error for %r: %s", title, exc)
         return MovieMetadata()
 
@@ -180,7 +181,7 @@ class TMDBProvider:
                 meta.year = air_date[:4] if air_date else None
                 meta.cast = [c["name"] for c in data.get("guest_stars", [])[:8]]
                 return meta
-        except httpx.HTTPError as exc:
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError) as exc:
             logger.debug(
                 "TMDB TV search error for %r S%02dE%02d: %s", show, season, episode, exc
             )
@@ -226,7 +227,7 @@ class TMDBProvider:
                     meta.tmdb_rating = f"{vote:.1f}/10"
                 meta.imdb_id = d.get("imdb_id", "")
                 meta.studio = [c["name"] for c in d.get("production_companies", [])[:3]]
-        except httpx.HTTPError:
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError):
             pass
 
         try:
@@ -253,7 +254,7 @@ class TMDBProvider:
                     x["name"] for x in crew if x.get("job") == "Original Music Composer"
                 ][:3]
                 meta.editor = [x["name"] for x in crew if x.get("job") == "Editor"][:3]
-        except httpx.HTTPError:
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError):
             pass
 
         return meta
@@ -306,7 +307,7 @@ class OMDBProvider:
                     ):
                         return MovieMetadata()
                     return self._parse(data)
-        except httpx.HTTPError as exc:
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError) as exc:
             logger.debug("OMDB error for %r: %s", title, exc)
         return MovieMetadata()
 
@@ -327,7 +328,7 @@ class OMDBProvider:
             )
             if resp.status_code == 200 and resp.json().get("Response") == "True":
                 return self._parse(resp.json())
-        except httpx.HTTPError:
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError):
             pass
         return MovieMetadata()
 

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/kryten_webqueue/catalog/enrichment/steps/meta.py

@@ -154,6 +154,19 @@ class MetaStep:
                 new_score = score_description(desc)
                 meta_json = json.dumps(self._meta_to_dict(meta))
 
+                # Validate round-trip before saving
+                try:
+                    json.loads(meta_json)
+                except (ValueError, TypeError) as e:
+                    logger.error(
+                        "[meta] %s: generated malformed meta_json: %s. First 300 chars: %r",
+                        cls.friendly_token,
+                        e,
+                        meta_json[:300],
+                    )
+                    result.record_error(f"{cls.friendly_token}: malformed meta_json ({e})")
+                    continue
+
                 logger.info(
                     "[meta] %s: %r → score %d",
                     cls.friendly_token,
@@ -206,21 +219,24 @@ class MetaStep:
 
     async def _push_description(self, token: str, desc: str) -> None:
         url = f"{self._base}/api/v1/media/{token}"
-        async with httpx.AsyncClient(
-            headers=self._cms_headers, timeout=_TIMEOUT
-        ) as client:
-            resp = await client.get(url)
-            owner = resp.json().get("user") if resp.status_code == 200 else None
-            await client.put(url, data={"description": desc})
-            if owner:
-                await client.post(
-                    f"{self._base}/api/v1/media/user/bulk_actions",
-                    json={
-                        "action": "change_owner",
-                        "media_ids": [token],
-                        "owner": owner,
-                    },
-                )
+        try:
+            async with httpx.AsyncClient(
+                headers=self._cms_headers, timeout=_TIMEOUT
+            ) as client:
+                resp = await client.get(url)
+                owner = resp.json().get("user") if resp.status_code == 200 else None
+                await client.put(url, data={"description": desc})
+                if owner:
+                    await client.post(
+                        f"{self._base}/api/v1/media/user/bulk_actions",
+                        json={
+                            "action": "change_owner",
+                            "media_ids": [token],
+                            "owner": owner,
+                        },
+                    )
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError) as exc:
+            logger.warning("[meta] Failed to push description for %s: %s", token, exc)
 
     async def _write_people(self, token: str, meta: MovieMetadata) -> None:
         people: list[dict] = []

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/kryten_webqueue/catalog/enrichment/steps/tags.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import json
 import logging
 import re
 from datetime import datetime, UTC
@@ -108,35 +109,41 @@ class TagsStep:
         self, client: httpx.AsyncClient, token: str, new_tags: list[str]
     ) -> bool:
         url = f"{self._base}/api/v1/media/{token}"
-        resp = await client.get(url)
-        if resp.status_code != 200:
+        try:
+            resp = await client.get(url)
+            if resp.status_code != 200:
+                return False
+            data = resp.json()
+            owner = data.get("user")
+            current = {
+                (t.get("title") if isinstance(t, dict) else t)
+                for t in (data.get("tags_info") or [])
+            }
+            to_add = [t for t in new_tags if t not in current]
+            if not to_add:
+                return False
+            merged = list(current | set(to_add))
+            put = await client.put(url, data={"tags": ",".join(merged)})
+            if put.status_code in (200, 201) and owner:
+                await client.post(
+                    f"{self._base}/api/v1/media/user/bulk_actions",
+                    json={"action": "change_owner", "media_ids": [token], "owner": owner},
+                )
+            return put.status_code in (200, 201)
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError):
             return False
-        data = resp.json()
-        owner = data.get("user")
-        current = {
-            (t.get("title") if isinstance(t, dict) else t)
-            for t in (data.get("tags_info") or [])
-        }
-        to_add = [t for t in new_tags if t not in current]
-        if not to_add:
-            return False
-        merged = list(current | set(to_add))
-        put = await client.put(url, data={"tags": ",".join(merged)})
-        if put.status_code in (200, 201) and owner:
-            await client.post(
-                f"{self._base}/api/v1/media/user/bulk_actions",
-                json={"action": "change_owner", "media_ids": [token], "owner": owner},
-            )
-        return put.status_code in (200, 201)
 
     async def _reverse_sync(self, client: httpx.AsyncClient, token: str) -> None:
         """Insert any CMS-only tags into the local catalog_tags table."""
         url = f"{self._base}/api/v1/media/{token}"
-        resp = await client.get(url)
-        if resp.status_code != 200:
-            return
-        data = resp.json()
-        for t in data.get("tags_info") or []:
-            name = t.get("title") if isinstance(t, dict) else t
-            if name:
-                await self._db.add_catalog_tag(token, str(name))
+        try:
+            resp = await client.get(url)
+            if resp.status_code != 200:
+                return
+            data = resp.json()
+            for t in data.get("tags_info") or []:
+                name = t.get("title") if isinstance(t, dict) else t
+                if name:
+                    await self._db.add_catalog_tag(token, str(name))
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError) as exc:
+            logger.warning("[tags] Failed reverse-sync for %s: %s", token, exc)

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/kryten_webqueue/catalog/enrichment/steps/title.py

@@ -1,5 +1,6 @@
 """Step: title — normalise and reformat CMS titles per content type."""
 
+import json
 import logging
 from datetime import datetime, UTC
 
@@ -122,5 +123,5 @@ class TitleStep:
                     },
                 )
             return ok
-        except httpx.HTTPError:
+        except (httpx.HTTPError, json.JSONDecodeError, ValueError):
             return False

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/kryten_webqueue/static/js/admin.js

@@ -281,23 +281,33 @@ async function loadJobs() {
             : '<p>No jobs registered</p>';
     }
 
-    // Recent job-run history
-    const rResp = await fetch('/admin/jobs/runs?limit=10');
+    // Recent job-run history — table includes an expand button for full output
+    const rResp = await fetch('/admin/jobs/runs?limit=15');
     if (rResp.ok) {
         const runs = await rResp.json();
         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><th>Detail</th></tr>
-                ${runs.map(r => `
+                <tr><th>Job</th><th>Started</th><th>Ended</th><th>Status</th><th>Detail</th><th></th></tr>
+                ${runs.map(r => {
+                    const summary = escapeHtml(summarizeRunDetail(r.detail));
+                    const hasDetail = r.detail && r.detail.length > 2;
+                    const expandBtn = hasDetail
+                        ? `<button class="btn btn-sm" onclick="showRunDetail(${r.id})" title="View full output">\u2139</button>`
+                        : '';
+                    const endedCell = r.ended_at
+                        ? formatLocalDateTime(r.ended_at)
+                        : `<span style="color:var(--warning)">running\u2026</span>`;
+                    return `
                     <tr>
                         <td>${escapeHtml(r.job_name || '')}</td>
                         <td>${formatLocalDateTime(r.started_at)}</td>
-                        <td>${r.ended_at ? formatLocalDateTime(r.ended_at) : '—'}</td>
+                        <td>${endedCell}</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('')}
+                        <td class="job-detail">${summary}</td>
+                        <td>${expandBtn}</td>
+                    </tr>`;
+                }).join('')}
             </table>`;
         } else {
             el.innerHTML = '<p>No job runs yet</p>';
@@ -305,6 +315,81 @@ async function loadJobs() {
     }
 }
 
+// Run-detail cache so we don't re-fetch on re-open.
+const RUN_DETAIL_CACHE = {};
+
+async function showRunDetail(runId) {
+    if (!RUN_DETAIL_CACHE[runId]) {
+        const resp = await fetch('/admin/jobs/runs?limit=50');
+        if (resp.ok) { (await resp.json()).forEach(r => { RUN_DETAIL_CACHE[r.id] = r; }); }
+    }
+    const run = RUN_DETAIL_CACHE[runId];
+    if (!run) { showToast('Run not found', 'error'); return; }
+
+    const existingModal = document.getElementById('run-detail-modal');
+    if (existingModal) existingModal.remove();
+
+    let d = null;
+    try { d = run.detail ? JSON.parse(run.detail) : null; } catch (e) {}
+
+    let bodyHtml;
+    if (d && d.steps_run && d.steps) {
+        // Pipeline enrichment final report — render as a table
+        const dryBadge = d.dry_run
+            ? ' <span style="color:var(--warning);font-size:.8rem">(dry run \u2014 no writes)</span>' : '';
+        const elapsed = d.elapsed_sec ? ` \u00b7 ${d.elapsed_sec}s elapsed` : '';
+        const rowsHtml = d.steps_run.map(s => {
+            const r = d.steps[s];
+            if (!r) return '';
+            const errs = (r.errors || []).map(e =>
+                `<div style="font-size:.78rem;color:var(--danger);padding:.15rem 0">${escapeHtml(e)}</div>`
+            ).join('');
+            return `<tr>
+                <td><strong>${escapeHtml(s)}</strong></td>
+                <td>${r.processed}</td>
+                <td>${r.changed}</td>
+                <td>${r.skipped}</td>
+                <td style="${r.failed ? 'color:var(--danger)' : ''}">${r.failed || 0}</td>
+            </tr>${errs ? `<tr><td colspan="5" style="padding:0 0 .5rem 1.5rem">${errs}</td></tr>` : ''}`;
+        }).join('');
+        bodyHtml = `
+            <p style="margin-bottom:.75rem">
+                Steps: <strong>${escapeHtml(d.steps_run.join(' \u2192 '))}</strong>${dryBadge}<br>
+                Total items: <strong>${(d.total_items || 0).toLocaleString()}</strong>${elapsed}
+            </p>
+            <table class="admin-table">
+                <tr><th>Step</th><th>Processed</th><th>Changed</th><th>Skipped</th><th>Failed</th></tr>
+                ${rowsHtml}
+            </table>`;
+    } else if (d && d.step && typeof d.processed === 'number') {
+        // In-progress heartbeat snapshot
+        bodyHtml = `<p style="color:var(--warning)">\u23f3 Job still running — last progress snapshot:</p>
+            <pre style="white-space:pre-wrap;font-size:.82rem">${escapeHtml(JSON.stringify(d, null, 2))}</pre>`;
+    } else {
+        // Generic / legacy format
+        const raw = typeof run.detail === 'string' ? run.detail : JSON.stringify(run.detail, null, 2);
+        bodyHtml = `<pre style="white-space:pre-wrap;font-size:.82rem">${escapeHtml(raw)}</pre>`;
+    }
+
+    const overlay = document.createElement('div');
+    overlay.id = 'run-detail-modal';
+    overlay.className = 'modal-overlay';
+    overlay.innerHTML = `
+        <div class="modal-box" role="dialog" aria-modal="true">
+            <h3>${escapeHtml(run.job_name || 'Run')} \u2014 ${escapeHtml(run.status || '')}
+                <span style="font-size:.75rem;font-weight:400;opacity:.7">#${run.id}</span></h3>
+            <div class="modal-body">${bodyHtml}</div>
+            <div class="modal-actions">
+                <button class="btn btn-secondary" data-action="close">Close</button>
+            </div>
+        </div>`;
+    overlay.addEventListener('click', e => {
+        if (e.target === overlay || e.target.getAttribute('data-action') === 'close')
+            overlay.remove();
+    });
+    document.body.appendChild(overlay);
+}
+
 async function loadAdminData() {
     // Queue status
     const qResp = await fetch('/queue/state');
@@ -376,8 +461,7 @@ function connectAdminWebSocket() {
     }, 30000);
 }
 
-// Summarize a job_runs.detail JSON blob for the history table. Prefers a
-// failure message, otherwise a compact success summary.
+// Summarize a job_runs.detail JSON blob for the history table.
 function summarizeRunDetail(detail) {
     if (!detail) return '';
     let d;
@@ -385,6 +469,26 @@ function summarizeRunDetail(detail) {
     catch { return String(detail).slice(0, 160); }
     if (d && d.error) return d.error;
     if (d && typeof d === 'object') {
+        // Pipeline in-progress heartbeat
+        if (d.step && typeof d.processed === 'number') {
+            const bits = [`${d.step}: ${d.processed} processed`];
+            if (d.changed) bits.push(`${d.changed} changed`);
+            if (d.failed) bits.push(`${d.failed} failed`);
+            return '\u23f3 ' + bits.join(', ');
+        }
+        // Pipeline final report
+        if (d.steps_run && d.steps) {
+            const tag = d.dry_run ? ' [dry run]' : '';
+            const elapsed = d.elapsed_sec ? ` (${d.elapsed_sec}s)` : '';
+            const parts = d.steps_run.filter(s => d.steps[s] && d.steps[s].processed).map(s => {
+                const r = d.steps[s];
+                const bits = [];
+                if (r.changed) bits.push(`${r.changed}\u2713`);
+                if (r.failed) bits.push(`${r.failed}\u2717`);
+                return `${s}: ${bits.join(' ') || r.processed}`;
+            });
+            return parts.join(' \u00b7 ') + elapsed + tag;
+        }
         const parts = [];
         if (d.sheet) parts.push(d.sheet);
         if (d.imported_playlists && d.imported_playlists.length) parts.push(`imported: ${d.imported_playlists.join(', ')}`);

{kryten_webqueue-0.35.2 → kryten_webqueue-0.35.4}/pyproject.toml

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