Update app.py

app.py

@@ -31,8 +31,8 @@ except Exception as e:
     print(f"Salesforce connection failed: {str(e)}")
     raise
 
-# Valid milestones with the updated percentage map
-VALID_MILESTONES = ["Planning", "Foundation", "Walls Erected", "Interior Furnishing", "Completed"]
+# Valid milestones
+VALID_MILESTONES = ["Planning", "Foundation", "Walls Erected", "Completed"]
 
 # Adjust the timezone to your local timezone
 local_timezone = pytz.timezone("Asia/Kolkata")
@@ -45,22 +45,31 @@ def process_image(images, project_name):
 
         milestones = []
         for image in images:
-            img = Image.open(image)  # Open the image directly from binary data
+            img = Image.open(image)
             
             # Check if the image exceeds the size limit (20MB)
-            image_size_mb = len(image) / (1024 * 1024)
+            image_size_mb = os.path.getsize(image) / (1024 * 1024)
             if image_size_mb > 20:
                 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")
+            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
-            image_data = base64.b64encode(image).decode('utf-8')
+            with open(saved_image_path, 'rb') as image_file:
+                image_data = base64.b64encode(image_file.read()).decode('utf-8')
 
             # Create the ContentVersion record in Salesforce
             content_version = {
-                'Title': project_name,  # Assuming project name or a unique image title
-                'PathOnClient': project_name,  # Same here for simplicity
+                'Title': image_filename,
+                'PathOnClient': saved_image_path,
                 'VersionData': image_data
             }
 
@@ -72,8 +81,15 @@ def process_image(images, project_name):
             except Exception as e:
                 return f"Error: Failed to upload image to Salesforce - {str(e)}", "Failure", "", "", 0
 
-            # Enhanced Milestone Detection
-            milestone = detect_milestone(project_name)
+            # Now check for completion criteria
+            if "completed" in os.path.basename(image).lower() or "finished" in os.path.basename(image).lower():
+                milestone = "Completed"  # Directly detect completion if such features exist
+            else:
+                # Default milestone detection logic (mock AI model or image-based hash)
+                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]
 
             milestones.append(milestone)
 
@@ -83,11 +99,63 @@ def process_image(images, project_name):
             "Planning": 10,
             "Foundation": 30,
             "Walls Erected": 50,
-            "Interior Furnishing": 80,
             "Completed": 100,
         }
         percent_complete = milestone_completion_map.get(final_milestone, 0)
 
+        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."
+                ],
+                "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."
+                ],
+                "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."
+                ],
+                "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."
+                ]
+            }
+        }
+
         completed_tasks = completion_details[final_milestone]["completed"]
         not_completed_tasks = completion_details[final_milestone]["not_completed"]
 
@@ -114,7 +182,6 @@ def process_image(images, project_name):
                 <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>
 
@@ -157,24 +224,6 @@ def process_image(images, project_name):
     except Exception as e:
         return f"Error: {str(e)}", "Failure", "", "", "0%"
 
-# Enhanced Milestone Detection based on image content or filename
-def detect_milestone(image_path):
-    # Check the image filename for certain keywords that might indicate a milestone
-    image_name = os.path.basename(image_path).lower()
-    if "planning" in image_name:
-        return "Planning"
-    elif "foundation" in image_name:
-        return "Foundation"
-    elif "walls" in image_name or "erected" in image_name:
-        return "Walls Erected"
-    elif "interior" in image_name or "furnishing" in image_name:
-        return "Interior Furnishing"
-    elif "completed" in image_name:
-        return "Completed"
-    
-    # Default to Planning if no specific milestone found
-    return "Planning"
-
 # Gradio UI
 with gr.Blocks(css="""
     .gradio-container {
@@ -229,10 +278,10 @@ with gr.Blocks(css="""
 """) as demo:
     gr.Markdown("<h1 class='title'>Construction Progress Analyzer</h1>")
     with gr.Row():
-        image_input = gr.Files(type="binary", label="Upload Construction Site Photos (JPG/PNG, ≤ 20MB)")  # Use 'binary' to handle image data
+        image_input = gr.Files(type="filepath", label="Upload Construction Site Photos (JPG/PNG, ≤ 20MB)")
         project_name_input = gr.Textbox(label="Project Name (Required)", placeholder="e.g. Project_12345")
 
-    submit_button = gr.Button("Process Images")
+    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")