kryten-webqueue 0.19.0__tar.gz → 0.20.0__tar.gz

{kryten_webqueue-0.19.0 → kryten_webqueue-0.20.0}/CHANGELOG.md

@@ -6,6 +6,19 @@ 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.20.0] — 2026-06-17
+
+### Added
+
+- **Richer fetchurls / job logging.** The fetchurls job now logs a per-section resolved/failed summary and a WARNING line for every failing URL (with its Excel row and the reason), and folds a compact `failures_detail` list into the `job_runs` record so the admin "Detail" column shows a concrete example instead of just a count. The `run()` result gained `section_summary` and `failure_details`.
+- **Actionable log format.** Application loggers (`kryten_webqueue.*`) now include the source `file:line` in each line via a dedicated formatter, while uvicorn keeps its leaner format.
+
+### Fixed
+
+- **SharePoint download failures lost their detail.** `download_sharepoint_xlsx` raised `SystemExit` (a `BaseException` the job manager's `except Exception` couldn't catch), so a failed download could bubble up uncaught with no recorded detail. It now raises `RuntimeError` with the HTTP status and a response excerpt, so the failure is caught, logged, and recorded in the job run.
+
+[0.20.0]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.20.0
+
 ## [0.19.0] — 2026-06-17
 
 ### Changed

{kryten_webqueue-0.19.0 → kryten_webqueue-0.20.0}/PKG-INFO

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

{kryten_webqueue-0.19.0 → kryten_webqueue-0.20.0}/kryten_webqueue/integrations/cmsutils/fetchurls.py

@@ -345,9 +345,9 @@ def download_sharepoint_xlsx(token: str, sharing_url: str) -> tuple[bytes, str,
     meta_url = f"{GRAPH_BASE}/shares/{encoded}/driveItem"
     r = requests.get(meta_url, headers=headers, timeout=REQUEST_TIMEOUT)
     if r.status_code != 200:
-        sys.exit(
-            f"ERROR: Could not resolve SharePoint file via Graph API "
-            f"(HTTP {r.status_code}).\n{r.text}"
+        raise RuntimeError(
+            f"Could not resolve SharePoint file via Graph API (HTTP {r.status_code}). "
+            f"Response: {r.text[:500]}"
         )
     item = r.json()
 
@@ -368,10 +368,17 @@ def download_sharepoint_xlsx(token: str, sharing_url: str) -> tuple[bytes, str,
         if dl_r.status_code == 302:
             download_url = dl_r.headers["Location"]
         else:
-            sys.exit(f"ERROR: Could not get download URL (HTTP {dl_r.status_code})")
+            raise RuntimeError(
+                f"Could not get SharePoint download URL (HTTP {dl_r.status_code}). "
+                f"Response: {dl_r.text[:500]}"
+            )
 
     content_r = requests.get(download_url, timeout=60)
-    content_r.raise_for_status()
+    if not content_r.ok:
+        raise RuntimeError(
+            f"SharePoint file download failed (HTTP {content_r.status_code}). "
+            f"Response: {content_r.text[:500]}"
+        )
     return content_r.content, drive_id, item_id
 
 
@@ -1415,6 +1422,10 @@ def run(params: dict, *, config, progress=None) -> dict:
     section_lines: dict[str, list[str]] = {}
     section_labels: dict[str, str] = {}
     all_results: dict[str, list[ProcessResult]] = {}
+    # Per-section {resolved, failed} counts and a flat list of failed rows for
+    # actionable diagnostics (surfaced in the job log + job_runs detail).
+    section_summary: dict[str, dict] = {}
+    failure_details: list[dict] = []
 
     try:
         for slug, url_rows in sections.items():
@@ -1428,16 +1439,27 @@ def run(params: dict, *, config, progress=None) -> dict:
             all_results[slug] = results
             write_playlist(out_dir / f"{sheet_name}-{slug}.txt", results)
             lines = []
+            sec_resolved = 0
+            sec_failed = 0
             for r in results:
                 if r.success:
                     resolved += 1
+                    sec_resolved += 1
                     if r.resolved_url != r.original_url:
                         downloaded += 1
                     token = _extract_manifest_token(r.resolved_url)
                     lines.append(f"cm:{token}" if token else r.resolved_url)
                 else:
                     failures += 1
+                    sec_failed += 1
+                    failure_details.append({
+                        "section": label,
+                        "row": r.row_number,
+                        "url": r.original_url,
+                        "note": r.note,
+                    })
             section_lines[slug] = lines
+            section_summary[label] = {"resolved": sec_resolved, "failed": sec_failed}
         write_failures(out_dir / f"{sheet_name}-failures.txt", all_results)
     finally:
         run_fetch = original_run_fetch
@@ -1461,6 +1483,8 @@ def run(params: dict, *, config, progress=None) -> dict:
         "writeback": writeback_stats,
         "section_lines": section_lines,
         "section_labels": section_labels,
+        "section_summary": section_summary,
+        "failure_details": failure_details,
         "imported_playlists": [],  # filled in by the async job wrapper
         "dry_run": dry_run,
     }

{kryten_webqueue-0.19.0 → kryten_webqueue-0.20.0}/kryten_webqueue/jobs/tasks.py

@@ -185,9 +185,41 @@ async def fetchurls_job(params: dict, ctx):
         info = await _import_section_as_playlist(ctx, name, lines, triggered_by)
         if info:
             imported.append(info["name"])
+            logger.info("fetchurls: imported %d item(s) into '%s'", info["count"], info["name"])
     result["imported_playlists"] = imported
-    result.pop("section_lines", None)  # keep the persisted detail compact
+
+    # Per-section resolved/failed summary for the process log.
+    sheet = result.get("sheet", "?")
+    for label, counts in (result.get("section_summary") or {}).items():
+        logger.info(
+            "fetchurls[%s] section '%s': resolved %d / failed %d",
+            sheet, label, counts.get("resolved", 0), counts.get("failed", 0),
+        )
+
+    # Surface each failing URL (with its Excel row) at WARNING, and keep a
+    # compact copy in the job result so the admin "Detail" column shows it.
+    failure_details = result.get("failure_details") or []
+    if failure_details:
+        logger.warning(
+            "fetchurls[%s]: %d URL(s) failed to resolve", sheet, len(failure_details)
+        )
+        for f in failure_details:
+            logger.warning(
+                "fetchurls[%s]   [%s row %s] %s — %s",
+                sheet, f.get("section", "?"), f.get("row", "?"),
+                f.get("url", ""), f.get("note", ""),
+            )
+        # Keep at most 25 in the persisted detail to stay compact.
+        result["failures_detail"] = [
+            {"section": f.get("section"), "row": f.get("row"),
+             "url": f.get("url"), "note": f.get("note")}
+            for f in failure_details[:25]
+        ]
+
+    # Trim the bulky intermediates from the persisted detail.
+    result.pop("section_lines", None)
     result.pop("section_labels", None)
+    result.pop("failure_details", None)
     return result
 
 

{kryten_webqueue-0.19.0 → kryten_webqueue-0.20.0}/kryten_webqueue/logging_config.py

@@ -43,6 +43,12 @@ def build_log_config(log_level: str = "INFO", promo_log_level: str | None = None
                 "format": "%(asctime)s %(levelname)-8s %(name)s: %(message)s",
                 "datefmt": "%Y-%m-%d %H:%M:%S",
             },
+            # Application formatter includes the source file:line so every app
+            # log line is actionable (uvicorn keeps the leaner "default").
+            "app": {
+                "format": "%(asctime)s %(levelname)-8s %(name)s %(filename)s:%(lineno)d: %(message)s",
+                "datefmt": "%Y-%m-%d %H:%M:%S",
+            },
             "access": {
                 "format": "%(asctime)s %(levelname)-8s %(name)s: %(message)s",
                 "datefmt": "%Y-%m-%d %H:%M:%S",
@@ -54,6 +60,11 @@ def build_log_config(log_level: str = "INFO", promo_log_level: str | None = None
                 "formatter": "default",
                 "stream": "ext://sys.stderr",
             },
+            "appconsole": {
+                "class": "logging.StreamHandler",
+                "formatter": "app",
+                "stream": "ext://sys.stderr",
+            },
             "access": {
                 "class": "logging.StreamHandler",
                 "formatter": "access",
@@ -64,14 +75,14 @@ def build_log_config(log_level: str = "INFO", promo_log_level: str | None = None
         "loggers": {
             "kryten_webqueue": {
                 "level": app_level,
-                "handlers": ["console"],
+                "handlers": ["appconsole"],
                 "propagate": False,
             },
             # Promo subsystem: independently tunable so operators can crank it to
             # DEBUG for a deep dive without flooding the rest of the app.
             "kryten_webqueue.promos": {
                 "level": promo_level,
-                "handlers": ["console"],
+                "handlers": ["appconsole"],
                 "propagate": False,
             },
             "uvicorn": {"level": "INFO", "handlers": ["console"], "propagate": False},

{kryten_webqueue-0.19.0 → kryten_webqueue-0.20.0}/kryten_webqueue/templates/admin/index.html

@@ -321,6 +321,10 @@ function summarizeRunDetail(detail) {
         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 (d.failures_detail && d.failures_detail.length) {
+            const f = d.failures_detail[0];
+            parts.push(`e.g. [${f.section || '?'} row ${f.row || '?'}] ${f.note || ''}`.trim());
+        }
         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(' · ');

{kryten_webqueue-0.19.0 → kryten_webqueue-0.20.0}/pyproject.toml

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