Update app.py via AI Editor

app.py

@@ -167,7 +167,7 @@ def get_file_cards(file_dict):
                         dbc.Col(
                             dbc.Button(
                                 "Delete",
-                                id={'type': 'remove-file', 'index': name},
+                                id={'type': 'delete-file-btn', 'index': name},
                                 color="danger",
                                 size="sm",
                                 style={'marginLeft': 'auto', 'float': 'right'}
@@ -273,54 +273,60 @@ app.layout = dbc.Container([
 
 @app.callback(
     Output('file-list', 'children'),
-    [Input('upload-files', 'contents'),
-     Input({'type': 'remove-file', 'index': ALL}, 'n_clicks')],
-    [State('upload-files', 'filename')],
+    [
+        Input('upload-files', 'contents'),
+        Input({'type': 'delete-file-btn', 'index': ALL}, 'n_clicks')
+    ],
+    [
+        State('upload-files', 'filename'),
+    ],
     prevent_initial_call='initial_duplicate'
 )
-def handle_file_upload_and_remove(list_of_contents, n_clicks, list_of_names):
+def handle_file_upload_and_delete(list_of_contents, delete_clicks, list_of_names):
     ctx = callback_context
     session_data, lock = get_session_data()
-    # On first load, restore file list from session temp dir
     with lock:
         restore_session_files(session_data)
-    # If upload triggered
-    if ctx.triggered and ctx.triggered[0]['prop_id'].startswith("upload-files.contents"):
-        logger.info("Uploading files...")
-        if list_of_contents is not None:
-            with lock:
-                for content, name in zip(list_of_contents, list_of_names):
-                    content_type, content_string = content.split(',')
-                    decoded = base64.b64decode(content_string)
-                    temp_path = os.path.join(session_data['temp_dir'], name)
-                    with open(temp_path, 'wb') as f:
-                        f.write(decoded)
-                    session_data['uploaded_files'][name] = temp_path
-                    session_data['file_texts'][name] = parse_file_content(temp_path, name)
-                logger.info(f"Files after upload: {list(session_data['uploaded_files'].keys())}")
-            return get_file_cards(session_data['uploaded_files'])
-    # If remove triggered
-    elif ctx.triggered and "remove-file" in ctx.triggered[0]['prop_id']:
-        triggered_id = ctx.triggered[0]['prop_id'].split('.')[0]
-        import ast
-        try:
-            triggered_id_dict = ast.literal_eval(triggered_id)
-            removed_file = triggered_id_dict['index']
-        except Exception:
-            raise PreventUpdate
-        with lock:
-            if removed_file in session_data['uploaded_files']:
+        triggered = ctx.triggered
+        if triggered:
+            prop_id = triggered[0]['prop_id']
+            # Handle file upload
+            if prop_id.startswith("upload-files.contents"):
+                logger.info("Uploading files...")
+                if list_of_contents is not None and list_of_names is not None:
+                    for content, name in zip(list_of_contents, list_of_names):
+                        content_type, content_string = content.split(',')
+                        decoded = base64.b64decode(content_string)
+                        temp_path = os.path.join(session_data['temp_dir'], name)
+                        with open(temp_path, 'wb') as f:
+                            f.write(decoded)
+                        session_data['uploaded_files'][name] = temp_path
+                        session_data['file_texts'][name] = parse_file_content(temp_path, name)
+                    logger.info(f"Files after upload: {list(session_data['uploaded_files'].keys())}")
+                    return get_file_cards(session_data['uploaded_files'])
+            # Handle delete button click
+            elif "delete-file-btn" in prop_id:
+                import ast
+                btn_id = prop_id.split('.')[0]
                 try:
-                    os.remove(session_data['uploaded_files'][removed_file])
-                    logger.info(f"Deleted file from disk: {removed_file}")
+                    btn_id_dict = ast.literal_eval(btn_id)
+                    filename = btn_id_dict['index']
                 except Exception as e:
-                    logger.warning(f"Failed to delete temp file {removed_file}: {e}")
-                session_data['uploaded_files'].pop(removed_file, None)
-                session_data['file_texts'].pop(removed_file, None)
-            logger.info(f"Files after deletion: {list(session_data['uploaded_files'].keys())}")
+                    logger.warning(f"Could not extract filename from delete prop_id: {prop_id} error: {e}")
+                    raise PreventUpdate
+                if filename in session_data['uploaded_files']:
+                    filepath = session_data['uploaded_files'][filename]
+                    try:
+                        os.remove(filepath)
+                        logger.info(f"Deleted file from disk: {filename}")
+                    except Exception as e:
+                        logger.warning(f"Failed to delete temp file {filename}: {e}")
+                    session_data['uploaded_files'].pop(filename, None)
+                    session_data['file_texts'].pop(filename, None)
+                    logger.info(f"Files after deletion: {list(session_data['uploaded_files'].keys())}")
+                return get_file_cards(session_data['uploaded_files'])
+        # On initial load or no trigger, show files from session
         return get_file_cards(session_data['uploaded_files'])
-    # Otherwise just display current files (e.g. on initial load)
-    return get_file_cards(session_data['uploaded_files'])
 
 def generate_matrix_with_gpt(matrix_type, file_contents):
     prompt = f"""Generate a {matrix_type} based on the following project artifacts:
@@ -367,7 +373,6 @@ Now, generate the {matrix_type}:
 def handle_matrix_and_chat(*args):
     session_data, lock = get_session_data()
     ctx = callback_context
-    # Matrix generation button pressed
     matrix_btns_len = len(matrix_types)
     matrix_btn_inputs = args[:matrix_btns_len]
     chat_n_clicks = args[matrix_btns_len]
@@ -375,7 +380,6 @@ def handle_matrix_and_chat(*args):
     if not ctx.triggered:
         raise PreventUpdate
     triggered_id = ctx.triggered[0]['prop_id'].split('.')[0]
-    # If matrix button triggered
     if "matrix-btn" in triggered_id:
         import ast
         try:
@@ -395,7 +399,6 @@ def handle_matrix_and_chat(*args):
             except Exception as e:
                 logger.exception(f"Error generating matrix: {str(e)}")
                 return html.Div(f"Error generating matrix: {str(e)}"), "Error", ""
-    # If chat send button triggered
     elif "btn-send-chat" in triggered_id:
         if not chat_input_value or session_data['current_matrix'] is None or session_data['matrix_type'] is None:
             raise PreventUpdate