Update app.py via AI Editor

app.py

@@ -383,12 +383,10 @@ def unified_callback(
             slides_content
         )
 
-    if hasattr(ctx.triggered[0], 'get'):
-        button_id = ctx.triggered[0].get('prop_id', '').split('.')[0]
-        triggered_id_dict = ctx.triggered[0].get('id', None)
-    else:
-        button_id = ctx.triggered[0]['prop_id'].split('.')[0]
-        triggered_id_dict = ctx.triggered[0]['id'] if 'id' in ctx.triggered[0] else None
+    # Determine what triggered the callback
+    triggered = ctx.triggered[0]
+    prop_id = triggered['prop_id']
+    triggered_id = triggered.get('id', None)
 
     session = get_or_create_session_data(session_id)
     slide_idx = current_slide_idx if current_slide_idx is not None else None
@@ -449,22 +447,69 @@ def unified_callback(
     with session['lock']:
         log_str = '\n'.join(session['log_messages'][:100])
 
-    # Main triggers
-    if button_id == 'upload-file':
-        if upload_contents and upload_filename:
+    # Detect if delete triggered
+    delete_triggered = False
+    delete_filename = None
+    if 'file-delete' in prop_id:
+        if isinstance(delete_ids, list):
+            for n, n_clicks in enumerate(file_deletes):
+                if n_clicks and n_clicks > 0 and isinstance(delete_ids[n], dict):
+                    delete_triggered = True
+                    delete_filename = delete_ids[n].get('filename')
+                    break
+    # Detect if download triggered
+    download_triggered = False
+    download_filename = None
+    if 'file-download' in prop_id:
+        if isinstance(download_ids, list):
+            for n, n_clicks in enumerate(file_downloads):
+                if n_clicks and n_clicks > 0 and isinstance(download_ids[n], dict):
+                    download_triggered = True
+                    download_filename = download_ids[n].get('filename')
+                    break
+
+    # Handle file deletion
+    if delete_triggered and delete_filename:
+        file_entry = next((f for f in session['files_box'] if f['name'] == delete_filename), None)
+        if file_entry:
             try:
-                header, content_string = upload_contents.split(',')
-                file_bytes = base64.b64decode(content_string)
-                file_path = save_to_session_temp_file(session_id, upload_filename, file_bytes)
-                session['files_box'] = list_session_files(session_id)
-                session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - Uploaded file '{upload_filename}' saved to '{file_path}' for session '{session_id}'.")
-                logger.info(f"File '{upload_filename}' registered in session file box for '{session_id}', path: {file_path}")
-            except Exception as e:
-                session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - Error uploading file: {str(e)}")
-                log_str = '\n'.join(session['log_messages'][:100])
+                os.remove(file_entry['path'])
+                add_log(f"Deleted file '{file_entry['name']}' from '{file_entry['path']}'", session_id)
+                logger.info(f"Deleted file '{file_entry['name']}' at '{file_entry['path']}' for session '{session_id}'")
+            except Exception as ex:
+                add_log(f"Failed to delete file '{file_entry['name']}' from '{file_entry['path']}': {str(ex)}", session_id)
+            session['files_box'] = list_session_files(session_id)
+            session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - File '{file_entry['name']}' deleted.")
+            log_str = '\n'.join(session['log_messages'][:100])
+        return build_files_box(session), slides_content, log_str, slide_idx, None, slides_content
+
+    # Handle file download
+    if download_triggered and download_filename:
+        file_entry = next((f for f in session['files_box'] if f['name'] == download_filename), None)
+        if file_entry:
+            file_path = file_entry['path']
+            file_name = file_entry['name']
+            file_bytes = read_session_temp_file(file_path)
+            add_log(f"Download link generated for file '{file_name}' at '{file_path}'", session_id)
+            logger.info(f"Download triggered for file '{file_name}' at '{file_path}' session '{session_id}'")
+            log_str = '\n'.join(session['log_messages'][:100])
+            return build_files_box(session), slides_content, log_str, slide_idx, dcc.send_bytes(file_bytes, file_name), slides_content
+
+    # Handle upload
+    if prop_id.startswith('upload-file') and upload_contents and upload_filename:
+        try:
+            header, content_string = upload_contents.split(',')
+            file_bytes = base64.b64decode(content_string)
+            file_path = save_to_session_temp_file(session_id, upload_filename, file_bytes)
+            session['files_box'] = list_session_files(session_id)
+            session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - Uploaded file '{upload_filename}' saved to '{file_path}' for session '{session_id}'.")
+            logger.info(f"File '{upload_filename}' registered in session file box for '{session_id}', path: {file_path}")
+        except Exception as e:
+            session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - Error uploading file: {str(e)}")
+            log_str = '\n'.join(session['log_messages'][:100])
         return build_files_box(session), slides_content, log_str, slide_idx, None, slides_content
 
-    elif button_id == 'generate-content-button':
+    elif prop_id.startswith('generate-content-button'):
         decoded_file_text = None
         uploaded_files = [f for f in session['files_box'] if f['type'] == 'uploaded']
         if uploaded_files:
@@ -506,7 +551,7 @@ def unified_callback(
             return build_files_box(session), f"An error occurred: {str(e)}", log_str, slide_idx, None, slides_content
         return build_files_box(session), slides_content, log_str, slide_idx, None, slides_content
 
-    elif button_id == 'generate-ppt-button':
+    elif prop_id.startswith('generate-ppt-button'):
         if not slides_content or not session_id:
             raise PreventUpdate
         pptx_bytes = None
@@ -530,36 +575,6 @@ def unified_callback(
             return build_files_box(session), slides_content, log_str, slide_idx, None, slides_content
         return build_files_box(session), slides_content, log_str, slide_idx, None, slides_content
 
-    # Handle pattern-matching download/delete, robustly extract the dict, never parse as JSON string
-    elif triggered_id_dict is not None and isinstance(triggered_id_dict, dict):
-        if triggered_id_dict.get('type') == 'file-download':
-            filename = triggered_id_dict.get('filename')
-            file_entry = next((f for f in session['files_box'] if f['name'] == filename), None)
-            if file_entry:
-                file_path = file_entry['path']
-                file_name = file_entry['name']
-                file_bytes = read_session_temp_file(file_path)
-                add_log(f"Download link generated for file '{file_name}' at '{file_path}'", session_id)
-                logger.info(f"Download triggered for file '{file_name}' at '{file_path}' session '{session_id}'")
-                log_str = '\n'.join(session['log_messages'][:100])
-                return build_files_box(session), slides_content, log_str, slide_idx, dcc.send_bytes(file_bytes, file_name), slides_content
-        elif triggered_id_dict.get('type') == 'file-delete':
-            filename = triggered_id_dict.get('filename')
-            file_entry = next((f for f in session['files_box'] if f['name'] == filename), None)
-            if file_entry:
-                try:
-                    os.remove(file_entry['path'])
-                    add_log(f"Deleted file '{file_entry['name']}' from '{file_entry['path']}'", session_id)
-                    logger.info(f"Deleted file '{file_entry['name']}' at '{file_entry['path']}' for session '{session_id}'")
-                except Exception as ex:
-                    add_log(f"Failed to delete file '{file_entry['name']}' from '{file_entry['path']}': {str(ex)}", session_id)
-                session['files_box'] = list_session_files(session_id)
-                session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - File '{file_entry['name']}' deleted.")
-                log_str = '\n'.join(session['log_messages'][:100])
-            return build_files_box(session), slides_content, log_str, slide_idx, None, slides_content
-        else:
-            raise PreventUpdate
-
     else:
         session['files_box'] = list_session_files(session_id)
         session['current_slide_md'] = load_current_slide_md_from_disk(session_id)