Update app.py

app.py

@@ -111,48 +111,41 @@ 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
-def upload_pdf_to_salesforce(pdf_file, project_title, record_id=None):
+# Function to upload a file to Salesforce as ContentVersion
+def upload_file_to_salesforce(file_path, filename, sf_connection, file_type):
     try:
-        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}")
+        # 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')
         
-        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
-
-        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}")
-
-        # 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']
+        # 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': filename,
+            'PathOnClient': filename,
+            'VersionData': file_content_b64,
+            'Description': description
+        })
         
-        # 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
+        # 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']
+        
+        # Generate a valid Salesforce URL for the ContentDocument
+        content_document_url = f"https://{sf_connection.sf_instance}.salesforce.com/{content_document_id}"
+
+        # Ensure the link is valid
+        return content_document_id, content_document_url, f"File {filename} uploaded successfully"
     except Exception as e:
-        print(f"Error uploading PDF to Salesforce: {str(e)}", exc_info=True)
-        return None, None
+        return None, None, f"Error uploading {filename} to Salesforce: {str(e)}"
 
-# Function to upload files and generate the daily progress report (DPR), save as PDF, and upload to Salesforce
+# Function to generate the daily progress report (DPR), save as PDF, and upload to Salesforce
 def generate_dpr(files):
     dpr_text = []
     captions = []
@@ -205,8 +198,8 @@ 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_pdf_to_salesforce(
-                pdf_filepath, project_title=pdf_filename  # Pass project title as the title
+            pdf_content_document_id, pdf_url, pdf_upload_result = upload_file_to_salesforce(
+                pdf_filepath, pdf_filename, sf, "pdf"
             )
             salesforce_result += pdf_upload_result + "\n"