Update app.py

app.py

@@ -25,6 +25,8 @@ uploaded_files = {}
 current_document = None
 document_type = None
 shredded_document = None
+pink_review_document = None
+red_review_document = None
 generated_documents = {}
 
 # Document types and their descriptions
@@ -81,7 +83,11 @@ app.layout = dbc.Container([
                 type="dot",
                 children=[html.Div(id="loading-output")]
             ),
-            html.Div(id='document-upload-area', style={'display': 'none'}, children=[
+            html.Div(id='document-preview', className="border p-3 mb-3"),
+            dbc.Button("Download Document", id="btn-download", color="success", className="mt-3"),
+            dcc.Download(id="download-document"),
+            html.Hr(),
+            html.Div(id='document-upload', style={'display': 'none'}, children=[
                 dcc.Upload(
                     id='upload-specific-document',
                     children=html.Div(['Drag and Drop or ', html.A('Select Document')]),
@@ -109,11 +115,7 @@ app.layout = dbc.Container([
                     value='generated'
                 )
             ]),
-            dbc.Button("Process Document", id="btn-process-document", color="primary", className="mt-3", style={'display': 'none'}),
-            html.Div(id='document-preview', className="border p-3 mb-3"),
-            dbc.Button("Download Document", id="btn-download", color="success", className="mt-3"),
-            dcc.Download(id="download-document"),
-            html.Hr(),
+            dbc.Button("Generate Document", id="btn-generate-document", color="primary", className="mt-3", style={'display': 'none'}),
             dcc.Loading(
                 id="chat-loading",
                 type="dot",
@@ -145,40 +147,7 @@ def process_document(contents, filename):
             return f"Unsupported file format: {filename}. Please upload a PDF or DOCX file."
     except Exception as e:
         return f"Error processing document: {str(e)}"
-def generate_document(document_type, file_contents):
-    print(f"Generating document for {document_type}")  # Debug print
-    prompt = f"""Generate a {document_type} based on the following project artifacts:
-{' '.join(file_contents)}
-Instructions:
-1. Create the {document_type} as a detailed document.
-2. Use proper formatting and structure.
-3. Include all necessary sections and details.
-4. Start the output immediately with the document content.
-5. IMPORTANT: If the document type is Pink, Red, Gold and not review type, loe or board
-then your goal is to be compliant and compelling based on the
-requirements, write in paragraph in active voice as
-MicroHealth, limit bullets, answer the
-requirement with what MicroHealth will do 
-to satisfy the requirement, the technical 
-approach with innovation for efficiency, 
-productivity, quality and measurable 
-outcomes, the industry standard that 
-methodology is based on if applicable, 
-detail the workflow or steps to accomplish 
-the requirement with labor categories that 
-will do those tasks in that workflow, 
-reference reputable research like gartner, 
-forrester, IDC, Deloitte, Accenture etc 
-with measures of success and substantiation 
-of MicroHealth's approach. Never use soft words
-like maybe, could be, should, possible be definitive in your language and confident.
-6. you must also take into account section L&M of the document which is the evaluation criteria
-to be sure we address them.
-Now, generate the {document_type}:
-"""
 
-    response = model.generate_content(prompt)
-    return response.text
 @app.callback(
     Output('file-list', 'children'),
     Output('status-bar', 'children'),
@@ -187,7 +156,6 @@ Now, generate the {document_type}:
     State('file-list', 'children')
 )
 def update_output(list_of_contents, list_of_names, existing_files):
-    print("update_output callback triggered")  # Debug print
     global uploaded_files, shredded_document
     if list_of_contents is not None:
         new_files = []
@@ -201,9 +169,8 @@ def update_output(list_of_contents, list_of_names, existing_files):
         if existing_files is None:
             existing_files = []
         shredded_document = None  # Reset shredded document when new files are uploaded
-        return existing_files + new_files, "Document uploaded. Please select a document type to proceed."
-    return existing_files, "Please upload a document to begin."
-
+        return existing_files + new_files, "Document uploaded. Please click 'Shred' to proceed."
+    return existing_files, "Please upload a document and click 'Shred' to begin."
 
 @app.callback(
     Output('file-list', 'children', allow_duplicate=True),
@@ -220,92 +187,144 @@ def remove_file(n_clicks, existing_files):
     removed_file = ctx.triggered[0]['prop_id'].split(',')[0].split(':')[-1].strip('}')
     uploaded_files.pop(removed_file, None)
     shredded_document = None  # Reset shredded document when a file is removed
-    return [file for file in existing_files if file['props']['children'][1]['props']['children'] != removed_file], "Document removed. Please upload a document to begin."
+    return [file for file in existing_files if file['props']['children'][1]['props']['children'] != removed_file], "Document removed. Please upload a document and click 'Shred' to begin."
 
-@app.callback(
-    Output('document-upload-area', 'style'),
-    Output('document-choice', 'style'),
-    Output('btn-process-document', 'style'),
-    [Input(f'btn-{doc_type.lower().replace("_", "-")}', 'n_clicks') for doc_type in document_types.keys()],
-    prevent_initial_call=True
-)
-def show_document_options(*args):
-    ctx = dash.callback_context
-    if not ctx.triggered:
-        raise dash.exceptions.PreventUpdate
-    button_id = ctx.triggered[0]['prop_id'].split('.')[0]
-    document_type = button_id.replace('btn-', '').replace('-', '_').title()
-    
-    if document_type == "Shred":
-        return {'display': 'none'}, {'display': 'none'}, {'display': 'block'}
-    else:
-        return {'display': 'block'}, {'display': 'block'}, {'display': 'block'}
+def generate_document(document_type, file_contents):
+    prompt = f"""Generate a {document_type} based on the following project artifacts:
+{' '.join(file_contents)}
+Instructions:
+1. Create the {document_type} as a detailed document.
+2. Use proper formatting and structure.
+3. Include all necessary sections and details.
+4. Start the output immediately with the document content.
+5. IMPORTANT: If the document type is Pink, Red, Gold and not review type, loe or board
+then your goal is to be compliant and compelling based on the
+requirements, write in paragraph in active voice as
+MicroHealth, limit bullets, answer the
+requirement with what MicroHealth will do 
+to satisfy the requirement, the technical 
+approach with innovation for efficiency, 
+productivity, quality and measurable 
+outcomes, the industry standard that 
+methodology is based on if applicable, 
+detail the workflow or steps to accomplish 
+the requirement with labor categories that 
+will do those tasks in that workflow, 
+reference reputable research like gartner, 
+forrester, IDC, Deloitte, Accenture etc 
+with measures of success and substantiation 
+of MicroHealth's approach. Never use soft words
+like maybe, could be, should, possible be definitive in your language and confident.
+6. you must also take into account section L&M of the document which is the evaluation criteria
+to be sure we address them.
+Now, generate the {document_type}:
+"""
+
+    response = model.generate_content(prompt)
+    return response.text
 
 @app.callback(
     Output('document-preview', 'children'),
     Output('loading-output', 'children'),
     Output('status-bar', 'children', allow_duplicate=True),
-    Input('btn-process-document', 'n_clicks'),
+    Output('document-upload', 'style'),
+    Output('document-choice', 'style'),
+    Output('btn-generate-document', 'style'),
+    [Input(f'btn-{doc_type.lower().replace("_", "-")}', 'n_clicks') for doc_type in document_types.keys()],
+    Input('btn-generate-document', 'n_clicks'),
     State('document-source', 'value'),
     State('specific-document-name', 'children'),
-    [State(f'btn-{doc_type.lower().replace("_", "-")}', 'n_clicks') for doc_type in document_types.keys()],
     prevent_initial_call=True
 )
-def generate_document_preview(n_clicks, doc_source, uploaded_doc_name, *args):
-    print("generate_document_preview callback triggered")  # Debug print
+def generate_document_preview(*args):
     global current_document, document_type, shredded_document, generated_documents
     ctx = dash.callback_context
     if not ctx.triggered:
         raise dash.exceptions.PreventUpdate
     
-    # Determine which document type button was last clicked
-    for i, arg in enumerate(args):
-        if arg is not None and arg > 0:
-            document_type = list(document_types.keys())[i]
-            break
+    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0]
     
-    if not uploaded_files and document_type != "Shred":
-        return html.Div("Please upload a document first."), "", "Please upload a document first."
-
-    try:
+    if triggered_id.startswith('btn-'):
+        document_type = triggered_id.replace('btn-', '').replace('-', '_').title()
+        if document_type == "Shred":
+            return html.Div("Ready to shred. Click 'Generate Document' to proceed."), "", "Ready to shred.", {'display': 'none'}, {'display': 'none'}, {'display': 'block'}
+        elif document_type in ["Pink", "Red", "Gold"]:
+            return html.Div(f"Ready to generate {document_type} document."), "", f"Ready to generate {document_type} document.", {'display': 'block'}, {'display': 'flex'}, {'display': 'block'}
+        elif document_type in ["Pink_Review", "Red_Review", "Gold_Review", "Virtual_Board", "LOE"]:
+            return html.Div(f"Ready to generate {document_type}."), "", f"Ready to generate {document_type}.", {'display': 'block'}, {'display': 'flex'}, {'display': 'block'}
+    
+    if triggered_id == 'btn-generate-document':
+        document_source = args[-2]
+        specific_document = args[-1]
+        
         if document_type == "Shred":
+            if not uploaded_files:
+                return html.Div("Please upload a document before shredding."), "", "Please upload a document before shredding.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
             file_contents = list(uploaded_files.values())
-            shredded_document = generate_document(document_type, file_contents)
-            generated_documents['Shred'] = shredded_document
-            current_document = shredded_document
-        elif doc_source == 'uploaded' and uploaded_doc_name:
-            current_document = process_document(uploaded_doc_name, uploaded_doc_name)
-        else:
+            try:
+                shredded_document = generate_document(document_type, file_contents)
+                generated_documents['Shred'] = shredded_document
+                return dcc.Markdown(shredded_document), f"{document_type} generated", "Document shredded successfully.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+            except Exception as e:
+                print(f"Error generating document: {str(e)}")
+                return html.Div(f"Error generating document: {str(e)}"), "Error", "An error occurred while shredding the document.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+        
+        if shredded_document is None:
+            return html.Div("Please shred a document first."), "", "Please shred a document first.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+        
+        try:
             if document_type == "Pink":
-                current_document = generate_document(document_type, [shredded_document])
+                if document_source == 'uploaded' and specific_document:
+                    current_document = generate_document(document_type, [specific_document, shredded_document])
+                else:
+                    current_document = generate_document(document_type, [shredded_document])
             elif document_type == "Red":
-                if 'Pink Review' not in generated_documents:
-                    return html.Div("Please complete Pink Review first."), "", "Please complete Pink Review first."
-                current_document = generate_document(document_type, [generated_documents['Pink Review'], shredded_document])
+                if 'Pink_Review' not in generated_documents:
+                    return html.Div("Please complete Pink Review first."), "", "Please complete Pink Review first.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+                if document_source == 'uploaded' and specific_document:
+                    current_document = generate_document(document_type, [specific_document, generated_documents['Pink_Review'], shredded_document])
+                else:
+                    current_document = generate_document(document_type, [generated_documents['Pink_Review'], shredded_document])
             elif document_type == "Gold":
-                if 'Red Review' not in generated_documents:
-                    return html.Div("Please complete Red Review first."), "", "Please complete Red Review first."
-                current_document = generate_document(document_type, [generated_documents['Red Review'], shredded_document])
-            elif document_type in ["Virtual Board", "LOE"]:
+                if 'Red_Review' not in generated_documents:
+                    return html.Div("Please complete Red Review first."), "", "Please complete Red Review first.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+                if document_source == 'uploaded' and specific_document:
+                    current_document = generate_document(document_type, [specific_document, generated_documents['Red_Review'], shredded_document])
+                else:
+                    current_document = generate_document(document_type, [generated_documents['Red_Review'], shredded_document])
+            elif document_type in ["Pink_Review", "Red_Review", "Gold_Review"]:
+                previous_document = generated_documents.get(document_type.split('_')[0], None)
+                if not previous_document:
+                    return html.Div(f"Please generate {document_type.split('_')[0]} document first."), "", f"Please generate {document_type.split('_')[0]} document first.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+                if document_source == 'uploaded' and specific_document:
+                    current_document = generate_document(document_type, [specific_document, previous_document, shredded_document])
+                else:
+                    current_document = generate_document(document_type, [previous_document, shredded_document])
+            elif document_type in ["Virtual_Board", "LOE"]:
                 if 'Gold' not in generated_documents:
-                    return html.Div("Please complete Gold document first."), "", "Please complete Gold document first."
-                current_document = generate_document(document_type, [generated_documents['Gold'], shredded_document])
+                    return html.Div("Please complete Gold document first."), "", "Please complete Gold document first.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+                if document_source == 'uploaded' and specific_document:
+                    current_document = generate_document(document_type, [specific_document, generated_documents['Gold'], shredded_document])
+                else:
+                    current_document = generate_document(document_type, [generated_documents['Gold'], shredded_document])
             else:
                 current_document = generate_document(document_type, [shredded_document])
 
-        generated_documents[document_type] = current_document
+            generated_documents[document_type] = current_document
 
-        return dcc.Markdown(current_document), f"{document_type} generated", f"{document_type} document generated successfully."
-    except Exception as e:
-        print(f"Error generating document: {str(e)}")
-        return html.Div(f"Error generating document: {str(e)}"), "Error", "An error occurred while generating the document."
+            return dcc.Markdown(current_document), f"{document_type} generated", f"{document_type} document generated successfully.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+        except Exception as e:
+            print(f"Error generating document: {str(e)}")
+            return html.Div(f"Error generating document: {str(e)}"), "Error", "An error occurred while generating the document.", {'display': 'none'}, {'display': 'none'}, {'display': 'none'}
+
+    raise dash.exceptions.PreventUpdate
 
 @app.callback(
     Output('specific-document-name', 'children'),
     Input('upload-specific-document', 'contents'),
     State('upload-specific-document', 'filename')
 )
-def update_specific_document_name(contents, filename):
+def update_specific_document_filename(contents, filename):
     if contents is not None:
         return filename
     return ""
@@ -347,26 +366,7 @@ def download_document(n_clicks):
     if current_document is None:
         raise dash.exceptions.PreventUpdate
     
-    if document_type in ["LOE", "Pink Review", "Red Review", "Gold Review", "Virtual Board", "Shred"]:
-        # Create a pandas DataFrame for spreadsheet-type documents
-        df = pd.read_csv(StringIO(current_document))
-        
-        # Save the DataFrame to an Excel file
-        output = BytesIO()
-        with pd.ExcelWriter(output, engine='xlsxwriter') as writer:
-            df.to_excel
-
-@app.callback(
-    Output("download-document", "data"),
-    Input("btn-download", "n_clicks"),
-    prevent_initial_call=True
-)
-def download_document(n_clicks):
-    global current_document, document_type
-    if current_document is None:
-        raise dash.exceptions.PreventUpdate
-    
-    if document_type in ["LOE", "Pink Review", "Red Review", "Gold Review", "Virtual Board", "Shred"]:
+    if document_type in ["LOE", "Pink_Review", "Red_Review", "Gold_Review", "Virtual_Board"]:
         # Create a pandas DataFrame for spreadsheet-type documents
         df = pd.read_csv(StringIO(current_document))
         
@@ -389,8 +389,5 @@ def download_document(n_clicks):
 
 if __name__ == '__main__':
     print("Starting the Dash application...")
-    try:
-        app.run(debug=True, host='0.0.0.0', port=7860)
-    except Exception as e:
-        print(f"An error occurred while running the app: {str(e)}")
+    app.run(debug=False, host='0.0.0.0', port=7860)
     print("Dash application has finished running.")