Update app.py

app.py

@@ -94,8 +94,8 @@ def save_dpr_to_pdf(dpr_text, 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 URL
-def upload_file_to_salesforce(file_path, filename, sf_connection, field_name):
+# Function to upload a file to Salesforce as ContentVersion
+def upload_file_to_salesforce(file_path, filename, sf_connection):
     try:
         # Read file content and encode in base64
         with open(file_path, 'rb') as f:
@@ -107,7 +107,7 @@ def upload_file_to_salesforce(file_path, filename, sf_connection, field_name):
             'Title': filename,
             'PathOnClient': filename,
             'VersionData': file_content_b64,
-            'Description': f'Uploaded for {field_name}'
+            'Description': f'Uploaded for Daily Progress Report'
         })
         
         # Get ContentDocumentId
@@ -117,12 +117,9 @@ def upload_file_to_salesforce(file_path, filename, sf_connection, field_name):
         )
         content_document_id = content_document['records'][0]['ContentDocumentId']
         
-        # Construct the file download URL
-        file_url = f"/sfc/servlet.shepherd/document/download/{content_document_id}"
-        
-        return content_document_id, file_url, f"File {filename} uploaded successfully for {field_name}"
+        return content_document_id, f"File {filename} uploaded successfully"
     except Exception as e:
-        return None, None, f"Error uploading {filename} to Salesforce for {field_name}: {str(e)}"
+        return None, f"Error uploading {filename} to Salesforce: {str(e)}"
 
 # Function to generate the daily progress report (DPR), save as PDF, and upload to Salesforce
 def generate_dpr(files):
@@ -161,40 +158,24 @@ def generate_dpr(files):
     # Salesforce upload
     salesforce_result = ""
     pdf_content_document_id = None
-    pdf_url = None
-    image_urls = []
     image_content_document_ids = []
     
     if sf and pdf_filepath:
         try:
-            # Upload PDF to Salesforce for Report_PDF__c
-            pdf_content_document_id, pdf_url, pdf_upload_result = upload_file_to_salesforce(
-                pdf_filepath, pdf_filename, sf, 'Report_PDF__c'
-            )
-            salesforce_result += pdf_upload_result + "\n"
-            
-            # Upload images to Salesforce for Site_Images__c
-            for file in files:
-                image_filename = os.path.basename(file.name)
-                image_content_document_id, image_url, image_upload_result = upload_file_to_salesforce(
-                    file.name, image_filename, sf, 'Site_Images__c'
-                )
-                if image_content_document_id and image_url:
-                    image_content_document_ids.append(image_content_document_id)
-                    image_urls.append(image_url)
-                salesforce_result += image_upload_result + "\n"
-            
-            # Create Daily_Progress_Reports__c record with file URLs
+            # Create Daily_Progress_Reports__c record
             report_description = "; ".join(captions)[:255]  # Concatenate captions, limit to 255 chars
-            images_urls_str = ";".join(image_urls)  # Semicolon-separated image URLs
             dpr_record = sf.Daily_Progress_Reports__c.create({
-                'Report_Description__c': report_description,
-                'Report_PDF__c': pdf_url if pdf_url else '',
-                'Site_Images__c': images_urls_str if images_urls_str else ''
+                'Report_Description__c': report_description
             })
             dpr_record_id = dpr_record['id']
             salesforce_result += f"Created Daily_Progress_Reports__c record with ID: {dpr_record_id}\n"
             
+            # Upload PDF to Salesforce
+            pdf_content_document_id, pdf_upload_result = upload_file_to_salesforce(
+                pdf_filepath, pdf_filename, sf
+            )
+            salesforce_result += pdf_upload_result + "\n"
+            
             # Link PDF to DPR record
             if pdf_content_document_id:
                 sf.ContentDocumentLink.create({
@@ -203,13 +184,23 @@ def generate_dpr(files):
                     'ShareType': 'V'
                 })
             
-            # Link images to DPR record
-            for image_content_document_id in image_content_document_ids:
-                sf.ContentDocumentLink.create({
-                    'ContentDocumentId': image_content_document_id,
-                    'LinkedEntityId': dpr_record_id,
-                    'ShareType': 'V'
-                })
+            # Upload images to Salesforce
+            for file in files:
+                image_filename = os.path.basename(file.name)
+                image_content_document_id, image_upload_result = upload_file_to_salesforce(
+                    file.name, image_filename, sf
+                )
+                if image_content_document_id:
+                    image_content_document_ids.append(image_content_document_id)
+                salesforce_result += image_upload_result + "\n"
+                
+                # Link image to DPR record
+                if image_content_document_id:
+                    sf.ContentDocumentLink.create({
+                        'ContentDocumentId': image_content_document_id,
+                        'LinkedEntityId': dpr_record_id,
+                        'ShareType': 'V'
+                    })
             
         except Exception as e:
             salesforce_result += f"Error interacting with Salesforce: {str(e)}\n"
@@ -231,7 +222,7 @@ iface = gr.Interface(
         gr.File(label="Download PDF")
     ],
     title="Daily Progress Report Generator",
-    description="Upload up to 10 site photos. The AI model will generate a text-based Daily Progress Report (DPR), save it as a PDF, and upload the PDF to Report_PDF__c and images to Site_Images__c in Salesforce under Daily_Progress_Reports__c. Download the PDF locally if needed.",
+    description="Upload up to 10 site photos. The AI model will generate a text-based Daily Progress Report (DPR), save it as a PDF, and upload the PDF and images to Salesforce under Daily_Progress_Reports__c in the Files related list. Download the PDF locally if needed.",
     allow_flagging="never"
 )