Update app.py via AI Editor

app.py

@@ -676,29 +676,23 @@ def unified_master_callback(
     sid = get_session_id(session_id_state if session_id_state else session_id_store_input)
     sess_data = get_session_data(sid)
     ctx = callback_context
-    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0] if ctx.triggered else None
     output_data_upload = html.Div("No action taken yet.", style={"wordWrap": "break-word"})
     uploaded_rfp_decoded_bytes = None
 
-    # Robust delete button handling for pattern-matching IDs
+    # NEW delete logic: use ctx.triggered[0]['id'] which is a dict for pattern-matched 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]
-        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':
+    if ctx.triggered and ctx.triggered[0].get('id', None):
+        triggered_id_dict = ctx.triggered[0]['id']
+        if isinstance(triggered_id_dict, dict):
+            if triggered_id_dict.get('type') == 'delete-doc-btn' and triggered_id_dict.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':
+                doc_del_filename = triggered_id_dict.get('index')
+            elif triggered_id_dict.get('type') == 'delete-proposal-btn' and triggered_id_dict.get('group') == 'proposal':
                 is_proposal_delete = True
-                proposal_del_filename = prop_id.get('index')
+                proposal_del_filename = triggered_id_dict.get('index')
 
     if is_doc_delete and doc_del_filename:
         if doc_del_filename in sess_data["uploaded_documents"]:
@@ -713,7 +707,6 @@ def unified_master_callback(
             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:
@@ -735,7 +728,6 @@ def unified_master_callback(
             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:
@@ -757,7 +749,7 @@ def unified_master_callback(
     doc_delete_clicks = safe_get_n_clicks(ctx, 8)
     proposal_delete_clicks = safe_get_n_clicks(ctx, 12)
 
-    if not ctx.triggered or triggered_id in ['session-id-store']:
+    if not ctx.triggered or (ctx.triggered[0].get('prop_id', None) in ['session-id-store']):
         doc_options = [{'label': truncate_filename(fn), 'value': fn} for fn in sess_data["uploaded_documents"].keys()]
         doc_value = next(iter(sess_data["uploaded_documents"]), None) if sess_data["uploaded_documents"] else None
         proposal_options = [{'label': truncate_filename(fn), 'value': fn} for fn in sess_data["proposals"].keys()]
@@ -771,7 +763,7 @@ def unified_master_callback(
             "expanded"
         )
 
-    if triggered_id == 'cancel-action-btn':
+    if ctx.triggered[0].get('prop_id', None) == 'cancel-action-btn.n_clicks':
         lock = sess_data.get("gemini_lock")
         if lock and lock.locked():
             try:
@@ -793,7 +785,7 @@ def unified_master_callback(
             "expanded"
         )
 
-    if triggered_id == 'upload-document' and rfp_content is not None and rfp_filename:
+    if ctx.triggered[0].get('prop_id', None) == 'upload-document.contents' and rfp_content is not None and rfp_filename:
         content_type, content_string = rfp_content.split(',')
         decoded = base64.b64decode(content_string)
         uploaded_rfp_decoded_bytes = decoded
@@ -810,7 +802,7 @@ def unified_master_callback(
         else:
             logging.error(f"[{sid}] Failed to decode uploaded document: {rfp_filename}")
 
-    if triggered_id == 'upload-proposal' and proposal_content is not None and proposal_filename:
+    if ctx.triggered[0].get('prop_id', None) == 'upload-proposal.contents' and proposal_content is not None and proposal_filename:
         content_type, content_string = proposal_content.split(',')
         decoded = base64.b64decode(content_string)
         text = decode_document(decoded)
@@ -837,7 +829,7 @@ def unified_master_callback(
         'recover-action-btn', 'board-action-btn', 'loe-action-btn'
     ]
 
-    if triggered_id in action_btns:
+    if ctx.triggered[0].get('prop_id', '').split('.')[0] in action_btns:
         got_lock = sess_data["gemini_lock"].acquire(blocking=False)
         if not got_lock:
             output_data_upload = html.Div("Another Gemini operation is in progress. Please wait or cancel.", style={"wordWrap": "break-word"})
@@ -848,6 +840,7 @@ def unified_master_callback(
                 "expanded"
             )
         try:
+            triggered_id = ctx.triggered[0].get('prop_id', '').split('.')[0]
             if triggered_id == "shred-action-btn":
                 action_name = "shred"
                 result, generated_filename, generated_xlsx_bytes, _, _ = process_document(sess_data, action_name, doc_value, chat_input, uploaded_rfp_decoded_bytes, None)