Update app.py via AI Editor

app.py

@@ -199,8 +199,8 @@ def get_left_col_content():
                             'overflowY': 'auto'
                         },
                         rows=5,
-                        wrap='soft',
-                        autoFocus=True
+                        wrap='soft'
+                        # autoFocus removed for Dash compatibility
                     ),
                     dbc.Row([
                         dbc.Col(
@@ -452,40 +452,11 @@ def update_right_col(selected_type, shred_doc, pink_doc, pink_review_doc, red_do
     Output('store-shred', 'data'),
     Output('document-preview', 'children'),
     Output('loading-output', 'children'),
+    Output('store-generated-doc', 'data'),
     Input('upload-document', 'contents'),
     State('upload-document', 'filename'),
     State('file-list', 'children'),
     State('store-shred', 'data'),
-    prevent_initial_call=True
-)
-def handle_shred_upload(upload_contents, upload_filenames, existing_files, current_shred):
-    files_display = existing_files if existing_files else []
-    new_shred = current_shred
-    if upload_contents and upload_filenames:
-        for content, name in zip(upload_contents, upload_filenames):
-            file_content = process_document(content, name)
-            uploaded_files[name] = file_content
-            new_shred = file_content
-            files_display.append(
-                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")
-            )
-        logging.info("Shred document uploaded and stored.")
-        return files_display, new_shred, markdown_table_preview(new_shred), ""
-    return files_display, new_shred, markdown_table_preview(new_shred) if new_shred else html.Div("No Shred document loaded."), ""
-
-@app.callback(
-    Output('document-preview', 'children'),
-    Output('store-generated-doc', 'data'),
-    Output('loading-output', 'children'),
     Input({'type': 'btn-generate-doc', 'index': ALL}, 'n_clicks'),
     State('selected-doc-type', 'data'),
     State('store-shred', 'data'),
@@ -499,54 +470,88 @@ def handle_shred_upload(upload_contents, upload_filenames, existing_files, curre
     State('store-virtual-board', 'data'),
     prevent_initial_call=True
 )
-def generate_document(n_clicks, selected_type, shred, pink, pink_review, red, red_review, gold, gold_review, loe, virtual_board):
+def combined_callback(
+    upload_contents, upload_filenames, existing_files, current_shred,
+    n_clicks, selected_type, shred, pink, pink_review, red, red_review, gold, gold_review, loe, virtual_board
+):
     ctx = callback_context
-    if not ctx.triggered or not any(n_clicks):
-        raise dash.exceptions.PreventUpdate
-    logging.info(f"Generating document for type: {selected_type}")
-    # Gather necessary documents
-    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
-    }
-    prompt = document_types.get(selected_type, "")
-    # Compose context for Gemini
-    context = ""
-    if selected_type in doc_dependencies:
-        for dep in doc_dependencies[selected_type]["source"]:
-            context += f"\n\n{dep.upper()}:\n{inputs.get(dep, '')}"
-    else:
-        context += f"\n\n{inputs.get('shred','')}"
-    full_prompt = f"{prompt}\n\n{context}"
-    # Gemini API call (threaded for responsiveness)
-    result_holder = {}
-    def gemini_thread():
-        try:
-            model = genai.GenerativeModel(GEMINI_MODEL)
-            response = model.generate_content(full_prompt, stream=False)
-            result_holder['result'] = response.text if hasattr(response, 'text') else str(response)
-            logging.info("Gemini document generated successfully.")
-        except Exception as e:
-            logging.error(f"Error with Gemini API: {str(e)}")
-            result_holder['result'] = f"Error generating document: {str(e)}"
-    t = threading.Thread(target=gemini_thread)
-    t.start()
-    t.join(timeout=60)
-    generated_doc = result_holder.get('result', 'Error: No document generated.')
-    # Store and preview
-    if selected_type in spreadsheet_types:
-        preview = markdown_table_preview(generated_doc)
-    else:
-        preview = markdown_narrative_preview(generated_doc)
-    logging.info("Document preview updated.")
-    return preview, generated_doc, ""
+    trigger = ctx.triggered[0]['prop_id'].split('.')[0] if ctx.triggered else ""
+    # Default outputs
+    files_display = existing_files if existing_files else []
+    new_shred = current_shred
+    preview = dash.no_update
+    loading_msg = ""
+    generated_doc = dash.no_update
+
+    if trigger == "upload-document":
+        if upload_contents and upload_filenames:
+            for content, name in zip(upload_contents, upload_filenames):
+                file_content = process_document(content, name)
+                uploaded_files[name] = file_content
+                new_shred = file_content
+                files_display.append(
+                    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")
+                )
+            logging.info("Shred document uploaded and stored.")
+            preview = markdown_table_preview(new_shred)
+            generated_doc = dash.no_update
+        else:
+            preview = markdown_table_preview(new_shred) if new_shred else html.Div("No Shred document loaded.")
+            generated_doc = dash.no_update
+        return files_display, new_shred, preview, loading_msg, generated_doc
+
+    if any(n_clicks):
+        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
+        }
+        prompt = document_types.get(selected_type, "")
+        context = ""
+        if selected_type in doc_dependencies:
+            for dep in doc_dependencies[selected_type]["source"]:
+                context += f"\n\n{dep.upper()}:\n{inputs.get(dep, '')}"
+        else:
+            context += f"\n\n{inputs.get('shred','')}"
+        full_prompt = f"{prompt}\n\n{context}"
+        result_holder = {}
+        def gemini_thread():
+            try:
+                model = genai.GenerativeModel(GEMINI_MODEL)
+                response = model.generate_content(full_prompt, stream=False)
+                result_holder['result'] = response.text if hasattr(response, 'text') else str(response)
+                logging.info("Gemini document generated successfully.")
+            except Exception as e:
+                logging.error(f"Error with Gemini API: {str(e)}")
+                result_holder['result'] = f"Error generating document: {str(e)}"
+        t = threading.Thread(target=gemini_thread)
+        t.start()
+        t.join(timeout=60)
+        generated_doc = result_holder.get('result', 'Error: No document generated.')
+        if selected_type in spreadsheet_types:
+            preview = markdown_table_preview(generated_doc)
+        else:
+            preview = markdown_narrative_preview(generated_doc)
+        logging.info("Document preview updated.")
+        return dash.no_update, dash.no_update, preview, "", generated_doc
+
+    return files_display, new_shred, markdown_table_preview(new_shred) if new_shred else html.Div("No Shred document loaded."), loading_msg, generated_doc
 
 @app.callback(
     Output("download-document", "data"),