Update app.py via AI Editor

app.py

@@ -132,7 +132,7 @@ def save_proposal_as_docx(proposal_text, base_filename):
     memf.seek(0)
     return memf.read()
 
-def process_document(action, selected_filename=None, chat_input=None):
+def process_document(action, selected_filename=None, chat_input=None, rfp_decoded_bytes=None):
     global shredded_document, generated_response
     logging.info(f"Process document called with action: {action}")
 
@@ -195,6 +195,16 @@ def process_document(action, selected_filename=None, chat_input=None):
             return "No RFP/SOW/PWS/RFI document selected.", None, None, None
         rfp_filename = selected_filename
         rfp_fileid = uploaded_documents_fileid.get(selected_filename)
+        # Upload file to Gemini if not already uploaded (if rfp_decoded_bytes provided and no fileid)
+        if not rfp_fileid and rfp_decoded_bytes is not None:
+            try:
+                fileid = upload_to_gemini_file(rfp_decoded_bytes, rfp_filename)
+                if fileid:
+                    uploaded_documents_fileid[rfp_filename] = fileid
+                    rfp_fileid = fileid
+                    logging.info(f"RFP file {rfp_filename} uploaded to Gemini for proposal.")
+            except Exception as e:
+                logging.error(f"Failed to upload RFP file {rfp_filename} for proposal: {e}")
         prompt = (
             "Respond to the following RFP/SOW/PWS/RFI by creating a highly detailed proposal response that follows each section and subsection header. "
             "The response to each section and subsection will be compliant and compelling, focusing on describing the approach, and how the labor category uses a specific industry standard process in a workflow described in steps, and how technology is used. "
@@ -207,9 +217,12 @@ def process_document(action, selected_filename=None, chat_input=None):
         logging.info(f"Sending proposal prompt to Gemini. RFP: {rfp_filename}")
         result_holder = {"text": None, "docx_name": None}
         def thread_proposal():
+            global generated_response
+            generated_response = ""
             try:
                 logging.info("Connecting to Gemini for proposal.")
                 response = gemini_generate_content(prompt, file_id=rfp_fileid, chat_input=chat_input)
+                generated_response = response
                 logging.info("Received proposal results from Gemini.")
                 docx_bytes = save_proposal_as_docx(response, rfp_filename)
                 generated_docx_name = f"{os.path.splitext(rfp_filename)[0]}_proposal.docx"
@@ -217,8 +230,9 @@ def process_document(action, selected_filename=None, chat_input=None):
                 result_holder["text"] = response
                 result_holder["docx_name"] = generated_docx_name
             except Exception as e:
+                generated_response = f"Error during Gemini completion: {e}"
                 logging.error("Error during Gemini proposal request: %s", e)
-                result_holder["text"] = f"Error during Gemini completion: {e}"
+                result_holder["text"] = generated_response
         t = Thread(target=thread_proposal)
         t.start()
         t.join()
@@ -239,9 +253,32 @@ def get_uploaded_doc_list(docdict):
         return html.Div("No documents uploaded.", style={"wordWrap": "break-word"})
     doc_list = []
     for filename in docdict:
+        file_content = docdict[filename]
+        # Always encode as docx for download, but if not docx, encode as txt
+        if filename.lower().endswith('.docx'):
+            mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+            b64 = None
+            # docx as text, not as file: re-encode to docx for download
+            try:
+                # If it's a docx, but only text available, save as docx
+                docx_bytes = save_shredded_as_docx(file_content, filename)
+                b64 = base64.b64encode(docx_bytes).decode('utf-8')
+            except Exception:
+                b64 = base64.b64encode(file_content.encode('utf-8')).decode('utf-8')
+        else:
+            mime = "text/plain"
+            # Always encode as utf-8 text for download
+            b64 = base64.b64encode(file_content.encode('utf-8')).decode('utf-8')
+        download_link = html.A(
+            filename,
+            href=f"data:{mime};base64,{b64}",
+            download=filename,
+            target="_blank",
+            style={"wordWrap": "break-word", "marginRight": "10px", "textDecoration": "underline"}
+        )
         doc_list.append(
             dbc.ListGroupItem([
-                html.Span(filename, style={"wordWrap": "break-word"}),
+                download_link,
                 dbc.Button("Delete", id={'type': 'delete-doc-btn', 'index': filename, 'group': 'rfp'}, size="sm", color="danger", className="float-end ms-2")
             ], className="d-flex justify-content-between align-items-center")
         )
@@ -254,15 +291,14 @@ def get_shredded_doc_list(shreddict):
     for filename in shreddict:
         b64 = base64.b64encode(shreddict[filename]).decode('utf-8')
         download_link = html.A(
-            f"Download {filename}",
+            filename,
             href=f"data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;base64,{b64}",
             download=filename,
             target="_blank",
-            style={"wordWrap": "break-word", "marginRight": "10px"}
+            style={"wordWrap": "break-word", "marginRight": "10px", "textDecoration": "underline"}
         )
         doc_list.append(
             dbc.ListGroupItem([
-                html.Span(filename, style={"wordWrap": "break-word", "marginRight": "10px"}),
                 download_link,
                 dbc.Button("Delete", id={'type': 'delete-shredded-btn', 'index': filename, 'group': 'shredded'}, size="sm", color="danger", className="float-end ms-2")
             ], className="d-flex justify-content-between align-items-center")
@@ -274,9 +310,28 @@ def get_uploaded_proposal_list(docdict):
         return html.Div("No proposal documents uploaded.", style={"wordWrap": "break-word"})
     doc_list = []
     for filename in docdict:
+        file_content = docdict[filename]
+        if filename.lower().endswith('.docx'):
+            mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+            b64 = None
+            try:
+                docx_bytes = save_proposal_as_docx(file_content, filename)
+                b64 = base64.b64encode(docx_bytes).decode('utf-8')
+            except Exception:
+                b64 = base64.b64encode(file_content.encode('utf-8')).decode('utf-8')
+        else:
+            mime = "text/plain"
+            b64 = base64.b64encode(file_content.encode('utf-8')).decode('utf-8')
+        download_link = html.A(
+            filename,
+            href=f"data:{mime};base64,{b64}",
+            download=filename,
+            target="_blank",
+            style={"wordWrap": "break-word", "marginRight": "10px", "textDecoration": "underline"}
+        )
         doc_list.append(
             dbc.ListGroupItem([
-                html.Span(filename, style={"wordWrap": "break-word"}),
+                download_link,
                 dbc.Button("Delete", id={'type': 'delete-proposal-btn', 'index': filename, 'group': 'proposal'}, size="sm", color="danger", className="float-end ms-2")
             ], className="d-flex justify-content-between align-items-center")
         )
@@ -287,9 +342,18 @@ def get_generated_doc_list(docdict):
         return html.Div("No generated documents yet.", style={"wordWrap": "break-word"})
     doc_list = []
     for filename in docdict:
+        docx_bytes = docdict[filename]
+        b64 = base64.b64encode(docx_bytes).decode('utf-8')
+        download_link = html.A(
+            filename,
+            href=f"data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;base64,{b64}",
+            download=filename,
+            target="_blank",
+            style={"wordWrap": "break-word", "marginRight": "10px", "textDecoration": "underline"}
+        )
         doc_list.append(
             dbc.ListGroupItem([
-                html.Span(filename, style={"wordWrap": "break-word"}),
+                download_link,
                 dbc.Button("Delete", id={'type': 'delete-generated-btn', 'index': filename, 'group': 'generated'}, size="sm", color="danger", className="float-end ms-2")
             ], className="d-flex justify-content-between align-items-center")
         )
@@ -494,9 +558,12 @@ def master_callback(
     generated_delete_clicks = safe_get_n_clicks(ctx, 10)
     shredded_delete_clicks = safe_get_n_clicks(ctx, 12)
 
+    uploaded_rfp_decoded_bytes = None
+
     if triggered_id == 'upload-document' and rfp_content is not None and rfp_filename:
         content_type, content_string = rfp_content.split(',')
         decoded = base64.b64decode(content_string)
+        uploaded_rfp_decoded_bytes = decoded
         text = decode_document(decoded)
         fileid = None
         if rfp_filename.lower().endswith(('.pdf', '.docx', '.xlsx', '.xls')):
@@ -600,7 +667,7 @@ def master_callback(
     output_data_upload = html.Div("No action taken yet.", style={"wordWrap": "break-word"})
 
     if triggered_id == 'shred-action-btn':
-        output_data_upload = dcc.Loading(type="default", children=html.Div("Shredding document...", style={"wordWrap": "break-word"}))
+        output_data_upload = dcc.Loading(type="default", children=html.Div("Shredding document...", style={"wordWrap": "break-word"}), style={"textAlign": "center"})
         shred_text, _, shredded_docx_name, shredded_text = process_document('shred', doc_value, chat_input)
         shred_store = {'text': shred_text, 'docx_name': shredded_docx_name}
 
@@ -620,8 +687,16 @@ def master_callback(
         )
 
     if triggered_id == 'proposal-action-btn':
-        output_data_upload = dcc.Loading(type="default", children=html.Div("Generating proposal...", style={"wordWrap": "break-word"}))
-        proposal_text, _, proposal_docx_name, proposal_text_preview = process_document('proposal', doc_value, chat_input)
+        output_data_upload = dcc.Loading(type="default", children=html.Div("Generating proposal...", style={"wordWrap": "break-word"}), style={"textAlign": "center"})
+        # get decoded bytes for the selected RFP doc for upload if needed
+        rfp_decoded_bytes = None
+        if doc_value and doc_value in uploaded_documents:
+            # Try to get from upload-document if that was just uploaded
+            if rfp_content is not None and rfp_filename == doc_value:
+                content_type, content_string = rfp_content.split(',')
+                rfp_decoded_bytes = base64.b64decode(content_string)
+            # otherwise, not available, unless user re-uploads
+        proposal_text, _, proposal_docx_name, proposal_text_preview = process_document('proposal', doc_value, chat_input, rfp_decoded_bytes)
         proposal_store = {'text': proposal_text, 'docx_name': proposal_docx_name}
         new_generated_doc_value = generated_doc_value
         if proposal_docx_name: