Update app.py

app.py

@@ -281,30 +281,39 @@ def load_journal() -> dict:
 # ────────────────────────────────────────────────────────
 # Shape Aliases (compile/cache/apply)
 # ────────────────────────────────────────────────────────
-def _compile_shape_aliases_from_file():
+def get_shape_alias_rows_ui_defaults():
     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:
+    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
+
+def save_shape_alias_rows(enabled, df_rows):
+    cfg = load_settings()
+    cfg["shape_aliases_enabled"] = bool(enabled)
+
+    cleaned = []
+    for r in (df_rows or []):
+        if not r:
             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()
+        shape = (r[0] or "").strip()
+        name  = (r[1] or "").strip()
+        if shape and name:
+            cleaned.append({"shape": shape, "name": name})
+
+    cfg["shape_aliases"] = cleaned
+    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"))
+    )
 
-def apply_shape_aliases(caption: str) -> str:
-    for pat, name in _SHAPE_ALIASES:
-        caption = pat.sub(f"({name})", caption)
-    return caption
 
 # ────────────────────────────────────────────────────────
 # Logo loader
@@ -606,14 +615,55 @@ with gr.Blocks(css=BASE_CSS, title="CaptionForge") as demo:
             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.Accordion("Shape Aliases", open=False):
-        enable_aliases = gr.Checkbox(label="Enable shape alias replacements", value=True)
-        alias_table = gr.Dataframe(
-            headers=["shape (literal token)", "name to insert"],
-            datatype=["str","str"],
-            row_count=(1, "dynamic"),
-            wrap=True,
-            interactive=True
+    with gr.Tab("Shape Aliases"):
+        gr.Markdown(
+            "### 🔷 Shape Aliases\n"
+            "Tell CaptionForge to replace literal **shape tokens** it sees in captions with your 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"
+            "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()
+
+    enable_aliases = gr.Checkbox(
+        label="Enable shape alias replacements",
+        value=init_enabled,
+        info="Turn all replacements on/off without deleting your list."
+    )
+
+    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
+    )
+
+    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()