Update app.py

app.py

@@ -1056,110 +1056,124 @@ gr.HTML("""
 </script> """)
 
 
-    # ---- Chunking logic
+# ---- Chunking logic
 def _split_chunks(files, csize: int):
-        files = files or []
-        c = max(1, int(csize))
-        return [files[i:i+c] for i in range(0, len(files), c)]
+    files = files or []
+    c = max(1, int(csize))
+    return [files[i:i + c] for i in range(0, len(files), c)]
+
 
 def _tpms():
-        s = load_settings()
-        return s.get("temperature", 0.6), s.get("top_p", 0.9), s.get("max_tokens", 256)
+    s = load_settings()
+    return s.get("temperature", 0.6), s.get("top_p", 0.9), s.get("max_tokens", 256)
+
 
 def _run_click(files, rows, instr, ms, mode, csize, budget_s, no_limit):
-        t, p, m = _tpms()
-        files = files or []
-        budget = None if no_limit else float(budget_s)
-
-        if mode == "Manual (step)" and files:
-            chunks = _split_chunks(files, int(csize))
-            batch = chunks[0]
-            remaining = sum(chunks[1:], [])
-            new_rows, gal, tbl, stamp, leftover_from_batch, done, total = run_batch(
-                batch, rows or [], instr, t, p, m, int(ms), budget
-            )
-            remaining = (leftover_from_batch or []) + remaining
-            panel_vis = gr.update(visible=bool(remaining))
-            msg = f"{len(remaining)} files remain. Process next chunk?"
-            prog = f"Batch progress: {done}/{total} processed in this step • Remaining overall: {len(remaining)}"
-            return new_rows, gal, tbl, stamp, remaining, panel_vis, gr.update(value=msg), gr.update(value=prog)
-
-        # Auto
-        new_rows, gal, tbl, stamp, leftover, done, total = run_batch(
-            files, rows or [], instr, t, p, m, int(ms), budget
+    t, p, m = _tpms()
+    files = files or []
+    budget = None if no_limit else float(budget_s)
+
+    if mode == "Manual (step)" and files:
+        chunks = _split_chunks(files, int(csize))
+        batch = chunks[0]
+        remaining = sum(chunks[1:], [])
+        new_rows, gal, tbl, stamp, leftover_from_batch, done, total = run_batch(
+            batch, rows or [], instr, t, p, m, int(ms), budget
         )
-        panel_vis = gr.update(visible=bool(leftover))
-        msg = f"{len(leftover)} files remain. Process next chunk?" if leftover else ""
-        prog = f"Batch progress: {done}/{total} processed in this call • Remaining: {len(leftover)}"
-        return new_rows, gal, tbl, stamp, leftover, panel_vis, gr.update(value=msg), gr.update(value=prog)
-
-    run_button.click(
-        _run_click,
-        inputs=[input_files, rows_state, instruction_preview, max_side, chunk_mode, chunk_size, gpu_budget, no_time_limit],
-        outputs=[rows_state, gallery, table, autosave_md, remaining_state, step_panel, step_msg, progress_md]
+        remaining = (leftover_from_batch or []) + remaining
+        panel_vis = gr.update(visible=bool(remaining))
+        msg = f"{len(remaining)} files remain. Process next chunk?"
+        prog = f"Batch progress: {done}/{total} processed in this step • Remaining overall: {len(remaining)}"
+        return new_rows, gal, tbl, stamp, remaining, panel_vis, gr.update(value=msg), gr.update(value=prog)
+
+    # Auto
+    new_rows, gal, tbl, stamp, leftover, done, total = run_batch(
+        files, rows or [], instr, t, p, m, int(ms), budget
     )
+    panel_vis = gr.update(visible=bool(leftover))
+    msg = f"{len(leftover)} files remain. Process next chunk?" if leftover else ""
+    prog = f"Batch progress: {done}/{total} processed in this call • Remaining: {len(leftover)}"
+    return new_rows, gal, tbl, stamp, leftover, panel_vis, gr.update(value=msg), gr.update(value=prog)
+
+
+run_button.click(
+    _run_click,
+    inputs=[input_files, rows_state, instruction_preview, max_side, chunk_mode, chunk_size, gpu_budget, no_time_limit],
+    outputs=[rows_state, gallery, table, autosave_md, remaining_state, step_panel, step_msg, progress_md]
+)
+
 
 def _step_next(remain, rows, instr, ms, csize, budget_s, no_limit):
-        t, p, m = _tpms()
-        remain = remain or []
-        budget = None if no_limit else float(budget_s)
-
-        if not remain:
-            return (
-                rows,
-                gr.update(value="No files remaining."),
-                gr.update(visible=False),
-                [],
-                [],
-                [],
-                "Saved.",
-                gr.update(value="")
-            )
-        batch = remain[:int(csize)]
-        leftover = remain[int(csize):]
-        new_rows, gal, tbl, stamp, leftover_from_batch, done, total = run_batch(
-            batch, rows or [], instr, t, p, m, int(ms), budget
+    t, p, m = _tpms()
+    remain = remain or []
+    budget = None if no_limit else float(budget_s)
+
+    if not remain:
+        return (
+            rows,
+            gr.update(value="No files remaining."),
+            gr.update(visible=False),
+            [],
+            [],
+            [],
+            "Saved.",
+            gr.update(value="")
         )
-        leftover = (leftover_from_batch or []) + leftover
-        panel_vis = gr.update(visible=bool(leftover))
-        msg = f"{len(leftover)} files remain. Process next chunk?" if leftover else "All done."
-        prog = f"Batch progress: {done}/{total} processed in this step • Remaining overall: {len(leftover)}"
-        return new_rows, msg, panel_vis, leftover, gal, tbl, stamp, gr.update(value=prog)
-
-    step_next.click(
-        _step_next,
-        inputs=[remaining_state, rows_state, instruction_preview, max_side, chunk_size, gpu_budget, no_time_limit],
-        outputs=[rows_state, step_msg, step_panel, remaining_state, gallery, table, autosave_md, progress_md]
+
+    batch = remain[:int(csize)]
+    leftover = remain[int(csize):]
+    new_rows, gal, tbl, stamp, leftover_from_batch, done, total = run_batch(
+        batch, rows or [], instr, t, p, m, int(ms), budget
     )
+    leftover = (leftover_from_batch or []) + leftover
+    panel_vis = gr.update(visible=bool(leftover))
+    msg = f"{len(leftover)} files remain. Process next chunk?" if leftover else "All done."
+    prog = f"Batch progress: {done}/{total} processed in this step • Remaining overall: {len(leftover)}"
+    return new_rows, msg, panel_vis, leftover, gal, tbl, stamp, gr.update(value=prog)
+
+
+step_next.click(
+    _step_next,
+    inputs=[remaining_state, rows_state, instruction_preview, max_side, chunk_size, gpu_budget, no_time_limit],
+    outputs=[rows_state, step_msg, step_panel, remaining_state, gallery, table, autosave_md, progress_md]
+)
+
 
 def _step_finish():
-        return gr.update(visible=False), gr.update(value=""), []
+    return gr.update(visible=False), gr.update(value=""), []
 
-    step_finish.click(_step_finish, inputs=None, outputs=[step_panel, step_msg, remaining_state])
 
-    # ---- Table edits → persist + refresh gallery
+step_finish.click(_step_finish, inputs=None, outputs=[step_panel, step_msg, remaining_state])
+
+
+# ---- Table edits → persist + refresh gallery
 def sync_table_to_session(table_value: Any, session_rows: List[dict]) -> Tuple[List[dict], list, str]:
-        session_rows = _table_to_rows(table_value, session_rows or [])
-        save_session(session_rows)
-        gallery_pairs = [((r.get("thumb_path") or r.get("path")), r.get("caption",""))
-                         for r in session_rows if (r.get("thumb_path") or r.get("path"))]
-        return session_rows, gallery_pairs, f"Saved • {time.strftime('%H:%M:%S')}"
+    session_rows = _table_to_rows(table_value, session_rows or [])
+    save_session(session_rows)
+    gallery_pairs = [((r.get("thumb_path") or r.get("path")), r.get("caption", ""))
+                     for r in session_rows if (r.get("thumb_path") or r.get("path"))]
+    return session_rows, gallery_pairs, f"Saved • {time.strftime('%H:%M:%S')}"
 
-    table.change(sync_table_to_session, inputs=[table, rows_state], outputs=[rows_state, gallery, autosave_md])
 
-    # ---- Exports
-    export_csv_btn.click(
-        lambda tbl, ds: (export_csv_from_table(tbl, ds), gr.update(visible=True)),
-        inputs=[table, dataset_name], outputs=[csv_file, csv_file]
-    )
-    export_xlsx_btn.click(
-        lambda tbl, rows, px, ds: (export_excel_with_thumbs(tbl, rows or [], int(px), ds), gr.update(visible=True)),
-        inputs=[table, rows_state, excel_thumb_px, dataset_name], outputs=[xlsx_file, xlsx_file]
-    )
-    export_txt_btn.click(
-        lambda tbl, ds: (export_txt_zip(tbl, ds), gr.update(visible=True)),
-        inputs=[table, dataset_name], outputs=[txt_zip, txt_zip]
-    )
+table.change(sync_table_to_session, inputs=[table, rows_state], outputs=[rows_state, gallery, autosave_md])
+
+
+# ---- Exports
+export_csv_btn.click(
+    lambda tbl, ds: (export_csv_from_table(tbl, ds), gr.update(visible=True)),
+    inputs=[table, dataset_name], outputs=[csv_file, csv_file]
+)
+
+export_xlsx_btn.click(
+    lambda tbl, rows, px, ds: (export_excel_with_thumbs(tbl, rows or [], int(px), ds), gr.update(visible=True)),
+    inputs=[table, rows_state, excel_thumb_px, dataset_name], outputs=[xlsx_file, xlsx_file]
+)
+
+export_txt_btn.click(
+    lambda tbl, ds: (export_txt_zip(tbl, ds), gr.update(visible=True)),
+    inputs=[table, dataset_name], outputs=[txt_zip, txt_zip]
+)
+
 
 
 # ------------------------------