Update app.py

app.py

@@ -113,54 +113,58 @@ def save_dpr_to_pdf(dpr_text, image_paths, captions, filename):
 
 
 
-def upload_pdf_to_salesforce(pdf_file, project_title, record_id=None):
+import base64
+
+def upload_pdf_to_salesforce(pdf_file, project_title, record_id=None, sf_connection=None):
     try:
-        sf = get_salesforce_connection()  # Ensure Salesforce connection
-        if not sf:
+        if not sf_connection:
             logger.error("Salesforce connection failed. Cannot upload PDF.")
             return None, None
 
-        # Encode PDF data in base64
+        # Read file content and encode in base64
         encoded_pdf_data = base64.b64encode(pdf_file.getvalue()).decode('utf-8')
         logger.debug(f"Uploading PDF for project: {project_title}, record ID: {record_id}")
-        
-        # Create ContentVersion
-        content_version = sf_connection.ContentVersion.create({
-            'Title': filename,
-            'PathOnClient': filename,
-            'VersionData': file_content_b64,
-            'Description': description
-        })
-        
 
+        # Set description based on file type
+        description = "Daily Progress Report PDF" if pdf_file.name.endswith(".pdf") else "Site Image"
+
+        # Prepare ContentVersion data
+        content_version_data = {
+            "Title": filename,
+            "PathOnClient": filename,
+            "VersionData": encoded_pdf_data,
+            "Description": description
+        }
+
+        # If a record ID is provided, associate the file with a Salesforce record
         if record_id:
             content_version_data["FirstPublishLocationId"] = record_id
 
-        # Upload the PDF file to Salesforce
-        content_version = sf.ContentVersion.create(content_version)
+        # Create ContentVersion in Salesforce
+        content_version = sf_connection.ContentVersion.create(content_version_data)
         content_version_id = content_version["id"]
         logger.info(f"PDF uploaded to Salesforce with ContentVersion ID: {content_version_id}")
 
-        # Query to get the ContentDocumentId
-        result = sf.query(f"SELECT Id, ContentDocumentId FROM ContentVersion WHERE Id = '{content_version_id}'")
+        # Query to get ContentDocumentId from the ContentVersion record
+        result = sf_connection.query(f"SELECT Id, ContentDocumentId FROM ContentVersion WHERE Id = '{content_version_id}'")
         if not result['records']:
             logger.error("No records returned for ContentVersion query")
             return content_version_id, None
 
+        # Retrieve ContentDocumentId
         content_document_id = result['records'][0]['ContentDocumentId']
         
-        # Correct URL format for downloading the file from Salesforce
-        file_url = f"https://{sf.sf_instance}.salesforce.com/sfc/servlet.shepherd/document/download/{content_version_id}"
+        # Generate a valid Salesforce URL for the file (Download link)
+        instance_url = sf_connection.base_url.split('/')[2]  # Extract instance URL (e.g., 'na1', 'ap1', etc.)
+        file_url = f"https://{instance_url}.salesforce.com/sfc/servlet.shepherd/version/download/{content_version_id}"
+
         logger.debug(f"Generated PDF URL: {file_url}")
-        
         return content_version_id, file_url
-
+    
     except Exception as e:
         logger.error(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
 def generate_dpr(files):
     dpr_text = []