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

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

@@ -2,6 +2,18 @@
 
 ## [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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: kryten-webqueue
-Version: 0.35.3
+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.3 → 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.3 → 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.3 → 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.3 → 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.3 → 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.3 → kryten_webqueue-0.35.4}/pyproject.toml

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