Update app.py via AI Editor

app.py

@@ -225,7 +225,7 @@ def get_left_col_content():
             html.H5("Maiko Chat", className="mb-2"),
             dcc.Loading(
                 id="chat-loading",
-                type="dot",
+                type="default",
                 children=[
                     dcc.Textarea(
                         id="chat-input",
@@ -269,15 +269,6 @@ def get_left_col_content():
 
 def get_right_col_content(selected_type, store_data):
     controls = []
-    controls.append(
-        html.Div(id='progress-dot-area', style={'textAlign': 'center', 'marginBottom': '8px'})
-    )
-    controls.append(dcc.Loading(
-        id="loading-indicator",
-        type="dot",
-        children=[html.Div(id="loading-output")]
-    ))
-
     if selected_type == "Shred":
         controls.append(
             html.Div([
@@ -390,7 +381,8 @@ 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'),
+    # This store triggers the main loader
+    dcc.Store(id='main-loader-trigger'),
     dbc.Row([
         dbc.Col(
             html.H2(id='main-title', className="mt-3 mb-2", style={'textAlign': 'center', 'width':'100%'}),
@@ -417,7 +409,6 @@ app.layout = dbc.Container([
         ),
         dbc.Col(
             html.Div([
-                html.Div(id='progress-dot-area', style={'textAlign': 'center', 'marginBottom': '8px'}),
                 html.Div(id='right-col-content')
             ]),
             width=9
@@ -499,7 +490,7 @@ def update_right_col(selected_type):
         Output('document-preview', 'children'),
         Output('store-generated-doc', 'data'),
         Output('download-document', 'data'),
-        Output('progress-dot-store', 'data')
+        Output('main-loader-trigger', 'data')
     ],
     [
         Input({'type': 'upload-doc-type', 'subtype': ALL, 'index': ALL}, 'contents'),
@@ -546,8 +537,8 @@ def unified_handler(contents_lists, n_clicks_generate_list, n_clicks_download, s
         "virtual_board": 8
     }
 
-    # Show progress dot as soon as action is triggered
-    progress = "progress"
+    # Show loader as soon as action is triggered
+    loader_trigger = time.time()
     if "upload-doc-type" in trigger:
         for i, (contents, filenames) in enumerate(zip(contents_lists, filenames_lists)):
             if contents and filenames:
@@ -585,7 +576,7 @@ def unified_handler(contents_lists, n_clicks_generate_list, n_clicks_download, s
                     preview = markdown_table_preview(file_text)
                 generated_doc = dash.no_update
                 download_data = dash.no_update
-                return stores + [file_list, uploaded_doc_name_shred, preview, generated_doc, download_data, progress]
+                return stores + [file_list, uploaded_doc_name_shred, preview, generated_doc, download_data, loader_trigger]
 
     if any(n_clicks_generate_list):
         logging.info(f"Generating document for type: {selected_type}")
@@ -629,7 +620,7 @@ def unified_handler(contents_lists, n_clicks_generate_list, n_clicks_download, s
         else:
             preview = markdown_narrative_preview(generated_doc)
         download_data = dash.no_update
-        return stores + [file_list, uploaded_doc_name_shred, preview, generated_doc, download_data, progress]
+        return stores + [file_list, uploaded_doc_name_shred, preview, generated_doc, download_data, loader_trigger]
 
     if "btn-download" in trigger:
         doc = prev_generated
@@ -656,17 +647,17 @@ def unified_handler(contents_lists, n_clicks_generate_list, n_clicks_download, s
                 doc = stores[8]
         if not doc:
             logging.warning("No generated document to download.")
-            return stores + [file_list, uploaded_doc_name_shred, dash.no_update, dash.no_update, dash.no_update, None]
+            return stores + [file_list, uploaded_doc_name_shred, dash.no_update, dash.no_update, dash.no_update, loader_trigger]
         if selected_type in spreadsheet_types:
             xlsx_io = markdown_tables_to_xlsx(doc)
             logging.info("Spreadsheet document prepared for download.")
             download_data = dcc.send_bytes(xlsx_io.getvalue(), filename=f"{selected_type}_output.xlsx")
-            return stores + [file_list, uploaded_doc_name_shred, dash.no_update, dash.no_update, download_data, progress]
+            return stores + [file_list, uploaded_doc_name_shred, dash.no_update, dash.no_update, download_data, loader_trigger]
         else:
             content = doc.encode('utf-8')
             logging.info("Narrative document prepared for download.")
             download_data = dcc.send_bytes(content, filename=f"{selected_type}_output.md")
-            return stores + [file_list, uploaded_doc_name_shred, dash.no_update, dash.no_update, download_data, progress]
+            return stores + [file_list, uploaded_doc_name_shred, dash.no_update, dash.no_update, download_data, loader_trigger]
 
     doc = get_generated_doc(selected_type)
     if not doc:
@@ -692,30 +683,19 @@ def unified_handler(contents_lists, n_clicks_generate_list, n_clicks_download, s
             preview = markdown_narrative_preview(doc)
         else:
             preview = html.Div("No document loaded.")
-        return stores + [file_list, uploaded_doc_name_shred, preview, dash.no_update, dash.no_update, None]
+        return stores + [file_list, uploaded_doc_name_shred, preview, dash.no_update, dash.no_update, loader_trigger]
     if selected_type in spreadsheet_types:
         preview = markdown_table_preview(doc)
     else:
         preview = markdown_narrative_preview(doc)
-    return stores + [file_list, uploaded_doc_name_shred, preview, doc, dash.no_update, None]
-
-@app.callback(
-    Output("progress-dot-area", "children"),
-    Input('progress-dot-store', 'data')
-)
-def update_right_progress_dot(progress):
-    if progress == "progress":
-        return html.Div("...", id="progress-blinker", style={'fontSize': '2rem', 'letterSpacing': '0.5rem', 'animation': 'blink 1s infinite'})
-    return ""
+    return stores + [file_list, uploaded_doc_name_shred, preview, doc, dash.no_update, loader_trigger]
 
 @app.callback(
     Output("main-progress-dot-output", "children"),
-    Input('progress-dot-store', 'data')
+    Input('main-loader-trigger', 'data')
 )
 def update_main_progress_dot(progress):
-    if progress == "progress":
-        return html.Div("...", style={'fontSize': '2rem', 'letterSpacing': '0.5rem', 'animation': 'blink 1s infinite'})
-    return ""
+    return ""  # dcc.Loading handles the animation via children update
 
 if __name__ == '__main__':
     print("Starting the Dash application...")