Update app.py via AI Editor

app.py

@@ -499,10 +499,16 @@ def update_right_col(selected_type):
         Output('uploaded-doc-name-gold_review', 'children'),
         Output('uploaded-doc-name-loe', 'children'),
         Output('uploaded-doc-name-virtual_board', 'children'),
+        Output('document-preview', 'children'),
+        Output('store-generated-doc', 'data'),
+        Output('download-document', 'data'),
         Output('progress-dot-store', 'data')
     ],
     [
         Input({'type': 'upload-doc-type', 'subtype': ALL, 'index': ALL}, 'contents'),
+        Input({'type': 'btn-generate-doc', 'index': ALL}, 'n_clicks'),
+        Input("btn-download", "n_clicks"),
+        Input('selected-doc-type', 'data')
     ],
     [
         State({'type': 'upload-doc-type', 'subtype': ALL, 'index': ALL}, 'filename'),
@@ -514,20 +520,23 @@ def update_right_col(selected_type):
         State('store-gold', 'data'),
         State('store-gold-review', 'data'),
         State('store-loe', 'data'),
-        State('store-virtual-board', 'data')
+        State('store-virtual-board', 'data'),
+        State('store-generated-doc', 'data')
     ],
     prevent_initial_call=True
 )
-def handle_doc_upload(contents_lists, filenames_lists,
-                     shred, pink, pink_review, red, red_review, gold, gold_review, loe, virtual_board):
+def unified_handler(contents_lists, n_clicks_generate_list, n_clicks_download, selected_type,
+                    filenames_lists, shred, pink, pink_review, red, red_review, gold, gold_review, loe, virtual_board, prev_generated):
     stores = [shred, pink, pink_review, red, red_review, gold, gold_review, loe, virtual_board]
     file_list = []
     doc_names = [None]*9
+    preview = dash.no_update
+    generated_doc = dash.no_update
+    download_data = dash.no_update
     progress = dash.no_update
 
-    triggered = callback_context.triggered
-    if not triggered or not contents_lists:
-        return [dash.no_update]*19 + [dash.no_update]
+    ctx = callback_context
+    trigger = ctx.triggered[0]['prop_id'] if ctx.triggered else ""
 
     subtype_map = {
         "shred": (0, 0),
@@ -541,119 +550,60 @@ def handle_doc_upload(contents_lists, filenames_lists,
         "virtual_board": (8, 8)
     }
 
-    for i, (contents, filenames) in enumerate(zip(contents_lists, filenames_lists)):
-        if contents and filenames:
-            id_dict = callback_context.inputs_list[0][i]['id']
-            subtype = id_dict['subtype']
-            idx, doc_name_idx = subtype_map[subtype]
-            if isinstance(contents, str):
-                contents = [contents]
-                filenames = [filenames]
-            content = contents[-1]
-            name = filenames[-1]
-            file_text = process_document(content, name)
-            set_uploaded_doc(subtype, file_text, name)
-            stores[idx] = file_text
-            doc_names[doc_name_idx] = name
-            if subtype == "shred":
-                file_list = [
-                    dbc.Row([
-                        dbc.Col(
-                            html.Button('×', id={'type': 'remove-file', 'index': name}, style={'marginRight': '5px', 'fontSize': '10px'}),
-                            width=1
-                        ),
-                        dbc.Col(
-                            html.Span(name, style={'wordBreak': 'break-all'}),
-                            width=11
-                        )
-                    ], id={'type': 'file-row', 'index': name}, align="center", className="mb-1")
-                ]
-            progress = "progress"
-            break
-
-    return stores + [file_list] + doc_names + [progress]
-
-@app.callback(
-    [
-        Output('document-preview', 'children'),
-        Output('store-generated-doc', 'data'),
-        Output('download-document', 'data'),
-        Output('progress-dot-store', 'data')
-    ],
-    [
-        Input({'type': 'btn-generate-doc', 'index': ALL}, 'n_clicks'),
-        Input("btn-download", "n_clicks"),
-        Input('selected-doc-type', 'data')
-    ],
-    [
-        State('store-shred', 'data'),
-        State('store-pink', 'data'),
-        State('store-pink-review', 'data'),
-        State('store-red', 'data'),
-        State('store-red-review', 'data'),
-        State('store-gold', 'data'),
-        State('store-gold-review', 'data'),
-        State('store-loe', 'data'),
-        State('store-virtual-board', 'data'),
-        State('store-generated-doc', 'data')
-    ],
-    prevent_initial_call=True
-)
-def handle_preview_generate_download(n_clicks_generate_list, n_clicks_download, selected_type,
-                                     shred, pink, pink_review, red, red_review, gold, gold_review, loe, virtual_board, prev_generated):
-    ctx = callback_context
-    trigger = ctx.triggered[0]['prop_id'] if ctx.triggered else ""
-    logging.info(f"Unified preview/generate/download trigger: {trigger}")
-
-    # Download logic
-    if "btn-download" in trigger:
-        doc = prev_generated
-        if not doc:
-            doc = get_generated_doc(selected_type)
-        if not doc:
-            if selected_type == "Shred":
-                doc = shred
-            elif selected_type == "Pink":
-                doc = pink
-            elif selected_type == "Pink Review":
-                doc = pink_review
-            elif selected_type == "Red":
-                doc = red
-            elif selected_type == "Red Review":
-                doc = red_review
-            elif selected_type == "Gold":
-                doc = gold
-            elif selected_type == "Gold Review":
-                doc = gold_review
-            elif selected_type == "LOE":
-                doc = loe
-            elif selected_type == "Virtual Board":
-                doc = virtual_board
-        if not doc:
-            logging.warning("No generated document to download.")
-            return dash.no_update, dash.no_update, 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 dash.no_update, dash.no_update, 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 dash.no_update, dash.no_update, dcc.send_bytes(content, filename=f"{selected_type}_output.md"), "progress"
-
-    # Generate logic
+    # Handle upload
+    if "upload-doc-type" in trigger:
+        for i, (contents, filenames) in enumerate(zip(contents_lists, filenames_lists)):
+            if contents and filenames:
+                id_dict = ctx.inputs_list[0][i]['id']
+                subtype = id_dict['subtype']
+                idx, doc_name_idx = subtype_map[subtype]
+                if isinstance(contents, str):
+                    contents = [contents]
+                    filenames = [filenames]
+                content = contents[-1]
+                name = filenames[-1]
+                file_text = process_document(content, name)
+                set_uploaded_doc(subtype, file_text, name)
+                stores[idx] = file_text
+                doc_names[doc_name_idx] = name
+                if subtype == "shred":
+                    file_list = [
+                        dbc.Row([
+                            dbc.Col(
+                                html.Button('×', id={'type': 'remove-file', 'index': name}, style={'marginRight': '5px', 'fontSize': '10px'}),
+                                width=1
+                            ),
+                            dbc.Col(
+                                html.Span(name, style={'wordBreak': 'break-all'}),
+                                width=11
+                            )
+                        ], id={'type': 'file-row', 'index': name}, align="center", className="mb-1")
+                    ]
+                progress = "progress"
+                # Set preview for this upload
+                if subtype == "shred":
+                    preview = markdown_table_preview(file_text)
+                elif subtype in ["pink", "red", "gold"]:
+                    preview = markdown_narrative_preview(file_text)
+                else:
+                    preview = markdown_table_preview(file_text)
+                generated_doc = dash.no_update
+                download_data = dash.no_update
+                return stores + [file_list] + doc_names + [preview, generated_doc, download_data, progress]
+
+    # Handle Generate
     if any(n_clicks_generate_list):
         logging.info(f"Generating document for type: {selected_type}")
         inputs = {
-            "shred": shred,
-            "pink": pink,
-            "pink_review": pink_review,
-            "red": red,
-            "red_review": red_review,
-            "gold": gold,
-            "gold_review": gold_review,
-            "loe": loe,
-            "virtual_board": virtual_board
+            "shred": stores[0],
+            "pink": stores[1],
+            "pink_review": stores[2],
+            "red": stores[3],
+            "red_review": stores[4],
+            "gold": stores[5],
+            "gold_review": stores[6],
+            "loe": stores[7],
+            "virtual_board": stores[8]
         }
         prompt = document_types.get(selected_type, "")
         context = ""
@@ -682,37 +632,81 @@ def handle_preview_generate_download(n_clicks_generate_list, n_clicks_download,
             preview = markdown_table_preview(generated_doc)
         else:
             preview = markdown_narrative_preview(generated_doc)
-        logging.info("Document preview updated.")
-        return preview, generated_doc, dash.no_update, "progress"
+        progress = "progress"
+        download_data = dash.no_update
+        return stores + [file_list] + doc_names + [preview, generated_doc, download_data, progress]
+
+    # Handle Download
+    if "btn-download" in trigger:
+        doc = prev_generated
+        if not doc:
+            doc = get_generated_doc(selected_type)
+        if not doc:
+            if selected_type == "Shred":
+                doc = stores[0]
+            elif selected_type == "Pink":
+                doc = stores[1]
+            elif selected_type == "Pink Review":
+                doc = stores[2]
+            elif selected_type == "Red":
+                doc = stores[3]
+            elif selected_type == "Red Review":
+                doc = stores[4]
+            elif selected_type == "Gold":
+                doc = stores[5]
+            elif selected_type == "Gold Review":
+                doc = stores[6]
+            elif selected_type == "LOE":
+                doc = stores[7]
+            elif selected_type == "Virtual Board":
+                doc = stores[8]
+        if not doc:
+            logging.warning("No generated document to download.")
+            return stores + [file_list] + doc_names + [dash.no_update, dash.no_update, 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.")
+            download_data = dcc.send_bytes(xlsx_io.getvalue(), filename=f"{selected_type}_output.xlsx")
+            progress = "progress"
+            return stores + [file_list] + doc_names + [dash.no_update, dash.no_update, download_data, progress]
+        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")
+            progress = "progress"
+            return stores + [file_list] + doc_names + [dash.no_update, dash.no_update, download_data, progress]
 
-    # Preview logic (selected type changed)
+    # Handle Doc Type Change/Preview
     doc = get_generated_doc(selected_type)
     if not doc:
-        if selected_type == "Shred" and shred:
-            return markdown_table_preview(shred), dash.no_update, dash.no_update, dash.no_update
+        if selected_type == "Shred" and stores[0]:
+            preview = markdown_table_preview(stores[0])
         elif selected_type in spreadsheet_types:
             doc_store = {
-                "Pink Review": pink_review,
-                "Red Review": red_review,
-                "Gold Review": gold_review,
-                "Virtual Board": virtual_board,
-                "LOE": loe
+                "Pink Review": stores[2],
+                "Red Review": stores[4],
+                "Gold Review": stores[6],
+                "Virtual Board": stores[8],
+                "LOE": stores[7]
             }
             doc = doc_store.get(selected_type, "")
-            return markdown_table_preview(doc), dash.no_update, dash.no_update, dash.no_update
+            preview = markdown_table_preview(doc)
         elif selected_type in narrative_types:
             doc_store = {
-                "Pink": pink,
-                "Red": red,
-                "Gold": gold
+                "Pink": stores[1],
+                "Red": stores[3],
+                "Gold": stores[5]
             }
             doc = doc_store.get(selected_type, "")
-            return markdown_narrative_preview(doc), dash.no_update, dash.no_update, dash.no_update
-        return html.Div("No document loaded."), dash.no_update, dash.no_update, dash.no_update
+            preview = markdown_narrative_preview(doc)
+        else:
+            preview = html.Div("No document loaded.")
+        return stores + [file_list] + doc_names + [preview, dash.no_update, dash.no_update, dash.no_update]
     if selected_type in spreadsheet_types:
-        return markdown_table_preview(doc), doc, dash.no_update, dash.no_update
+        preview = markdown_table_preview(doc)
     else:
-        return markdown_narrative_preview(doc), doc, dash.no_update, dash.no_update
+        preview = markdown_narrative_preview(doc)
+    return stores + [file_list] + doc_names + [preview, doc, dash.no_update, dash.no_update]
 
 @app.callback(
     Output("main-progress-dot-output", "children"),