Update app.py via AI Editor

app.py

@@ -2,7 +2,7 @@ import os
 import base64
 import io
 import dash
-from dash import dcc, html, Input, Output, State, callback_context
+from dash import dcc, html, Input, Output, State, callback_context, MATCH, ALL
 import dash_bootstrap_components as dbc
 import pandas as pd
 import logging
@@ -153,7 +153,7 @@ def process_document(action, selected_filename=None, chat_input=None):
     if action == 'shred':
         if not doc_content:
             logging.warning("No uploaded document found for shredding.")
-            return "No document uploaded.", None, None
+            return "No document uploaded.", None, None, None
         prompt = (
             "Analyze the following RFP/PWS/SOW/RFI and generate a requirements spreadsheet. "
             "Identify requirements by action words like 'shall', 'will', 'perform', etc. Also analye the document and put a column for win theme for each requirement identified. Organize by PWS section and requirement. "
@@ -184,12 +184,20 @@ def process_document(action, selected_filename=None, chat_input=None):
         t = Thread(target=thread_shred)
         t.start()
         t.join()
-        return result_holder["text"], result_holder["docx_bytes"], result_holder["docx_name"]
+        # Add the shredded docx to uploaded_documents as a new doc
+        if result_holder["docx_bytes"] and result_holder["docx_name"]:
+            docx_name = result_holder["docx_name"]
+            try:
+                # We'll store the text as the plain shredded text (not binary docx) in uploaded_documents
+                uploaded_documents[docx_name] = result_holder["text"]
+            except Exception as e:
+                logging.error(f"Error adding shredded docx to uploaded_documents: {e}")
+        return result_holder["text"], result_holder["docx_bytes"], result_holder["docx_name"], result_holder["text"]
 
     elif action == 'generate':
         if not shredded_document:
             logging.warning("No shredded document found when generating response.")
-            return "Shredded document not available.", None, None
+            return "Shredded document not available.", None, None, None
         prompt = (
             "Create a highly detailed proposal response based on the following PWS requirements. "
             "Be compliant and compelling. Focus on describing the approach, steps, workflow, people, processes, and technology. "
@@ -220,12 +228,12 @@ def process_document(action, selected_filename=None, chat_input=None):
         t = Thread(target=thread_generate)
         t.start()
         t.join()
-        return result_holder["text"], result_holder["docx_bytes"], result_holder["docx_name"]
+        return result_holder["text"], result_holder["docx_bytes"], result_holder["docx_name"], result_holder["text"]
 
     elif action == 'proposal':
         if not doc_content:
             logging.warning("No RFP/SOW/PWS/RFI document selected for proposal action.")
-            return "No RFP/SOW/PWS/RFI document selected.", None, None
+            return "No RFP/SOW/PWS/RFI document selected.", None, None, None
         rfp_filename = selected_filename
         rfp_fileid = uploaded_documents_fileid.get(selected_filename)
         prompt = (
@@ -255,17 +263,17 @@ def process_document(action, selected_filename=None, chat_input=None):
         t = Thread(target=thread_proposal)
         t.start()
         t.join()
-        return result_holder["text"], result_holder["docx_bytes"], result_holder["docx_name"]
+        return result_holder["text"], result_holder["docx_bytes"], result_holder["docx_name"], result_holder["text"]
 
     elif action == 'compliance':
-        return "Compliance checking not implemented yet.", None, None
+        return "Compliance checking not implemented yet.", None, None, None
     elif action == 'recover':
-        return "Recovery not implemented yet.", None, None
+        return "Recovery not implemented yet.", None, None, None
     elif action == 'board':
-        return "Virtual board not implemented yet.", None, None
+        return "Virtual board not implemented yet.", None, None, None
     elif action == 'loe':
-        return "LOE estimation not implemented yet.", None, None
-    return "Action not implemented yet.", None, None
+        return "LOE estimation not implemented yet.", None, None, None
+    return "Action not implemented yet.", None, None, None
 
 def get_uploaded_doc_list(docdict):
     if not docdict:
@@ -329,6 +337,8 @@ def get_generated_doc_list(docdict):
     return dbc.ListGroup(doc_list, flush=True)
 
 app.layout = dbc.Container([
+    dcc.Store(id='shred-store', data={'text': None, 'docx_bytes': None, 'docx_name': None}),
+    dcc.Store(id='proposal-store', data={'text': None, 'docx_bytes': None, 'docx_name': None}),
     dbc.Row([
         dbc.Col([
             dbc.Card([
@@ -441,37 +451,31 @@ app.layout = dbc.Container([
 ], fluid=True)
 
 @app.callback(
+    Output('shred-store', 'data'),
+    Output('proposal-store', 'data'),
+    Output('output-data-upload', 'children'),
     Output('uploaded-doc-list', 'children'),
     Output('select-document-dropdown', 'options'),
     Output('select-document-dropdown', 'value'),
-    Output('select-proposal-dropdown', 'options'),
-    Output('select-proposal-dropdown', 'value'),
-    Output('uploaded-proposal-list', 'children'),
+    Output('shredded-doc-list', 'children'),
     Output('generated-doc-list', 'children'),
     Output('select-generated-dropdown', 'options'),
     Output('select-generated-dropdown', 'value'),
-    Output('shredded-doc-list', 'children'),
-    Output('output-data-upload', 'children'),
     [
+        Input('shred-action-btn', 'n_clicks'),
+        Input('proposal-action-btn', 'n_clicks'),
         Input('upload-document', 'contents'),
         State('upload-document', 'filename'),
-        Input({'type': 'delete-doc-btn', 'index': dash.ALL, 'group': 'rfp'}, 'n_clicks'),
+        Input({'type': 'delete-doc-btn', 'index': 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'),
+        Input({'type': 'delete-proposal-btn', 'index': ALL, 'group': 'proposal'}, 'n_clicks'),
         State('select-proposal-dropdown', 'value'),
-        Input({'type': 'delete-generated-btn', 'index': dash.ALL, 'group': 'generated'}, 'n_clicks'),
+        Input({'type': 'delete-generated-btn', 'index': ALL, 'group': 'generated'}, 'n_clicks'),
         State('select-generated-dropdown', 'value'),
-        State('select-generated-dropdown', 'options'),
-        Input({'type': 'delete-shredded-btn', 'index': dash.ALL, 'group': 'shredded'}, 'n_clicks'),
+        Input({'type': 'delete-shredded-btn', 'index': ALL, 'group': 'shredded'}, 'n_clicks'),
         State('shredded-doc-list', 'children'),
-        Input('shred-action-btn', 'n_clicks'),
-        Input('proposal-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'),
@@ -481,12 +485,12 @@ app.layout = dbc.Container([
     prevent_initial_call=True
 )
 def master_callback(
+    shred_clicks, proposal_clicks,
     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,
     shredded_delete_clicks, shredded_doc_children,
-    shred_clicks, proposal_clicks, compliance_clicks, recover_clicks, board_clicks, loe_clicks,
-    selected_generated_dropdown,
+    select_generated_value,
     chat_input, selected_filename, selected_proposal_dropdown, selected_generated_dropdown_state
 ):
     ctx = callback_context
@@ -494,6 +498,10 @@ def master_callback(
 
     upload_triggered = False
 
+    shred_store = {'text': None, 'docx_bytes': None, 'docx_name': None}
+    proposal_store = {'text': None, 'docx_bytes': None, 'docx_name': None}
+
+    # Handle uploads and deletes
     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)
@@ -526,10 +534,10 @@ def master_callback(
             logging.error(f"Failed to decode uploaded proposal: {proposal_filename}")
         upload_triggered = True
 
-    if triggered_id and isinstance(ctx.inputs_list[2], list):
+    if triggered_id and isinstance(ctx.inputs_list[4], list):
         for i, n_click in enumerate(rfp_delete_clicks):
             if n_click:
-                btn_id = ctx.inputs_list[2][i]['id']
+                btn_id = ctx.inputs_list[4][i]['id']
                 del_filename = btn_id['index']
                 if del_filename in uploaded_documents:
                     del uploaded_documents[del_filename]
@@ -545,10 +553,10 @@ def master_callback(
                     upload_triggered = True
                     break
 
-    if triggered_id and isinstance(ctx.inputs_list[6], list):
+    if triggered_id and isinstance(ctx.inputs_list[8], list):
         for i, n_click in enumerate(proposal_delete_clicks):
             if n_click:
-                btn_id = ctx.inputs_list[6][i]['id']
+                btn_id = ctx.inputs_list[8][i]['id']
                 del_filename = btn_id['index']
                 if del_filename in uploaded_proposals:
                     del uploaded_proposals[del_filename]
@@ -590,72 +598,59 @@ def master_callback(
 
     doc_options = [{'label': fn, 'value': fn} for fn in uploaded_documents.keys()]
     doc_value = selected_doc if selected_doc in uploaded_documents else (next(iter(uploaded_documents), None) if uploaded_documents else None)
-    proposal_options = [{'label': fn, 'value': fn} for fn in uploaded_proposals.keys()]
-    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)
     shredded_doc_list_items = get_shredded_doc_list(shredded_documents)
-
     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)
+    generated_doc_options = [{'label': fn, 'value': fn} for fn in generated_documents.keys()]
+    generated_doc_value = select_generated_value if select_generated_value in generated_documents else (next(iter(generated_documents), None) if generated_documents else None)
 
     output_data_upload = html.Div("No action taken yet.", style={"wordWrap": "break-word"})
 
-    action_buttons = [
-        'shred-action-btn', 'proposal-action-btn', 'compliance-action-btn',
-        'recover-action-btn', 'board-action-btn', 'loe-action-btn'
-    ]
-
-    if triggered_id in action_buttons:
-        result = ""
-        generated_docx_bytes = None
-        generated_docx_name = None
-        new_selected_generated = generated_doc_value
-
-        if triggered_id == 'shred-action-btn':
-            result, shredded_docx_bytes, shredded_docx_name = process_document('shred', selected_filename, chat_input)
-            if shredded_docx_bytes and shredded_docx_name:
-                shredded_documents[shredded_docx_name] = shredded_docx_bytes
-                logging.info(f"Shredded docx saved: {shredded_docx_name}")
+    if triggered_id == 'shred-action-btn':
+        output_data_upload = dcc.Loading(type="default", children=html.Div("Shredding document...", style={"wordWrap": "break-word"}))
+        shred_text, shredded_docx_bytes, shredded_docx_name, shredded_text = process_document('shred', selected_filename, chat_input)
+        shred_store = {'text': shred_text, 'docx_bytes': shredded_docx_bytes, 'docx_name': shredded_docx_name}
+
+        if shredded_docx_bytes and shredded_docx_name:
+            shredded_documents[shredded_docx_name] = shredded_docx_bytes
+            logging.info(f"Shredded docx saved: {shredded_docx_name}")
+            # Add shredded docx to uploaded_documents as text so it appears as selectable
+            if shredded_docx_name not in uploaded_documents:
+                uploaded_documents[shredded_docx_name] = shredded_text
+            doc_options = [{'label': fn, 'value': fn} for fn in uploaded_documents.keys()]
+            doc_value = shredded_docx_name
+            uploaded_doc_list = get_uploaded_doc_list(uploaded_documents)
             shredded_doc_list_items = get_shredded_doc_list(shredded_documents)
-            output_data_upload = dcc.Markdown(result, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
-
-        elif triggered_id == 'proposal-action-btn':
-            rfp_doc = selected_filename
-            logging.info(f"Starting proposal with RFP: {rfp_doc}")
-            result, generated_docx_bytes, generated_docx_name = process_document(
-                'proposal',
-                rfp_doc,
-                chat_input
-            )
-            if generated_docx_bytes and generated_docx_name:
-                generated_documents[generated_docx_name] = generated_docx_bytes
-                logging.info(f"Generated proposal docx saved: {generated_docx_name}")
-                new_selected_generated = generated_docx_name
+        output_data_upload = dcc.Markdown(shred_text, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
+
+        return (
+            shred_store, proposal_store, output_data_upload,
+            uploaded_doc_list, doc_options, doc_value,
+            shredded_doc_list_items,
+            generated_doc_list, generated_doc_options, generated_doc_value
+        )
+
+    if triggered_id == 'proposal-action-btn':
+        output_data_upload = dcc.Loading(type="default", children=html.Div("Generating proposal...", style={"wordWrap": "break-word"}))
+        proposal_text, proposal_docx_bytes, proposal_docx_name, proposal_text_preview = process_document('proposal', selected_filename, chat_input)
+        proposal_store = {'text': proposal_text, 'docx_bytes': proposal_docx_bytes, 'docx_name': proposal_docx_name}
+        new_generated_doc_value = generated_doc_value
+        if proposal_docx_bytes and proposal_docx_name:
+            generated_documents[proposal_docx_name] = proposal_docx_bytes
             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)
+            new_generated_doc_value = proposal_docx_name
             generated_doc_list = get_generated_doc_list(generated_documents)
-            output_data_upload = dcc.Markdown(result, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
-
-        elif triggered_id == 'compliance-action-btn':
-            result, _, _ = process_document('compliance', selected_filename, chat_input)
-            output_data_upload = html.Div(result, style={"wordWrap": "break-word"})
-        elif triggered_id == 'recover-action-btn':
-            result, _, _ = process_document('recover', selected_filename, chat_input)
-            output_data_upload = html.Div(result, style={"wordWrap": "break-word"})
-        elif triggered_id == 'board-action-btn':
-            result, _, _ = process_document('board', selected_filename, chat_input)
-            output_data_upload = html.Div(result, style={"wordWrap": "break-word"})
-        elif triggered_id == 'loe-action-btn':
-            result, _, _ = process_document('loe', selected_filename, chat_input)
-            output_data_upload = html.Div(result, style={"wordWrap": "break-word"})
-        else:
-            result = "Action not implemented yet."
-            output_data_upload = html.Div(result, style={"wordWrap": "break-word"})
+            logging.info(f"Generated proposal docx saved: {proposal_docx_name}")
+        output_data_upload = dcc.Markdown(proposal_text, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
+        return (
+            shred_store, proposal_store, output_data_upload,
+            uploaded_doc_list, doc_options, doc_value,
+            shredded_doc_list_items,
+            generated_doc_list, generated_doc_options, new_generated_doc_value
+        )
 
-    elif triggered_id == 'select-generated-dropdown':
-        sel_gen = selected_generated_dropdown
+    if triggered_id == 'select-generated-dropdown':
+        sel_gen = select_generated_value
         if not sel_gen or sel_gen not in generated_documents:
             output_data_upload = html.Div("No generated document selected.", style={"wordWrap": "break-word"})
         else:
@@ -672,22 +667,27 @@ def master_callback(
                 html.Div(download_link, style={"marginBottom": "15px"}),
                 html.Div("Preview not available for docx. Download to view.", style={"wordWrap": "break-word"})
             ])
+        return (
+            shred_store, proposal_store, output_data_upload,
+            uploaded_doc_list, doc_options, doc_value,
+            shredded_doc_list_items,
+            generated_doc_list, generated_doc_options, generated_doc_value
+        )
 
-    elif upload_triggered:
+    if upload_triggered:
         output_data_upload = html.Div("Upload/Delete completed.", style={"wordWrap": "break-word"})
+        return (
+            shred_store, proposal_store, output_data_upload,
+            uploaded_doc_list, doc_options, doc_value,
+            shredded_doc_list_items,
+            generated_doc_list, generated_doc_options, generated_doc_value
+        )
 
     return (
-        uploaded_doc_list,
-        doc_options,
-        doc_value,
-        proposal_options,
-        proposal_value,
-        uploaded_proposal_list,
-        generated_doc_list,
-        generated_doc_options,
-        generated_doc_value,
+        shred_store, proposal_store, output_data_upload,
+        uploaded_doc_list, doc_options, doc_value,
         shredded_doc_list_items,
-        output_data_upload
+        generated_doc_list, generated_doc_options, generated_doc_value
     )
 
 if __name__ == '__main__':