kryten-webqueue 0.32.2__tar.gz → 0.32.3__tar.gz

{kryten_webqueue-0.32.2 → kryten_webqueue-0.32.3}/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 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).
 
+## [0.32.3] — 2026-07-09
+
+### Fixed
+
+- **Tag/category-classified promos are now also exempt from recently-played hiding.** v0.32.2 only exempted promo-*pool* clips, but most station promos/bumpers (e.g. “CHANNEL Z …”) are classified by hidden category (`Z Channel Promos`) or tag (`channelz`, `bumpers`, …) instead, so they were still being recorded and appeared in the recently-played debug list. `record_play_completion` now skips any item hidden from the public catalog by a promo pool **or** a hidden category/tag. On startup the service self-heals by purging any such rows written by earlier builds (`purge_promo_hide_state`, now covering the tag/category case).
+
 ## [0.32.2] — 2026-07-09
 
 ### Fixed
@@ -35,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [0.32.0]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.32.0
 [0.32.1]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.32.1
 [0.32.2]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.32.2
+[0.32.3]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.32.3
 
 ## [0.31.0] — 2026-07-04
 

{kryten_webqueue-0.32.2 → kryten_webqueue-0.32.3}/PKG-INFO

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

{kryten_webqueue-0.32.2 → kryten_webqueue-0.32.3}/kryten_webqueue/app.py

@@ -51,6 +51,16 @@ async def lifespan(app: FastAPI):
     db = Database(config.db_path)
     await db.connect()
     await db.run_migrations()
+    # Self-heal: purge any recently-played hide state recorded for promos/bumpers
+    # (they are excluded from the public catalog and must never be hidden by the
+    # recently-played rules). Cheap and idempotent; also cleans rows written by
+    # older builds that classified promos only by pool membership.
+    purged = await db.purge_promo_hide_state()
+    if purged["completions"] or purged["playlist_pass"]:
+        logger.info(
+            "Purged promo recently-played state: %d completion(s), %d pass row(s)",
+            purged["completions"], purged["playlist_pass"],
+        )
     # Any job run still marked 'running' is an orphan from a prior crash/restart
     # (the running flag is in-memory only). Reconcile before registering jobs.
     orphaned = await db.reconcile_orphaned_job_runs()

{kryten_webqueue-0.32.2 → kryten_webqueue-0.32.3}/kryten_webqueue/catalog/db/_catalog.py

@@ -72,6 +72,33 @@ def _hidden_exclusion(alias: str = "c") -> tuple[str, list]:
     return sql, [*HIDDEN_CATEGORY_NAMES, *HIDDEN_TAG_NAMES]
 
 
+def _promo_hidden_media_subquery() -> tuple[str, list]:
+    """Subquery (+ params) yielding media_ids that are promos/bumpers.
+
+    "Promo/bumper" content is anything hidden from the public catalog by a promo
+    pool OR a hidden category OR a hidden tag (e.g. ``Z Channel Promos`` /
+    ``channelz``). These items never appear to regular users, so they must never
+    be recorded as recently-played. Immutable *event* playlists are intentionally
+    excluded here — they are their own class, not promos.
+    """
+    cat_ph = ",".join("?" * len(HIDDEN_CATEGORY_NAMES))
+    tag_ph = ",".join("?" * len(HIDDEN_TAG_NAMES))
+    sql = f"""
+        SELECT spi.media_id FROM saved_playlist_items spi
+        JOIN saved_playlists sp ON sp.id = spi.playlist_id
+        WHERE sp.promo_type IS NOT NULL AND spi.media_type = 'cm'
+        UNION
+        SELECT cc.friendly_token FROM catalog_categories cc
+        JOIN categories cat ON cc.category_id = cat.id
+        WHERE cat.name IN ({cat_ph})
+        UNION
+        SELECT ct.friendly_token FROM catalog_tags ct
+        JOIN tags t ON ct.tag_id = t.id
+        WHERE t.name IN ({tag_ph})
+    """
+    return sql, [*HIDDEN_CATEGORY_NAMES, *HIDDEN_TAG_NAMES]
+
+
 def _recently_played_exclusion(alias: str, days: int) -> tuple[str, list]:
     """SQL fragment (+ params) hiding recently-played items from regular users.
 
@@ -363,13 +390,14 @@ class _CatalogMixin:
 
         Promo-pool clips are exempt entirely: they are already excluded from the
         public catalog and must never be treated like normal (mutable/immutable)
-        playlist items, so playing one records nothing.
+        playlist items, so playing one records nothing. The same exemption covers
+        any promo/bumper hidden by category or tag (e.g. ``Z Channel Promos`` /
+        ``channelz``), which is how most station promos are actually classified.
         """
+        sub, sub_params = _promo_hidden_media_subquery()
         promo = await self._fetch_one(
-            "SELECT 1 FROM saved_playlist_items spi "
-            "JOIN saved_playlists sp ON sp.id = spi.playlist_id "
-            "WHERE spi.media_id = ? AND spi.media_type = ? AND sp.promo_type IS NOT NULL LIMIT 1",
-            [friendly_token, media_type],
+            f"SELECT 1 WHERE ? IN ({sub})",
+            [friendly_token, *sub_params],
         )
         if promo:
             return
@@ -448,26 +476,25 @@ class _CatalogMixin:
         return {"completions": pc["c"] if pc else 0, "playlist_pass": pip["c"] if pip else 0}
 
     async def purge_promo_hide_state(self) -> dict:
-        """Remove any recently-played hide state recorded for promo-pool clips.
+        """Remove any recently-played hide state recorded for promos/bumpers.
 
         Promos must never be subject to recently-played hiding. New completions
         are already skipped in ``record_play_completion``; this purges rows
-        written before that exemption existed (also run once by migration v14).
+        written before that exemption existed (run once at startup). Covers promo
+        pools plus hidden-category/tag promos (the usual station-promo case).
         Returns the row counts removed.
         """
-        promo_subquery = (
-            "SELECT spi.media_id FROM saved_playlist_items spi "
-            "JOIN saved_playlists sp ON sp.id = spi.playlist_id "
-            "WHERE sp.promo_type IS NOT NULL AND spi.media_type = 'cm'"
-        )
+        sub, sub_params = _promo_hidden_media_subquery()
         pc = await self._fetch_one(
-            f"SELECT COUNT(*) AS c FROM play_completions WHERE media_id IN ({promo_subquery})"
+            f"SELECT COUNT(*) AS c FROM play_completions WHERE media_id IN ({sub})",
+            sub_params,
         )
         pip = await self._fetch_one(
-            f"SELECT COUNT(*) AS c FROM playlist_item_played WHERE media_id IN ({promo_subquery})"
+            f"SELECT COUNT(*) AS c FROM playlist_item_played WHERE media_id IN ({sub})",
+            sub_params,
         )
-        await self._execute(f"DELETE FROM play_completions WHERE media_id IN ({promo_subquery})")
-        await self._execute(f"DELETE FROM playlist_item_played WHERE media_id IN ({promo_subquery})")
+        await self._execute(f"DELETE FROM play_completions WHERE media_id IN ({sub})", sub_params)
+        await self._execute(f"DELETE FROM playlist_item_played WHERE media_id IN ({sub})", sub_params)
         return {"completions": pc["c"] if pc else 0, "playlist_pass": pip["c"] if pip else 0}
 
     async def get_recently_played_debug(self, days: int) -> dict:

{kryten_webqueue-0.32.2 → kryten_webqueue-0.32.3}/pyproject.toml

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

{kryten_webqueue-0.32.2 → kryten_webqueue-0.32.3}/tests/test_recently_played_hide.py

@@ -395,6 +395,39 @@ async def test_purge_promo_hide_state_removes_stale_rows(db):
     assert (await db.get_recently_played_debug(21))["by_completion"] == []
 
 
+async def test_hidden_tag_promo_is_exempt_from_hiding(db):
+    # Station promos/bumpers are usually classified by hidden tag/category
+    # (e.g. `channelz`), not promo-pool membership. They must still be exempt.
+    await _add_catalog(db, "bumper", "CHANNEL Z - ITS 10PM", duration_sec=15)
+    tid = await db.upsert_tag("channelz")
+    await db.set_catalog_tags("bumper", [tid])
+
+    await db.record_play_completion(friendly_token="bumper", duration_sec=15)
+    assert await db._fetch_all("SELECT media_id FROM play_completions") == []
+
+
+async def test_hidden_category_promo_is_exempt_from_hiding(db):
+    await _add_catalog(db, "bumper", "Z Promo", duration_sec=15)
+    cid = await db.upsert_category("Z Channel Promos")
+    await db.set_catalog_categories("bumper", [cid])
+
+    await db.record_play_completion(friendly_token="bumper", duration_sec=15)
+    assert await db._fetch_all("SELECT media_id FROM play_completions") == []
+
+
+async def test_purge_removes_hidden_tag_promo_rows(db):
+    # A stale row written before the tag/category exemption is cleaned by purge.
+    await _add_catalog(db, "bumper", "CHANNEL Z - ITS 10PM", duration_sec=15)
+    tid = await db.upsert_tag("channelz")
+    await db.set_catalog_tags("bumper", [tid])
+    await db._execute("INSERT INTO play_completions (media_type, media_id) VALUES ('cm', 'bumper')")
+
+    removed = await db.purge_promo_hide_state()
+    assert removed["completions"] == 1
+    assert await db._fetch_all("SELECT media_id FROM play_completions") == []
+
+
+