Update app.py

app.py

@@ -119,7 +119,6 @@ EXTRA_CHOICES = [
     "Include information on composition (rule of thirds, symmetry, leading lines, etc).",
     "Specify the depth of field and whether the background is in focus or blurred.",
     "If applicable, mention the likely use of artificial or natural lighting sources.",
-    "If it is a work of art, do not include the artist's name or the title of the work.",
     "Identify the image orientation (portrait, landscape, or square) if obvious.",
 ]
 NAME_OPTION = "If there is a person/character in the image you must refer to them as {name}."
@@ -281,11 +280,36 @@ def load_journal() -> dict:
 # ────────────────────────────────────────────────────────
 # Shape Aliases (compile/cache/apply)
 # ────────────────────────────────────────────────────────
+def _compile_shape_aliases_from_file():
+    s = load_settings()
+    if not s.get("shape_aliases_enabled", True):
+        return []
+    compiled = []
+    for item in s.get("shape_aliases", []):
+        shape = (item.get("shape") or "").strip()
+        name  = (item.get("name")  or "").strip()
+        if not shape or not name:
+            continue
+        pat = rf"\b{re.escape(shape)}(?:-?shaped)?\b"
+        compiled.append((re.compile(pat, flags=re.I), name))
+    return compiled
+
+_SHAPE_ALIASES = _compile_shape_aliases_from_file()
+
+def _refresh_shape_aliases_cache():
+    global _SHAPE_ALIASES
+    _SHAPE_ALIASES = _compile_shape_aliases_from_file()
+
+def apply_shape_aliases(caption: str) -> str:
+    for pat, name in _SHAPE_ALIASES:
+        caption = pat.sub(f"({name})", caption)
+    return caption
+
+# Helpers for Shape Aliases UI
 def get_shape_alias_rows_ui_defaults():
     s = load_settings()
     rows = [[it.get("shape",""), it.get("name","")] for it in s.get("shape_aliases", [])]
     enabled = bool(s.get("shape_aliases_enabled", True))
-    # Always show at least one empty row
     if not rows:
         rows = [["", ""]]
     return rows, enabled
@@ -307,14 +331,12 @@ def save_shape_alias_rows(enabled, df_rows):
     save_settings(cfg)
     _refresh_shape_aliases_cache()
 
-    # Normalize table after save (keep one empty row at the end)
     normalized = [[it["shape"], it["name"]] for it in cleaned] + [["", ""]]
     return (
         "✅ Saved shape alias options.",
         gr.update(value=normalized, row_count=(max(1, len(normalized)), "dynamic"))
     )
 
-
 # ────────────────────────────────────────────────────────
 # Logo loader
 # ────────────────────────────────────────────────────────
@@ -614,84 +636,55 @@ with gr.Blocks(css=BASE_CSS, title="CaptionForge") as demo:
             chunk_size = gr.Slider(1, 50, settings.get("chunk_size", 10), step=1, label="Chunk size")
             max_side   = gr.Slider(256, MAX_SIDE_CAP, settings.get("max_side", min(896, MAX_SIDE_CAP)), step=32, label="Max side (resize)")
 
-    # Shape Aliases UI (Accordion)
-    with gr.Tab("Shape Aliases"):
+    # === Shape Aliases UI (Accordion) ===
+    with gr.Accordion("Shape Aliases", open=False):
         gr.Markdown(
             "### 🔷 Shape Aliases\n"
-            "Tell CaptionForge to replace literal **shape tokens** it sees in captions with your preferred **name**.\n\n"
+            "Replace literal **shape tokens** in captions with a preferred **name**.\n\n"
             "**How to use:**\n"
-            "1) In the left column, type the exact shape token (e.g., `diamond`, `heart`, `oval`).\n"
-            "2) In the right column, type the replacement name you want inserted (e.g., `starkey-emblem`).\n"
+            "1) Left column: exact shape token (e.g., `diamond`, `heart`).\n"
+            "2) Right column: replacement name (e.g., `starkey-emblem`).\n"
             "3) Click **Save**.\n\n"
-            "Tips: rows with either side blank are ignored; you can add as many rows as you like."
-    )
-
-    init_rows, init_enabled = get_shape_alias_rows_ui_defaults()
+            "_Rows with blanks are ignored; add as many rows as you like._"
+        )
 
-    enable_aliases = gr.Checkbox(
-        label="Enable shape alias replacements",
-        value=init_enabled,
-        info="Turn all replacements on/off without deleting your list."
-    )
+        init_rows, init_enabled = get_shape_alias_rows_ui_defaults()
 
-    alias_table = gr.Dataframe(
-        headers=["shape (literal token)", "name to insert"],
-        value=init_rows,                    # <-- set value at creation time
-        col_count=(2, "fixed"),            # <-- lock to 2 columns
-        row_count=(max(1, len(init_rows)), "dynamic"),  # user can add rows
-        datatype=["str", "str"],
-        type="array",                       # <-- treat rows as lists (most reliable for editing)
-        interactive=True
-    )
+        enable_aliases = gr.Checkbox(
+            label="Enable shape alias replacements",
+            value=init_enabled,
+        )
 
-    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("")
-
-    # Button logic
-    def _add_row(cur):
-        cur = (cur or []) + [["", ""]]
-        # keep dynamic rows in sync
-        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, inputs=None, outputs=[alias_table])
-    save_btn.click(save_shape_alias_rows, inputs=[enable_aliases, alias_table], outputs=[save_status, alias_table])
-
-        
-        save_aliases_btn = gr.Button("Save aliases")
-        save_status = gr.Markdown()
-
-        # init values
-        init_rows = [[it.get("shape",""), it.get("name","")] for it in settings.get("shape_aliases", [])]
-        if not init_rows:
-            init_rows = [["diamond", "starkey-emblem"]]
-        enable_aliases.value = bool(settings.get("shape_aliases_enabled", True))
-        alias_table.value = init_rows
-
-        def set_shape_alias_rows(enabled, rows):
-            cfg = load_settings()
-            cfg["shape_aliases_enabled"] = bool(enabled)
-            cfg["shape_aliases"] = [
-                {"shape": (r[0] or "").strip(), "name": (r[1] or "").strip()}
-                for r in (rows or []) if r and (r[0] or "").strip() and (r[1] or "").strip()
-            ]
-            save_settings(cfg)
-            _refresh_shape_aliases_cache()
-            return "Saved shape alias options."
-
-        save_aliases_btn.click(
-            set_shape_alias_rows,
-            inputs=[enable_aliases, alias_table],
-            outputs=[save_status]
+        alias_table = gr.Dataframe(
+            headers=["shape (literal token)", "name to insert"],
+            value=init_rows,                               # set value at creation time
+            col_count=(2, "fixed"),                        # exactly two columns
+            row_count=(max(1, len(init_rows)), "dynamic"), # user can add/remove rows
+            datatype=["str", "str"],
+            type="array",                                  # treat rows as simple lists
+            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("")
+
+        # Button handlers
+        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])
+
     # Auto-refresh instruction & persist key controls
     def _refresh_instruction(styles, extra, name_value, trigv, begv, endv):
         instr = final_instruction(styles or ["Character training (short)"], extra or [], name_value)