Update app.py

app.py

@@ -136,59 +136,38 @@ def is_likely_bird_image(img):
         # If any error occurs during the check, assume it might be a bird
         return True
 
-def get_bird_habitat_map(bird_name, check_tanzania=True):
-    """Get habitat map locations for the bird using Groq API with caching"""
+def get_bird_habitat_and_status(bird_name):
+    """Get both habitat locations and Tanzania status in a single API call"""
     clean_name = clean_bird_name(bird_name)
     
-    # Check cache for Tanzania check
-    tanzania_cache_key = f"{clean_name}_tanzania"
-    cached_tanzania = load_from_cache("tanzania_check", tanzania_cache_key)
-    if cached_tanzania is not None:
-        is_in_tanzania = cached_tanzania
-    else:
-        # First check if the bird is endemic to Tanzania
-        if check_tanzania:
-            tanzania_check_prompt = f"""
-            Is the {clean_name} bird native to or commonly found in Tanzania? 
-            Answer with ONLY "yes" or "no".
-            """
-            
-            try:
-                tanzania_check = client.chat.completions.create(
-                    messages=[{"role": "user", "content": tanzania_check_prompt}],
-                    model="llama-3.3-70b-versatile",
-                )
-                is_in_tanzania = "yes" in tanzania_check.choices[0].message.content.lower()
-                # Cache result
-                save_to_cache("tanzania_check", tanzania_cache_key, is_in_tanzania)
-            except:
-                # Default to showing Tanzania if we can't determine
-                is_in_tanzania = True
-        else:
-            is_in_tanzania = True
-    
-    # Check cache for habitat locations
-    habitat_cache_key = f"{clean_name}_habitat"
-    cached_habitat = load_from_cache("habitat", habitat_cache_key)
-    if cached_habitat is not None:
-        return cached_habitat, is_in_tanzania
+    # Check cache first - use a combined cache key
+    cache_key = f"{clean_name}_combined"
+    cached_result = load_from_cache("combined_habitat_status", cache_key)
+    if cached_result is not None:
+        return cached_result["locations"], cached_result["is_in_tanzania"]
     
-    # Now get the habitat locations
+    # Single API call to get both information
     prompt = f"""
-    Provide a JSON array of the main habitat locations for the {clean_name} bird in the world. 
-    Return ONLY a JSON array with 3-5 entries, each containing:
-    1. "name": Location name
-    2. "lat": Latitude (numeric value)
-    3. "lon": Longitude (numeric value)
-    4. "description": Brief description of why this is a key habitat (2-3 sentences)
-    
-    Example format:
-    [
-      {{"name": "Example Location", "lat": 12.34, "lon": 56.78, "description": "Brief description"}},
-      ...
-    ]
-    
-    {'' if is_in_tanzania else 'DO NOT include any locations in Tanzania as this bird is not native to or commonly found there.'}
+    Provide information about the {clean_name} bird in the following JSON format:
+    
+    {{
+        "is_native_to_tanzania": true/false,
+        "habitat_locations": [
+            {{
+                "name": "Location name",
+                "lat": latitude_number,
+                "lon": longitude_number,
+                "description": "Brief description of habitat"
+            }}
+        ]
+    }}
+    
+    Instructions:
+    1. Set "is_native_to_tanzania" to true if this bird is native to, endemic to, or commonly found in Tanzania. Set to false if it's not typically found there.
+    2. Provide 3-5 main habitat locations worldwide for this bird species.
+    3. If the bird IS native to Tanzania, include Tanzania or East African locations in the habitat list.
+    4. If the bird is NOT native to Tanzania, do not include any Tanzania locations.
+    5. Return ONLY the JSON response, no additional text.
     """
     
     try:
@@ -203,27 +182,42 @@ def get_bird_habitat_map(bird_name, check_tanzania=True):
         )
         response = chat_completion.choices[0].message.content
         
-        # Extract JSON from response (in case there's additional text)
+        # Extract and parse JSON from response
         import json
         import re
         
         # Find JSON pattern in response
-        json_match = re.search(r'\[.*\]', response, re.DOTALL)
+        json_match = re.search(r'\{.*\}', response, re.DOTALL)
         if json_match:
-            locations = json.loads(json_match.group())
+            result = json.loads(json_match.group())
+            locations = result.get("habitat_locations", [])
+            is_in_tanzania = result.get("is_native_to_tanzania", False)
         else:
-            # Fallback if JSON extraction fails
+            # Fallback if JSON parsing fails
             locations = [
                 {"name": "Primary habitat region", "lat": 0, "lon": 0, 
                  "description": "Could not retrieve specific habitat information for this bird."}
             ]
+            is_in_tanzania = False
         
-        # Cache the result
-        save_to_cache("habitat", habitat_cache_key, locations)
+        # Ensure we have valid data structure
+        if not locations:
+            locations = [
+                {"name": "Unknown habitat", "lat": 0, "lon": 0, 
+                 "description": "Habitat information not available."}
+            ]
+        
+        # Cache the combined result
+        combined_result = {
+            "locations": locations,
+            "is_in_tanzania": is_in_tanzania
+        }
+        save_to_cache("combined_habitat_status", cache_key, combined_result)
         
         return locations, is_in_tanzania
         
     except Exception as e:
+        print(f"Error in get_bird_habitat_and_status: {e}")
         return [{"name": "Error retrieving data", "lat": 0, "lon": 0, 
                 "description": "Please try again or check your connection."}], False
 
@@ -266,19 +260,20 @@ def create_habitat_map(habitat_locations):
     map_html = m._repr_html_()
     return map_html
 
-def format_bird_info(raw_info, language="en"):
+def format_bird_info(raw_info, is_in_tanzania, language="en"):
     """Improve the formatting of bird information"""
     # Add proper line breaks between sections and ensure consistent heading levels
     formatted = raw_info
     
-    # Get translation of warning text based on language
-    warning_text = "NOT TYPICALLY FOUND IN TANZANIA"
-    warning_translation = "HAPATIKANI SANA TANZANIA" if language == "sw" else warning_text
-    
-    # Fix heading levels (make all main sections h3)
-    formatted = re.sub(r'#+\s+' + warning_text, 
-                        f'<div class="alert alert-warning"><strong>⚠️ {warning_translation}</strong></div>', 
-                        formatted)
+    # Only add the warning if the bird is NOT in Tanzania
+    if not is_in_tanzania:
+        # Get translation of warning text based on language
+        warning_text = "NOT TYPICALLY FOUND IN TANZANIA"
+        warning_translation = "HAPATIKANI SANA TANZANIA" if language == "sw" else warning_text
+        
+        # Add warning at the beginning if not already present
+        if warning_translation not in formatted:
+            formatted = f'<div class="alert alert-warning"><strong>⚠️ {warning_translation}</strong></div>\n\n{formatted}'
     
     # Replace markdown headings with HTML headings for better control
     formatted = re.sub(r'#+\s+(.*)', r'<h3>\1</h3>', formatted)
@@ -293,12 +288,12 @@ def format_bird_info(raw_info, language="en"):
     
     return formatted
 
-def get_bird_info(bird_name, language="en"):
+def get_bird_info(bird_name, is_in_tanzania, language="en"):
     """Get detailed information about a bird using Groq API with caching"""
     clean_name = clean_bird_name(bird_name)
     
-    # Check cache first
-    cache_key = f"{clean_name}_{language}"
+    # Check cache first - include Tanzania status in cache key
+    cache_key = f"{clean_name}_{language}_{is_in_tanzania}"
     cached_info = load_from_cache("bird_info", cache_key)
     if cached_info is not None:
         return cached_info
@@ -308,6 +303,13 @@ def get_bird_info(bird_name, language="en"):
     if language == "sw":
         lang_instruction = " Provide your response in Swahili language."
     
+    # Adjust prompt based on Tanzania status
+    tanzania_instruction = ""
+    if not is_in_tanzania:
+        tanzania_instruction = " Important: This bird is NOT typically found in Tanzania. Explain why its presence might be unusual and focus on its natural range."
+    else:
+        tanzania_instruction = " This bird is native to or commonly found in Tanzania. Include information about its presence in Tanzania and East Africa."
+    
     prompt = f"""
     Provide detailed information about the {clean_name} bird, including:
     1. Physical characteristics and appearance
@@ -316,7 +318,7 @@ def get_bird_info(bird_name, language="en"):
     4. Migration patterns (emphasize if this pattern has changed in recent years due to climate change)
     5. Conservation status
     
-    If this bird is not commonly found in Tanzania, explicitly flag that this bird is "NOT TYPICALLY FOUND IN TANZANIA" at the beginning of your response and explain why its presence might be unusual.
+    {tanzania_instruction}
     
     Format your response in markdown for better readability.{lang_instruction}
     """
@@ -345,8 +347,7 @@ def create_message_html(message, icon="🔍", language="en"):
     <style>
     .message-container {
         font-family: Arial, sans-serif;
-        padding:
-        20px;
+        padding: 20px;
         background-color: #f8f9fa;
         border-radius: 8px;
         text-align: center;
@@ -421,13 +422,13 @@ def predict_and_get_info(img, language="en"):
             combined_info = create_message_html(other_message, "🔍", language)
             return prediction_results, combined_info, clean_top_bird, ""
         
-        # Get habitat locations and create map
-        habitat_locations, is_in_tanzania = get_bird_habitat_map(top_bird)
+        # Get habitat locations and Tanzania status in a single call
+        habitat_locations, is_in_tanzania = get_bird_habitat_and_status(top_bird)
         habitat_map_html = create_habitat_map(habitat_locations)
         
         # Get detailed information about the top predicted bird
-        bird_info = get_bird_info(top_bird, language)
-        formatted_info = format_bird_info(bird_info, language)
+        bird_info = get_bird_info(top_bird, is_in_tanzania, language)
+        formatted_info = format_bird_info(bird_info, is_in_tanzania, language)
         
         # Create combined info with map at the top and properly formatted information
         custom_css = """