Update app.py

app.py

@@ -38,11 +38,12 @@ 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")
         image_data_url = f"data:image/png;base64,{encode_image(image)}"
+        logger.debug("Image encoded successfully")
 
         messages = [
             {
@@ -50,7 +51,7 @@ def analyze_construction_image(image):
                 "content": [
                     {
                         "type": "text",
-                        "text": "Analyze this construction site image. Identify any safety issues or hazards, categorize them, provide a detailed description, and suggest steps to resolve them. Format your response as a structured analysis with clear categories, descriptions, and resolution steps."
+                        "text": "Analyze this construction site image. Identify any safety issues or hazards, categorize them, provide a detailed description, and suggest steps to resolve them."
                     },
                     {
                         "type": "image_url",
@@ -77,28 +78,42 @@ def analyze_construction_image(image):
         result = completion.choices[0].message.content
         logger.debug(f"Raw API response: {result}")
 
+        if not result:
+            logger.warning("Received empty response from API")
+            return [(None, "Error: Received empty response from API")], "Error: Received empty response from API"
+
         # Parse the result
-        analysis_text = "Image Analysis Results:\n\n"
-        categories = result.split("Category: ")[1:]  # Split by categories
+        analysis_text = "Safety and Hazard Analysis of the Construction Site Image:\n\n"
+        categories = result.split("Category")[1:]  # Split by categories
+        
+        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].strip()
+            category_name = lines[0].split(":")[1].strip() if ":" in lines[0] else lines[0].strip()
             analysis_text += f"Category: {category_name}\n"
-            
-            description_start = category.find("Description: ") + len("Description: ")
-            description_end = category.find("Resolution Steps:")
-            description = category[description_start:description_end].strip()
+
+            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"
-            
-            resolution_steps = "".join(lines[lines.index("Resolution Steps:") + 1:]).replace("* ", "").replace("\n", "")
-            analysis_text += f"Resolution Steps:\n{resolution_steps}\n\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)}")
-        return [(None, f"Error: {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)], error_message
+        
 def chat_about_image(message, chat_history):
     try:
         # Prepare the conversation history for the API