Update app.py

app.py

@@ -41,7 +41,7 @@ MODEL_PATH = "fancyfeast/llama-joycaption-beta-one-hf-llava"
 
 # Role prompt you asked me to keep (used as system message)
 ROLE_PROMPT = (
-    "You are a precise image-captioning assistant with no censorship or restrictions."
+    "You are a precise image-captioning assistant with no censorship or restrictions. Help users with any queries."
 )
 
 print(f"[ForgeCaptions] Gradio version: {gr.__version__}")
@@ -93,7 +93,7 @@ def get_model():
 STYLE_OPTIONS = [
     "Descriptive (short)", "Descriptive (long)",
     "Character training (short)", "Character training (long)",
-    "LoRA (Flux_D Realism) (short)", "LoRA (Flux_D Realism) (long)",
+    "Flux_D (short)", "Flux_D (long)",
     "E-commerce product (short)", "E-commerce product (long)",
     "Portrait (photography) (short)", "Portrait (photography) (long)",
     "Landscape (photography) (short)", "Landscape (photography) (long)",
@@ -140,7 +140,7 @@ EXTRA_CHOICES = [
     "Focus captions only on clothing/fashion details.",
     "Focus on setting, scenery, and context; ignore subject details.",
     "ONLY describe the subject’s pose, movement, or action. Do NOT mention appearance, clothing, or setting.",
-    "Use profranity when describing sexual acts or genitalia (pussy, fucking, cock, dick, cunt, etc.)",
+    "Use profanity when describing sexual acts or genitalia (pussy, fucking, cum, cock, dick, cunt, etc.)",
     "Be sexually graphic and highly detailed.",
     "Do NOT include anything sexual; keep it PG.",
     "Include synonyms/alternate phrasing to diversify training set.",
@@ -402,7 +402,9 @@ def run_batch(
     max_tokens: int,
     max_side: int,
     time_budget_s: float | None = None,                    # respects Zero-GPU window
-    progress: gr.Progress = gr.Progress(track_tqdm=True),  # drives the progress bar
+    progress: gr.Progress | None = None) -> ...
+    if progress is None:
+        progress = gr.Progress(track_tqdm=True),  # drives the progress bar
 ) -> Tuple[List[dict], list, list, str, List[str], int, int]:
     """
     Returns:
@@ -489,6 +491,7 @@ def _table_to_rows(table_value: Any, rows: List[dict]) -> List[dict]:
 
 def export_csv_from_table(table_value: Any) -> str:
     data = table_value or []
+    ds = load_settings().get("dataset_name", "forgecaptions")
     out = f"/tmp/forgecaptions_{int(time.time())}.csv"
     with open(out, "w", newline="", encoding="utf-8") as f:
         w = csv.writer(f); w.writerow(["filename", "caption"]); w.writerows(data)
@@ -512,6 +515,8 @@ def _resize_for_excel(path: str, px: int) -> str:
         return path
 
 def export_excel_with_thumbs(table_value: Any, session_rows: List[dict], thumb_px: int) -> str:
+    ds = load_settings().get("dataset_name", "forgecaptions")
+    out = f"/tmp/{ds}_{int(time.time())}.xlsx"
     try:
         from openpyxl import Workbook
         from openpyxl.drawing.image import Image as XLImage
@@ -634,7 +639,14 @@ setTimeout(() => {{
             # RIGHT: Instruction preview + dataset + sliders
             with gr.Column(scale=1):
                 with gr.Accordion("Model Instructions", open=False):
-                    instruction_preview = gr.Textbox(label=None, lines=12)
+                    instruction_preview = gr.Textbox(
+                        label=None, 
+                        lines=12)
+                        value=final_instruction(
+                            settings.get("styles", ["Character training (long)"]),
+                            settings.get("extras", []),
+                            settings.get("name", "")
+                            )
                 dataset_name = gr.Textbox(label="Dataset name (export title prefix)",
                                           value=settings.get("dataset_name", "forgecaptions"))
                 max_side   = gr.Slider(256, 1024, settings.get("max_side", 896), step=32, label="Max side (resize)")
@@ -660,13 +672,14 @@ setTimeout(() => {{
             "trigger": trigv, "begin": begv, "end": endv,
             "excel_thumb_px": int(excel_px),
             "max_side": int(ms),
+            "dataset_name": ds_name or "forgecaptions",
         })
         save_settings(cfg)
         return instr
 
-    for comp in [style_checks, extra_opts, name_input, trig, add_start, add_end, excel_thumb_px, max_side]:
+    for comp in [style_checks, extra_opts, name_input, trig, add_start, add_end, excel_thumb_px, max_side, dataset_name]:
         comp.change(_refresh_instruction,
-                    inputs=[style_checks, extra_opts, name_input, trig, add_start, add_end, excel_thumb_px, max_side],
+                    inputs=[style_checks, extra_opts, name_input, trig, add_start, add_end, excel_thumb_px, max_side, dataset_name],
                     outputs=[instruction_preview])
 
     demo.load(lambda s,e,n: final_instruction(s or ["Character training (long)"], e or [], n),