Update app.py

app.py

@@ -50,31 +50,28 @@ def detect_milestone_from_image(image_path):
 
 def process_image(images, project_name):
     try:
-        # Validates that at least one image is provided
         if not images or len(images) == 0:
-            return "Error: Please upload at least one image to proceed.", "Pending", "", "", 0
+            return "Error: Please upload at least one image to proceed.", "Pending", "", "", 0, None  # Added None for image output
 
-        # List to store milestones for all images
         milestones = []
+        last_image_path = None  # Track the last saved image path
         for image in images:
             img = Image.open(image)
 
-            # Check file size and format
             image_size_mb = os.path.getsize(image) / (1024 * 1024)
             if image_size_mb > 20:
-                return "Error: One or more images exceed 20MB.", "Failure", "", "", 0
+                return "Error: One or more images exceed 20MB.", "Failure", "", "", 0, None
             if not str(image).lower().endswith(('.jpg', '.jpeg', '.png')):
-                return "Error: Only JPG/PNG images are supported.", "Failure", "", "", 0
+                return "Error: Only JPG/PNG images are supported.", "Failure", "", "", 0, None
 
-            # Save image locally with unique filename
-            upload_dir = "public_Uploads"
+            upload_dir = "public_uploads"
             os.makedirs(upload_dir, exist_ok=True)
             unique_id = datetime.now().strftime("%Y%m%d%H%M%S")
             image_filename = f"{unique_id}_{os.path.basename(image)}"
             saved_image_path = os.path.join(upload_dir, image_filename)
             shutil.copy(image, saved_image_path)
+            last_image_path = saved_image_path  # Update last image path
 
-            # Upload image to Salesforce
             with open(saved_image_path, 'rb') as image_file:
                 image_data = base64.b64encode(image_file.read()).decode('utf-8')
 
@@ -88,13 +85,11 @@ def process_image(images, project_name):
                 content_version_id = content_version_result['id']
                 file_url = f"https://sathkruthatechsolutionspri8-dev-ed.develop.lightning.force.com/{content_version_id}"
             except Exception as e:
-                return f"Error: Failed to upload image to Salesforce - {str(e)}", "Failure", "", "", 0
+                return f"Error: Failed to upload image to Salesforce - {str(e)}", "Failure", "", "", 0, None
 
-            # Detect milestone for each image and store
             milestone = detect_milestone_from_image(saved_image_path)
             milestones.append(milestone)
 
-        # Aggregate milestones by selecting the most frequent one
         final_milestone = max(set(milestones), key=milestones.count) if milestones else "Planning"
         milestone_completion_map = {
             "Planning": 10,
@@ -104,11 +99,9 @@ def process_image(images, project_name):
         }
         percent_complete = milestone_completion_map.get(final_milestone, 0)
 
-        # Get current time in Asia/Kolkata timezone
         now = datetime.now(local_timezone)
         local_time = now.strftime("%Y-%m-%dT%H:%M:%S") + now.strftime("%z")[:-2] + ":" + now.strftime("%z")[-2:]
 
-        # Create Salesforce record with aggregated milestone and last image URL
         record = {
             "Name__c": project_name,
             "Current_Milestone__c": final_milestone,
@@ -116,26 +109,27 @@ def process_image(images, project_name):
             "Last_Updated_On__c": local_time,
             "Upload_Status__c": "Success",
             "Comments__c": f"{final_milestone}",
-            "Last_Updated_Image__c": file_url  # Note: Uses the last image's URL
+            "Last_Updated_Image__c": file_url
         }
 
         try:
             sf.Construction__c.create(record)
         except Exception as e:
-            return f"Error: Failed to update Salesforce - {str(e)}", "Failure", "", "", 0
+            return f"Error: Failed to update Salesforce - {str(e)}", "Failure", "", "", 0, None
 
-        # Return formatted output for Gradio UI
+        # Return last image path for display (filename not shown in UI)
         return (
             f"<h3 style='color:green;'>Milestone: {final_milestone}</h3>",
             "Success",
             final_milestone,
-            f"{percent_complete}%"
+            f"{percent_complete}%",
+            last_image_path  # Added to return the last image for display
         )
 
     except Exception as e:
-        return f"Error: {str(e)}", "Failure", "", "", "0%"
+        return f"Error: {str(e)}", "Failure", "", "", "0%", None
 
-# Gradio UI
+# Gradio UI with added image output
 with gr.Blocks(css="") as demo:
     gr.Markdown("<h1 class='title'>Construction Progress Analyzer</h1>")
     with gr.Row():
@@ -147,11 +141,12 @@ with gr.Blocks(css="") as demo:
     upload_status = gr.Textbox(label="Upload Status")
     milestone = gr.Textbox(label="Detected Milestone")
     progress = gr.Textbox(label="Completion Percentage", interactive=False)
+    image_output = gr.Image(label="Uploaded Image", interactive=False)  # Added to display image
 
     submit_button.click(
         fn=process_image,
         inputs=[image_input, project_name_input],
-        outputs=[output_html, upload_status, milestone, progress]
+        outputs=[output_html, upload_status, milestone, progress, image_output]  # Added image_output
     )
 
 demo.launch(share=True)