Update app.py

app.py

@@ -60,23 +60,23 @@ def predict_milestone(image):
         return None, None, f"AI failed to process the image: {str(e)}"
 
 # Function to upload image to Salesforce and get a URL
-def upload_image_to_salesforce(image, project_id):
+def upload_image_to_salesforce(image, project_name):
     try:
         # Placeholder: Simulate uploading image to Salesforce ContentVersion
-        image_url = f"https://your-salesforce-instance.com/file/{project_id}.jpg"  # Simulated URL
+        image_url = f"https://your-salesforce-instance.com/file/{project_name}.jpg"  # Simulated URL
         return image_url, None
     except Exception as e:
         return None, f"Failed to upload image to Salesforce: {str(e)}"
 
-# Function to update Salesforce Construction_Project__c object
-def update_salesforce_record(sf, project_id, milestone, percentage, image_url, status, comments):
+# Function to update Salesforce Construction_Project__c object and fetch fields
+def update_salesforce_record(sf, project_name, milestone, percentage, image_url, status, comments):
     try:
         # Query to check if the project exists
-        query = f"SELECT Id FROM Construction_Project__c WHERE Name = '{project_id}'"
+        query = f"SELECT Id FROM Construction_Project__c WHERE Name = '{project_name}'"
         result = sf.query(query)
         
         if result['totalSize'] == 0:
-            return f"No project found with ID: {project_id}"
+            return None, f"No project found with Name: {project_name}"
         
         record_id = result['records'][0]['Id']
         
@@ -89,14 +89,29 @@ def update_salesforce_record(sf, project_id, milestone, percentage, image_url, s
             'Upload_Status__c': status,
             'Comments__c': comments
         })
-        return None
+        
+        # Fetch the updated record to get the specified fields
+        updated_query = f"SELECT Current_Milestone__c, Last_Updated_Image__c, Last_Updated_On__c, Upload_Status__c FROM Construction_Project__c WHERE Id = '{record_id}'"
+        updated_result = sf.query(updated_query)
+        
+        if updated_result['totalSize'] == 0:
+            return None, "Failed to retrieve updated record."
+        
+        record = updated_result['records'][0]
+        fields_output = {
+            'Current_Milestone__c': record.get('Current_Milestone__c', 'N/A'),
+            'Last_Updated_Image__c': record.get('Last_Updated_Image__c', 'N/A'),
+            'Last_Updated_On__c': record.get('Last_Updated_On__c', 'N/A'),
+            'Upload_Status__c': record.get('Upload_Status__c', 'N/A')
+        }
+        return fields_output, None
     except Exception as e:
-        return f"Failed to update Salesforce: {str(e)}"
+        return None, f"Failed to update Salesforce: {str(e)}"
 
 # Main Gradio function
-def process_construction_photo(project_id, image):
-    if not project_id or not image:
-        return None, "Please provide a project ID and upload a photo."
+def process_construction_photo(project_name, image):
+    if not project_name or not image:
+        return None, "Please provide a project name and upload a photo."
     
     # Connect to Salesforce
     try:
@@ -118,36 +133,50 @@ def process_construction_photo(project_id, image):
     milestone, percentage, error = predict_milestone(image)
     
     if error:
-        error_message = update_salesforce_record(
+        fields, error_message = update_salesforce_record(
             sf=sf,
-            project_id=project_id,
+            project_name=project_name,
             milestone=None,
             percentage=0.00,
             image_url=None,
             status="Failure",
             comments=error
         )
-        return None, f"AI Error: {error}\nSalesforce Error: {error_message}" if error_message else f"AI Error: {error}"
+        error_text = f"AI Error: {error}"
+        if error_message:
+            error_text += f"\nSalesforce Error: {error_message}"
+        if fields:
+            error_text += "\nUpdated Salesforce Fields:\n"
+            for field, value in fields.items():
+                error_text += f"{field}: {value}\n"
+        return None, error_text
     
     # Upload image to Salesforce
-    image_url, upload_error = upload_image_to_salesforce(image, project_id)
+    image_url, upload_error = upload_image_to_salesforce(image, project_name)
     
     if upload_error:
-        error_message = update_salesforce_record(
+        fields, error_message = update_salesforce_record(
             sf=sf,
-            project_id=project_id,
+            project_name=project_name,
             milestone=milestone,
             percentage=percentage,
             image_url=None,
             status="Failure",
             comments=upload_error
         )
-        return None, f"Upload Error: {upload_error}\nSalesforce Error: {error_message}" if error_message else f"Upload Error: {upload_error}"
+        error_text = f"Upload Error: {upload_error}"
+        if error_message:
+            error_text += f"\nSalesforce Error: {error_message}"
+        if fields:
+            error_text += "\nUpdated Salesforce Fields:\n"
+            for field, value in fields.items():
+                error_text += f"{field}: {value}\n"
+        return None, error_text
     
     # Update Salesforce with success
-    error_message = update_salesforce_record(
+    fields, error_message = update_salesforce_record(
         sf=sf,
-        project_id=project_id,
+        project_name=project_name,
         milestone=milestone,
         percentage=percentage,
         image_url=image_url,
@@ -158,13 +187,18 @@ def process_construction_photo(project_id, image):
     if error_message:
         return None, f"Salesforce Error: {error_message}"
     
-    return image, f"Success! Milestone: {milestone}, Completion: {percentage}%\nProgress saved to Salesforce!"
+    # Prepare output with AI results and Salesforce fields
+    result_text = f"Success! Milestone: {milestone}, Completion: {percentage}%\nProgress saved to Salesforce!\n\nSalesforce Fields:\n"
+    for field, value in fields.items():
+        result_text += f"{field}: {value}\n"
+    
+    return image, result_text
 
 # Gradio interface
 iface = gr.Interface(
     fn=process_construction_photo,
     inputs=[
-        gr.Textbox(label="Project ID (e.g., Sunshine Apartments)", placeholder="Sunshine Apartments"),
+        gr.Textbox(label="Project Name (e.g., Sunshine Apartments)", placeholder="Sunshine Apartments"),
         gr.Image(type="pil", label="Upload a Construction Photo")
     ],
     outputs=[