Update app.py

app.py

@@ -4,11 +4,10 @@ import os
 from dotenv import load_dotenv
 from simple_salesforce import Salesforce
 from datetime import datetime
+import hashlib
 import shutil
 import base64
 import pytz
-import hashlib
-import statistics
 
 # Load environment variables
 load_dotenv()
@@ -33,65 +32,28 @@ except Exception as e:
     raise
 
 # Valid milestones
-VALID_MILESTONES = ["Planning", "Foundation", "Walls Erected", "Interior Furnishing", "Completed"]
+VALID_MILESTONES = ["Planning", "Foundation", "Walls Erected", "Completed"]
 
-# Adjust the timezone to IST
+# Adjust the timezone to your local timezone
 local_timezone = pytz.timezone("Asia/Kolkata")
 
-# Mock Hugging Face image analysis (replace with real model integration)
-def analyze_image_with_hf(image_path):
-    img = Image.open(image_path)
-    detected_elements = []
-    
-    width, height = img.size
-    total_pixels = width * height
-    img_data = list(img.convert('RGB').getdata())
-    gray_pixels = sum(1 for pixel in img_data if sum(pixel[:3]) / 3 < 128) / len(img_data)
-    color_variance = statistics.variance([sum(pixel[:3]) / 3 for pixel in img_data]) if len(img_data) > 1 else 0
-    
-    # Adjusted logic to detect completed construction, overriding small size
-    if (color_variance > 2000 and gray_pixels < 0.4 and any(keyword in os.path.basename(image_path).lower() for keyword in ["window", "door", "roof"])) or \
-       (total_pixels > 800000 and gray_pixels < 0.4 and color_variance > 2000):
-        detected_elements.extend(["roof", "windows", "doors", "cladding", "finished"])
-    elif total_pixels < 200000 and color_variance < 800:
-        detected_elements.append("planning")
-    elif gray_pixels > 0.6 and total_pixels > 400000:
-        detected_elements.append("foundation")
-    elif gray_pixels > 0.35 and total_pixels > 800000 and color_variance > 1500:
-        detected_elements.append("walls")
-    elif gray_pixels < 0.25 or any(keyword in os.path.basename(image_path).lower() for keyword in ["interior", "plumbing", "electrical", "ceiling"]):
-        detected_elements.extend(["interior", "electrical_wiring", "plumbing_pipes"])
-    else:
-        detected_elements.append("walls")
-
-    return detected_elements
-
-# Image processing and Salesforce upload with live preview
+# Image processing and Salesforce upload
 def process_image(images, project_name):
     try:
         if not images or len(images) == 0:
-            return "Error: Please upload at least one image to proceed.", None, "Pending", "", "", 0
+            return "Error: Please upload at least one image to proceed.", "Pending", "", 0
 
-        results_html = []
-        upload_statuses = []
+        # Process each image
         milestones = []
-        progresses = []
-
         for image in images:
-            img = None
-            try:
-                img = Image.open(image)
-            except Exception as e:
-                if "cannot identify image file" in str(e):
-                    return f"Error: Unsupported image format '{os.path.basename(image)}'. Please use JPG, JPEG, PNG, or convert to a supported format.", None, "Failure", "", "", 0
-                return f"Error: Failed to open image '{os.path.basename(image)}' - {str(e)}", None, "Failure", "", "", 0
-
+            img = Image.open(image)
             image_size_mb = os.path.getsize(image) / (1024 * 1024)
             if image_size_mb > 20:
-                return "Error: One or more images exceed 20MB.", None, "Failure", "", "", 0
-            if not str(image).lower().endswith(('.jpg', '.jpeg', '.png', '.avif')):
-                return "Error: Only JPG, JPEG, PNG, or AVIF images are supported.", None, "Failure", "", "", 0
+                return "Error: One or more images exceed 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)
             unique_id = datetime.now().strftime("%Y%m%d%H%M%S")
@@ -99,197 +61,177 @@ def process_image(images, project_name):
             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')
 
-            file_url = ""
+            # Create the ContentVersion record in Salesforce
+            content_version = {
+                'Title': image_filename,
+                'PathOnClient': saved_image_path,
+                'VersionData': image_data
+            }
+
+            # Upload the file to Salesforce
             try:
-                content_version = {
-                    'Title': image_filename,
-                    'PathOnClient': saved_image_path,
-                    'VersionData': image_data
-                }
                 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:
-                if "STORAGE_LIMIT_EXCEEDED" in str(e):
-                    file_url = "Upload skipped due to storage limit"
+                return f"Error: Failed to upload image to Salesforce - {str(e)}", "Failure", "", 0
+
+            # Mock AI model to detect milestone based on image content
+            img_bytes = img.tobytes()
+            img_hash = int(hashlib.sha256(img_bytes).hexdigest(), 16)
+            milestone_index = img_hash % len(VALID_MILESTONES)
+            milestone = VALID_MILESTONES[milestone_index]
+
+            # Adjust milestone detection based on internal/external features
+            if milestone == "Walls Erected" and any("interior" in img_text.lower() for img_text in [os.path.basename(image)] if img_text):
+                # Check for visible internal works like electrical/plumbing
+                if any(keyword in str(os.path.basename(image)).lower() for keyword in ["electrical", "plumbing", "wiring", "pipes"]):
+                    milestone = "Completed"  # Upgrade to Completed if internal works are detected
                 else:
-                    return f"Error: Failed to upload image to Salesforce - {str(e)}", None, "Failure", "", "", 0
+                    milestone = "Walls Erected"  # Retain if no internal works visible
 
-            detected_elements = analyze_image_with_hf(image)
+            milestones.append(milestone)
 
-            completed_tasks = []
-            not_completed_tasks = []
-            all_tasks = {
-                "Planning": [
+        # Determine overall milestone (most advanced detected)
+        final_milestone = max(set(milestones), key=milestones.count) if milestones else "Planning"
+        milestone_completion_map = {
+            "Planning": 10,
+            "Foundation": 30,
+            "Walls Erected": 50,
+            "Completed": 100,
+        }
+        percent_complete = milestone_completion_map.get(final_milestone, 0)
+
+        # Detailed Completion Breakdown based on final milestone
+        completion_details = {
+            "Planning": {
+                "completed": [
                     "Initial project outline and objectives have been established.",
                     "Preliminary designs and architectural plans are drafted.",
                     "Stakeholder meetings and initial approvals are completed."
                 ],
-                "Foundation": [
+                "not_completed": [
+                    "Detailed construction plans and blueprints are pending finalization.",
+                    "Permits and regulatory approvals are yet to be obtained.",
+                    "Contractor selection and procurement processes are not yet complete."
+                ]
+            },
+            "Foundation": {
+                "completed": [
                     "Site preparation, including clearing and leveling, is finished.",
                     "Excavation for the foundation has been completed.",
                     "Concrete pouring for the foundation, including footings and slabs, is done.",
                     "Initial structural inspections for the foundation have been passed."
                 ],
-                "Walls Erected": [
+                "not_completed": [
+                    "Plumbing and electrical groundwork installations are pending.",
+                    "Backfilling and site grading around the foundation are not yet done.",
+                    "Above-ground structural work, such as columns and walls, has not started."
+                ]
+            },
+            "Walls Erected": {
+                "completed": [
                     "The concrete framework, including columns and beams, is in place.",
                     "All structural walls have been erected and stabilized.",
                     "Temporary scaffolding and safety measures are installed for ongoing work.",
                     "Initial inspections for structural integrity have been completed."
                 ],
-                "Interior Furnishing": [
-                    "Plumbing and electrical groundwork installations are completed.",
-                    "Interior walls are fully implemented.",
-                    "Flooring installation is completed.",
-                    "Painting and fixtures are installed."
-                ],
-                "Completed": [
-                    "Roofing installation and weatherproofing are completed.",
-                    "Windows, doors, and exterior cladding are installed.",
+                "not_completed": [
+                    "Roofing installation and weatherproofing are pending.",
+                    "Windows, doors, and exterior cladding are not yet installed.",
+                    "Interior walls, electrical, and plumbing systems are still to be implemented."
+                ]
+            },
+            "Completed": {
+                "completed": [
+                    "The concrete framework, including columns, beams, and floor slabs, is fully constructed.",
+                    "Exterior walls, windows, and cladding are installed, completing the building's facade.",
                     "Interior work, including electrical, plumbing, and HVAC systems, is fully implemented.",
                     "Finishing touches, such as flooring, painting, and fixtures, are completed.",
                     "All phases of the project are finished, including final inspections and approvals."
+                ],
+                "not_completed": [
+                    "There should be no more pending work as the project is fully completed."
                 ]
             }
+        }
 
-            if any(elem == "planning" for elem in detected_elements):
-                completed_tasks.extend(all_tasks["Planning"])
-                final_milestone = "Planning"
-                percent_complete = 10
-            elif any(elem == "foundation" for elem in detected_elements):
-                completed_tasks.extend(all_tasks["Foundation"])
-                final_milestone = "Foundation"
-                percent_complete = 30
-            elif any(elem == "walls" for elem in detected_elements):
-                completed_tasks.extend(all_tasks["Walls Erected"])
-                final_milestone = "Walls Erected"
-                percent_complete = 50
-            elif any(elem in ["interior", "electrical_wiring", "plumbing_pipes"] for elem in detected_elements):
-                completed_tasks.extend(all_tasks["Interior Furnishing"])
-                final_milestone = "Interior Furnishing"
-                percent_complete = 80
-            elif all(elem in ["roof", "windows", "doors", "cladding", "finished"] for elem in detected_elements if elem in ["roof", "windows", "doors", "cladding", "finished"]):
-                completed_tasks.extend(all_tasks["Completed"])
-                final_milestone = "Completed"
-                percent_complete = 100
-            else:
-                completed_tasks.extend(all_tasks["Walls Erected"])
-                final_milestone = "Walls Erected"
-                percent_complete = 50
-
-            all_possible_tasks = [task for sublist in all_tasks.values() for task in sublist]
-            not_completed_tasks = [task for task in all_possible_tasks if task not in completed_tasks]
+        completed_tasks = completion_details[final_milestone]["completed"]
+        not_completed_tasks = completion_details[final_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])
+        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])
 
-            if final_milestone == "Completed":
-                result_html = f"""
-                <div style="font-family: Arial, sans-serif; padding: 20px; background-color: #f9f9f9; border-radius: 10px; margin-bottom: 20px;">
-                    <h2 style="color: #2c3e50; text-align: center;">Project Summary - {os.path.basename(image)}</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;">{final_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>
-                        </div>
-                    </div>
-                    <h3 style="color: #2c3e50;">Milestone Timeline</h3>
-                    <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">
-                        <span style="color: #bdc3c7;">Planning</span>
-                        <span style="color: #bdc3c7;">Foundation</span>
-                        <span style="color: #bdc3c7;">Walls Erected</span>
-                        <span style="color: #bdc3c7;">Interior Furnishing</span>
-                        <span style="color: #2ecc71;">Completed</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>
-                    <p style="color: green;">Project is fully completed as of 02:35 PM IST, June 20, 2025.</p>
+        # Create HTML for the output with collapsible sections and progress bar
+        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;">{final_milestone}</p>
                 </div>
-                """
-            else:
-                result_html = f"""
-                <div style="font-family: Arial, sans-serif; padding: 20px; background-color: #f9f9f9; border-radius: 10px; margin-bottom: 20px;">
-                    <h2 style="color: #2c3e50; text-align: center;">Project Summary - {os.path.basename(image)}</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;">{final_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>
-                        </div>
-                    </div>
-                    <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 final_milestone == 'Planning' else '#bdc3c7'};">Planning</span>
-                        <span style="color: {'#2ecc71' if final_milestone == 'Foundation' else '#bdc3c7'};">Foundation</span>
-                        <span style="color: {'#2ecc71' if final_milestone == 'Walls Erected' else '#bdc3c7'};">Walls Erected</span>
-                        <span style="color: {'#2ecc71' if final_milestone == 'Interior Furnishing' else '#bdc3c7'};">Interior Furnishing</span>
-                        <span style="color: {'#2ecc71' if final_milestone == 'Completed' else '#bdc3c7'};">Completed</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>
-                    <p style="color: orange;">Construction is in progress at {final_milestone} stage as of 02:35 PM IST, June 20, 2025.</p>
+                <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>
                 </div>
-                """
+            </div>
 
-            results_html.append(result_html)
-            upload_statuses.append("Success" if file_url != "Upload skipped due to storage limit" else "Pending")
-            milestones.append(final_milestone)
-            progresses.append(f"{percent_complete}%")
+            <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 final_milestone == 'Planning' else '#bdc3c7'};">Planning</span>
+                <span style="color: {'#2ecc71' if final_milestone == 'Foundation' else '#bdc3c7'};">Foundation</span>
+                <span style="color: {'#2ecc71' if final_milestone == 'Walls Erected' else '#bdc3c7'};">Walls Erected</span>
+                <span style="color: {'#2ecc71' if final_milestone == 'Completed' else '#bdc3c7'};">Completed</span>
+            </div>
 
-        combined_html = "<div>" + "".join(results_html) + "</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>
 
-        # Set current time to 02:35 PM IST, June 20, 2025
-        now = local_timezone.localize(datetime(2025, 6, 20, 14, 35))
+            <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>
+        """
+
+        # Adjust the current time to local timezone with proper ISO 8601 format
+        now = datetime.now(local_timezone)
         local_time = now.strftime("%Y-%m-%dT%H:%M:%S") + now.strftime("%z")[:-2] + ":" + now.strftime("%z")[-2:]
 
+        # Create the Salesforce record (removing confidence score)
         record = {
             "Name__c": project_name,
-            "Current_Milestone__c": milestones[0] if milestones else "Pending",
-            "Completion_Percentage__c": int(progresses[0].rstrip('%')) if progresses else 0,
+            "Current_Milestone__c": final_milestone,
+            "Completion_Percentage__c": percent_complete,
             "Last_Updated_On__c": local_time,
-            "Upload_Status__c": upload_statuses[0] if upload_statuses else "Pending",
-            "Comments__c": milestones[0] if milestones else "Pending",
-            "Last_Updated_Image__c": file_url if file_url else ""
+            "Upload_Status__c": "Success",
+            "Comments__c": f"{final_milestone}",
+            "Last_Updated_Image__c": file_url
         }
 
         try:
-            if file_url and file_url != "Upload skipped due to storage limit":
-                sf.Construction__c.create(record)
+            sf.Construction__c.create(record)
         except Exception as e:
-            return f"Error: Failed to update Salesforce - {str(e)}", None, "Failure", "", "", 0
+            return f"Error: Failed to update Salesforce - {str(e)}", "Failure", "", 0
 
-        return combined_html, Image.open(images[0]) if images else None, ",".join(upload_statuses), ",".join(milestones), "", ",".join(progresses)
+        return result_html, "Success", final_milestone, f"{percent_complete}%"
 
     except Exception as e:
-        return f"Error: {str(e)}", None, "Failure", "", "", "0%"
+        return f"Error: {str(e)}", "Failure", "", "0%"
 
-# Gradio UI with enhanced styling and live image preview
+# Gradio UI with enhanced styling
 with gr.Blocks(css="""
     .gradio-container {
         background-color: #f0f4f8;
@@ -344,26 +286,18 @@ with gr.Blocks(css="""
     gr.Markdown("<h1 class='title'>Construction Progress Analyzer</h1>")
     with gr.Row():
         image_input = gr.Files(type="filepath", label="Upload Construction Site Photos (JPG/PNG, ≤ 20MB)")
-        image_preview = gr.Image(label="Image Preview", interactive=False)
         project_name_input = gr.Textbox(label="Project Name (Required)", placeholder="e.g. Project_12345")
 
     submit_button = gr.Button("Process Image")
-    output_html = gr.HTML(label="Result")
+    output_html = gr.HTML(label="Result")  # Changed to HTML for richer output
     upload_status = gr.Textbox(label="Upload Status")
     milestone = gr.Textbox(label="Detected Milestone")
-    confidence = gr.Textbox(label="Confidence Score")  # Kept for compatibility, but unused
     progress = gr.Textbox(label="Completion Percentage", interactive=False)
 
-    # Update preview on file upload
-    image_input.change(
-        fn=lambda x: Image.open(x[0]) if x else None,
-        inputs=[image_input],
-        outputs=[image_preview]
-    )
     submit_button.click(
         fn=process_image,
         inputs=[image_input, project_name_input],
-        outputs=[output_html, image_preview, upload_status, milestone, confidence, progress]
+        outputs=[output_html, upload_status, milestone, progress]
     )
 
 demo.launch(share=True)