Update app.py via AI Editor

app.py

@@ -336,28 +336,49 @@ app.layout = dbc.Container([
     Output('generated-doc-list', 'children'),
     Output('select-generated-dropdown', 'options'),
     Output('select-generated-dropdown', 'value'),
-    Input('upload-document', 'contents'),
-    State('upload-document', 'filename'),
-    Input({'type': 'delete-doc-btn', 'index': dash.ALL, 'group': 'rfp'}, 'n_clicks'),
-    State('select-document-dropdown', 'value'),
-    Input('upload-proposal', 'contents'),
-    State('upload-proposal', 'filename'),
-    Input({'type': 'delete-proposal-btn', 'index': dash.ALL, 'group': 'proposal'}, 'n_clicks'),
-    State('select-proposal-dropdown', 'value'),
-    Input({'type': 'delete-generated-btn', 'index': dash.ALL, 'group': 'generated'}, 'n_clicks'),
-    State('select-generated-dropdown', 'value'),
-    State('select-generated-dropdown', 'options'),
+    Output('output-data-upload', 'children'),
+    [
+        Input('upload-document', 'contents'),
+        State('upload-document', 'filename'),
+        Input({'type': 'delete-doc-btn', 'index': dash.ALL, 'group': 'rfp'}, 'n_clicks'),
+        State('select-document-dropdown', 'value'),
+        Input('upload-proposal', 'contents'),
+        State('upload-proposal', 'filename'),
+        Input({'type': 'delete-proposal-btn', 'index': dash.ALL, 'group': 'proposal'}, 'n_clicks'),
+        State('select-proposal-dropdown', 'value'),
+        Input({'type': 'delete-generated-btn', 'index': dash.ALL, 'group': 'generated'}, 'n_clicks'),
+        State('select-generated-dropdown', 'value'),
+        State('select-generated-dropdown', 'options'),
+        Input('shred-action-btn', 'n_clicks'),
+        Input('generate-action-btn', 'n_clicks'),
+        Input('compliance-action-btn', 'n_clicks'),
+        Input('recover-action-btn', 'n_clicks'),
+        Input('board-action-btn', 'n_clicks'),
+        Input('loe-action-btn', 'n_clicks'),
+        Input('select-generated-dropdown', 'value'),
+        State('chat-input', 'value'),
+        State('select-document-dropdown', 'value'),
+        State('select-proposal-dropdown', 'value'),
+        State('select-generated-dropdown', 'value'),
+    ],
     prevent_initial_call=True
 )
-def update_uploaded_docs(
+def master_callback(
     rfp_content, rfp_filename, rfp_delete_clicks, selected_doc,
     proposal_content, proposal_filename, proposal_delete_clicks, selected_proposal,
-    generated_delete_clicks, selected_generated, generated_options
+    generated_delete_clicks, selected_generated, generated_options,
+    shred_clicks, generate_clicks, compliance_clicks, recover_clicks, board_clicks, loe_clicks,
+    selected_generated_dropdown,
+    chat_input, selected_filename, selected_proposal_dropdown, selected_generated_dropdown_state
 ):
     ctx = callback_context
-    triggered = ctx.triggered
+    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0] if ctx.triggered else None
 
-    if rfp_content is not None and rfp_filename:
+    # Upload or delete document or proposal or generated document
+    upload_triggered = False
+
+    # Handle upload document
+    if triggered_id == 'upload-document' and rfp_content is not None and rfp_filename:
         content_type, content_string = rfp_content.split(',')
         decoded = base64.b64decode(content_string)
         text = decode_document(decoded)
@@ -366,8 +387,10 @@ def update_uploaded_docs(
             logging.info(f"Document uploaded: {rfp_filename}")
         else:
             logging.error(f"Failed to decode uploaded document: {rfp_filename}")
+        upload_triggered = True
 
-    if proposal_content is not None and proposal_filename:
+    # Handle upload proposal
+    if triggered_id == 'upload-proposal' 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)
@@ -376,8 +399,10 @@ def update_uploaded_docs(
             logging.info(f"Proposal uploaded: {proposal_filename}")
         else:
             logging.error(f"Failed to decode uploaded proposal: {proposal_filename}")
+        upload_triggered = True
 
-    if rfp_delete_clicks:
+    # Handle delete document
+    if triggered_id and isinstance(ctx.inputs_list[2], list):
         for i, n_click in enumerate(rfp_delete_clicks):
             if n_click:
                 btn_id = ctx.inputs_list[2][i]['id']
@@ -387,8 +412,11 @@ def update_uploaded_docs(
                     logging.info(f"Document deleted: {del_filename}")
                     if selected_doc == del_filename:
                         selected_doc = next(iter(uploaded_documents), None)
+                    upload_triggered = True
                     break
-    if proposal_delete_clicks:
+
+    # Handle delete proposal
+    if triggered_id and isinstance(ctx.inputs_list[6], list):
         for i, n_click in enumerate(proposal_delete_clicks):
             if n_click:
                 btn_id = ctx.inputs_list[6][i]['id']
@@ -398,8 +426,11 @@ def update_uploaded_docs(
                     logging.info(f"Proposal deleted: {del_filename}")
                     if selected_proposal == del_filename:
                         selected_proposal = next(iter(uploaded_proposals), None)
+                    upload_triggered = True
                     break
-    if generated_delete_clicks:
+
+    # Handle delete generated document
+    if triggered_id and isinstance(ctx.inputs_list[10], list):
         for i, n_click in enumerate(generated_delete_clicks):
             if n_click:
                 btn_id = ctx.inputs_list[10][i]['id']
@@ -409,6 +440,7 @@ def update_uploaded_docs(
                     logging.info(f"Generated doc deleted: {del_filename}")
                     if selected_generated == del_filename:
                         selected_generated = next(iter(generated_documents), None)
+                    upload_triggered = True
                     break
 
     doc_options = [{'label': fn, 'value': fn} for fn in uploaded_documents.keys()]
@@ -417,60 +449,25 @@ def update_uploaded_docs(
     proposal_value = selected_proposal if selected_proposal in uploaded_proposals else (next(iter(uploaded_proposals), None) if uploaded_proposals else None)
     generated_doc_options = [{'label': fn, 'value': fn} for fn in generated_documents.keys()]
     generated_doc_value = selected_generated if selected_generated in generated_documents else (next(iter(generated_documents), None) if generated_documents else None)
-    return (
-        get_uploaded_doc_list(uploaded_documents),
-        doc_options,
-        doc_value,
-        proposal_options,
-        proposal_value,
-        get_uploaded_proposal_list(uploaded_proposals),
-        get_generated_doc_list(generated_documents),
-        generated_doc_options,
-        generated_doc_value
-    )
 
-@app.callback(
-    Output('output-data-upload', 'children'),
-    Output('generated-doc-list', 'children'),
-    Output('select-generated-dropdown', 'options'),
-    Output('select-generated-dropdown', 'value'),
-    [
-        Input('shred-action-btn', 'n_clicks'),
-        Input('generate-action-btn', 'n_clicks'),
-        Input('compliance-action-btn', 'n_clicks'),
-        Input('recover-action-btn', 'n_clicks'),
-        Input('board-action-btn', 'n_clicks'),
-        Input('loe-action-btn', 'n_clicks'),
-        Input('select-generated-dropdown', 'value'),
-    ],
-    State('chat-input', 'value'),
-    State('select-document-dropdown', 'value'),
-    State('select-proposal-dropdown', 'value'),
-    State('select-generated-dropdown', 'value'),
-    prevent_initial_call=True
-)
-def handle_all_actions(
-    shred_clicks, generate_clicks, compliance_clicks, recover_clicks, board_clicks, loe_clicks, selected_generated_dropdown,
-    chat_input, selected_filename, selected_proposal, selected_generated
-):
-    ctx = callback_context
-    if not ctx.triggered:
-        logging.info("No action triggered yet.")
-        return html.Div("No action taken yet.", style={"wordWrap": "break-word"}), get_generated_doc_list(generated_documents), [{'label': fn, 'value': fn} for fn in generated_documents.keys()], selected_generated
+    uploaded_doc_list = get_uploaded_doc_list(uploaded_documents)
+    uploaded_proposal_list = get_uploaded_proposal_list(uploaded_proposals)
+    generated_doc_list = get_generated_doc_list(generated_documents)
 
-    button_ids = [
+    # Default output
+    output_data_upload = html.Div("No action taken yet.", style={"wordWrap": "break-word"})
+
+    action_buttons = [
         'shred-action-btn', 'generate-action-btn', 'compliance-action-btn',
         'recover-action-btn', 'board-action-btn', 'loe-action-btn'
     ]
-    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0]
-    logging.info(f"Trigger: {triggered_id}")
 
-    # if a button is pressed
-    if triggered_id in button_ids:
+    # Handle action buttons
+    if triggered_id in action_buttons:
         result = ""
         generated_docx_bytes = None
         generated_docx_name = None
-        new_selected_generated = selected_generated
+        new_selected_generated = generated_doc_value
 
         if triggered_id == 'shred-action-btn':
             result, generated_docx_bytes, generated_docx_name = process_document('shred', selected_filename, chat_input)
@@ -492,31 +489,51 @@ def handle_all_actions(
             result = "Action not implemented yet."
 
         if isinstance(result, str) and result.strip().startswith("Error"):
-            return html.Div(result, style={"wordWrap": "break-word"}), get_generated_doc_list(generated_documents), [{'label': fn, 'value': fn} for fn in generated_documents.keys()], new_selected_generated
-        if isinstance(result, str) and ("not implemented" in result or "No document uploaded" in result or "Shredding in progress" in result or "Generating response" in result or "Shredded document not available" in result):
-            return html.Div(result, style={"wordWrap": "break-word"}), get_generated_doc_list(generated_documents), [{'label': fn, 'value': fn} for fn in generated_documents.keys()], new_selected_generated
-        return dcc.Markdown(result, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"}), get_generated_doc_list(generated_documents), [{'label': fn, 'value': fn} for fn in generated_documents.keys()], new_selected_generated
+            output_data_upload = html.Div(result, style={"wordWrap": "break-word"})
+        elif isinstance(result, str) and ("not implemented" in result or "No document uploaded" in result or "Shredding in progress" in result or "Generating response" in result or "Shredded document not available" in result):
+            output_data_upload = html.Div(result, style={"wordWrap": "break-word"})
+        else:
+            output_data_upload = dcc.Markdown(result, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
+
+        generated_doc_options = [{'label': fn, 'value': fn} for fn in generated_documents.keys()]
+        generated_doc_value = new_selected_generated if new_selected_generated in generated_documents else (next(iter(generated_documents), None) if generated_documents else None)
+        generated_doc_list = get_generated_doc_list(generated_documents)
 
-    # if the generated doc dropdown is changed
-    if triggered_id == 'select-generated-dropdown':
+    # Handle select-generated-dropdown for download
+    elif triggered_id == 'select-generated-dropdown':
         sel_gen = selected_generated_dropdown
         if not sel_gen or sel_gen not in generated_documents:
-            return html.Div("No generated document selected.", style={"wordWrap": "break-word"}), get_generated_doc_list(generated_documents), [{'label': fn, 'value': fn} for fn in generated_documents.keys()], sel_gen
-        docx_bytes = generated_documents[sel_gen]
-        b64 = base64.b64encode(docx_bytes).decode('utf-8')
-        download_link = html.A(
-            f"Download {sel_gen}",
-            href=f"data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;base64,{b64}",
-            download=sel_gen,
-            target="_blank",
-            style={"wordWrap": "break-word"}
-        )
-        return html.Div([
-            html.Div(download_link, style={"marginBottom": "15px"}),
-            html.Div("Preview not available for docx. Download to view.", style={"wordWrap": "break-word"})
-        ]), get_generated_doc_list(generated_documents), [{'label': fn, 'value': fn} for fn in generated_documents.keys()], sel_gen
+            output_data_upload = html.Div("No generated document selected.", style={"wordWrap": "break-word"})
+        else:
+            docx_bytes = generated_documents[sel_gen]
+            b64 = base64.b64encode(docx_bytes).decode('utf-8')
+            download_link = html.A(
+                f"Download {sel_gen}",
+                href=f"data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;base64,{b64}",
+                download=sel_gen,
+                target="_blank",
+                style={"wordWrap": "break-word"}
+            )
+            output_data_upload = html.Div([
+                html.Div(download_link, style={"marginBottom": "15px"}),
+                html.Div("Preview not available for docx. Download to view.", style={"wordWrap": "break-word"})
+            ])
+
+    elif upload_triggered:
+        output_data_upload = html.Div("Upload/Delete completed.", style={"wordWrap": "break-word"})
 
-    return html.Div("No action taken.", style={"wordWrap": "break-word"}), get_generated_doc_list(generated_documents), [{'label': fn, 'value': fn} for fn in generated_documents.keys()], selected_generated
+    return (
+        uploaded_doc_list,
+        doc_options,
+        doc_value,
+        proposal_options,
+        proposal_value,
+        uploaded_proposal_list,
+        generated_doc_list,
+        generated_doc_options,
+        generated_doc_value,
+        output_data_upload
+    )
 
 if __name__ == '__main__':
     print("Starting the Dash application...")