kryten-webqueue 0.4.2__tar.gz → 0.4.4__tar.gz

{kryten_webqueue-0.4.2 → kryten_webqueue-0.4.4}/PKG-INFO

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

{kryten_webqueue-0.4.2 → kryten_webqueue-0.4.4}/kryten_webqueue/queue/ordering.py

@@ -2,6 +2,8 @@ import asyncio
 import uuid
 import logging
 
+import httpx
+
 logger = logging.getLogger(__name__)
 
 # Module-level lock for queue ordering
@@ -25,15 +27,17 @@ async def insert_pay_queue(
     async with _queue_lock:
         request_id = str(uuid.uuid4())
 
-        # Spend currency
-        spend_result = await api_gate.queue_spend(
-            username=username,
-            duration_sec=duration_sec,
-            tier=tier,
-            request_id=request_id,
-        )
-        if not spend_result.get("success"):
-            return {"success": False, "error": spend_result.get("error", "Spend failed")}
+        # Spend currency (api-gate _unwrap strips the success envelope;
+        # raise_for_status propagates failures as httpx.HTTPStatusError)
+        try:
+            await api_gate.queue_spend(
+                username=username,
+                duration_sec=duration_sec,
+                tier=tier,
+                request_id=request_id,
+            )
+        except httpx.HTTPStatusError as exc:
+            return {"success": False, "error": f"Spend failed: {exc.response.status_code}"}
 
         # Find position: after last pay item, or prepend if none
         last_pay_uid = await db.get_last_pay_uid()
@@ -109,15 +113,17 @@ async def insert_pay_playnext(
     async with _queue_lock:
         request_id = str(uuid.uuid4())
 
-        # Spend currency
-        spend_result = await api_gate.queue_spend(
-            username=username,
-            duration_sec=duration_sec,
-            tier=tier,
-            request_id=request_id,
-        )
-        if not spend_result.get("success"):
-            return {"success": False, "error": spend_result.get("error", "Spend failed")}
+        # Spend currency (api-gate _unwrap strips the success envelope;
+        # raise_for_status propagates failures as httpx.HTTPStatusError)
+        try:
+            await api_gate.queue_spend(
+                username=username,
+                duration_sec=duration_sec,
+                tier=tier,
+                request_id=request_id,
+            )
+        except httpx.HTTPStatusError as exc:
+            return {"success": False, "error": f"Spend failed: {exc.response.status_code}"}
 
         # Add to CyTube playlist at prepend position
         add_result = await api_gate.playlist_add(

{kryten_webqueue-0.4.2 → kryten_webqueue-0.4.4}/kryten_webqueue/routes/queue.py

@@ -36,16 +36,19 @@ async def add_to_queue(request: Request, user: dict = Depends(get_current_user))
     if not item:
         raise HTTPException(404, "Item not found in catalog")
 
-    # Preview cost
+    # Preview cost (api-gate _unwrap strips the success envelope; raise_for_status
+    # handles non-2xx, so no success check needed here)
     preview = await api_gate.queue_preview(
         username=user["username"],
         duration_sec=item["duration_sec"],
         tier=tier,
     )
-    if not preview.get("success"):
-        raise HTTPException(400, preview.get("error", "Cost preview failed"))
-
-    z_cost = preview["cost"]
+    if not preview.get("available", True):
+        error_code = preview.get("error_code") or "unavailable"
+        raise HTTPException(400, error_code)
+    z_cost = preview.get("cost_z")
+    if z_cost is None:
+        raise HTTPException(502, "Cost preview returned no cost value")
 
     result = await insert_pay_queue(
         api_gate=api_gate,
@@ -88,16 +91,19 @@ async def play_next(request: Request, user: dict = Depends(get_current_user)):
     if not item:
         raise HTTPException(404, "Item not found in catalog")
 
-    # Preview cost
+    # Preview cost (api-gate _unwrap strips the success envelope; raise_for_status
+    # handles non-2xx, so no success check needed here)
     preview = await api_gate.queue_preview(
         username=user["username"],
         duration_sec=item["duration_sec"],
         tier=tier,
     )
-    if not preview.get("success"):
-        raise HTTPException(400, preview.get("error", "Cost preview failed"))
-
-    z_cost = preview["cost"]
+    if not preview.get("available", True):
+        error_code = preview.get("error_code") or "unavailable"
+        raise HTTPException(400, error_code)
+    z_cost = preview.get("cost_z")
+    if z_cost is None:
+        raise HTTPException(502, "Cost preview returned no cost value")
 
     result = await insert_pay_playnext(
         api_gate=api_gate,

{kryten_webqueue-0.4.2 → kryten_webqueue-0.4.4}/pyproject.toml

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