Update app.py

app.py

@@ -111,43 +111,43 @@ def save_dpr_to_pdf(dpr_text, image_paths, captions, filename):
     except Exception as e:
         return f"Error saving PDF: {str(e)}", None
 
-# Function to upload a file to Salesforce as ContentVersion
-# Function to upload a file to Salesforce as ContentVersion
-def upload_file_to_salesforce(file_path, file_name, sf_connection, file_type):
+# Function to upload a file to Salesforce as ContentVersion and get its download URL
+def upload_pdf_to_salesforce(pdf_file, project_title, record_id=None):
     try:
-        # Read file content and encode in base64
-        with open(file_path, 'rb') as f:
-            file_content = f.read()
-        file_content_b64 = base64.b64encode(file_content).decode('utf-8')
-        
-        # Set description based on file type
-        description = "Daily Progress Report PDF" if file_type == "pdf" else "Site Image"
-        
-        # Create ContentVersion
-        content_version = sf_connection.ContentVersion.create({
-            'Title': file_name,
-            'PathOnClient': file_name,
-            'VersionData': file_content_b64,
-            'Description': description
-        })
-        
-        # Get ContentDocumentId
-        content_version_id = content_version['id']
-        content_document = sf_connection.query(
-            f"SELECT ContentDocumentId FROM ContentVersion WHERE Id = '{content_version_id}'"
-        )
-        content_document_id = content_document['records'][0]['ContentDocumentId']
-        
-        # Correctly generate Salesforce URL (use the correct instance and format)
-        instance_url = sf_connection.sf_instance  # Salesforce instance (e.g., na1, eu2)
-        content_document_url = f"https://{instance_url}.salesforce.com/sfc/servlet.shepherd/document/download/{content_document_id}"
+        sf = get_salesforce_connection()
+        if not sf:
+            print("Salesforce connection failed. Cannot upload PDF.")
+            return None, None
+
+        encoded_pdf_data = base64.b64encode(pdf_file.getvalue()).decode('utf-8')
+        print(f"Uploading PDF for project: {project_title}, record ID: {record_id}")
+        content_version_data = {
+            "Title": f"{project_title} - Gantt Chart PDF",
+            "PathOnClient": f"{project_title}_Gantt_Chart.pdf",
+            "VersionData": encoded_pdf_data,
+        }
+       
+        if record_id:
+            content_version_data["FirstPublishLocationId"] = record_id
 
-        # Ensure the link is valid
-        return content_document_id, content_document_url, f"File {file_name} uploaded successfully"
+        content_version = sf.ContentVersion.create(content_version_data)
+        content_version_id = content_version["id"]
+        print(f"PDF uploaded to Salesforce with ContentVersion ID: {content_version_id}")
+
+        result = sf.query(f"SELECT Id, ContentDocumentId FROM ContentVersion WHERE Id = '{content_version_id}'")
+        if not result['records']:
+            print("No records returned for ContentVersion query")
+            return content_version_id, None
+           
+        content_document_id = result['records'][0]['ContentDocumentId']
+        file_url = f"https://{sf.sf_instance}.salesforce.com/sfc/servlet.shepherd/document/download/{content_document_id}"
+        print(f"Generated PDF URL: {file_url}")
+        return content_version_id, file_url
     except Exception as e:
-        return None, None, f"Error uploading {file_name} to Salesforce: {str(e)}"
+        print(f"Error uploading PDF to Salesforce: {str(e)}", exc_info=True)
+        return None, None
 
-# Function to generate the daily progress report (DPR), save as PDF, and upload to Salesforce
+# Function to upload files and generate the daily progress report (DPR), save as PDF, and upload to Salesforce
 def generate_dpr(files):
     dpr_text = []
     captions = []
@@ -200,7 +200,7 @@ def generate_dpr(files):
             salesforce_result += f"Created Daily_Progress_Reports__c record with ID: {dpr_record_id}\n"
             
             # Upload PDF to Salesforce
-            pdf_content_document_id, pdf_url, pdf_upload_result = upload_file_to_salesforce(
+            pdf_content_document_id, pdf_url, pdf_upload_result = upload_pdf_to_salesforce(
                 pdf_filepath, pdf_filename, sf, "pdf"
             )
             salesforce_result += pdf_upload_result + "\n"
@@ -270,4 +270,3 @@ iface = gr.Interface(
 
 if __name__ == "__main__":
     iface.launch()
-