Update app.py

app.py

@@ -10,7 +10,6 @@ import json
 import os
 from dotenv import load_dotenv
 
-
 # Load environment variables from .env file
 load_dotenv()
 
@@ -88,42 +87,56 @@ def create_and_upload_pdf(dpr_content):
 
 # Function to generate the daily progress report (DPR) text
 def generate_dpr(files):
-    dpr_text = []
-    current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    # Query the latest Daily Progress Report records to get the highest number
+    last_report = sf.query("SELECT Daily_Progress_Reports_Name__c FROM Daily_Progress_Reports__c ORDER BY CreatedDate DESC LIMIT 1")
     
-    # Add header to the DPR
-    dpr_text.append(f"Daily Progress Report\nGenerated on: {current_time}\n")
+    # Generate the new report name
+    if last_report['totalSize'] > 0:
+        last_name = last_report['records'][0]['Daily_Progress_Reports_Name__c']
+        # Extract the number from the last report name, assuming format "Daily Progress Report X"
+        report_number = int(last_name.split()[-1]) + 1  # Increment the number
+    else:
+        # If no records exist, start with "1"
+        report_number = 1
     
+    # Generate the new report name dynamically
+    new_report_name = f"Daily Progress Report {report_number}"
+
+    # Prepare the current time and start the DPR text
+    current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    dpr_text = [f"Daily Progress Report\nGenerated on: {current_time}\n"]
+
     # Process each uploaded file (image)
     for file in files:
-        # Open the image from file path
+        # Open the image from the file path
         image = Image.open(file.name)  # Using file.name for filepath
         
         if image.mode != "RGB":
             image = image.convert("RGB")
         
-        # Dynamically generate a caption based on the image
+        # Generate a caption for the image
         caption = generate_captions_from_image(image)
         
-        # Generate DPR section for this image with dynamic caption
+        # Generate a section of the DPR for this image
         dpr_section = f"\nImage: {file.name}\nDescription: {caption}\n"
         dpr_text.append(dpr_section)
 
-    # Join the DPR sections to form the complete report
+    # Join the DPR sections into one complete string
     dpr_content = "\n".join(dpr_text)
 
-    # Create and upload the PDF for this report in Salesforce
+    # Create and upload the PDF for this report to Salesforce
     pdf_url = create_and_upload_pdf(dpr_content)
 
-    # Create a new Salesforce record for this report
+    # Create the new Daily Progress Report record in Salesforce
     new_report_data = {
-        "Report_Date__c": current_time,  # Set Report Date to current time
+        "Daily_Progress_Reports_Name__c": new_report_name,  # Set the dynamic name
+        "Report_Date__c": current_time,  # Set the report date to the current time
         "Detected_Activities__c": dpr_content,  # Set the activities field to the generated text
-        "Photo_Uploads__c": ", ".join([file.name for file in files]),  # Upload file names as Photo Uploads
+        "Photo_Uploads__c": ", ".join([file.name for file in files]),  # Upload the image names as Photo Uploads
         "PDF_URL__c": pdf_url  # Set the PDF URL field with the generated PDF link
     }
 
-    # Insert new Daily Progress Report record into Salesforce
+    # Insert the new report into Salesforce
     new_report = sf.Daily_Progress_Reports__c.create(new_report_data)
 
     return f"New report created in Salesforce with PDF URL: {pdf_url}"
@@ -139,5 +152,3 @@ iface = gr.Interface(
 )
 
 iface.launch()
-
-