Update app.py via AI Editor

app.py

@@ -256,11 +256,48 @@ def process_document(action, selected_filename=None, chat_input=None, rfp_decode
     elif action == 'recover':
         # For recover: need compliance check or shred (selected_filename), and proposal (selected_proposal_filename)
         if not selected_proposal_filename or selected_proposal_filename not in proposals:
+            logging.error("No proposal document selected for recovery.")
             return "No proposal document selected for recovery.", None, None, None, None
         if not selected_filename or selected_filename not in uploaded_documents:
+            logging.error("No compliance check or shredded requirements document selected for recovery.")
             return "No compliance check or shredded requirements document selected for recovery.", None, None, None, None
+
         findings_content = uploaded_documents[selected_filename]
         proposal_text = proposals[selected_proposal_filename]
+        findings_fileid = uploaded_documents_fileid.get(selected_filename)
+        proposal_fileid = proposals_fileid.get(selected_proposal_filename)
+
+        # Upload findings doc if not already uploaded
+        if not findings_fileid:
+            if selected_filename in shredded_documents:
+                findings_bytes = shredded_documents[selected_filename]
+            elif selected_filename in uploaded_documents_bytes:
+                findings_bytes = uploaded_documents_bytes[selected_filename]
+            else:
+                findings_bytes = None
+            if findings_bytes:
+                try:
+                    findings_fileid = upload_to_gemini_file(findings_bytes, selected_filename)
+                    if findings_fileid:
+                        uploaded_documents_fileid[selected_filename] = findings_fileid
+                        logging.info(f"Findings/Compliance doc {selected_filename} uploaded to Gemini for recover.")
+                except Exception as e:
+                    logging.error(f"Failed to upload findings doc {selected_filename} for recover: {e}")
+
+        # Upload proposal doc if not already uploaded
+        if not proposal_fileid:
+            proposal_bytes = None
+            if selected_proposal_filename in proposals:
+                proposal_bytes = save_proposal_as_docx(proposals[selected_proposal_filename], selected_proposal_filename)
+            if proposal_bytes:
+                try:
+                    proposal_fileid = upload_to_gemini_file(proposal_bytes, selected_proposal_filename)
+                    if proposal_fileid:
+                        proposals_fileid[selected_proposal_filename] = proposal_fileid
+                        logging.info(f"Proposal doc {selected_proposal_filename} uploaded to Gemini for recover.")
+                except Exception as e:
+                    logging.error(f"Failed to upload proposal doc {selected_proposal_filename} for recover: {e}")
+
         logging.info(f"Recovery: fixing proposal [{selected_proposal_filename}] based on findings [{selected_filename}]")
         prompt = (
             "You are a proposal compliance recovery expert. Use the following findings and recommendations table, and the original proposal response. "
@@ -269,21 +306,33 @@ def process_document(action, selected_filename=None, chat_input=None, rfp_decode
             "For each section that needs fixing, revise it in the proposal to address the recommendation for compliance or to strengthen the response. "
             "Return the full proposal with only the necessary sections revised, and leave all other sections untouched. "
             "Do not add any introduction, summary, or comments. Return only the revised proposal in markdown, nothing else.\n\n"
+        )
+        if chat_input:
+            prompt += f"User additional instructions: {chat_input}\n"
+        prompt += (
             "Findings and Recommendations Table or Requirements Table:\n"
             f"{findings_content}\n"
             "---\nOriginal Proposal:\n"
             f"{proposal_text}\n"
         )
-        result = gemini_generate_content(prompt, file_id=None, chat_input=chat_input)
+        # If both are present, use both as file context for Gemini
+        used_fileid = None
+        if findings_fileid:
+            used_fileid = findings_fileid
+        elif proposal_fileid:
+            used_fileid = proposal_fileid
+
+        result = gemini_generate_content(prompt, file_id=used_fileid, chat_input=chat_input)
         if result and not result.startswith("Error"):
-            # Name for the recovered proposal: <original proposal base>_recovered.docx
             base_name = os.path.splitext(selected_proposal_filename)[0]
             recovered_docx_name = f"{base_name}_recovered.docx"
             docx_bytes = save_proposal_as_docx(result, base_name)
             proposals[recovered_docx_name] = result
             proposals_fileid[recovered_docx_name] = None
+            logging.info(f"Recovered proposal generated and saved as {recovered_docx_name}.")
             return result, None, None, recovered_docx_name, docx_bytes
         else:
+            logging.error(f"Error in Gemini recover: {result}")
             return result, None, None, None, None
 
     elif action == 'loe':
@@ -645,7 +694,6 @@ def master_callback(
                 output_data_upload = dcc.Markdown(result, style={"whiteSpace": "pre-wrap", "wordWrap": "break-word"})
             elif triggered_id == "recover-action-btn":
                 action_name = "recover"
-                # For recover, use selected compliance/shred doc (doc_value) and selected proposal (proposal_value)
                 result, _, _, generated_filename, generated_docx_bytes = process_document(
                     action_name, doc_value, chat_input, None, proposal_value
                 )