Update app.py

app.py

@@ -8,12 +8,6 @@ from datetime import datetime
 import shutil
 import base64
 import pytz
-import logging
-import tempfile
-
-# Set up logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
 
 # Load environment variables
 load_dotenv()
@@ -22,8 +16,7 @@ SF_PASSWORD = os.getenv("SF_PASSWORD")
 SF_SECURITY_TOKEN = os.getenv("SF_SECURITY_TOKEN")
 
 if not all([SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN]):
-    logger.error("Missing Salesforce credentials.")
-    raise ValueError("Missing Salesforce credentials in .env file.")
+    raise ValueError("Missing Salesforce credentials.")
 
 # Connect to Salesforce
 try:
@@ -33,165 +26,132 @@ try:
         security_token=SF_SECURITY_TOKEN,
         domain='login'
     )
-    logger.info("Successfully connected to Salesforce.")
 except Exception as e:
-    logger.error(f"Salesforce connection failed: {str(e)}")
+    print(f"Salesforce connection failed: {str(e)}")
     raise
 
 VALID_MILESTONES = ["Planning", "Foundation", "Walls Erected", "Completed"]
-MILESTONE_COMPLETION_MAP = {
-    "Planning": 25,
-    "Foundation": 50,
-    "Walls Erected": 75,
-    "Completed": 100
-}
-LOCAL_TIMEZONE = pytz.timezone("Asia/Kolkata")
-ALLOWED_EXTENSIONS = {'.jpg', '.jpeg', '.png'}
-MAX_FILE_SIZE_MB = 20
+local_timezone = pytz.timezone("Asia/Kolkata")
 
 # Milestone detection based on image brightness
 def detect_milestone_from_image(image_path):
-    try:
-        img = Image.open(image_path).convert("L")
-        img_array = np.array(img)
-        brightness = np.mean(img_array)
-        logger.debug(f"Image {image_path} brightness: {brightness}")
-
-        if brightness < 80:
-            return "Planning"
-        elif 80 <= brightness < 130:
-            return "Foundation"
-        elif 130 <= brightness < 180:
-            return "Walls Erected"
-        else:
-            return "Completed"
-    except Exception as e:
-        logger.error(f"Failed to detect milestone for {image_path}: {str(e)}")
-        return "Planning"  # Default milestone on error
+    img = Image.open(image_path).convert("L")
+    img_array = np.array(img)
+    brightness = np.mean(img_array)
+
+    if brightness < 80:
+        return "Planning"
+    elif 80 <= brightness < 130:
+        return "Foundation"
+    elif 130 <= brightness < 180:
+        return "Walls Erected"
+    else:
+        return "Completed"
 
 def process_image(images, project_name):
     try:
-        if not project_name or not project_name.strip():
-            return "Error: Project name is required.", "Failure", "", "", "0%"
-
+        # Validates that at least one image is provided
         if not images or len(images) == 0:
-            return "Error: Please upload at least one image.", "Failure", "", "", "0%"
+            return "Error: Please upload at least one image to proceed.", "Pending", "", "", 0
 
+        # List to store milestones for all images
         milestones = []
-        file_urls = []
-        with tempfile.TemporaryDirectory() as temp_dir:
-            for image in images:
-                # Validate file extension
-                ext = os.path.splitext(image.name)[1].lower()
-                if ext not in ALLOWED_EXTENSIONS:
-                    return f"Error: {os.path.basename(image.name)} is not a supported format (JPG/PNG only).", "Failure", "", "", "0%"
-
-                # Validate file size
-                image_size_mb = os.path.getsize(image.name) / (1024 * 1024)
-                if image_size_mb > MAX_FILE_SIZE_MB:
-                    return f"Error: {os.path.basename(image.name)} exceeds {MAX_FILE_SIZE_MB}MB.", "Failure", "", "", "0%"
-
-                # Save image to temporary directory
-                unique_id = datetime.now().strftime("%Y%m%d%H%M%S")
-                image_filename = f"{unique_id}_{os.path.basename(image.name)}"
-                temp_image_path = os.path.join(temp_dir, image_filename)
-                shutil.copy(image.name, temp_image_path)
-
-                # Upload to Salesforce
-                with open(temp_image_path, 'rb') as image_file:
-                    image_data = base64.b64encode(image_file.read()).decode('utf-8')
-
+        for image in images:
+            img = Image.open(image)
+
+            # Check file size and format
+            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 locally with unique filename
+            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)
+
+            # Upload image to Salesforce
+            with open(saved_image_path, 'rb') as image_file:
+                image_data = base64.b64encode(image_file.read()).decode('utf-8')
+
+            try:
                 content_version = {
                     'Title': image_filename,
-                    'PathOnClient': 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}"
-                    file_urls.append(file_url)
-                    logger.info(f"Uploaded {image_filename} to Salesforce: {file_url}")
-                except Exception as e:
-                    logger.error(f"Failed to upload {image_filename} to Salesforce: {str(e)}")
-                    return f"Error: Failed to upload {image_filename} to Salesforce.", "Failure", "", "", "0%"
-
-                # Detect milestone
-                milestone = detect_milestone_from_image(temp_image_path)
-                milestones.append(milestone)
-
-        # Determine final milestone
+                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
+
+            # Detect milestone for each image and store
+            milestone = detect_milestone_from_image(saved_image_path)
+            milestones.append(milestone)
+
+        # Aggregate milestones by selecting the most frequent one
         final_milestone = max(set(milestones), key=milestones.count) if milestones else "Planning"
-        percent_complete = MILESTONE_COMPLETION_MAP.get(final_milestone, 0)
+        milestone_completion_map = {
+            "Planning": 10,
+            "Foundation": 30,
+            "Walls Erected": 50,
+            "Completed": 100,
+        }
+        percent_complete = milestone_completion_map.get(final_milestone, 0)
 
-        # Get current time in local timezone
-        now = datetime.now(LOCAL_TIMEZONE)
-        local_time = now.strftime("%Y-%m-%dT%H:%M:%S%z")[:-2] + ":" + now.strftime("%z")[-2:]
+        # Get current time in Asia/Kolkata timezone
+        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
+        # Create Salesforce record with aggregated milestone and last image URL
         record = {
-            "Name__c": project_name.strip(),
+            "Name__c": project_name,
             "Current_Milestone__c": final_milestone,
             "Completion_Percentage__c": percent_complete,
             "Last_Updated_On__c": local_time,
             "Upload_Status__c": "Success",
-            "Comments__c": f"Detected milestone: {final_milestone}",
-            "Last_Updated_Image__c": file_urls[-1] if file_urls else ""
+            "Comments__c": f"{final_milestone}",
+            "Last_Updated_Image__c": file_url  # Note: Uses the last image's URL
         }
 
         try:
             sf.Construction__c.create(record)
-            logger.info(f"Created Salesforce record for project {project_name}: {final_milestone}")
         except Exception as e:
-            logger.error(f"Failed to create Salesforce record: {str(e)}")
-            return f"Error: Failed to update Salesforce record.", "Failure", "", "", "0%"
+            return f"Error: Failed to update Salesforce - {str(e)}", "Failure", "", "", 0
 
+        # Return formatted output for Gradio UI
         return (
             f"<h3 style='color:green;'>Milestone: {final_milestone}</h3>",
             "Success",
             final_milestone,
-            f"{percent_complete}%",
-            file_urls[-1] if file_urls else ""
+            f"{percent_complete}%"
         )
 
     except Exception as e:
-        logger.error(f"Unexpected error in process_image: {str(e)}")
-        return f"Error: An unexpected error occurred - {str(e)}", "Failure", "", "", "0%"
+        return f"Error: {str(e)}", "Failure", "", "", "0%"
 
 # Gradio UI
-with gr.Blocks(theme=gr.themes.Soft(), css=".title {text-align: center; font-size: 2em; margin-bottom: 20px;}") as demo:
+with gr.Blocks(css="") as demo:
     gr.Markdown("<h1 class='title'>Construction Progress Analyzer</h1>")
     with gr.Row():
-        with gr.Column(scale=2):
-            image_input = gr.Files(
-                file_types=[".jpg", ".jpeg", ".png"],
-                label=f"Upload Construction Site Photos (JPG/PNG, ≤ {MAX_FILE_SIZE_MB}MB)",
-                file_count="multiple"
-            )
-        with gr.Column(scale=1):
-            project_name_input = gr.Textbox(
-                label="Project Name (Required)",
-                placeholder="e.g., Highrise_001",
-                lines=1
-            )
-
-    submit_button = gr.Button("Process Images", variant="primary")
+        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 Image")
     output_html = gr.HTML(label="Result")
-    with gr.Row():
-        upload_status = gr.Textbox(label="Upload Status", interactive=False)
-        milestone = gr.Textbox(label="Detected Milestone", interactive=False)
-        progress = gr.Textbox(label="Completion Percentage", interactive=False)
-    file_url = gr.Textbox(label="Last Image URL", interactive=False, visible=False)
+    upload_status = gr.Textbox(label="Upload Status")
+    milestone = gr.Textbox(label="Detected Milestone")
+    progress = gr.Textbox(label="Completion Percentage", interactive=False)
 
     submit_button.click(
         fn=process_image,
         inputs=[image_input, project_name_input],
-        outputs=[output_html, upload_status, milestone, progress, file_url]
+        outputs=[output_html, upload_status, milestone, progress]
     )
 
-# Launch Gradio app
-try:
-    demo.launch(share=False, server_name="0.0.0.0", server_port=7860)
-except Exception as e:
-    logger.error(f"Failed to launch Gradio app: {str(e)}")
-    raise
+demo.launch(share=True)