Update app.py

app.py

@@ -4,6 +4,7 @@ import os
 import threading
 import time
 from typing import List, Tuple
+import re
 
 import dash
 import dash_bootstrap_components as dbc
@@ -36,25 +37,32 @@ def process_document(contents: str, filename: str) -> str:
     
     return text
 
-def generate_outline(text: str) -> str:
+def generate_outline(text: str, instructions: str) -> str:
     prompt = f"""
     Analyze the following Project Work Statement (PWS) and create an outline 
     focusing on sections L&M. Extract the main headers, subheaders, and specific 
-    requirements in each section. Summarize the key points:
+    requirements in each section. Pay special attention to requirements indicated 
+    by words like "shall", "will", "must", and similar imperative language.
 
+    Additional instructions: {instructions}
+
+    Document text:
     {text}
 
-    Provide the outline in a structured format.
+    Provide the outline in a structured format, clearly highlighting the specific 
+    requirements and their associated sections.
     """
     response = model.generate_content(prompt)
     return response.text
 
-def generate_pink_team_document(outline: str) -> str:
+def generate_pink_team_document(outline: str, instructions: str) -> str:
     prompt = f"""
     Based on the following outline of a Project Work Statement (PWS):
 
     {outline}
 
+    Additional instructions: {instructions}
+
     Create a detailed response document as if MicroHealth is responding to this PWS. 
     Follow these guidelines:
     1. Use Wikipedia style writing with active voice.
@@ -74,6 +82,11 @@ app.layout = dbc.Container([
     html.H1("MicroHealth PWS Analysis and Response Generator", className="my-4"),
     dbc.Tabs([
         dbc.Tab(label="Shred", tab_id="shred", children=[
+            dbc.Textarea(
+                id='shred-instructions',
+                placeholder="Enter any additional instructions for shredding the document...",
+                style={'height': '100px', 'marginBottom': '10px'}
+            ),
             dcc.Upload(
                 id='upload-document',
                 children=html.Div(['Drag and Drop or ', html.A('Select Files')]),
@@ -94,6 +107,11 @@ app.layout = dbc.Container([
             dcc.Download(id="download-shred-doc")
         ]),
         dbc.Tab(label="Pink", tab_id="pink", children=[
+            dbc.Textarea(
+                id='pink-instructions',
+                placeholder="Enter any additional instructions for generating the Pink Team document...",
+                style={'height': '100px', 'marginBottom': '10px'}
+            ),
             dbc.Button("Generate Pink Team Document", id="generate-pink", className="mt-3"),
             dbc.Spinner(html.Div(id='pink-output')),
             dbc.Button("Download Pink Team Document", id="download-pink", className="mt-3"),
@@ -105,26 +123,28 @@ app.layout = dbc.Container([
 @app.callback(
     Output('shred-output', 'children'),
     Input('upload-document', 'contents'),
-    State('upload-document', 'filename')
+    State('upload-document', 'filename'),
+    State('shred-instructions', 'value')
 )
-def update_shred_output(contents, filename):
+def update_shred_output(contents, filename, instructions):
     if contents is None:
         return "Upload a document to begin."
     
     text = process_document(contents, filename)
-    outline = generate_outline(text)
+    outline = generate_outline(text, instructions or "")
     return dcc.Markdown(outline)
 
 @app.callback(
     Output('pink-output', 'children'),
     Input('generate-pink', 'n_clicks'),
-    State('shred-output', 'children')
+    State('shred-output', 'children'),
+    State('pink-instructions', 'value')
 )
-def update_pink_output(n_clicks, shred_output):
+def update_pink_output(n_clicks, shred_output, instructions):
     if n_clicks is None or shred_output is None:
         return "Generate an outline in the Shred tab first."
     
-    pink_doc = generate_pink_team_document(shred_output)
+    pink_doc = generate_pink_team_document(shred_output, instructions or "")
     return dcc.Markdown(pink_doc)
 
 @app.callback(