Update app.py

app.py

@@ -111,20 +111,17 @@ 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 and get its download URL
 # 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:
-        sf = get_salesforce_connection()  # Get Salesforce connection
+        sf = get_salesforce_connection()
         if not sf:
             print("Salesforce connection failed. Cannot upload PDF.")
             return None, None
 
-        # Encoding the file in base64
         encoded_pdf_data = base64.b64encode(pdf_file.getvalue()).decode('utf-8')
         print(f"Uploading PDF for project: {project_title}, record ID: {record_id}")
         
-        # Create ContentVersion data to upload to Salesforce
         content_version_data = {
             "Title": f"{project_title} - Gantt Chart PDF",
             "PathOnClient": f"{project_title}_Gantt_Chart.pdf",
@@ -134,26 +131,28 @@ def upload_pdf_to_salesforce(pdf_file, project_title, record_id=None):
         if record_id:
             content_version_data["FirstPublishLocationId"] = record_id
 
-        # Uploading the PDF to Salesforce
         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}")
 
-        # Querying the ContentDocumentId to get the download URL
+        # Query the ContentDocumentId
         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}"
+        
+        # Correctly generate Salesforce URL (use the correct instance and format)
+        instance_url = sf.sf_instance  # Get Salesforce instance (e.g., na1, eu2)
+        file_url = f"https://{instance_url}.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:
         print(f"Error uploading PDF to Salesforce: {str(e)}", exc_info=True)
         return None, None
 
-# Correct the call to upload_pdf_to_salesforce() in generate_dpr
+# 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 = []
@@ -205,7 +204,7 @@ def generate_dpr(files):
             dpr_record_id = dpr_record['id']
             salesforce_result += f"Created Daily_Progress_Reports__c record with ID: {dpr_record_id}\n"
             
-            # Corrected call to upload_pdf_to_salesforce
+            # Upload PDF to Salesforce
             pdf_content_document_id, pdf_url, pdf_upload_result = upload_pdf_to_salesforce(
                 pdf_filepath, project_title=pdf_filename  # Pass project title as the title
             )