kryten-webqueue 0.45.0__tar.gz → 0.46.0__tar.gz

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [0.46.0] - 2026-09-10
+
+### Changed
+
+- **MOTD template rebuilt from the live hand-built MOTD** (pulled from the
+  channel via api-gate) rather than the older copy in kryten-llm. Banner image,
+  headline, and both footer lines now match the real markup verbatim — including
+  the "Our Webqueue app is in open beta!" footer text that the earlier default
+  dropped. The generated snippet diffs clean against the live one apart from
+  properly closed `<a>` tags and `title`/`alt` attributes.
+- **Grid shape follows the schedule.** A 5/7 weekend now renders 5/7 instead of
+  being forced into an even 6/6, matching how the MOTD is actually built. A
+  night is never truncated, so an over-full weekend shows every scheduled movie;
+  `motd.slots` is a target the grid is only padded *up* to when the weekend is
+  still thin.
+- **Sunday is excluded.** New `motd.nights` (default `[1, 2]`) controls which
+  nights the grid covers; Sunday has no schedule yet, so its workbook titles are
+  parsed but ignored. Add `3` once the scheduled-playlists feature fills that
+  slot.
+- **The next-event line stays hidden.** It is still carried in the render
+  context, but is only emitted when `motd.show_next_event` is true (default
+  false), so the published MOTD matches the hand-built one until the feature is
+  deliberately debuted.
+
+## [0.45.1] - 2026-09-10
+
+### Fixed
+
+- **MOTD mystery boxes now use the branded placeholder art** the catalog browse
+  view already draws from (`placeholder_dir`, served under `/images`), picking a
+  different tape per slot the way browse varies it per tile. The 0.45.0 default
+  pointed at a `motd_boxes/mystery-box.jpg` that doesn't exist, so every
+  unresolved slot would have rendered a broken image. New
+  `motd.mystery_box_base_url` absolutizes those URLs for CyTube, which renders
+  the MOTD off-site; `motd.mystery_box_url` is now an empty-by-default fallback
+  used only when no branded placeholders are installed.
+
 ## [0.45.0] - 2026-09-10
 
 ### Added

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/PKG-INFO

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

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/config.example.json

@@ -92,19 +92,22 @@
     "output_dir": "~/kryten",
     "template": "channel_z.html",
     "slots": 12,
+    "nights": [1, 2],
     "banner_url": "https://i.postimg.cc/jdr2mR8Y/1562479186-8-channel-Ztitlenew.png",
     "headline": "CHANNEL Z WEEKEND MOVIE PLAYLIST ({dates})",
     "showtime": "6pm ET",
-    "mystery_box_url": "https://www.dropsugar.co/static/motd_boxes/mystery-box.jpg",
+    "mystery_box_base_url": "https://queue.dropsugar.co",
+    "mystery_box_url": "",
     "mystery_box_href": "https://queue.dropsugar.co/",
     "upload_max_bytes": 5242880,
     "links": [
       { "label": "Join us on Reddit!", "url": "https://www.reddit.com/r/Channel_Z/" },
       {
-        "label": "See the queue and decide what's next!",
+        "label": "See the queue and decide what's next! Our Webqueue app is in open beta!",
         "url": "https://queue.dropsugar.co/"
       }
-    ]
+    ],
+    "show_next_event": false
   },
 
   "prometheus_port": 28292

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/kryten_webqueue/config.py

@@ -43,11 +43,19 @@ class MOTDConfig(BaseModel):
     template: str = "channel_z.html"
     # Grid size; unresolved positions are filled with mystery boxes.
     slots: int = 12
+    # Nights the grid covers, in display order (1=Fri, 2=Sat, 3=Sun). Sunday has
+    # no schedule yet, so its workbook titles are ignored until it's added here.
+    nights: list[int] = Field(default_factory=lambda: [1, 2])
     banner_url: str = "https://i.postimg.cc/jdr2mR8Y/1562479186-8-channel-Ztitlenew.png"
     # {dates} is substituted with the weekend showtimes (e.g. "8/14 @ 6pm ET & ...").
     headline: str = "CHANNEL Z WEEKEND MOVIE PLAYLIST ({dates})"
     showtime: str = "6pm ET"
-    mystery_box_url: str = "https://www.dropsugar.co/static/motd_boxes/mystery-box.jpg"
+    # Mystery boxes are drawn from the same branded placeholder pool the browse
+    # view uses (served from the webqueue /images mount); this absolutizes them
+    # for CyTube, which renders the MOTD off-site.
+    mystery_box_base_url: str = "https://queue.dropsugar.co"
+    # Single fallback used only when no branded placeholders are installed.
+    mystery_box_url: str = ""
     mystery_box_href: str = "https://queue.dropsugar.co/"
     links: list[MOTDLink] = Field(
         default_factory=lambda: [
@@ -56,11 +64,14 @@ class MOTDConfig(BaseModel):
                 url="https://www.reddit.com/r/Channel_Z/",
             ),
             MOTDLink(
-                label="See the queue and decide what's next!",
+                label="See the queue and decide what's next! Our Webqueue app is in open beta!",
                 url="https://queue.dropsugar.co/",
             ),
         ]
     )
+    # The next-event line is carried in the render context but stays hidden until
+    # it's deliberately debuted; the hand-built MOTD has no such line.
+    show_next_event: bool = False
     # Max size accepted by the admin alternate-art upload endpoint.
     upload_max_bytes: int = 5 * 1024 * 1024
 

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/kryten_webqueue/jobs/motd_publish.py

@@ -17,7 +17,7 @@ import datetime
 import logging
 from pathlib import Path
 
-from ..motd.builder import build_slots
+from ..motd.builder import build_slots, mystery_pool
 from ..motd.render import render_motd
 from .manager import JobError
 
@@ -140,6 +140,7 @@ async def motd_publish_job(params: dict, ctx) -> dict:
             refresh_art=refresh_art,
             dry_run=dry_run,
             week_offset=week_offset,
+            mystery_urls=mystery_pool(ctx.config, getattr(ctx, "cover_art", None)),
             emit=_emit,
         )
     except RuntimeError as exc:

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/kryten_webqueue/motd/builder.py

@@ -13,6 +13,7 @@ from __future__ import annotations
 
 import datetime
 import logging
+import random
 import re
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -34,7 +35,9 @@ logger = logging.getLogger(__name__)
 
 SLOT_KEY_RE = re.compile(r"^night[1-3]-slot([1-9]\d{0,2})$")
 
-# Nights the grid always reserves space for, in display order.
+# Every night the workbook can describe. The grid itself covers only the nights
+# in ``motd.nights`` — Sunday has no schedule yet, so its titles are parsed but
+# never placed.
 _NIGHTS = (1, 2, 3)
 
 
@@ -117,17 +120,43 @@ def _imdb_href(imdb_id: str | None) -> str:
     return f"https://www.imdb.com/title/{imdb_id}/" if imdb_id else ""
 
 
+def _grid_nights(motd_cfg) -> tuple[int, ...]:
+    """Nights the grid reserves space for, in display order."""
+    configured = getattr(motd_cfg, "nights", None) or _NIGHTS
+    nights = tuple(int(n) for n in configured if int(n) in _NIGHTS)
+    return nights or _NIGHTS
+
+
+def _slot_counts(
+    titles_by_night: dict[int, list[str]], nights: tuple[int, ...], slots: int
+) -> dict[int, int]:
+    """Decide how many positions each night gets.
+
+    The schedule drives the shape — a 5/7 weekend renders 5/7, not an even 6/6 —
+    and a night is never truncated, so a scheduled movie can't be hidden. Only
+    when the weekend is still thin is the grid padded up to ``slots``, handing
+    each extra to whichever night is furthest below its even share.
+    """
+    counts = {n: len(titles_by_night.get(n, [])) for n in nights}
+    share = slots / len(nights)
+    while sum(counts.values()) < slots:
+        night = min(nights, key=lambda n: (counts[n] - share, nights.index(n)))
+        counts[night] += 1
+    return counts
+
+
 def _blank_grid(
-    friday: datetime.date, saturday: datetime.date, sunday: datetime.date, slots: int
+    friday: datetime.date,
+    saturday: datetime.date,
+    sunday: datetime.date,
+    counts: dict[int, int],
+    nights: tuple[int, ...],
 ) -> list[MOTDSlot]:
-    """Lay out ``slots`` positions spread evenly across the three nights."""
-    per_night = max(1, slots // len(_NIGHTS))
-    remainder = slots - per_night * len(_NIGHTS)
+    """Lay out the per-night positions in display order."""
     dates = {1: friday, 2: saturday, 3: sunday}
     grid: list[MOTDSlot] = []
-    for night in _NIGHTS:
-        count = per_night + (1 if night <= remainder else 0)
-        for position in range(1, count + 1):
+    for night in nights:
+        for position in range(1, counts[night] + 1):
             grid.append(
                 MOTDSlot(
                     slot_key=f"night{night}-slot{position}",
@@ -149,9 +178,28 @@ def _titles_by_night(movies_by_section: dict[str, list[str]]) -> dict[int, list[
     return by_night
 
 
-def _apply_mystery(slot: MOTDSlot, motd_cfg) -> None:
+def mystery_pool(config, cover_art) -> list[str]:
+    """Absolute URLs for the branded placeholder art the browse view uses.
+
+    ``list_placeholder_urls`` returns site-relative ``/images/...`` paths; CyTube
+    renders the MOTD off-site, so they have to be absolutized.
+    """
+    if cover_art is None:
+        return []
+    base = str(getattr(config.motd, "mystery_box_base_url", "") or "").rstrip("/")
+    if not base:
+        return []
+    return [base + url for url in cover_art.list_placeholder_urls()]
+
+
+def _apply_mystery(slot: MOTDSlot, motd_cfg, pool: list[str]) -> None:
     slot.source = "mystery"
-    slot.poster_url = getattr(motd_cfg, "mystery_box_url", "") or ""
+    # Vary the art across the grid the way browse varies it across tiles.
+    slot.poster_url = (
+        random.choice(pool)
+        if pool
+        else (getattr(motd_cfg, "mystery_box_url", "") or "")
+    )
     slot.href = getattr(motd_cfg, "mystery_box_href", "") or ""
 
 
@@ -164,6 +212,7 @@ def build_slots(
     dry_run: bool = False,
     today: datetime.date | None = None,
     week_offset: int = 0,
+    mystery_urls: list[str] | None = None,
     emit=None,
 ) -> MOTDWeek:
     """Resolve the upcoming weekend into a complete grid of poster slots.
@@ -178,6 +227,7 @@ def build_slots(
             emit(detail)
 
     overrides = overrides or {}
+    pool = mystery_urls or []
     motd_cfg = getattr(config, "motd", None)
     slot_count = int(getattr(motd_cfg, "slots", 12) or 12)
     poster_dir = Path(
@@ -190,7 +240,6 @@ def build_slots(
     week_key, friday, saturday = upcoming_weekend_sheet(base_day)
     sunday = friday + datetime.timedelta(days=2)
     week = MOTDWeek(week_key=week_key, friday=friday, saturday=saturday, sunday=sunday)
-    week.slots = _blank_grid(friday, saturday, sunday, slot_count)
 
     # The workbook is best-effort: a missing sheet yields an all-mystery grid
     # rather than a failed run, so the MOTD still publishes on schedule.
@@ -208,6 +257,15 @@ def build_slots(
         week.warnings.append(f"workbook unavailable: {exc}")
         logger.warning("motd: workbook unavailable for %s: %s", week_key, exc)
 
+    nights = _grid_nights(motd_cfg)
+    week.slots = _blank_grid(
+        friday,
+        saturday,
+        sunday,
+        _slot_counts(titles_by_night, nights, slot_count),
+        nights,
+    )
+
     if not dry_run:
         poster_dir.mkdir(parents=True, exist_ok=True)
 
@@ -234,13 +292,13 @@ def build_slots(
             continue
 
         if not slot.title:
-            _apply_mystery(slot, motd_cfg)
+            _apply_mystery(slot, motd_cfg, pool)
             slot.note = "no title on the schedule yet"
             continue
 
         info = _resolve_omdb(slot.title, api_key=omdb_key) if omdb_key else None
         if not info:
-            _apply_mystery(slot, motd_cfg)
+            _apply_mystery(slot, motd_cfg, pool)
             slot.note = "title could not be verified"
             logger.info("motd: no OMDB match for %r (%s)", slot.title, slot.slot_key)
             if override.get("href"):
@@ -266,7 +324,7 @@ def build_slots(
                 slot.poster_url = f"{poster_base_url}/{filename}"
                 slot.source = "omdb"
             else:
-                _apply_mystery(slot, motd_cfg)
+                _apply_mystery(slot, motd_cfg, pool)
                 slot.note = "poster download failed"
 
         slot.href = override.get("href") or _imdb_href(slot.imdb_id)

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/kryten_webqueue/motd/render.py

@@ -73,6 +73,7 @@ def render_motd(config, week: MOTDWeek, *, next_event: dict | None = None) -> st
             for link in getattr(motd_cfg, "links", [])
         ],
         next_event=next_event,
+        show_next_event=bool(getattr(motd_cfg, "show_next_event", False)),
         week_key=week.week_key,
         generated_at=datetime.datetime.now(datetime.timezone.utc).isoformat(
             timespec="seconds"

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/kryten_webqueue/routes/admin_motd.py

@@ -18,7 +18,7 @@ from fastapi import APIRouter, Depends, File, Form, HTTPException, Request, Uplo
 from pydantic import BaseModel
 
 from ..auth.session import require_admin
-from ..motd.builder import SLOT_KEY_RE, build_slots, week_context
+from ..motd.builder import SLOT_KEY_RE, build_slots, mystery_pool, week_context
 from ..motd.render import render_motd
 
 router = APIRouter(prefix="/admin/motd", tags=["admin"])
@@ -72,6 +72,9 @@ async def _build_current(request: Request, week: str = "current"):
         overrides=overrides,
         dry_run=True,
         week_offset=_week_offset(week),
+        mystery_urls=mystery_pool(
+            config, getattr(request.app.state, "cover_art", None)
+        ),
     )
 
 

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/kryten_webqueue/templates/motd/channel_z.html

@@ -22,7 +22,7 @@
 {% endfor %}
 {% endfor %}
         </div>
-{% if next_event %}
+{% if show_next_event and next_event %}
         <div class="weekend-title">🟥🟧🟨🟩Up next: {{ next_event.label }}{% if next_event.starts_in %} — {{ next_event.starts_in }}{% endif %}🟩🟨🟧🟥</div>
 {% endif %}
 {% for link in links %}

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/pyproject.toml

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

{kryten_webqueue-0.45.0 → kryten_webqueue-0.46.0}/tests/test_motd_publish.py

@@ -30,6 +30,7 @@ def _config(tmp_path, **motd_kw):
         poster_dir=str(tmp_path / "boxes"),
         poster_base_url="https://cdn.example/boxes",
         output_dir=str(tmp_path / "out"),
+        mystery_box_base_url="https://queue.example",
         mystery_box_url="https://cdn.example/boxes/mystery.jpg",
         mystery_box_href="https://queue.example/",
         **motd_kw,
@@ -71,12 +72,70 @@ def _stub_workbook(monkeypatch, titles_by_night):
 # --- grid layout ---
 
 
-def test_grid_is_always_full_size(tmp_path, monkeypatch, stub_lookup):
+def test_grid_pads_a_thin_weekend_to_the_target_size(
+    tmp_path, monkeypatch, stub_lookup
+):
     _stub_workbook(monkeypatch, {})
     week = builder.build_slots(_config(tmp_path), today=datetime.date(2026, 3, 4))
     assert len(week.slots) == 12
     assert [s.slot_key for s in week.slots[:2]] == ["night1-slot1", "night1-slot2"]
+    # Sunday has no schedule yet, so the grid is Friday + Saturday.
+    assert {s.night for s in week.slots} == {1, 2}
+    assert len([s for s in week.slots if s.night == 1]) == 6
+    assert len([s for s in week.slots if s.night == 2]) == 6
+
+
+def test_grid_shape_follows_the_schedule(tmp_path, monkeypatch, stub_lookup):
+    # A real 5/7 weekend renders 5/7, not an even 6/6.
+    _stub_workbook(
+        monkeypatch,
+        {
+            1: [f"Friday {n} (1980)" for n in range(5)],
+            2: [f"Saturday {n} (1980)" for n in range(7)],
+        },
+    )
+    week = builder.build_slots(_config(tmp_path), today=datetime.date(2026, 3, 4))
+    assert len([s for s in week.slots if s.night == 1]) == 5
+    assert len([s for s in week.slots if s.night == 2]) == 7
+    assert all(s.resolved for s in week.slots)
+
+
+def test_grid_never_truncates_an_overfull_weekend(tmp_path, monkeypatch, stub_lookup):
+    _stub_workbook(
+        monkeypatch,
+        {
+            1: [f"Friday {n} (1980)" for n in range(8)],
+            2: [f"Saturday {n} (1980)" for n in range(7)],
+        },
+    )
+    week = builder.build_slots(_config(tmp_path), today=datetime.date(2026, 3, 4))
+    assert len(week.slots) == 15
+    assert "Friday 7 (1980)" in [s.title for s in week.slots]
+
+
+def test_sunday_titles_are_ignored(tmp_path, monkeypatch, stub_lookup):
+    _stub_workbook(
+        monkeypatch,
+        {
+            1: ["Friday One (1976)"],
+            2: ["Saturday One (1980)"],
+            3: ["Sunday One (1990)"],
+        },
+    )
+    week = builder.build_slots(_config(tmp_path), today=datetime.date(2026, 3, 4))
+    titles = [s.title for s in week.slots if s.title]
+    assert "Friday One (1976)" in titles
+    assert "Saturday One (1980)" in titles
+    assert "Sunday One (1990)" not in titles
+
+
+def test_nights_config_can_re_enable_sunday(tmp_path, monkeypatch, stub_lookup):
+    _stub_workbook(monkeypatch, {3: ["Sunday One (1990)"]})
+    week = builder.build_slots(
+        _config(tmp_path, nights=[1, 2, 3]), today=datetime.date(2026, 3, 4)
+    )
     assert {s.night for s in week.slots} == {1, 2, 3}
+    assert "Sunday One (1990)" in [s.title for s in week.slots if s.title]
 
 
 def test_missing_workbook_yields_all_mystery(tmp_path, monkeypatch, stub_lookup):
@@ -126,6 +185,43 @@ def test_unverifiable_title_falls_back_to_mystery(tmp_path, monkeypatch, stub_lo
     assert "could not be verified" in slot.note
 
 
+# --- mystery art comes from the browse view's branded placeholder pool ---
+
+
+def test_mystery_pool_absolutizes_browse_placeholders(tmp_path):
+    config = _config(tmp_path)
+    cover_art = SimpleNamespace(
+        list_placeholder_urls=lambda: ["/images/placeholders/a.webp"]
+    )
+    assert builder.mystery_pool(config, cover_art) == [
+        "https://queue.example/images/placeholders/a.webp"
+    ]
+    assert builder.mystery_pool(config, None) == []
+
+
+def test_mystery_slots_use_the_placeholder_pool(tmp_path, monkeypatch, stub_lookup):
+    _stub_workbook(monkeypatch, {})
+    week = builder.build_slots(
+        _config(tmp_path),
+        today=datetime.date(2026, 3, 4),
+        mystery_urls=["https://queue.example/images/placeholders/a.webp"],
+    )
+    assert all(
+        s.poster_url == "https://queue.example/images/placeholders/a.webp"
+        for s in week.slots
+    )
+
+
+def test_mystery_falls_back_when_no_placeholders_installed(
+    tmp_path, monkeypatch, stub_lookup
+):
+    _stub_workbook(monkeypatch, {})
+    week = builder.build_slots(
+        _config(tmp_path), today=datetime.date(2026, 3, 4), mystery_urls=[]
+    )
+    assert all(s.poster_url.endswith("mystery.jpg") for s in week.slots)
+
+
 def test_dry_run_writes_nothing(tmp_path, monkeypatch, stub_lookup):
     _stub_workbook(monkeypatch, {1: ["The Big Bus (1976)"]})
     builder.build_slots(
@@ -203,13 +299,25 @@ def test_render_groups_by_night_and_includes_links(tmp_path, monkeypatch, stub_l
     assert "3/6 @ 6pm ET & 3/7 @ 6pm ET" in html
 
 
-def test_render_includes_next_event_when_present(tmp_path, monkeypatch, stub_lookup):
+def test_next_event_is_carried_but_hidden_by_default(
+    tmp_path, monkeypatch, stub_lookup
+):
     _stub_workbook(monkeypatch, {})
     config = _config(tmp_path)
     week = builder.build_slots(config, today=datetime.date(2026, 3, 4))
     html = render.render_motd(
         config, week, next_event={"label": "Saturday Night", "starts_in": "in 2h"}
     )
+    assert "Up next" not in html
+
+
+def test_render_includes_next_event_when_enabled(tmp_path, monkeypatch, stub_lookup):
+    _stub_workbook(monkeypatch, {})
+    config = _config(tmp_path, show_next_event=True)
+    week = builder.build_slots(config, today=datetime.date(2026, 3, 4))
+    html = render.render_motd(
+        config, week, next_event={"label": "Saturday Night", "starts_in": "in 2h"}
+    )
     assert "Up next: Saturday Night — in 2h" in html