Update app.py via AI Editor

app.py

@@ -219,9 +219,6 @@ def get_left_col_content():
     )
     return [
         html.H4("Proposal Writer", className="mt-3 mb-2", style={'marginBottom': '12px'}),
-        html.Div([
-            html.Div(className="blinking-dot", style={'margin':'0 auto','width':'16px','height':'16px'}),
-        ], style={'textAlign':'center', 'marginBottom':'10px'}),
         html.Hr(style={'marginTop': '8px', 'marginBottom': '16px'}),
         html.Div(
             id='doc-type-buttons'
@@ -231,9 +228,6 @@ def get_left_col_content():
 
 def get_right_col_content(selected_type, store_data):
     controls = []
-    controls.append(html.Div([
-        html.Div(className="blinking-dot", style={'margin':'0 auto','width':'16px','height':'16px'}),
-    ], style={'textAlign':'center', 'marginBottom':'10px'}))
     controls.append(dcc.Loading(
         id="loading-indicator",
         type="dot",
@@ -351,6 +345,7 @@ app.layout = dbc.Container([
     dcc.Store(id='store-loe'),
     dcc.Store(id='store-virtual-board'),
     dcc.Store(id='store-generated-doc'),
+    dcc.Store(id='progress-dot-store'),
     dbc.Row([
         dbc.Col(
             html.H2(id='main-title', className="mt-3 mb-2", style={'textAlign': 'center', 'width':'100%'}),
@@ -359,9 +354,13 @@ app.layout = dbc.Container([
     ]),
     dbc.Row([
         dbc.Col(
-            html.Div([
-                html.Div(className="blinking-dot", style={'margin':'0 auto','width':'16px','height':'16px'}),
-            ], style={'textAlign':'center', 'marginBottom':'10px'})
+            dcc.Loading(
+                id="main-progress-dot",
+                type="dot",
+                children=html.Div(id="main-progress-dot-output")
+            ),
+            width=12,
+            style={'textAlign':'center', 'marginBottom':'10px'}
         )
     ]),
     dbc.Row([
@@ -456,7 +455,8 @@ def update_right_col(selected_type, shred, pink, pink_review, red, red_review, g
     [
         Output('store-shred', 'data'),
         Output('file-list', 'children'),
-        Output('uploaded-doc-name-shred', 'children')
+        Output('uploaded-doc-name-shred', 'children'),
+        Output('progress-dot-store', 'data')
     ],
     [
         Input({'type': 'upload-doc-type', 'subtype': 'shred', 'index': 'Shred'}, 'contents')
@@ -493,18 +493,19 @@ def handle_shred_upload(contents, filenames, current_shred, file_list):
             ], id={'type': 'file-row', 'index': name}, align="center", className="mb-1")
         )
     logging.info("Shred document uploaded and stored.")
-    return latest_text, file_previews, filenames[-1]
+    return latest_text, file_previews, filenames[-1], "progress"
 
 @app.callback(
     Output('store-pink', 'data'),
     Output('uploaded-doc-name-pink', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'pink', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'pink', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_pink_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -512,19 +513,20 @@ def handle_pink_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('store-pink-review', 'data'),
     Output('uploaded-doc-name-pink_review', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'pink_review', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'pink_review', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_pink_review_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -532,19 +534,20 @@ def handle_pink_review_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('store-red', 'data'),
     Output('uploaded-doc-name-red', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'red', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'red', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_red_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -552,19 +555,20 @@ def handle_red_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('store-red-review', 'data'),
     Output('uploaded-doc-name-red_review', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'red_review', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'red_review', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_red_review_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -572,19 +576,20 @@ def handle_red_review_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('store-gold', 'data'),
     Output('uploaded-doc-name-gold', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'gold', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'gold', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_gold_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -592,19 +597,20 @@ def handle_gold_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('store-gold-review', 'data'),
     Output('uploaded-doc-name-gold_review', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'gold_review', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'gold_review', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_gold_review_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -612,19 +618,20 @@ def handle_gold_review_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('store-loe', 'data'),
     Output('uploaded-doc-name-loe', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'loe', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'loe', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_loe_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -632,19 +639,20 @@ def handle_loe_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('store-virtual-board', 'data'),
     Output('uploaded-doc-name-virtual_board', 'children'),
+    Output('progress-dot-store', 'data'),
     Input({'type': 'upload-doc-type', 'subtype': 'virtual_board', 'index': ALL}, 'contents'),
     State({'type': 'upload-doc-type', 'subtype': 'virtual_board', 'index': ALL}, 'filename'),
     prevent_initial_call=True
 )
 def handle_virtual_board_upload(contents_list, filenames_list):
     if not contents_list or not filenames_list:
-        return dash.no_update, dash.no_update
+        return dash.no_update, dash.no_update, dash.no_update
     for contents, filenames in zip(contents_list, filenames_list):
         if contents and filenames:
             if isinstance(contents, str):
@@ -652,11 +660,12 @@ def handle_virtual_board_upload(contents_list, filenames_list):
                 filenames = [filenames]
             for content, name in zip(contents, filenames):
                 file_text = process_document(content, name)
-                return file_text, name
-    return dash.no_update, dash.no_update
+                return file_text, name, "progress"
+    return dash.no_update, dash.no_update, dash.no_update
 
 @app.callback(
     Output('document-preview', 'children'),
+    Output('progress-dot-store', 'data'),
     [
         Input({'type': 'btn-generate-doc', 'index': ALL}, 'n_clicks'),
         Input('selected-doc-type', 'data'),
@@ -718,10 +727,10 @@ def preview_or_generate_doc(n_clicks_list, selected_type, shred, pink, pink_revi
         else:
             preview = markdown_narrative_preview(generated_doc)
         logging.info("Document preview updated.")
-        return preview
+        return preview, "progress"
     else:
         if selected_type == "Shred" and shred:
-            return markdown_table_preview(shred)
+            return markdown_table_preview(shred), dash.no_update
         elif selected_type in spreadsheet_types:
             doc_store = {
                 "Pink Review": pink_review,
@@ -731,7 +740,7 @@ def preview_or_generate_doc(n_clicks_list, selected_type, shred, pink, pink_revi
                 "LOE": loe
             }
             doc = doc_store.get(selected_type, "")
-            return markdown_table_preview(doc)
+            return markdown_table_preview(doc), dash.no_update
         elif selected_type in narrative_types:
             doc_store = {
                 "Pink": pink,
@@ -739,11 +748,12 @@ def preview_or_generate_doc(n_clicks_list, selected_type, shred, pink, pink_revi
                 "Gold": gold
             }
             doc = doc_store.get(selected_type, "")
-            return markdown_narrative_preview(doc)
-        return html.Div("No document loaded.")
+            return markdown_narrative_preview(doc), dash.no_update
+        return html.Div("No document loaded."), dash.no_update
 
 @app.callback(
     Output('store-generated-doc', 'data'),
+    Output('progress-dot-store', 'data'),
     [
         Input({'type': 'btn-generate-doc', 'index': ALL}, 'n_clicks'),
         Input('selected-doc-type', 'data'),
@@ -767,11 +777,12 @@ def update_generated_doc(n_clicks_list, selected_type, preview_content, shred, p
     ctx = callback_context
     trigger = ctx.triggered[0]['prop_id'] if ctx.triggered else ""
     if any(n_clicks_list):
-        return app.server.config.get('last_generated_doc', prev_generated)
-    return prev_generated
+        return app.server.config.get('last_generated_doc', prev_generated), "progress"
+    return prev_generated, dash.no_update
 
 @app.callback(
     Output("download-document", "data"),
+    Output('progress-dot-store', 'data'),
     Input("btn-download", "n_clicks"),
     State('selected-doc-type', 'data'),
     State('store-generated-doc', 'data'),
@@ -809,15 +820,23 @@ def download_document(n_clicks, selected_type, generated_doc, shred, pink, pink_
             doc = virtual_board
     if not doc:
         logging.warning("No generated document to download.")
-        return dash.no_update
+        return dash.no_update, dash.no_update
     if selected_type in spreadsheet_types:
         xlsx_io = markdown_tables_to_xlsx(doc)
         logging.info("Spreadsheet document prepared for download.")
-        return dcc.send_bytes(xlsx_io.getvalue(), filename=f"{selected_type}_output.xlsx")
+        return dcc.send_bytes(xlsx_io.getvalue(), filename=f"{selected_type}_output.xlsx"), "progress"
     else:
         content = doc.encode('utf-8')
         logging.info("Narrative document prepared for download.")
-        return dcc.send_bytes(content, filename=f"{selected_type}_output.md")
+        return dcc.send_bytes(content, filename=f"{selected_type}_output.md"), "progress"
+
+@app.callback(
+    Output("main-progress-dot-output", "children"),
+    Input('progress-dot-store', 'data')
+)
+def update_main_progress_dot(progress):
+    # Dummy output to trigger dcc.Loading
+    return ""
 
 if __name__ == '__main__':
     print("Starting the Dash application...")