Update app.py

app.py

@@ -930,66 +930,51 @@ with gr.Blocks(css=BASE_CSS, title="ForgeCaptions") as demo:
 
     # ---- Shape Aliases block (placed WITH other settings, before uploads)
     # ---- Shape Aliases block (placed WITH other settings, before uploads)
-    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, also catches simple plurals (`box`→`boxes`, `lady`→`ladies`), "
-            "and `*-shaped` or `* shaped` variants."
-        )
-        init_rows, init_enabled = get_shape_alias_rows_ui_defaults()
-        enable_aliases = gr.Checkbox(label="Enable shape alias replacements", value=init_enabled)
-        persist_aliases = gr.Checkbox(
-            label="Save aliases across sessions",
-            value=load_settings().get("shape_aliases_persist", True)
-        )
-        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")
-    
-        # status line for saves
-        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])
-    
-        # Persist the "persist" toggle itself
-        def _save_alias_persist_flag(v):
-            cfg = load_settings()
-            cfg["shape_aliases_persist"] = bool(v)
-            save_settings(cfg)
-            return gr.update()
-    
-        persist_aliases.change(_save_alias_persist_flag, inputs=[persist_aliases], outputs=[])
-    
-        # Save/apply rows (persists to disk only if persist_aliases is checked)
-        save_btn.click(
-            save_shape_alias_rows,
-            inputs=[enable_aliases, alias_table, persist_aliases],
-            outputs=[save_status, alias_table]
-        )
+    # ---- Shape Aliases block (placed WITH other settings, before uploads)
+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, also catches simple plurals (`box`→`boxes`, `lady`→`ladies`), "
+        "and `*-shaped` or `* shaped` variants."
+    )
+    init_rows, init_enabled = get_shape_alias_rows_ui_defaults()
+    enable_aliases = gr.Checkbox(label="Enable shape alias replacements", value=init_enabled)
+    persist_aliases = gr.Checkbox(
+        label="Save aliases across sessions",
+        value=load_settings().get("shape_aliases_persist", True)
+    )
+    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
+    )
 
-        # Also persist the user's choice of the toggle itself
+    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")
+
+    # status line for saves
+    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])
+
+    # Persist the "persist" toggle itself
     def _save_alias_persist_flag(v):
         cfg = load_settings()
         cfg["shape_aliases_persist"] = bool(v)
@@ -997,14 +982,14 @@ with gr.Blocks(css=BASE_CSS, title="ForgeCaptions") as demo:
         return gr.update()
 
     persist_aliases.change(_save_alias_persist_flag, inputs=[persist_aliases], outputs=[])
-        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])
+
+    # Save/apply rows (persists to disk only if persist_aliases is checked)
+    save_btn.click(
+        save_shape_alias_rows,
+        inputs=[enable_aliases, alias_table, persist_aliases],
+        outputs=[save_status, alias_table]
+    )
+
 
     # ---- Tabs: Single & Batch
     with gr.Tabs():