Update app.py

app.py

@@ -493,6 +493,10 @@ if LEADS_DATASET and HF_TOKEN:
         log.warning(f"[users] user log is off: {type(e).__name__}: {e}")
 
 
+TRACK_COLUMNS = ["outcome", "error", "error_message", "preset", "happy", "sad", "excited", "angry",
+                 "clip_seconds", "processing_seconds", "marketing_opt_in", "run_id", "job_id"]
+
+
 def track(event, profile, **extra):
     if _leads is None or profile is None:
         return
@@ -509,8 +513,11 @@ def track(event, profile, **extra):
             "avatar": profile.picture,
             "orgs": [o.get("preferred_username") or o.get("name") for o in orgs if isinstance(o, dict)],
             "admin": is_admin(profile.username),
-            **extra,
         }
+        drama = extra.pop("drama", None) or {}
+        row.update({k: None for k in TRACK_COLUMNS})  # same columns on every row, for the viewer/SQL
+        row.update({k: float(drama.get(k, 0)) for k in ("happy", "sad", "excited", "angry")} if drama else {})
+        row.update(extra)
         with _leads.lock:
             with open(_leads_file, "a") as f:
                 f.write(json.dumps(row, default=str) + "\n")
@@ -730,7 +737,7 @@ def settings_chips(drama):
 
 # ---------- main handler ----------
 
-def run(video, mood, excited, angry, updates, profile: gr.OAuthProfile | None):
+def run(video, mood, excited, angry, updates, preset_name, profile: gr.OAuthProfile | None):
     def stop(message):
         raise gr.Error(message, print_exception=False)
 
@@ -747,7 +754,7 @@ def run(video, mood, excited, angry, updates, profile: gr.OAuthProfile | None):
     ctx = Run(profile.username)
     ctx.log(f"new run: user={ctx.user} admin={is_admin(ctx.user)} drama={drama} flow={FLOW}")
     counted = False
-    clip = {"drama": drama, "marketing_opt_in": bool(updates)}
+    clip = {"preset": preset_name or "Custom", "drama": drama, "marketing_opt_in": bool(updates)}
     try:
         take_quota(ctx.user)
         counted = True
@@ -790,7 +797,8 @@ def run(video, mood, excited, angry, updates, profile: gr.OAuthProfile | None):
         ctx.stage = "watermark"
         result = watermark(raw, workdir, ctx)
         report(ctx, "SUCCESS")
-        track("run", profile, outcome="success", run_id=ctx.id, seconds=round(time.time() - ctx.started), **clip)
+        track("run", profile, outcome="success", run_id=ctx.id, job_id=ctx.facts.get("job"),
+              processing_seconds=round(time.time() - ctx.started), **clip)
         yield result, status_html("done", f"Done in {ctx.elapsed()}", 5,
                                   settings_chips(drama))
 
@@ -802,7 +810,8 @@ def run(video, mood, excited, angry, updates, profile: gr.OAuthProfile | None):
             track("limit_hit", profile, run_id=ctx.id, **clip)
         else:
             report(ctx, "FAILED", e.category, e.detail)
-            track("run", profile, outcome="failed", error=e.category, run_id=ctx.id, **clip)
+            track("run", profile, outcome="failed", error=e.category, error_message=e.user_message,
+                  run_id=ctx.id, job_id=ctx.facts.get("job"), **clip)
         yield None, status_html("error", e.user_message, note=f"Reference: {ctx.id}")
         stop(f"{e.user_message} (ref: {ctx.id})")
     except gr.Error:
@@ -812,7 +821,8 @@ def run(video, mood, excited, angry, updates, profile: gr.OAuthProfile | None):
             refund_quota(ctx.user)
         ctx.log(f"UNEXPECTED {type(e).__name__}: {e}\n{traceback.format_exc()}", logging.ERROR)
         report(ctx, "FAILED", "UNEXPECTED", f"{type(e).__name__}: {e}")
-        track("run", profile, outcome="failed", error="UNEXPECTED", run_id=ctx.id, **clip)
+        track("run", profile, outcome="failed", error="UNEXPECTED", run_id=ctx.id,
+              job_id=ctx.facts.get("job"), **clip)
         yield None, status_html("error", "Something unexpected went wrong.", note=f"Reference: {ctx.id}")
         stop(f"Something unexpected went wrong. (ref: {ctx.id})")
 
@@ -1295,7 +1305,7 @@ with gr.Blocks(title=PAGE_TITLE) as demo:
     demo.load(on_visit, inputs=None, outputs=None, api_visibility="private", show_progress="hidden")
     go.click(
         run,
-        inputs=[video_in, mood, excited, angry, updates],
+        inputs=[video_in, mood, excited, angry, updates, preset],
         outputs=[video_out, status_out],
         concurrency_limit=2,
         api_visibility="private",