Update app.py

app.py

@@ -31,63 +31,47 @@ except Exception as e:
     print(f"Salesforce connection failed: {str(e)}")
     raise
 
-# Updated Milestone Percentages
+# Updated Milestone Percentages (reflecting the percentage ranges)
 milestone_percentage_map = {
-    "Excavation and Foundation": 10,
-    "Structural Framework": 40,
-    "Roofing": 70,
-    "Exterior Work": 85,
-    "Interior Work": 95,
-    "Final Completion": 100
+    "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%
 }
 
 # Adjust the timezone to your local timezone
 local_timezone = pytz.timezone("Asia/Kolkata")
 
-# AI model prediction with basic rule-based check
+# AI model prediction (for simulation)
 def mock_ai_model(image):
     img = image.convert("RGB")
     max_size = 1024
     img.thumbnail((max_size, max_size), Image.Resampling.LANCZOS)
 
-    # Basic rule-based milestone detection (simplified placeholder)
-    img_data = list(img.getdata())
-    gray_scale = [sum(pixel) / 3 for pixel in img_data]  # Simple grayscale conversion
-    avg_brightness = sum(gray_scale) / len(gray_scale)
+    img_bytes = img.tobytes()
+    img_hash = int(hashlib.sha256(img_bytes).hexdigest(), 16)
 
-    if avg_brightness < 150:  # Darker image might indicate early stages or groundwork
-        milestone = "Excavation and Foundation"
-    elif any(255 in pixel for pixel in img_data):  # Bright spots might indicate concrete structures
-        milestone = "Structural Framework"
-    elif avg_brightness > 200:  # Brighter image might suggest advanced stages
-        milestone = "Exterior Work"
-    else:
-        milestone_index = int(hashlib.sha256(img.tobytes()).hexdigest(), 16) % len(milestone_percentage_map)
-        milestone = list(milestone_percentage_map.keys())[milestone_index]
+    # Assign milestone based on hash (for simulation)
+    milestone_index = img_hash % len(milestone_percentage_map)
+    milestone = list(milestone_percentage_map.keys())[milestone_index]
 
-    completion_percent = milestone_percentage_map[milestone]
-    confidence_raw = 0.85 + ((hashlib.sha256(img.tobytes()).hexdigest() % 1000) / 1000) * (0.95 - 0.85)
+    confidence_raw = 0.85 + ((img_hash % 1000) / 1000) * (0.95 - 0.85)
     confidence_score = round(confidence_raw, 2)
 
-    return milestone, completion_percent, confidence_score
+    return milestone, milestone_percentage_map[milestone], confidence_score
 
-# Image processing and Salesforce upload with detailed output
+# Image processing and Salesforce upload
 def process_image(image, project_name, project_type):
     try:
-        if not image or not project_name or not project_type:
-            return "Error: Please upload an image and provide a project name and type.", "Pending", "", "", "0%"
+        if not image:
+            return "Error: Please upload an image to proceed.", "Pending", "", "", 0
 
         # Open the image from the file path
-        img = Image.open(image)
+        img = Image.open(image)  # image is now the file path string
         milestone, percent_complete, confidence_score = mock_ai_model(img)
 
-        # Image size and format validation
-        image_size_mb = os.path.getsize(image) / (1024 * 1024)
-        if image_size_mb > 20:
-            return "Error: Image size exceeds 20MB.", "Failure", "", "", "0%"
-        if not str(image).lower().endswith(('.jpg', '.jpeg', '.png')):
-            return "Error: Only JPG/PNG images are supported.", "Failure", "", "", "0%"
-
         # Save image to public folder temporarily before uploading to Salesforce
         upload_dir = "public_uploads"
         os.makedirs(upload_dir, exist_ok=True)
@@ -112,158 +96,30 @@ def process_image(image, project_name, project_type):
             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%"
-
-        # Detailed Completion Breakdown
-        completion_details = {
-            "Excavation and Foundation": {
-                "completed": [
-                    "Site clearing and leveling completed.",
-                    "Excavation for foundation finished.",
-                    "Foundation concrete poured and cured."
-                ],
-                "not_completed": [
-                    "Structural framework not started.",
-                    "Roofing and exterior work pending.",
-                    "Interior work not initiated."
-                ]
-            },
-            "Structural Framework": {
-                "completed": [
-                    "Foundation fully set and inspected.",
-                    "Concrete columns and beams erected.",
-                    "Floor slabs poured and cured."
-                ],
-                "not_completed": [
-                    "Roofing installation not started.",
-                    "Exterior walls and windows pending.",
-                    "Interior work not begun."
-                ]
-            },
-            "Roofing": {
-                "completed": [
-                    "Structural framework completed.",
-                    "Roof structure installed and secured.",
-                    "Weatherproofing applied."
-                ],
-                "not_completed": [
-                    "Exterior cladding and windows not installed.",
-                    "Interior work still pending.",
-                    "Final finishes not started."
-                ]
-            },
-            "Exterior Work": {
-                "completed": [
-                    "Roofing fully completed.",
-                    "Exterior walls, windows, and doors installed.",
-                    "Cladding and exterior finishes applied."
-                ],
-                "not_completed": [
-                    "Interior electrical and plumbing pending.",
-                    "Interior finishes not started.",
-                    "Final inspections not conducted."
-                ]
-            },
-            "Interior Work": {
-                "completed": [
-                    "Exterior work fully completed.",
-                    "Interior walls, electrical, and plumbing installed.",
-                    "HVAC systems set up."
-                ],
-                "not_completed": [
-                    "Final flooring and painting pending.",
-                    "Fixtures and fittings not installed.",
-                    "Final approvals not obtained."
-                ]
-            },
-            "Final Completion": {
-                "completed": [
-                    "All construction and interior work finished.",
-                    "Flooring, painting, and fixtures installed.",
-                    "Final inspections and approvals obtained."
-                ],
-                "not_completed": [
-                    "No pending tasks."
-                ]
-            }
-        }
-
-        # Format the completed and not completed tasks as HTML for collapsible sections
-        completed_tasks = completion_details[milestone]["completed"]
-        not_completed_tasks = completion_details[milestone]["not_completed"]
-
-        completed_html = "".join([f'<li style="color: green;">✔ {task}</li>' for task in completed_tasks])
-        not_completed_html = "".join([f'<li style="color: red;">✘ {task}</li>' for task in not_completed_tasks])
-
-        # Create HTML for the output with collapsible sections and progress bar
-        # Escape % signs to prevent string formatting errors
-        result_html = f"""
-        <div style="font-family: Arial, sans-serif; padding: 20px; background-color: #f9f9f9; border-radius: 10px;">
-            <h2 style="color: #2c3e50; text-align: center;">Project Summary</h2>
-            <div style="display: flex; justify-content: space-around; margin-bottom: 20px;">
-                <div style="text-align: center;">
-                    <h3 style="color: #34495e;">Detected Milestone</h3>
-                    <p style="font-size: 18px; font-weight: bold;">{milestone}</p>
-                </div>
-                <div style="text-align: center;">
-                    <h3 style="color: #34495e;">Completion</h3>
-                    <progress value="{percent_complete}" max="100" style="width: 200px; height: 20px;"></progress>
-                    <p>{percent_complete}%%</p> <!-- Escaped % with %% -->
-                </div>
-                <div style="text-align: center;">
-                    <h3 style="color: #34495e;">Confidence Score</h3>
-                    <p style="font-size: 18px; font-weight: bold;">{confidence_score * 100}%%</p> <!-- Escaped % with %% -->
-                    <small>The AI is {confidence_score * 100}%% confident that this image represents the {milestone} stage.</small>
-                </div>
-            </div>
+            return f"Error: Failed to upload image to Salesforce - {str(e)}", "Failure", "", "", 0
 
-            <h3 style="color: #2c3e50;">Milestone Timeline</h3>
-            <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">
-                <span style="color: {'#2ecc71' if milestone == 'Excavation and Foundation' else '#bdc3c7'};">Excavation and Foundation</span>
-                <span style="color: {'#2ecc71' if milestone == 'Structural Framework' else '#bdc3c7'};">Structural Framework</span>
-                <span style="color: {'#2ecc71' if milestone == 'Roofing' else '#bdc3c7'};">Roofing</span>
-                <span style="color: {'#2ecc71' if milestone == 'Exterior Work' else '#bdc3c7'};">Exterior Work</span>
-                <span style="color: {'#2ecc71' if milestone == 'Interior Work' else '#bdc3c7'};">Interior Work</span>
-                <span style="color: {'#2ecc71' if milestone == 'Final Completion' else '#bdc3c7'};">Final Completion</span>
-            </div>
-
-            <details style="margin-bottom: 20px;">
-                <summary style="color: #2c3e50; font-weight: bold;">Completed Tasks</summary>
-                <ul style="padding-left: 20px;">
-                    {completed_html}
-                </ul>
-            </details>
-
-            <details style="margin-bottom: 20px;">
-                <summary style="color: #2c3e50; font-weight: bold;">Not Completed Tasks</summary>
-                <ul style="padding-left: 20px;">
-                    {not_completed_html}
-                </ul>
-            </details>
-        </div>
-        """
-
-        # Create Salesforce record with current date and time (05:09 PM IST, June 30, 2025)
+        # Create Salesforce record for construction project
         now = datetime.now(local_timezone)
-        local_time = now.strftime("%Y-%m-%dT%H:%M:%S") + now.strftime("%z")[:-2] + ":" + now.strftime("%z")[-2:]  # 2025-06-30T17:09:00+05:30
+        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,
-            "Current_Milestone__c": milestone,
+            "Completion_Percentage__c": percent_complete,  # Correct field for percentage
+            "Current_Milestone__c": milestone,  # Correct field for milestone (Picklist)
             "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
+            "Last_Updated_Image__c": file_url  # Correct field for image URL
         }
 
         try:
-            sf.Construction__c.create(record)
+            sf.Construction__c.create(record)  # Creating a record in Salesforce
         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
 
-        return result_html, "Success", milestone, f"Confidence Score: {confidence_score}", f"{percent_complete}%"
+        return f"Image processed successfully. {milestone} - {percent_complete}% completion", "Success", milestone, f"Confidence Score: {confidence_score}", f"{percent_complete}%"
 
     except Exception as e:
         return f"Error: {str(e)}", "Failure", "", "", "0%"
@@ -326,19 +182,15 @@ 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
-    image_input = gr.Image(type="filepath", label="Upload Construction Site Photo (JPG/PNG, ≤ 20MB)")
+    # 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")
     output_html = gr.HTML(label="Result")
-    upload_status = gr.Textbox(label="Upload Status")
-    milestone = gr.Textbox(label="Detected Milestone")
-    confidence = gr.Textbox(label="Confidence Score")
-    progress = gr.Textbox(label="Completion Percentage", interactive=False)
-
+    
     submit_button.click(
         fn=process_image,
         inputs=[image_input, project_name_input, project_type_input],
-        outputs=[output_html, upload_status, milestone, confidence, progress]
+        outputs=[output_html]
     )
 
-demo.launch(share=True)
+demo.launch(share=True)