Update app.py

app.py

@@ -2,7 +2,7 @@ import os
 import time
 import json
 import tempfile
-from typing import Dict, Any, List
+from typing import Dict, Any, List, Generator, Tuple
 
 import requests
 import gradio as gr
@@ -15,6 +15,10 @@ def _now() -> str:
     return time.strftime("%H:%M:%S")
 
 
+def _sleep(ms: int):
+    time.sleep(ms / 1000)
+
+
 def _auth_headers() -> Dict[str, str]:
     token = os.environ.get("PRINTIFY_API_TOKEN")
     if not token:
@@ -38,44 +42,10 @@ def _log(logs: List[str], msg: str):
     logs.append(f"[{_now()}] {msg}")
 
 
-def _pick_shop_id(logs: List[str], shop_id_text: str) -> int:
-    if isinstance(shop_id_text, str) and shop_id_text.strip().isdigit():
-        sid = int(shop_id_text.strip())
-        _log(logs, f"USING_SHOP_ID (manual) {sid}")
-        return sid
-
-    _log(logs, "Listing shops")
-    shops = _req("GET", "/v1/shops.json")
-    if not isinstance(shops, list):
-        raise RuntimeError("Unexpected shops response.")
-
-    _log(logs, f"FOUND {len(shops)} shops")
-
-    picked = None
-    for s in shops:
-        title = (s.get("title") or "").strip().lower()
-        if title == "atheria":
-            picked = s
-            break
-
-    if not picked and shops:
-        picked = shops[0]
-
-    if not picked or not picked.get("id"):
-        raise RuntimeError("Could not resolve a shop id (no shops returned).")
-
-    sid = int(picked["id"])
-    _log(logs, f"USING_SHOP_ID (auto) {sid} title={(picked.get('title') or 'untitled')}")
-    return sid
-
-
-def _collect_phase_a(shop_id: int, logs: List[str]) -> Dict[str, Any]:
+def _find_first_valid_pair(logs: List[str]) -> Dict[str, Any]:
     _log(logs, "Listing blueprints")
     blueprints = _req("GET", "/v1/catalog/blueprints.json")
 
-    templates: List[Dict[str, Any]] = []
-    scanned_pairs = 0
-
     for bp in blueprints:
         bp_id = str(bp["id"])
         _log(logs, f"Blueprint {bp_id}: fetching providers")
@@ -83,7 +53,6 @@ def _collect_phase_a(shop_id: int, logs: List[str]) -> Dict[str, Any]:
         providers = _req("GET", f"/v1/catalog/blueprints/{bp_id}/print_providers.json")
         for p in providers:
             p_id = str(p["id"])
-            scanned_pairs += 1
             _log(logs, f"Blueprint {bp_id} / Provider {p_id}: fetching variants")
 
             vr = _req(
@@ -91,32 +60,22 @@ def _collect_phase_a(shop_id: int, logs: List[str]) -> Dict[str, Any]:
                 f"/v1/catalog/blueprints/{bp_id}/print_providers/{p_id}/variants.json?show-out-of-stock=1",
             )
             variants = vr.get("variants")
-            if not (isinstance(variants, list) and variants):
-                continue
-
-            _log(logs, f"FOUND {len(variants)} variants")
-
-            blob = {
-                "blueprint": bp,
-                "provider": p,
-                "variants": variants,
-                "blueprintDetails": _req("GET", f"/v1/catalog/blueprints/{bp_id}.json"),
-                "providerDetails": _req("GET", f"/v1/catalog/print_providers/{p_id}.json"),
-                "shippingInfo": _req(
-                    "GET",
-                    f"/v1/catalog/blueprints/{bp_id}/print_providers/{p_id}/shipping.json",
-                ),
-            }
-
-            templates.append({
-                "shop_id": shop_id,
-                "blueprint_id": int(bp_id),
-                "print_provider_id": int(p_id),
-                "raw": blob,
-            })
-
-    _log(logs, f"PHASE_A_DONE templates={len(templates)} scanned_pairs={scanned_pairs}")
-    return {"shop_id": shop_id, "templates": templates}
+            if isinstance(variants, list) and variants:
+                _log(logs, f"FOUND {len(variants)} variants")
+
+                return {
+                    "blueprint": bp,
+                    "provider": p,
+                    "variants": variants,
+                    "blueprintDetails": _req("GET", f"/v1/catalog/blueprints/{bp_id}.json"),
+                    "providerDetails": _req("GET", f"/v1/catalog/print_providers/{p_id}.json"),
+                    "shippingInfo": _req(
+                        "GET",
+                        f"/v1/catalog/blueprints/{bp_id}/print_providers/{p_id}/shipping.json",
+                    ),
+                }
+
+    raise RuntimeError("No blueprint/provider pair with variants found.")
 
 
 def _build_product(blob: Dict[str, Any], currency: str, logs: List[str]) -> Dict[str, Any]:
@@ -167,7 +126,7 @@ def _build_product(blob: Dict[str, Any], currency: str, logs: List[str]) -> Dict
     }
 
 
-def run(currency, shop_id_text):
+def run(currency: str) -> Generator[Tuple[str, str, str], None, None]:
     logs: List[str] = []
     result: Dict[str, Any] = {}
     dl_path = ""
@@ -179,23 +138,20 @@ def run(currency, shop_id_text):
         _log(logs, "START")
         yield flush()
 
-        sid = _pick_shop_id(logs, shop_id_text)
+        shops = _req("GET", "/v1/shops.json")
+        _log(logs, f"SHOP_LIST {json.dumps(shops)}")
         yield flush()
 
-        phase_a = _collect_phase_a(sid, logs)
+        blob = _find_first_valid_pair(logs)
         yield flush()
 
-        templates = phase_a.get("templates") or []
-        if templates:
-            first_raw = (templates[0].get("raw") or {})
-            result = _build_product(first_raw, currency or "USD", logs)
-        else:
-            result = {"shop_id": sid, "templates": []}
+        result = _build_product(blob, currency or "USD", logs)
+        yield flush()
 
-        fd, path = tempfile.mkstemp(prefix="phase_a_", suffix=".json")
+        fd, path = tempfile.mkstemp(prefix="shops_", suffix=".json")
         os.close(fd)
         with open(path, "w", encoding="utf-8") as f:
-            json.dump(phase_a, f, indent=2)
+            json.dump(shops, f, indent=2)
         dl_path = path
 
         _log(logs, "DONE")
@@ -208,16 +164,14 @@ def run(currency, shop_id_text):
 
 
 with gr.Blocks(title="Printify Catalog Probe") as demo:
-    gr.Markdown("Extract and normalize Printify catalog into Phase A templates, plus a sample normalized product JSON.")
+    gr.Markdown("Extract and normalize ONE Printify blueprint/provider into a structured JSON object.")
 
     currency = gr.Textbox(label="Currency", value="USD")
-    shop_id = gr.Textbox(label="Shop ID (optional; leave blank to auto-pick Atheria)", value="")
-
     btn = gr.Button("Run")
     logs = gr.Textbox(label="Logs", lines=18)
     out = gr.Textbox(label="Output JSON", lines=18)
-    dl = gr.File(label="Download Phase A JSON")
+    dl = gr.File(label="Download Shops JSON")
 
-    btn.click(run, inputs=[currency, shop_id], outputs=[logs, out, dl])
+    btn.click(run, inputs=[currency], outputs=[logs, out, dl])
 
 demo.queue().launch()