Update app.py

app.py

@@ -26,8 +26,6 @@ current_document = None
 document_type = None
 shredded_document = None
 pink_review_document = None
-red_review_document = None
-generated_documents = {}
 
 # Document types and their descriptions
 document_types = {
@@ -36,7 +34,7 @@ document_types = {
     "Pink Review": "Evaluate compliance of the Pink Team document against the requirements and output a spreadsheet of non compliant findings by pws number, the goal of that pws section, what made it non compliant and your recommendations for recovery",
     "Red": "Produce a Red Team document based on the Pink Review by pws sections. Your goal is to be compliant and compelling by recovering all the findings in Pink Review",
     "Red Review": "Evaluate compliance of the Red Team document against the requirements and output a spreadsheet of non compliant findings by pws number, the goal of that pws section, what made it non compliant and your recommendations for recovery",
-    "Gold": "Create a Gold Team document based on the PWS response by pws sections. Your goal is to be compliant and compelling by recovering all the findings in Red Review",
+    "Gold": "Create a Pink Team document based on the PWS response by pws sections. Your goal is to be compliant and compelling by recovering all the findings in Red Review",
     "Gold Review": "Perform a final compliance review against the requirements and output a spreadsheet of non compliant findings by pws number, the goal of that pws section, what made it non compliant and your recommendations for recovery",
     "Virtual Board": "Based on the requirements and in particular the evaulation criteria, you will evaluate the proposal as if you were a contracting office and provide section by section evaluation as unsatisfactory, satisfactory, good, very good, excellent and why in a spreadsheet",
     "LOE": "Generate a Level of Effort (LOE) breakdown as a spreadsheet"
@@ -87,10 +85,10 @@ app.layout = dbc.Container([
             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=[
+            html.Div(id='pink-review-upload', style={'display': 'none'}, children=[
                 dcc.Upload(
-                    id='upload-specific-document',
-                    children=html.Div(['Drag and Drop or ', html.A('Select Document')]),
+                    id='upload-pink-review',
+                    children=html.Div(['Drag and Drop or ', html.A('Select Pink Review File')]),
                     style={
                         'width': '100%',
                         'height': '60px',
@@ -103,19 +101,8 @@ app.layout = dbc.Container([
                     },
                     multiple=False
                 ),
-                html.Div(id='specific-document-name')
+                html.Div(id='pink-review-file-name')
             ]),
-            html.Div(id='document-choice', style={'display': 'none'}, children=[
-                dcc.RadioItems(
-                    id='document-source',
-                    options=[
-                        {'label': 'Use Generated Document', 'value': 'generated'},
-                        {'label': 'Use Uploaded Document', 'value': 'uploaded'}
-                    ],
-                    value='generated'
-                )
-            ]),
-            dbc.Button("Generate Document", id="btn-generate-document", color="primary", className="mt-3", style={'display': 'none'}),
             dcc.Loading(
                 id="chat-loading",
                 type="dot",
@@ -168,13 +155,10 @@ def update_output(list_of_contents, list_of_names, existing_files):
             ]))
         if existing_files is None:
             existing_files = []
-        elif not isinstance(existing_files, list):
-            existing_files = [existing_files]
         shredded_document = None  # Reset shredded document when new files are uploaded
-        updated_files = existing_files + new_files
-        return updated_files, f"{len(new_files)} document(s) uploaded. Please click 'Shred' to proceed."
-    return dash.no_update, "Please upload a document and click 'Shred' 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),
     Output('status-bar', 'children', allow_duplicate=True),
@@ -188,11 +172,9 @@ def remove_file(n_clicks, existing_files):
     if not ctx.triggered:
         raise dash.exceptions.PreventUpdate
     removed_file = ctx.triggered[0]['prop_id'].split(',')[0].split(':')[-1].strip('}')
-    if removed_file in uploaded_files:
-        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], f"Document '{removed_file}' removed."
-    return dash.no_update, dash.no_update
+    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 and click 'Shred' to begin."
 
 def generate_document(document_type, file_contents):
     prompt = f"""Generate a {document_type} based on the following project artifacts:
@@ -204,7 +186,7 @@ Instructions:
 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
+requrements, write in paragraph in active voice as
 MicroHealth, limit bullets, answer the
 requirement with what MicroHealth will do 
 to satisfy the requirement, the technical 
@@ -232,126 +214,65 @@ Now, generate the {document_type}:
     Output('document-preview', 'children'),
     Output('loading-output', 'children'),
     Output('status-bar', 'children', allow_duplicate=True),
-    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()],
+    Output('pink-review-upload', 'style'),
+    [Input(f'btn-{doc_type.lower().replace("_", "-")}', 'n_clicks') for doc_type in document_types.keys()],
+    State('pink-review-file-name', 'children'),
     prevent_initial_call=True
 )
-def update_document_type(*args):
-    global document_type
+def generate_document_preview(*args):
+    global current_document, document_type, shredded_document, pink_review_document
     ctx = dash.callback_context
     if not ctx.triggered:
         raise dash.exceptions.PreventUpdate
-    
-    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0]
-    
-    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."), "", dash.no_update, {'display': 'none'}, {'display': 'none'}, {'display': 'block'}
-        elif document_type in ["Pink", "Red", "Gold"]:
-            return html.Div(f"Ready to generate {document_type} document."), "", dash.no_update, {'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}."), "", dash.no_update, {'display': 'block'}, {'display': 'flex'}, {'display': 'block'}
-    
-    return dash.no_update, dash.no_update, dash.no_update, dash.no_update, dash.no_update, dash.no_update
+    button_id = ctx.triggered[0]['prop_id'].split('.')[0]
+    document_type = button_id.replace('btn-', '').replace('-', '_').title()
+    pink_review_file = args[-1]
+
+    if not uploaded_files and document_type != "Shred":
+        return html.Div("Please upload and shred a document first."), "", "Please upload and shred a document first.", {'display': 'none'}
 
-@app.callback(
-    Output('document-preview', 'children', allow_duplicate=True),
-    Output('loading-output', 'children', allow_duplicate=True),
-    Output('status-bar', 'children', allow_duplicate=True),
-    Input('btn-generate-document', 'n_clicks'),
-    State('document-source', 'value'),
-    State('specific-document-name', 'children'),
-    prevent_initial_call=True
-)
-@app.callback(
-    Output('document-preview', 'children', allow_duplicate=True),
-    Output('loading-output', 'children', allow_duplicate=True),
-    Output('status-bar', 'children', allow_duplicate=True),
-    Input('btn-generate-document', 'n_clicks'),
-    State('document-source', 'value'),
-    State('specific-document-name', 'children'),
-    prevent_initial_call=True
-)
-@app.callback(
-    Output('document-preview', 'children', allow_duplicate=True),
-    Output('loading-output', 'children', allow_duplicate=True),
-    Output('status-bar', 'children', allow_duplicate=True),
-    Input('btn-generate-document', 'n_clicks'),
-    State('document-source', 'value'),
-    State('specific-document-name', 'children'),
-    prevent_initial_call=True
-)
-def generate_document_preview(n_clicks, document_source, specific_document):
-    global current_document, document_type, shredded_document, generated_documents
-    
     if document_type == "Shred":
         if not uploaded_files:
-            return html.Div("Please upload a document before shredding."), "", "Please upload a document before shredding."
+            return html.Div("Please upload a document before shredding."), "", "Please upload a document before shredding.", {'display': 'none'}
         file_contents = list(uploaded_files.values())
         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."
+            return dcc.Markdown(shredded_document), f"{document_type} generated", "Document shredded. You can now proceed with other operations.", {'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."
-    
+            return html.Div(f"Error generating document: {str(e)}"), "Error", "An error occurred while shredding the document.", {'display': 'none'}
+
     if shredded_document is None:
-        return html.Div("Please shred a document first."), "", "Please shred a document first."
-    
+        return html.Div("Please shred a document first."), "", "Please shred a document first.", {'display': 'none'}
+
+    if document_type == "Pink Review":
+        return html.Div("Please upload a Pink Team document or use the generated one."), "", "Please upload a Pink Team document or use the generated one.", {'display': 'block'}
+
+    if document_type in ["Red", "Red Review"] and pink_review_document is None:
+        return html.Div("Please complete Pink Review first."), "", "Please complete Pink Review first.", {'display': 'none'}
+
     try:
-        if document_type == "Pink":
-            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."
-            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."
-            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."
-            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."
-            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])
+        if document_type == "Pink Review" and pink_review_file:
+            current_document = generate_document(document_type, [pink_review_file, shredded_document])
+        elif document_type in ["Red", "Red Review"]:
+            current_document = generate_document(document_type, [pink_review_document, shredded_document])
         else:
             current_document = generate_document(document_type, [shredded_document])
 
-        generated_documents[document_type] = current_document
-        return dcc.Markdown(current_document), f"{document_type} generated", f"{document_type} document generated successfully."
+        if document_type == "Pink Review":
+            pink_review_document = current_document
+
+        return dcc.Markdown(current_document), f"{document_type} generated", f"{document_type} document generated successfully.", {'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."
+        return html.Div(f"Error generating document: {str(e)}"), "Error", "An error occurred while generating the document.", {'display': 'none'}
 
 @app.callback(
-    Output('specific-document-name', 'children'),
-    Input('upload-specific-document', 'contents'),
-    State('upload-specific-document', 'filename')
+    Output('pink-review-file-name', 'children'),
+    Input('upload-pink-review', 'contents'),
+    State('upload-pink-review', 'filename')
 )
-def update_specific_document_filename(contents, filename):
+def update_pink_review_filename(contents, filename):
     if contents is not None:
         return filename
     return ""
@@ -393,14 +314,14 @@ 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"]:
-        # Create a pandas DataFrame for spreadsheet-type documents
+    if document_type == "LOE":
+        # Create a pandas DataFrame for LOE
         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(writer, sheet_name=document_type, index=False)
+            df.to_excel(writer, sheet_name='LOE', index=False)
         
         return dcc.send_bytes(output.getvalue(), f"{document_type}.xlsx")
     else: