Update app.py via AI Editor

app.py

@@ -680,67 +680,73 @@ def unified_master_callback(
     output_data_upload = html.Div("No action taken yet.", style={"wordWrap": "break-word"})
     uploaded_rfp_decoded_bytes = None
 
-    # --- Fix for delete buttons using callback_context.triggered ---
-    # Check if a delete button was pressed (documents or proposals)
+    # Robust delete button handling for pattern-matching IDs
+    is_doc_delete = False
+    is_proposal_delete = False
+    doc_del_filename = None
+    proposal_del_filename = None
     if ctx.triggered and ctx.triggered[0]['prop_id']:
         prop_id_str = ctx.triggered[0]['prop_id'].split('.')[0]
-        if prop_id_str == "{'type': 'delete-doc-btn', 'index': '*', 'group': 'doc'}" or prop_id_str == "{'type': 'delete-proposal-btn', 'index': '*', 'group': 'proposal'}":
-            # fallback for some Dash versions
-            prop_id = eval(ctx.triggered[0]['prop_id'].split('.')[0])
-        else:
+        try:
+            import json
+            prop_id = json.loads(prop_id_str.replace("'", '"'))
+        except Exception:
+            prop_id = None
+        if isinstance(prop_id, dict):
+            if prop_id.get('type') == 'delete-doc-btn' and prop_id.get('group') == 'doc':
+                is_doc_delete = True
+                doc_del_filename = prop_id.get('index')
+            elif prop_id.get('type') == 'delete-proposal-btn' and prop_id.get('group') == 'proposal':
+                is_proposal_delete = True
+                proposal_del_filename = prop_id.get('index')
+
+    if is_doc_delete and doc_del_filename:
+        if doc_del_filename in sess_data["uploaded_documents"]:
+            del sess_data["uploaded_documents"][doc_del_filename]
+        if doc_del_filename in sess_data["uploaded_documents_fileid"]:
+            try:
+                genai.delete_file(sess_data["uploaded_documents_fileid"][doc_del_filename])
+            except Exception as e:
+                logging.warning(f"[{sid}] Failed to delete Gemini file {doc_del_filename}: {e}")
+            del sess_data["uploaded_documents_fileid"][doc_del_filename]
+        if doc_del_filename in sess_data["uploaded_documents_bytes"]:
+            del sess_data["uploaded_documents_bytes"][doc_del_filename]
+        if doc_del_filename in sess_data["shredded_documents"]:
+            del sess_data["shredded_documents"][doc_del_filename]
+        # Remove from disk if present
+        tempdir = sess_data.get("session_tempdir")
+        if tempdir and os.path.isdir(tempdir):
             try:
-                import json
-                prop_id = json.loads(prop_id_str.replace("'", '"'))
+                file_path = os.path.join(tempdir, doc_del_filename)
+                if os.path.exists(file_path):
+                    os.remove(file_path)
             except Exception:
-                prop_id = ctx.triggered[0]['prop_id']
-        if isinstance(prop_id, dict) and prop_id.get('type') == 'delete-doc-btn' and prop_id.get('group') == 'doc':
-            del_filename = prop_id.get('index')
-            if del_filename in sess_data["uploaded_documents"]:
-                del sess_data["uploaded_documents"][del_filename]
-            if del_filename in sess_data["uploaded_documents_fileid"]:
-                try:
-                    genai.delete_file(sess_data["uploaded_documents_fileid"][del_filename])
-                except Exception as e:
-                    logging.warning(f"[{sid}] Failed to delete Gemini file {del_filename}: {e}")
-                del sess_data["uploaded_documents_fileid"][del_filename]
-            if del_filename in sess_data["uploaded_documents_bytes"]:
-                del sess_data["uploaded_documents_bytes"][del_filename]
-            if del_filename in sess_data["shredded_documents"]:
-                del sess_data["shredded_documents"][del_filename]
-            # If there are temp files on disk, attempt to remove them
-            tempdir = sess_data.get("session_tempdir")
-            if tempdir and os.path.isdir(tempdir):
-                try:
-                    file_path = os.path.join(tempdir, del_filename)
-                    if os.path.exists(file_path):
-                        os.remove(file_path)
-                except Exception:
-                    pass
-            if selected_doc == del_filename:
-                selected_doc = None
-            logging.info(f"[{sid}] Document deleted: {del_filename}")
-        elif isinstance(prop_id, dict) and prop_id.get('type') == 'delete-proposal-btn' and prop_id.get('group') == 'proposal':
-            del_filename = prop_id.get('index')
-            if del_filename in sess_data["proposals"]:
-                del sess_data["proposals"][del_filename]
-            if del_filename in sess_data["proposals_fileid"]:
-                try:
-                    genai.delete_file(sess_data["proposals_fileid"][del_filename])
-                except Exception as e:
-                    logging.warning(f"[{sid}] Failed to delete Gemini proposal file {del_filename}: {e}")
-                del sess_data["proposals_fileid"][del_filename]
-            # If there are temp files on disk, attempt to remove them
-            tempdir = sess_data.get("session_tempdir")
-            if tempdir and os.path.isdir(tempdir):
-                try:
-                    file_path = os.path.join(tempdir, del_filename)
-                    if os.path.exists(file_path):
-                        os.remove(file_path)
-                except Exception:
-                    pass
-            if selected_proposal == del_filename:
-                selected_proposal = None
-            logging.info(f"[{sid}] Proposal deleted: {del_filename}")
+                pass
+        if selected_doc == doc_del_filename:
+            selected_doc = None
+        logging.info(f"[{sid}] Document deleted: {doc_del_filename}")
+
+    if is_proposal_delete and proposal_del_filename:
+        if proposal_del_filename in sess_data["proposals"]:
+            del sess_data["proposals"][proposal_del_filename]
+        if proposal_del_filename in sess_data["proposals_fileid"]:
+            try:
+                genai.delete_file(sess_data["proposals_fileid"][proposal_del_filename])
+            except Exception as e:
+                logging.warning(f"[{sid}] Failed to delete Gemini proposal file {proposal_del_filename}: {e}")
+            del sess_data["proposals_fileid"][proposal_del_filename]
+        # Remove from disk if present
+        tempdir = sess_data.get("session_tempdir")
+        if tempdir and os.path.isdir(tempdir):
+            try:
+                file_path = os.path.join(tempdir, proposal_del_filename)
+                if os.path.exists(file_path):
+                    os.remove(file_path)
+            except Exception:
+                pass
+        if selected_proposal == proposal_del_filename:
+            selected_proposal = None
+        logging.info(f"[{sid}] Proposal deleted: {proposal_del_filename}")
 
     def safe_get_n_clicks(ctx, idx):
         try: