Update app.py via AI Editor

app.py

@@ -1,4 +1,4 @@
-# Generated code appears hereimport os
+import os
 import base64
 import io
 import dash
@@ -138,7 +138,7 @@ def process_document(action, selected_filename=None, chat_input=None):
 
     doc_content = None
     doc_fileid = None
-    if action in ["shred", "generate", "proposal"]:
+    if action in ["shred", "proposal"]:
         if selected_filename and selected_filename in uploaded_documents:
             doc_content = uploaded_documents[selected_filename]
             doc_fileid = uploaded_documents_fileid.get(selected_filename)
@@ -189,42 +189,6 @@ def process_document(action, selected_filename=None, chat_input=None):
                 uploaded_documents[result_holder["docx_name"]] = result_holder["text"]
         return result_holder["text"], None, result_holder["docx_name"], result_holder["text"]
 
-    elif action == 'generate':
-        if not shredded_document:
-            logging.warning("No shredded document found when generating response.")
-            return "Shredded document not available.", None, None, None
-        prompt = (
-            "Create a highly detailed proposal response based on the following PWS requirements. "
-            "Be compliant and compelling. Focus on describing the approach, steps, workflow, people, processes, and technology. "
-            "Refer to research that validates the approach and cite sources with measurable outcomes. Return only the proposal response in markdown and nothing else, no comments, no intro, no outro, just the proposal.\n"
-        )
-        if chat_input:
-            prompt += f"User additional instructions: {chat_input}\n"
-        prompt += f"\nFile Name: {selected_filename}\n\n{shredded_document}"
-        result_holder = {"text": None, "docx_name": None}
-        def thread_generate():
-            global generated_response
-            generated_response = ""
-            try:
-                logging.info("Starting Gemini generate_content for generation.")
-                result = gemini_generate_content(prompt, file_id=doc_fileid, chat_input=chat_input)
-                generated_response = result
-                logging.info("Proposal response generated successfully.")
-                docx_bytes = save_proposal_as_docx(result, selected_filename)
-                generated_docx_name = f"{os.path.splitext(selected_filename)[0]}_proposal.docx"
-                generated_documents[generated_docx_name] = docx_bytes
-                result_holder["text"] = result
-                result_holder["docx_name"] = generated_docx_name
-            except Exception as e:
-                generated_response = f"Error during generation: {e}"
-                logging.error("Error in thread_generate: %s", e)
-                result_holder["text"] = generated_response
-        generated_response = "Generating response..."
-        t = Thread(target=thread_generate)
-        t.start()
-        t.join()
-        return result_holder["text"], None, result_holder["docx_name"], result_holder["text"]
-
     elif action == 'proposal':
         if not doc_content:
             logging.warning("No RFP/SOW/PWS/RFI document selected for proposal action.")
@@ -331,17 +295,23 @@ def get_generated_doc_list(docdict):
         )
     return dbc.ListGroup(doc_list, flush=True)
 
-def get_ctx_input_list_item(ctx, idx, default):
-    try:
-        return ctx.inputs_list[idx]
-    except Exception:
-        return default
-
-def get_ctx_input_n_clicks(ctx, idx):
-    try:
-        return ctx.inputs_list[idx]
-    except Exception:
-        return []
+def get_generated_rfp_download_section(selected_value):
+    if not selected_value or selected_value not in generated_documents:
+        return html.Div("No generated document selected.", style={"wordWrap": "break-word"})
+    docx_bytes = generated_documents[selected_value]
+    b64 = base64.b64encode(docx_bytes).decode('utf-8')
+    download_link = html.A(
+        f"Download {selected_value}",
+        href=f"data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;base64,{b64}",
+        download=selected_value,
+        target="_blank",
+        style={"wordWrap": "break-word"}
+    )
+    return html.Div([
+        html.H6("RFP/SOW/PWS/RFI", style={"marginTop": "10px"}),
+        html.Div(download_link, style={"marginBottom": "15px"}),
+        html.Div("Preview not available for docx. Download to view.", style={"wordWrap": "break-word"})
+    ])
 
 app.layout = dbc.Container([
     dcc.Store(id='shred-store', data={'text': None, 'docx_name': None}),
@@ -351,6 +321,7 @@ app.layout = dbc.Container([
             dbc.Card([
                 dbc.CardHeader(html.H5("RFP/SOW/PWS/RFI")),
                 dbc.CardBody([
+                    html.H6("Uploaded Documents"),
                     html.Div(get_uploaded_doc_list(uploaded_documents), id='uploaded-doc-list'),
                     dcc.Dropdown(
                         id='select-document-dropdown',
@@ -377,7 +348,7 @@ app.layout = dbc.Container([
                         },
                         multiple=False
                     ),
-                    html.Hr(),
+                    html.Hr(style={"marginTop": "20px", "marginBottom": "10px"}),
                     html.H6("Shredded Requirements"),
                     html.Div(get_shredded_doc_list(shredded_documents), id='shredded-doc-list')
                 ])
@@ -386,6 +357,7 @@ app.layout = dbc.Container([
             dbc.Card([
                 dbc.CardHeader(html.H5("Proposal")),
                 dbc.CardBody([
+                    html.H6("Uploaded Documents"),
                     html.Div(get_uploaded_proposal_list(uploaded_proposals), id='uploaded-proposal-list'),
                     dcc.Dropdown(
                         id='select-proposal-dropdown',
@@ -418,7 +390,6 @@ app.layout = dbc.Container([
             dbc.Card([
                 dbc.CardHeader(html.H5("Generated Documents")),
                 dbc.CardBody([
-                    html.Div(get_generated_doc_list(generated_documents), id='generated-doc-list'),
                     dcc.Dropdown(
                         id='select-generated-dropdown',
                         options=[{'label': fn, 'value': fn} for fn in generated_documents.keys()],
@@ -426,6 +397,9 @@ app.layout = dbc.Container([
                         value=next(iter(generated_documents), None),
                         style={"marginBottom": "10px"}
                     ),
+                    html.Div(id='generated-rfp-section'),
+                    html.Hr(style={"marginTop": "20px", "marginBottom": "10px"}),
+                    html.Div(get_generated_doc_list(generated_documents), id='generated-doc-list'),
                 ])
             ], className="mb-3")
         ], style={'minWidth': '260px', 'width':'30vw','maxWidth':'30vw'}, width=3),
@@ -468,6 +442,7 @@ app.layout = dbc.Container([
     Output('generated-doc-list', 'children'),
     Output('select-generated-dropdown', 'options'),
     Output('select-generated-dropdown', 'value'),
+    Output('generated-rfp-section', 'children'),
     [
         Input('shred-action-btn', 'n_clicks'),
         Input('proposal-action-btn', 'n_clicks'),
@@ -620,6 +595,7 @@ def master_callback(
     generated_doc_list = get_generated_doc_list(generated_documents)
     generated_doc_options = [{'label': fn, 'value': fn} for fn in generated_documents.keys()]
     generated_doc_value = select_generated_value if select_generated_value in generated_documents else (next(iter(generated_documents), None) if generated_documents else None)
+    generated_rfp_section = get_generated_rfp_download_section(generated_doc_value)
 
     output_data_upload = html.Div("No action taken yet.", style={"wordWrap": "break-word"})
 
@@ -634,11 +610,13 @@ def master_callback(
             uploaded_doc_list = get_uploaded_doc_list(uploaded_documents)
             shredded_doc_list_items = get_shredded_doc_list(shredded_documents)
         output_data_upload = dcc.Markdown(shred_text, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
+        generated_rfp_section = get_generated_rfp_download_section(generated_doc_value)
         return (
             shred_store, proposal_store, output_data_upload,
             uploaded_doc_list, doc_options, doc_value,
             shredded_doc_list_items,
-            generated_doc_list, generated_doc_options, generated_doc_value
+            generated_doc_list, generated_doc_options, generated_doc_value,
+            generated_rfp_section
         )
 
     if triggered_id == 'proposal-action-btn':
@@ -650,58 +628,51 @@ def master_callback(
             generated_doc_options = [{'label': fn, 'value': fn} for fn in generated_documents.keys()]
             new_generated_doc_value = proposal_docx_name if proposal_docx_name in generated_documents else (next(iter(generated_documents), None) if generated_documents else None)
             generated_doc_list = get_generated_doc_list(generated_documents)
+            generated_rfp_section = get_generated_rfp_download_section(new_generated_doc_value)
             logging.info(f"Generated proposal docx saved: {proposal_docx_name}")
+        else:
+            generated_rfp_section = get_generated_rfp_download_section(generated_doc_value)
         output_data_upload = dcc.Markdown(proposal_text, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
         return (
             shred_store, proposal_store, output_data_upload,
             uploaded_doc_list, doc_options, doc_value,
             shredded_doc_list_items,
-            generated_doc_list, generated_doc_options, new_generated_doc_value
+            generated_doc_list, generated_doc_options, new_generated_doc_value,
+            generated_rfp_section
         )
 
     if triggered_id == 'select-generated-dropdown':
-        sel_gen = select_generated_value
-        if not sel_gen or sel_gen not in generated_documents:
-            output_data_upload = html.Div("No generated document selected.", style={"wordWrap": "break-word"})
-        else:
-            docx_bytes = generated_documents[sel_gen]
-            b64 = base64.b64encode(docx_bytes).decode('utf-8')
-            download_link = html.A(
-                f"Download {sel_gen}",
-                href=f"data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;base64,{b64}",
-                download=sel_gen,
-                target="_blank",
-                style={"wordWrap": "break-word"}
-            )
-            output_data_upload = html.Div([
-                html.Div(download_link, style={"marginBottom": "15px"}),
-                html.Div("Preview not available for docx. Download to view.", style={"wordWrap": "break-word"})
-            ])
+        generated_rfp_section = get_generated_rfp_download_section(select_generated_value)
         return (
             shred_store, proposal_store, output_data_upload,
             uploaded_doc_list, doc_options, doc_value,
             shredded_doc_list_items,
-            generated_doc_list, generated_doc_options, generated_doc_value
+            generated_doc_list, generated_doc_options, generated_doc_value,
+            generated_rfp_section
         )
 
     if upload_triggered:
         doc_value = doc_value if doc_value in uploaded_documents else (next(iter(uploaded_documents), None) if uploaded_documents else None)
         generated_doc_value = generated_doc_value if generated_doc_value in generated_documents else (next(iter(generated_documents), None) if generated_documents else None)
+        generated_rfp_section = get_generated_rfp_download_section(generated_doc_value)
         output_data_upload = html.Div("Upload/Delete completed.", style={"wordWrap": "break-word"})
         return (
             shred_store, proposal_store, output_data_upload,
             uploaded_doc_list, doc_options, doc_value,
             shredded_doc_list_items,
-            generated_doc_list, generated_doc_options, generated_doc_value
+            generated_doc_list, generated_doc_options, generated_doc_value,
+            generated_rfp_section
         )
 
     doc_value = doc_value if doc_value in uploaded_documents else (next(iter(uploaded_documents), None) if uploaded_documents else None)
     generated_doc_value = generated_doc_value if generated_doc_value in generated_documents else (next(iter(generated_documents), None) if generated_documents else None)
+    generated_rfp_section = get_generated_rfp_download_section(generated_doc_value)
     return (
         shred_store, proposal_store, output_data_upload,
         uploaded_doc_list, doc_options, doc_value,
         shredded_doc_list_items,
-        generated_doc_list, generated_doc_options, generated_doc_value
+        generated_doc_list, generated_doc_options, generated_doc_value,
+        generated_rfp_section
     )
 
 if __name__ == '__main__':