Update app.py via AI Editor

app.py

@@ -126,22 +126,27 @@ def make_shred_doc_preview():
     return dbc.Card(
         dbc.CardBody([
             html.Div(id="shred-upload-preview", style={"whiteSpace": "pre-wrap", "overflowWrap": "break-word"}),
-            dbc.Button("Delete Document", id="shred-delete-btn", className="mt-2 btn-tertiary", n_clicks=0)
         ]), className="mb-2", id="shred-doc-preview-card", style={"display": "none"}
     )
 
+def make_shred_controls():
+    return html.Div([
+        dbc.Button("Delete Document", id="shred-delete-btn", className="mt-2 btn-tertiary", n_clicks=0, style={'marginRight': '8px'}),
+        dbc.Button("Generate Shred", id='shred-btn', className="mt-2 btn-primary", n_clicks=0, style={'marginRight': '8px'}),
+        dbc.Button("Download Shred Report", id="shred-download-btn", className="mt-2 btn-secondary", n_clicks=0),
+        dcc.Download(id="shred-download"),
+    ], style={'display': 'flex', 'flexWrap': 'wrap', 'gap': '8px', 'marginTop': '10px', 'marginBottom': '10px'})
+
 def make_tab(tab_id, label):
     if tab_id == "shred":
-        # Insert doc preview card for shred
+        # Upload first, then preview, then control buttons below as requested
         return dbc.Card(
             dbc.CardBody([
                 make_textarea(tab_id, f"Instructions for {label} (optional)"),
                 make_upload(tab_id),
                 make_shred_doc_preview(),
-                dbc.Button(f"Generate {label}", id=f'{tab_id}-btn', className="mt-2 btn-primary", n_clicks=0),
+                make_shred_controls(),
                 dcc.Loading(html.Div(id=f'{tab_id}-output'), id="loading", type="default", parent_style={'justifyContent': 'center'}),
-                dbc.Button(f"Download {label} Report", id=f"{tab_id}-download-btn", className="mt-2 btn-secondary", n_clicks=0),
-                dcc.Download(id=f"{tab_id}-download"),
                 dcc.Store(id="shred-upload-store")
             ]), className="mb-4"
         )
@@ -256,7 +261,8 @@ def update_shred_upload(contents, delete_clicks, filename, stored_data):
     [Output(f'{tab_id}-output', 'children') for tab_id in tab_cards] +
     [Output(f"{tab_id}-download", "data") for tab_id in tab_cards],
     [Input(f'{tab_id}-btn', 'n_clicks') for tab_id in tab_cards] +
-    [Input(f"{tab_id}-download-btn", "n_clicks") for tab_id in tab_cards],
+    [Input(f"{tab_id}-download-btn", "n_clicks") for tab_id in tab_cards] +
+    [Input("shred-btn", "n_clicks"), Input("shred-download-btn", "n_clicks")],
     [State(f'{tab_id}-upload', 'contents') for tab_id in tab_cards] +
     [State(f'{tab_id}-upload', 'filename') for tab_id in tab_cards] +
     [State(f'{tab_id}-instructions', 'value') for tab_id in tab_cards] +
@@ -271,6 +277,7 @@ def handle_all_tabs(*args):
         return outputs
     trig = ctx.triggered[0]['prop_id']
     logger.info(f"Main callback triggered by {trig}")
+    # Index mapping because Shred tab has custom button IDs
     for idx, tab_id in enumerate(tab_cards):
         gen_btn = f"{tab_id}-btn.n_clicks"
         dl_btn = f"{tab_id}-download-btn.n_clicks"
@@ -282,10 +289,12 @@ def handle_all_tabs(*args):
         prev_output_idx = idx + 3 * n
         shred_upload_store_idx = 4 * n
 
-        if trig == gen_btn:
-            logger.info(f"Generate button pressed for {tab_id}")
-            if tab_id == "shred":
-                # Use stored doc for Shred
+        # For shred, support the special button IDs
+        if tab_id == "shred":
+            shred_gen_btn = "shred-btn.n_clicks"
+            shred_dl_btn = "shred-download-btn.n_clicks"
+            if trig == shred_gen_btn:
+                logger.info(f"Generate Shred button pressed for {tab_id}")
                 shred_data = args[shred_upload_store_idx]
                 instr = args[instr_idx] or ""
                 if shred_data and "contents" in shred_data and "filename" in shred_data:
@@ -307,30 +316,45 @@ def handle_all_tabs(*args):
                         ])
                 else:
                     outputs[out_idx] = "Please upload a document to begin."
-            else:
-                upload = args[upload_idx]
-                filename = args[filename_idx]
-                instr = args[instr_idx] or ""
-                doc_type = tab_id.replace('-', ' ').title().replace(' ', '')
-                doc_type = next((k for k in document_types if k.lower().replace(' ', '') == tab_id.replace('-', '')), tab_id.title())
-                if upload and filename:
-                    doc = process_document(upload, filename)
+            elif trig == shred_dl_btn:
+                prev_output = args[prev_output_idx]
+                shred_data = args[shred_upload_store_idx]
+                if prev_output and hasattr(prev_output, 'props') and 'data' in prev_output.props:
+                    df = pd.DataFrame(prev_output.props['data'])
+                    buffer = BytesIO()
+                    df.to_csv(buffer, index=False)
+                    outputs[dl_idx] = dcc.send_bytes(buffer.getvalue(), f"{tab_id}_report.csv")
+                elif prev_output:
+                    buffer = BytesIO(prev_output.encode("utf-8") if isinstance(prev_output, str) else b"")
+                    outputs[dl_idx] = dcc.send_bytes(buffer.getvalue(), f"{tab_id}_report.txt")
                 else:
-                    doc = ""
-                if doc or tab_id == "virtual-board":
-                    content, df = generate_content(doc, doc_type, instr)
-                    if not df.empty:
-                        outputs[out_idx] = dash_table.DataTable(
-                            data=df.to_dict('records'),
-                            columns=[{'name': i, 'id': i} for i in df.columns],
-                            style_table={'overflowX': 'auto'},
-                            style_cell={'textAlign': 'left', 'padding': '5px'},
-                            style_header={'fontWeight': 'bold'}
-                        )
-                    else:
-                        outputs[out_idx] = dcc.Markdown(content)
+                    outputs[dl_idx] = None
+        # All other tabs
+        if trig == gen_btn:
+            logger.info(f"Generate button pressed for {tab_id}")
+            upload = args[upload_idx]
+            filename = args[filename_idx]
+            instr = args[instr_idx] or ""
+            doc_type = tab_id.replace('-', ' ').title().replace(' ', '')
+            doc_type = next((k for k in document_types if k.lower().replace(' ', '') == tab_id.replace('-', '')), tab_id.title())
+            if upload and filename:
+                doc = process_document(upload, filename)
+            else:
+                doc = ""
+            if doc or tab_id == "virtual-board":
+                content, df = generate_content(doc, doc_type, instr)
+                if not df.empty:
+                    outputs[out_idx] = dash_table.DataTable(
+                        data=df.to_dict('records'),
+                        columns=[{'name': i, 'id': i} for i in df.columns],
+                        style_table={'overflowX': 'auto'},
+                        style_cell={'textAlign': 'left', 'padding': '5px'},
+                        style_header={'fontWeight': 'bold'}
+                    )
                 else:
-                    outputs[out_idx] = "Please upload a document to begin."
+                    outputs[out_idx] = dcc.Markdown(content)
+            else:
+                outputs[out_idx] = "Please upload a document to begin."
         elif trig == dl_btn:
             prev_output = args[prev_output_idx]
             if prev_output and hasattr(prev_output, 'props') and 'data' in prev_output.props: