Update app.py

app.py

@@ -7,7 +7,7 @@ from datetime import datetime
 import shutil
 import base64
 import pytz
-import hashlib  # Added missing import
+import hashlib
 
 # Load environment variables
 load_dotenv()
@@ -43,20 +43,22 @@ def analyze_image_with_hf(image_path):
     img = Image.open(image_path)
     detected_elements = []
     
-    # Mock detection based on image content (simplified)
+    # Enhanced mock detection based on filename keywords and simple content inference
+    filename = os.path.basename(image_path).lower()
     img_data = img.tobytes()
-    img_hash = int(hashlib.sha256(img_data).hexdigest(), 16)  # Now works with hashlib imported
-    if any(keyword in os.path.basename(image_path).lower() for keyword in ["interior", "inside"]):
-        if any(keyword in os.path.basename(image_path).lower() for keyword in ["electrical", "wiring", "plumbing", "pipes"]):
-            detected_elements.extend(["electrical_wiring", "plumbing_pipes"])
-        if any(keyword in os.path.basename(image_path).lower() for keyword in ["flooring", "painting", "fixtures"]):
-            detected_elements.extend(["flooring", "painting", "fixtures"])
-    elif "foundation" in os.path.basename(image_path).lower():
+    img_hash = int(hashlib.sha256(img_data).hexdigest(), 16)
+    
+    # Heuristic detection based on filename or content
+    if any(keyword in filename for keyword in ["plan", "design", "blueprint"]):
+        detected_elements.append("planning")
+    elif any(keyword in filename for keyword in ["foundation", "excavation", "slab"]):
         detected_elements.append("foundation")
-    elif any(keyword in os.path.basename(image_path).lower() for keyword in ["wall", "column", "beam"]):
-        detected_elements.extend(["columns", "beams", "walls"])
-    elif any(keyword in os.path.basename(image_path).lower() for keyword in ["roof", "window", "door", "cladding"]):
-        detected_elements.extend(["roof", "windows", "doors", "cladding"])
+    elif any(keyword in filename for keyword in ["wall", "column", "beam", "structure"]):
+        detected_elements.append("walls")
+    elif any(keyword in filename for keyword in ["interior", "electrical", "plumbing", "flooring"]):
+        detected_elements.extend(["interior", "electrical_wiring", "plumbing_pipes", "flooring"])
+    elif any(keyword in filename for keyword in ["roof", "window", "door", "cladding", "finished"]):
+        detected_elements.extend(["roof", "windows", "doors", "cladding", "finished"])
 
     return detected_elements
 
@@ -155,35 +157,35 @@ def process_image(images, project_name):
             ]
         }
 
-        # Map detected elements to tasks
-        if any(elem in ["columns", "beams", "walls"] for elem in detected_elements_all):
-            completed_tasks.extend(all_tasks["Walls Erected"])
-        if any(elem in ["foundation"] for elem in detected_elements_all):
+        # Map detected elements to tasks and determine milestone
+        if any(elem == "planning" for elem in detected_elements_all):
+            completed_tasks.extend(all_tasks["Planning"])
+            final_milestone = "Planning"
+            percent_complete = 10
+        elif any(elem == "foundation" for elem in detected_elements_all):
             completed_tasks.extend(all_tasks["Foundation"])
-        if all(elem in ["roof", "windows", "doors", "cladding"] for elem in ["roof", "windows", "doors", "cladding"] if elem in detected_elements_all):
-            completed_tasks.extend(all_tasks["Completed"])
-        if all(elem in ["electrical_wiring", "plumbing_pipes", "flooring", "painting", "fixtures"] for elem in ["electrical_wiring", "plumbing_pipes", "flooring", "painting", "fixtures"] if elem in detected_elements_all):
-            completed_tasks.extend(all_tasks["Interior Furnishing"])
-
-        # Add remaining tasks as not completed
-        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]
-
-        # Determine milestone based on detected progress
-        final_milestone = "Planning"
-        percent_complete = 10
-        if any(elem in ["foundation"] for elem in detected_elements_all):
             final_milestone = "Foundation"
             percent_complete = 30
-        if any(elem in ["columns", "beams", "walls"] for elem in detected_elements_all):
+        elif any(elem == "walls" for elem in detected_elements_all):
+            completed_tasks.extend(all_tasks["Walls Erected"])
             final_milestone = "Walls Erected"
             percent_complete = 50
-        if all(elem in ["electrical_wiring", "plumbing_pipes"] for elem in ["electrical_wiring", "plumbing_pipes"] if elem in detected_elements_all):
+        elif all(elem in ["interior", "electrical_wiring", "plumbing_pipes", "flooring"] for elem in detected_elements_all if elem in ["interior", "electrical_wiring", "plumbing_pipes", "flooring"]):
+            completed_tasks.extend(all_tasks["Interior Furnishing"])
             final_milestone = "Interior Furnishing"
             percent_complete = 80
-        if all(elem in ["roof", "windows", "doors", "cladding", "electrical_wiring", "plumbing_pipes", "flooring", "painting", "fixtures"] for elem in ["roof", "windows", "doors", "cladding", "electrical_wiring", "plumbing_pipes", "flooring", "painting", "fixtures"] if elem in detected_elements_all):
+        elif all(elem in ["roof", "windows", "doors", "cladding", "finished"] for elem in detected_elements_all 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["Planning"])  # Default to Planning if no specific stage detected
+            final_milestone = "Planning"
+            percent_complete = 10
+
+        # Add remaining tasks as not completed
+        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_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])