Update app.py

app.py

@@ -31,14 +31,14 @@ except Exception as e:
     print(f"Salesforce connection failed: {str(e)}")
     raise
 
-# Updated Milestone Percentages (reflecting the percentage ranges)
+# Updated Milestone Percentages
 milestone_percentage_map = {
-    "Excavation and Foundation": 10,           # Stage 1: Excavation and Foundation = 0% to 10%
-    "Structural Framework": 40,                # Stage 2: Structural Framework = 10% to 40%
-    "Roofing": 70,                             # Stage 3: Roofing = 40% to 70%
-    "Exterior Work": 85,                       # Stage 4: Exterior Work = 70% to 85%
-    "Interior Work": 95,                       # Stage 5: Interior Work = 85% to 95%
-    "Final Completion": 100                    # Stage 6: Final Completion = 90% to 100%
+    "Excavation and Foundation": 10,
+    "Structural Framework": 40,
+    "Roofing": 70,
+    "Exterior Work": 85,
+    "Interior Work": 95,
+    "Final Completion": 100
 }
 
 # Adjust the timezone to your local timezone
@@ -62,67 +62,105 @@ def mock_ai_model(image):
 
     return milestone, milestone_percentage_map[milestone], confidence_score
 
-# Image processing and Salesforce upload
-def process_image(image, project_name, project_type):
+# Image processing and Salesforce upload for multiple images
+def process_image(images, project_name, project_type):
     try:
-        if not image:
-            return "Error: Please upload an image to proceed.", "Pending", "", "", 0
-
-        # Open the image from the file path
-        img = Image.open(image)  # image is now the file path string
-        milestone, percent_complete, confidence_score = mock_ai_model(img)
-
-        # Save image to public folder temporarily before uploading to Salesforce
-        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)
-
-        # Convert image to base64 before uploading to Salesforce
-        with open(saved_image_path, 'rb') as image_file:
-            image_data = base64.b64encode(image_file.read()).decode('utf-8')
-
-        # Upload the file to Salesforce (ContentVersion)
-        content_version = {
-            'Title': image_filename,
-            'PathOnClient': saved_image_path,
-            'VersionData': image_data
-        }
-
-        try:
-            content_version_result = sf.ContentVersion.create(content_version)
-            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
+        if not images:
+            return "<p style='color: red;'>Error: Please upload at least one image to proceed.</p>", "Pending", "", "", 0
+
+        if not project_name:
+            return "<p style='color: red;'>Error: Project Name is required.</p>", "Pending", "", "", 0
+
+        results = []
+        image_urls = []
+        milestone_confidences = []
+        max_percent_complete = 0
+        dominant_milestone = None
+
+        # Process each image
+        for idx, image_path in enumerate(images):
+            try:
+                # Open the image
+                img = Image.open(image_path)
+                milestone, percent_complete, confidence_score = mock_ai_model(img)
+
+                # Save image to public folder temporarily
+                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}_{idx}_{os.path.basename(image_path)}"
+                saved_image_path = os.path.join(upload_dir, image_filename)
+                shutil.copy(image_path, saved_image_path)
+
+                # Convert image to base64
+                with open(saved_image_path, 'rb') as image_file:
+                    image_data = base64.b64encode(image_file.read()).decode('utf-8')
+
+                # Upload to Salesforce (ContentVersion)
+                content_version = {
+                    'Title': image_filename,
+                    'PathOnClient': saved_image_path,
+                    'VersionData': image_data
+                }
+
+                try:
+                    content_version_result = sf.ContentVersion.create(content_version)
+                    content_version_id = content_version_result['id']
+                    file_url = f"https://sathkruthatechsolutionspri8-dev-ed.develop.lightning.force.com/{content_version_id}"
+                    image_urls.append(file_url)
+                except Exception as e:
+                    results.append(f"Image {idx+1}: Failed to upload to Salesforce - {str(e)}")
+                    continue
+
+                # Track the highest completion percentage and corresponding milestone
+                if percent_complete > max_percent_complete:
+                    max_percent_complete = percent_complete
+                    dominant_milestone = milestone
+
+                milestone_confidences.append((milestone, confidence_score))
+                results.append(f"Image {idx+1}: {milestone} - {percent_complete}% completion (Confidence: {confidence_score})")
+
+            except Exception as e:
+                results.append(f"Image {idx+1}: Error processing image - {str(e)}")
+                continue
+
+        # If no images were successfully processed
+        if not results:
+            return "<p style='color: red;'>Error: No images were successfully processed.</p>", "Failure", "", "", 0
 
-        # Create Salesforce record for construction project
+        # Create Salesforce record
         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
         record = {
             "Name__c": project_name,
             "Project_Type__c": project_type,
-            "Completion_Percentage__c": percent_complete,  # Correct field for percentage
-            "Current_Milestone__c": milestone,  # Correct field for milestone (Picklist)
+            "Completion_Percentage__c": max_percent_complete,
+            "Current_Milestone__c": dominant_milestone or "Unknown",
             "Last_Updated_On__c": local_time,
             "Upload_Status__c": "Success",
-            "Comments__c": f"Project {project_name} at {milestone} with {percent_complete}% completion",
-            "Last_Updated_Image__c": file_url  # Correct field for image URL
+            "Comments__c": f"Project {project_name} at {dominant_milestone or 'Unknown'} with {max_percent_complete}% completion",
+            "Last_Updated_Image__c": ";".join(image_urls)  # Store all image URLs
         }
 
         try:
-            sf.Construction__c.create(record)  # Creating a record in Salesforce
+            sf.Construction__c.create(record)
         except Exception as e:
-            return f"Error: Failed to update Salesforce - {str(e)}", "Failure", "", "", 0
+            return f"<p style='color: red;'>Error: Failed to update Salesforce - {str(e)}</p>", "Failure", "", "", 0
+
+        # Format output
+        output_html = "<div style='text-align: left;'>"
+        output_html += "<h3>Processing Results:</h3><ul>"
+        for result in results:
+            output_html += f"<li>{result}</li>"
+        output_html += "</ul>"
+        output_html += f"<p><strong>Project Record Created:</strong> {project_name} - {dominant_milestone or 'Unknown'} ({max_percent_complete}%)</p>"
+        output_html += "</div>"
 
-        return f"Image processed successfully. {milestone} - {percent_complete}% completion", "Success", milestone, f"Confidence Score: {confidence_score}", f"{percent_complete}%"
+        return output_html, "Success", dominant_milestone or "", f"Max Confidence: {max([conf for _, conf in milestone_confidences], default=0)}", f"{max_percent_complete}%"
 
     except Exception as e:
-        return f"Error: {str(e)}", "Failure", "", "", "0%"
+        return f"<p style='color: red;'>Error: {str(e)}</p>", "Failure", "", "", "0%"
 
 # Gradio UI with enhanced styling
 with gr.Blocks(css="""
@@ -182,9 +220,9 @@ with gr.Blocks(css="""
         project_type_input = gr.Dropdown(label="Project Type", choices=["House", "Apartment"], value="House")
         project_name_input = gr.Textbox(label="Project Name (Required)", placeholder="e.g. Project_12345")
         
-    # Handle single image upload (no need for multiple)
-    image_input = gr.Image(type="filepath", label="Upload Construction Site Photo (JPG/PNG, ≤ 20MB)")  # Single image upload
-    submit_button = gr.Button("Process Image")
+    # Updated to allow multiple image uploads
+    image_input = gr.Image(type="filepath", label="Upload Construction Site Photos (JPG/PNG, ≤ 20MB each)", allow_multiple=True)
+    submit_button = gr.Button("Process Images")
     output_html = gr.HTML(label="Result")
     
     submit_button.click(
@@ -193,4 +231,4 @@ with gr.Blocks(css="""
         outputs=[output_html]
     )
 
-demo.launch(share=True)
+demo.launch(share=True)