Update app.py

app.py

@@ -38,7 +38,7 @@ def encode_image(image):
 def analyze_construction_image(image):
     if image is None:
         logger.warning("No image provided")
-        return [(None, "Error: No image uploaded")]
+        return [(None, "Error: No image uploaded")], "Error: No image uploaded"
 
     try:
         logger.info("Starting image analysis")
@@ -80,30 +80,39 @@ def analyze_construction_image(image):
 
         if not result:
             logger.warning("Received empty response from API")
-            return [(None, "Error: Received empty response from API")]
+            return [(None, "Error: Received empty response from API")], "Error: Received empty response from API"
 
         # Parse the result
         analysis_text = "Safety and Hazard Analysis of the Construction Site Image:\n\n"
+        categories = result.split("Category")[1:]  # Split by categories
         
-        sections = ["Hazard Identification", "Categorization", "Detailed Description", "Resolution Steps"]
-        for section in sections:
-            start = result.find(section)
-            if start != -1:
-                end = result.find(next((s for s in sections if s != section and result.find(s) > start), None))
-                content = result[start:end if end != -1 else None].strip()
-                analysis_text += f"{content}\n\n"
-
-        if analysis_text == "Safety and Hazard Analysis of the Construction Site Image:\n\n":
-            logger.warning("No sections found in the response")
-            return [(None, "Error: Unable to parse the response. No sections found.")]
+        if not categories:
+            logger.warning("No categories found in the response")
+            return [(None, "Error: Unable to parse the response. No categories found.")], "Error: Unable to parse the response"
+
+        for category in categories:
+            lines = category.split("\n")
+            category_name = lines[0].split(":")[1].strip() if ":" in lines[0] else lines[0].strip()
+            analysis_text += f"Category: {category_name}\n"
+
+            description = next((line.split("Description:")[1].strip() for line in lines if "Description:" in line), "N/A")
+            hazard = next((line.split("Hazard:")[1].strip() for line in lines if "Hazard:" in line), "N/A")
+            resolution_steps = [line.strip() for line in lines if line.strip().startswith("*")]
+
+            analysis_text += f"Description: {description}\n"
+            analysis_text += f"Hazard: {hazard}\n"
+            analysis_text += "Resolution Steps:\n"
+            for step in resolution_steps:
+                analysis_text += f"{step}\n"
+            analysis_text += "\n"
 
         logger.info("Analysis completed successfully")
-        return [(None, analysis_text)]
+        return [(None, analysis_text)], ""
     except Exception as e:
         logger.error(f"Error during image analysis: {str(e)}")
         logger.error(traceback.format_exc())
         error_message = f"Error during analysis: {str(e)}. Please try again or contact support if the issue persists."
-        return [(None, error_message)]
+        return [(None, error_message)], error_message
         
 def chat_about_image(message, chat_history):
     try: