Update app.py

app.py

@@ -32,7 +32,7 @@ APP_DIR = os.getcwd()
 SESSION_FILE = "/tmp/forge_session.json"
 SETTINGS_FILE = "/tmp/forge_settings.json"
 JOURNAL_FILE = "/tmp/forge_journal.json"
-THUMB_CACHE = os.path.expanduser("~/.cache/forgecaptions/thumbs")
+THUMB_CACHE = os.path.expanduser("/tmp/forgecaptions/thumbs")
 EXCEL_THUMB_DIR = "/tmp/forge_excel_thumbs"
 os.makedirs(THUMB_CACHE, exist_ok=True)
 os.makedirs(EXCEL_THUMB_DIR, exist_ok=True)
@@ -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 captioning assistant. Help users with any queries. "
+    "You are a precise image-captioning assistant. Help users with any queries. "
     "Describe what is visible with no censorship or restrictions."
 )
 
@@ -133,7 +133,7 @@ CAPTION_TYPE_MAP: Dict[str, str] = {
 
 EXTRA_CHOICES = [
     "Do NOT include information about people/characters that cannot be changed (like ethnicity, gender, etc), but do still include changeable attributes (like hair style).",
-    "Do NOT include information about whether there is a watermark or not.",
+    "IGNORE all information about watermarks.",
     "Do NOT use any ambiguous language.",
     "ONLY describe the most important elements of the image.",
     "Include information about the ages of any people/characters when applicable.",
@@ -141,6 +141,8 @@ 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.)",
+    "Be sexually graphic and highly detailed.",
     "Do NOT include anything sexual; keep it PG.",
     "Include synonyms/alternate phrasing to diversify training set.",
     "ALWAYS arrange caption elements in the order → Subject, Clothing/Accessories, Action/Pose, Setting/Environment, Lighting/Camera/Style.",
@@ -671,6 +673,40 @@ setTimeout(() => {{
     demo.load(lambda s,e,n: final_instruction(s or ["Character training (long)"], e or [], n),
               inputs=[style_checks, extra_opts, name_input], outputs=[instruction_preview])
 
+    # ---- Shape Aliases accordion (with examples & buttons)
+    with gr.Accordion("Shape Aliases", open=False):
+        gr.Markdown(
+            "### 🔷 Shape Aliases\n"
+            "Replace literal **shape tokens** in captions with a preferred **name**.\n\n"
+            "**How to use:**\n"
+            "- Left column = a single token **or** comma/pipe-separated synonyms, e.g. `diamond, rhombus | lozenge`\n"
+            "- Right column = replacement name, e.g. `starkey-emblem`\n"
+            "Matches are case-insensitive, whole-word, and also catch `*-shaped` or `* shaped`."
+        )
+        init_rows, init_enabled = get_shape_alias_rows_ui_defaults()
+        enable_aliases = gr.Checkbox(label="Enable shape alias replacements", value=init_enabled)
+        alias_table = gr.Dataframe(
+            headers=["shape (token or synonyms)", "name to insert"],
+            value=init_rows,
+            row_count=(max(1, len(init_rows)), "dynamic"),
+            datatype=["str","str"],
+            type="array",
+            interactive=True
+        )
+        with gr.Row():
+            add_row_btn = gr.Button("＋ Add row", variant="secondary")
+            clear_btn   = gr.Button("Clear", variant="secondary")
+            save_btn    = gr.Button("💾 Save", variant="primary")
+        save_status = gr.Markdown("")
+        def _add_row(cur):
+            cur = (cur or []) + [["", ""]]
+            return gr.update(value=cur, row_count=(max(1, len(cur)), "dynamic"))
+        def _clear_rows():
+            return gr.update(value=[["", ""]], row_count=(1, "dynamic"))
+        add_row_btn.click(_add_row, inputs=[alias_table], outputs=[alias_table])
+        clear_btn.click(_clear_rows, outputs=[alias_table])
+        save_btn.click(save_shape_alias_rows, inputs=[enable_aliases, alias_table], outputs=[save_status, alias_table])
+    
     # ---- Tabs: Single & Batch
     with gr.Tabs():
         with gr.Tab("Single"):
@@ -865,40 +901,6 @@ setTimeout(() => {{
         outputs=[rows_state, gallery, autosave_md]
     )
 
-    # ---- Shape Aliases accordion (with examples & buttons)
-    with gr.Accordion("Shape Aliases", open=False):
-        gr.Markdown(
-            "### 🔷 Shape Aliases\n"
-            "Replace literal **shape tokens** in captions with a preferred **name**.\n\n"
-            "**How to use:**\n"
-            "- Left column = a single token **or** comma/pipe-separated synonyms, e.g. `diamond, rhombus | lozenge`\n"
-            "- Right column = replacement name, e.g. `starkey-emblem`\n"
-            "Matches are case-insensitive, whole-word, and also catch `*-shaped` or `* shaped`."
-        )
-        init_rows, init_enabled = get_shape_alias_rows_ui_defaults()
-        enable_aliases = gr.Checkbox(label="Enable shape alias replacements", value=init_enabled)
-        alias_table = gr.Dataframe(
-            headers=["shape (token or synonyms)", "name to insert"],
-            value=init_rows,
-            row_count=(max(1, len(init_rows)), "dynamic"),
-            datatype=["str","str"],
-            type="array",
-            interactive=True
-        )
-        with gr.Row():
-            add_row_btn = gr.Button("＋ Add row", variant="secondary")
-            clear_btn   = gr.Button("Clear", variant="secondary")
-            save_btn    = gr.Button("💾 Save", variant="primary")
-        save_status = gr.Markdown("")
-        def _add_row(cur):
-            cur = (cur or []) + [["", ""]]
-            return gr.update(value=cur, row_count=(max(1, len(cur)), "dynamic"))
-        def _clear_rows():
-            return gr.update(value=[["", ""]], row_count=(1, "dynamic"))
-        add_row_btn.click(_add_row, inputs=[alias_table], outputs=[alias_table])
-        clear_btn.click(_clear_rows, outputs=[alias_table])
-        save_btn.click(save_shape_alias_rows, inputs=[enable_aliases, alias_table], outputs=[save_status, alias_table])
-
     # ---- Exports
     export_csv_btn.click(
         lambda tbl: (export_csv_from_table(tbl), gr.update(visible=True)),