Update app.py via AI Editor

app.py

@@ -86,10 +86,17 @@ def upload_to_gemini_file(decoded_bytes, filename):
         logging.error(f"Exception during file upload to Gemini: {e}")
         return None
 
-def gemini_generate_content(prompt, file_id=None, chat_input=None):
+def gemini_generate_content(prompt, file_id=None, chat_input=None, file_ids=None):
     try:
         files = []
-        if file_id:
+        if file_ids:
+            for fid in file_ids:
+                try:
+                    gemini_file = genai.get_file(fid)
+                    files.append(gemini_file)
+                except Exception as e:
+                    logging.error(f"Could not fetch Gemini file for id {fid}: {e}")
+        elif file_id:
             try:
                 gemini_file = genai.get_file(file_id)
                 files.append(gemini_file)
@@ -266,13 +273,15 @@ def process_document(action, selected_filename=None, chat_input=None, rfp_decode
         findings_fileid = uploaded_documents_fileid.get(selected_filename)
         proposal_fileid = proposals_fileid.get(selected_proposal_filename)
 
+        # Ensure both findings and proposal are uploaded as files in Gemini
         if not findings_fileid:
+            findings_bytes = None
             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
+                findings_bytes = save_compliance_as_docx(findings_content, selected_filename)
             if findings_bytes:
                 try:
                     findings_fileid = upload_to_gemini_file(findings_bytes, selected_filename)
@@ -283,9 +292,7 @@ def process_document(action, selected_filename=None, chat_input=None, rfp_decode
                     logging.error(f"Failed to upload findings doc {selected_filename} for recover: {e}")
 
         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)
+            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)
@@ -297,28 +304,24 @@ def process_document(action, selected_filename=None, chat_input=None, rfp_decode
 
         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. "
+            "You are a proposal compliance recovery expert. Use the findings and recommendations table and the original proposal response provided in the attached files. "
             "Address ONLY those sections of the proposal that have a finding and a recommendation for improvement. "
             "Do NOT change sections that are marked as fully compliant or already fully address the requirements. "
             "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"
+            "Do not add any introduction, summary, or comments. Return only the revised proposal in markdown, nothing else.\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"
-        )
-        used_fileid = None
+
+        # Compose file_ids and pass both files to Gemini in order
+        file_ids = []
         if findings_fileid:
-            used_fileid = findings_fileid
-        elif proposal_fileid:
-            used_fileid = proposal_fileid
+            file_ids.append(findings_fileid)
+        if proposal_fileid:
+            file_ids.append(proposal_fileid)
 
-        result = gemini_generate_content(prompt, file_id=used_fileid, chat_input=chat_input)
+        result = gemini_generate_content(prompt, file_ids=file_ids)
         if result and not result.startswith("Error"):
             base_name = os.path.splitext(selected_proposal_filename)[0]
             recovered_docx_name = f"{base_name}_recovered.docx"