Update app.py via AI Editor

app.py

@@ -273,99 +273,54 @@ app.layout = dbc.Container([
 
 @app.callback(
     Output('file-list', 'children'),
-    Input('upload-files', 'contents'),
-    State('upload-files', 'filename'),
-    prevent_initial_call=True
+    [Input('upload-files', 'contents'),
+     Input({'type': 'remove-file', 'index': ALL}, 'n_clicks')],
+    [State('upload-files', 'filename')],
+    prevent_initial_call='initial_duplicate'
 )
-def update_output(list_of_contents, list_of_names):
-    session_data, lock = get_session_data()
-    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'])
-    raise PreventUpdate
-
-@app.callback(
-    Output('file-list', 'children'),
-    Input({'type': 'remove-file', 'index': ALL}, 'n_clicks'),
-    State('file-list', 'children'),
-    prevent_initial_call=True
-)
-def remove_file(n_clicks, file_list_children):
+def handle_file_upload_and_remove(list_of_contents, n_clicks, list_of_names):
     ctx = callback_context
-    if not ctx.triggered or not any(n_clicks):
-        raise PreventUpdate
-    session_data, lock = get_session_data()
-    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']:
-            try:
-                os.remove(session_data['uploaded_files'][removed_file])
-                logger.info(f"Deleted file from disk: {removed_file}")
-            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())}")
-    return get_file_cards(session_data['uploaded_files'])
-
-@app.callback(
-    Output('file-list', 'children', allow_duplicate=True),
-    Input('file-list', 'children'),
-    prevent_initial_call=False
-)
-def restore_file_list(file_list_children):
     session_data, lock = get_session_data()
+    # On first load, restore file list from session temp dir
     with lock:
         restore_session_files(session_data)
-        return get_file_cards(session_data['uploaded_files'])
-
-@app.callback(
-    Output('matrix-preview', 'children'),
-    Output('loading-output', 'children'),
-    [Input({'type': 'matrix-btn', 'index': matrix_label}, 'n_clicks') for matrix_label in matrix_types.keys()],
-    prevent_initial_call=True
-)
-def generate_matrix(*args):
-    session_data, lock = get_session_data()
-    ctx = callback_context
-    if not ctx.triggered:
-        raise PreventUpdate
-    button_id = ctx.triggered[0]['prop_id'].split('.')[0]
-    import ast
-    try:
-        triggered = ast.literal_eval(button_id)
-        matrix_type = triggered['index']
-    except Exception:
-        raise PreventUpdate
-
-    if not session_data['uploaded_files']:
-        return html.Div("Please upload project artifacts before generating a matrix."), ""
-    file_contents = list(session_data['file_texts'].values())
-    with lock:
+    # 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:
-            session_data['matrix_type'] = matrix_type
-            session_data['current_matrix'] = generate_matrix_with_gpt(matrix_type, file_contents)
-            logger.info(f"{matrix_type} generated for session.")
-            return dbc.Table.from_dataframe(session_data['current_matrix'], striped=True, bordered=True, hover=True), f"{matrix_type} generated"
-        except Exception as e:
-            logger.exception(f"Error generating matrix: {str(e)}")
-            return html.Div(f"Error generating matrix: {str(e)}"), "Error"
+            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']:
+                try:
+                    os.remove(session_data['uploaded_files'][removed_file])
+                    logger.info(f"Deleted file from disk: {removed_file}")
+                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())}")
+        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:
@@ -401,19 +356,52 @@ Now, generate the {matrix_type}:
     return pd.DataFrame(data, columns=headers)
 
 @app.callback(
+    Output('matrix-preview', 'children'),
+    Output('loading-output', 'children'),
     Output('chat-output', 'children'),
-    Output('matrix-preview', 'children', allow_duplicate=True),
-    Input('btn-send-chat', 'n_clicks'),
-    State('chat-input', 'value'),
-    prevent_initial_call=True
+    [Input({'type': 'matrix-btn', 'index': matrix_label}, 'n_clicks') for matrix_label in matrix_types.keys()] +
+    [Input('btn-send-chat', 'n_clicks')],
+    [State('chat-input', 'value')],
+    prevent_initial_call='initial_duplicate'
 )
-def update_matrix_via_chat(n_clicks, chat_input):
+def handle_matrix_and_chat(*args):
     session_data, lock = get_session_data()
-    if not chat_input or session_data['current_matrix'] is None or session_data['matrix_type'] is None:
+    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]
+    chat_input_value = args[matrix_btns_len + 1]
+    if not ctx.triggered:
         raise PreventUpdate
-    matrix_type = session_data['matrix_type']
-    with lock:
-        prompt = f"""Update the following {matrix_type} based on this instruction: {chat_input}
+    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0]
+    # If matrix button triggered
+    if "matrix-btn" in triggered_id:
+        import ast
+        try:
+            triggered = ast.literal_eval(triggered_id)
+            matrix_type = triggered['index']
+        except Exception:
+            raise PreventUpdate
+        if not session_data['uploaded_files']:
+            return html.Div("Please upload project artifacts before generating a matrix."), "", ""
+        file_contents = list(session_data['file_texts'].values())
+        with lock:
+            try:
+                session_data['matrix_type'] = matrix_type
+                session_data['current_matrix'] = generate_matrix_with_gpt(matrix_type, file_contents)
+                logger.info(f"{matrix_type} generated for session.")
+                return dbc.Table.from_dataframe(session_data['current_matrix'], striped=True, bordered=True, hover=True), f"{matrix_type} generated", ""
+            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
+        matrix_type = session_data['matrix_type']
+        with lock:
+            prompt = f"""Update the following {matrix_type} based on this instruction: {chat_input_value}
 Current matrix:
 {session_data['current_matrix'].to_string(index=False)}
 Instructions:
@@ -426,22 +414,24 @@ Instructions:
 7. Each subsequent row should represent a single item in the matrix.
 Now, provide the updated {matrix_type}:
 """
-        response = openai.ChatCompletion.create(
-            model="gpt-4-turbo",
-            messages=[
-                {"role": "system", "content": "You are a precise matrix updater that outputs only the requested matrix without any additional text. You will make assumptions as a project manager to produce the matrix based on the limited information provided"},
-                {"role": "user", "content": prompt}
-            ]
-        )
-        updated_matrix_text = response.choices[0].message.content.strip()
-        logger.info(f"Raw updated matrix text from GPT: {updated_matrix_text[:200]}...")
-        lines = [line.strip() for line in updated_matrix_text.split('\n') if '|' in line]
-        data = [line.split('|') for line in lines]
-        data = [[cell.strip() for cell in row] for row in data]
-        headers = data[0]
-        data = data[1:]
-        session_data['current_matrix'] = pd.DataFrame(data, columns=headers)
-        return f"Matrix updated based on: {chat_input}", dbc.Table.from_dataframe(session_data['current_matrix'], striped=True, bordered=True, hover=True)
+            response = openai.ChatCompletion.create(
+                model="gpt-4-turbo",
+                messages=[
+                    {"role": "system", "content": "You are a precise matrix updater that outputs only the requested matrix without any additional text. You will make assumptions as a project manager to produce the matrix based on the limited information provided"},
+                    {"role": "user", "content": prompt}
+                ]
+            )
+            updated_matrix_text = response.choices[0].message.content.strip()
+            logger.info(f"Raw updated matrix text from GPT: {updated_matrix_text[:200]}...")
+            lines = [line.strip() for line in updated_matrix_text.split('\n') if '|' in line]
+            data = [line.split('|') for line in lines]
+            data = [[cell.strip() for cell in row] for row in data]
+            headers = data[0]
+            data = data[1:]
+            session_data['current_matrix'] = pd.DataFrame(data, columns=headers)
+            return dbc.Table.from_dataframe(session_data['current_matrix'], striped=True, bordered=True, hover=True), "", f"Matrix updated based on: {chat_input_value}"
+    else:
+        raise PreventUpdate
 
 @app.callback(
     Output("download-matrix", "data"),