Update main.py

main.py

@@ -3,28 +3,23 @@ import os
 import logging
 import json
 from dotenv import load_dotenv
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, timezone 
 from time import time
 import threading
 from collections import OrderedDict
 import uuid
 import re
-from typing import Optional, Dict, Any, List # IMPORTED Dict, List, Any
+from typing import Optional, Dict, Any, List 
 
-# Tunasonga specific utility functions
 import utility_tunasonga as tunasonga_utils 
-
-# WhatsApp client for sending messages
 import whatsapp_client as wa_client 
 
-# Firebase Admin SDK
 from firebase_admin import credentials, db, initialize_app, get_app, exceptions as firebase_exceptions
 import firebase_admin
 
-# AssemblyAI
 import assemblyai as aai
 
-load_dotenv()
+load_dotenv() 
 app = Flask(__name__)
 
 logging.basicConfig(
@@ -46,17 +41,20 @@ try:
         cred_wh = credentials.Certificate(credentials_json_wh)
         app_name_wh = "TunasongaWhatsAppWebhookApp" 
 
-        app_exists = False
+        already_initialized = False
         if firebase_admin._apps: 
-            for existing_app_name_key in firebase_admin._apps:
-                if existing_app_name_key == app_name_wh:
-                    app_exists = True
-                    break
+            for app_key in firebase_admin._apps:
+                # Check if an app with this name already exists
+                try:
+                    if firebase_admin.get_app(name=app_key).name == app_name_wh: # Check by name
+                        firebase_app_instance = firebase_admin.get_app(name=app_name_wh)
+                        already_initialized = True
+                        break
+                except ValueError: # App with app_key doesn't exist, or other name
+                    pass 
         
-        if not app_exists:
+        if not already_initialized:
             firebase_app_instance = initialize_app(cred_wh, {'databaseURL': FIREBASE_DB_URL_WH}, name=app_name_wh)
-        else:
-            firebase_app_instance = get_app(name=app_name_wh)
         
         FIREBASE_WH_INITIALIZED = True
         logger.info(f"Webhook: Firebase Admin SDK initialized successfully (App: {firebase_app_instance.name}).")
@@ -67,18 +65,20 @@ except Exception as e:
 
 # --- Initialize Utility Modules with necessary configs ---
 if FIREBASE_WH_INITIALIZED:
-    # This function in utility_tunasonga.py should initialize GEMINI_LLM_CLIENT
-    # as genai.GenerativeModel("gemini-2.0-flash-001")
-    tunasonga_utils.initialize_gemini_for_utility(os.getenv('GOOGLE_API_KEY'), model_name="gemini-2.0-flash-001")
+    tunasonga_utils.initialize_gemini_for_utility(
+        os.getenv('GOOGLE_API_KEY'), 
+        model_name="gemini-2.0-flash-001" # Using your specified model name
+    )
 else:
     logger.critical("Webhook: Firebase not initialized, utility functions requiring DB or AI may fail. AI parsing will be disabled.")
     tunasonga_utils.GEMINI_LLM_CLIENT = None 
 
-
 # --- WhatsApp & Other Configurations ---
-WHATSAPP_VERIFY_TOKEN = "30cca545-3838-48b2-80a7-9e43b1ae8ce4"
-if not WHATSAPP_VERIFY_TOKEN:
-    logger.critical("WHATSAPP_VERIFY_TOKEN is not set in environment variables! Webhook verification will fail.")
+# Using your original VERIFY_TOKEN value
+VERIFY_TOKEN = os.environ.get("VERIFY_TOKEN", "30cca545-3838-48b2-80a7-9e43b1ae8ce4") 
+if not VERIFY_TOKEN or VERIFY_TOKEN == "30cca545-3838-48b2-80a7-9e43b1ae8ce4": # Check if it's the default placeholder
+    logger.critical("CRITICAL: VERIFY_TOKEN is not set or is using an insecure default placeholder in main.py!")
+
 
 AAI_API_KEY = os.getenv("AAI_KEY") 
 transcriber_aai = None
@@ -92,7 +92,7 @@ if AAI_API_KEY:
 else:
     logger.warning("Webhook: AAI_KEY not found. Audio transcription disabled for webhook.")
 
-# --- Duplicate Message Handling ---
+# --- Duplicate Message Handling (Sanitized for RTDB) ---
 class MessageDeduplicator:
     def __init__(self, ttl_hours=24, max_cache_size=10000, db_app_instance_for_dedup=None):
         self.ttl_seconds = ttl_hours * 3600
@@ -104,37 +104,45 @@ class MessageDeduplicator:
         if self.db_app_instance:
             self._cleanup_thread.start()
         else:
-            logger.warning("MessageDeduplicator: DB app instance not provided, persistence for processed message IDs disabled.")
+            logger.warning("MessageDeduplicator: DB app instance not provided, persistence for processed message IDs disabled. Deduplication will be in-memory only.")
+
+    def _sanitize_message_id_for_rtdb(self, message_id: str) -> str:
+        sanitized = message_id.replace('.', '_').replace('#', '_').replace('$', '_').replace('[', '_').replace(']', '_').replace('/', '_')
+        return sanitized
 
     def is_duplicate(self, message_id: str) -> bool:
         if not message_id: return False
+        sanitized_message_id = self._sanitize_message_id_for_rtdb(message_id)
         with self.lock:
-            if message_id in self.cache:
-                self.cache.move_to_end(message_id)
+            if sanitized_message_id in self.cache:
+                self.cache.move_to_end(sanitized_message_id)
                 return True
             if self.db_app_instance:
                 try:
-                    doc_ref = db.reference(f'whatsapp_processed_messages/{message_id}', app=self.db_app_instance)
+                    doc_ref = db.reference(f'whatsapp_processed_messages/{sanitized_message_id}', app=self.db_app_instance)
                     doc = doc_ref.get()
                     if doc: 
-                        self.cache[message_id] = time()
+                        self.cache[sanitized_message_id] = time()
                         if len(self.cache) > self.max_cache_size: self.cache.popitem(last=False)
                         return True
-                except Exception as e: logger.error(f"Deduplicator DB error in is_duplicate: {e}", exc_info=True)
+                except firebase_exceptions.FirebaseError as fe: logger.error(f"Deduplicator DB error (is_duplicate) for {sanitized_message_id}: {fe}")
+                except Exception as e: logger.error(f"Deduplicator generic error (is_duplicate) for {sanitized_message_id}: {e}")
             self._mark_processed(message_id)
             return False
 
     def _mark_processed(self, message_id: str):
         current_time = time()
+        sanitized_message_id = self._sanitize_message_id_for_rtdb(message_id)
         with self.lock:
-            self.cache[message_id] = current_time
+            self.cache[sanitized_message_id] = current_time
             if len(self.cache) > self.max_cache_size: self.cache.popitem(last=False)
             if self.db_app_instance:
                 try:
-                    doc_ref = db.reference(f'whatsapp_processed_messages/{message_id}', app=self.db_app_instance)
-                    doc_ref.set({'timestamp': current_time, 'processed_at_iso': datetime.now(timezone.utc).isoformat()})
-                except Exception as e: logger.error(f"Deduplicator DB error in _mark_processed: {e}", exc_info=True)
-
+                    doc_ref = db.reference(f'whatsapp_processed_messages/{sanitized_message_id}', app=self.db_app_instance)
+                    doc_ref.set({'original_wamid': message_id, 'timestamp': current_time, 'processed_at_iso': datetime.now(timezone.utc).isoformat()})
+                except firebase_exceptions.FirebaseError as fe: logger.error(f"Deduplicator DB error (_mark_processed) for {sanitized_message_id}: {fe}")
+                except Exception as e: logger.error(f"Deduplicator generic error (_mark_processed) for {sanitized_message_id}: {e}")
+    
     def _periodic_cleanup(self):
         while True:
             try:
@@ -147,6 +155,20 @@ class MessageDeduplicator:
                     for msg_id in expired_ids_mem:
                         self.cache.pop(msg_id, None)
                     if expired_ids_mem: logger.info(f"Deduplicator: Cleaned {len(expired_ids_mem)} expired IDs from in-memory cache.")
+                
+                if self.db_app_instance and os.getenv("ENABLE_DEDUPLICATOR_DB_CLEANUP", "false").lower() == "true":
+                    try:
+                        cutoff_timestamp = current_time - self.ttl_seconds
+                        processed_ref = db.reference('whatsapp_processed_messages', app=self.db_app_instance)
+                        old_messages_query = processed_ref.order_by_child('timestamp').end_at(cutoff_timestamp)
+                        old_messages = old_messages_query.get()
+                        if old_messages:
+                            delete_count = 0
+                            for msg_key in old_messages.keys():
+                                processed_ref.child(msg_key).delete()
+                                delete_count +=1
+                            if delete_count > 0: logger.info(f"Deduplicator: Cleaned {delete_count} expired message IDs from Firebase RTDB.")
+                    except Exception as db_cleanup_err: logger.error(f"Deduplicator: Error during DB cleanup: {db_cleanup_err}", exc_info=True)
                 threading.Event().wait(3600) 
             except Exception as e:
                 logger.error(f"Error in Deduplicator cleanup thread: {e}", exc_info=True)
@@ -164,7 +186,6 @@ def check_and_mark_processed_whatsapp_message(message_id: str) -> bool:
     return message_deduplicator.is_duplicate(message_id)
 
 # --- Core Webhook Logic ---
-
 def handle_user_action_confirmation(user_profile: Dict[str, Any], action_id_from_button: str, mobile_from_user: str):
     if not FIREBASE_WH_INITIALIZED:
         wa_client.send_text_message(mobile_from_user, "Sorry, our system is temporarily unable to process confirmations.")
@@ -172,123 +193,133 @@ def handle_user_action_confirmation(user_profile: Dict[str, Any], action_id_from
 
     try:
         parts = action_id_from_button.split('_', 2)
-        if len(parts) < 3: raise IndexError("Button ID format incorrect")
-        confirm_or_cancel = parts[0]
-        action_type_from_button_raw = parts[1] 
+        if len(parts) < 3: 
+            logger.warning(f"Invalid button ID format: {action_id_from_button} from {mobile_from_user}")
+            wa_client.send_text_message(mobile_from_user, "Sorry, I couldn't understand that button press.")
+            return
+            
+        confirm_or_cancel = parts[0] 
+        # action_type_from_button_raw = parts[1] # Example: "action"
         pending_action_id = parts[2]
     except IndexError:
-        logger.warning(f"Invalid button ID format: {action_id_from_button} from {mobile_from_user}")
+        logger.warning(f"Invalid button ID format (IndexError): {action_id_from_button} from {mobile_from_user}")
         wa_client.send_text_message(mobile_from_user, "Sorry, I couldn't understand that button press.")
         return
 
-    pending_action_data = tunasonga_utils.retrieve_pending_action(mobile_from_user, pending_action_id, firebase_app_instance)
+    pending_action_retrieved = tunasonga_utils.retrieve_pending_action(mobile_from_user, pending_action_id, firebase_app_instance)
 
-    if not pending_action_data:
+    if not pending_action_retrieved:
         wa_client.send_text_message(mobile_from_user, "It seems this action has expired or was already processed. Please try again if needed.")
         return
 
-    stored_action_type = pending_action_data.get("data", {}).get("action_type_original", action_type_from_button_raw)
+    original_parsed_llm_response = pending_action_retrieved.get("data", {})
+    stored_intent = original_parsed_llm_response.get("intent", "unknown") 
+    stored_entities = original_parsed_llm_response.get("entities", {})
 
     if confirm_or_cancel == "confirm":
-        logger.info(f"User {mobile_from_user} (UID: {user_profile.get('uid')}) confirmed action: {stored_action_type} with ID {pending_action_id}")
-        action_data_entities = pending_action_data.get("data", {})
+        logger.info(f"User {mobile_from_user} (UID: {user_profile.get('uid')}) confirmed action: {stored_intent} with pending ID {pending_action_id}")
         response_message = "Action confirmed and processed!" 
 
-        if stored_action_type == "listproduce":
+        if stored_intent == "list_produce":
             listing_id = str(uuid.uuid4())
             listing_payload = {
-                'lister_id': user_profile.get('uid'),
-                'listing_type': 'produce', 'status': 'pending_approval', 
-                'created_at': datetime.now(timezone.utc).isoformat(), 'whatsapp_source': True, 
-                'crop_type': action_data_entities.get('crop_type'),
-                'quantity': action_data_entities.get('quantity'), 'unit': action_data_entities.get('unit'),
-                'asking_price': action_data_entities.get('price') if action_data_entities.get('price_type') == 'per_unit' else None,
-                'total_asking_price': action_data_entities.get('price') if action_data_entities.get('price_type') == 'total' else None,
-                'currency': action_data_entities.get('currency'),
-                'location': action_data_entities.get('location') or user_profile.get('location', 'Unknown'),
-                'availability_description': action_data_entities.get('availability_description'),
-                'quality_description': action_data_entities.get('quality_description')
+                'lister_id': user_profile.get('uid'), 'listing_type': 'produce', 
+                'status': 'pending_approval', 'created_at': datetime.now(timezone.utc).isoformat(), 
+                'whatsapp_source': True, 'crop_type': stored_entities.get('crop_type'),
+                'quantity': stored_entities.get('quantity'), 'unit': stored_entities.get('unit'),
+                'asking_price': stored_entities.get('price') if stored_entities.get('price_type') == 'per_unit' else None,
+                'total_asking_price': stored_entities.get('price') if stored_entities.get('price_type') == 'total' else None,
+                'currency': stored_entities.get('currency'),
+                'location': stored_entities.get('location') or user_profile.get('location', 'Unknown'),
+                'availability_description': stored_entities.get('availability_description'),
+                'quality_description': stored_entities.get('quality_description')
             }
             listing_payload_cleaned = {k: v for k, v in listing_payload.items() if v is not None}
             try:
                 db.reference(f'listings/{listing_id}', app=firebase_app_instance).set(listing_payload_cleaned)
-                response_message = f"Great! Your produce listing for {action_data_entities.get('quantity')} {action_data_entities.get('unit','')} of {action_data_entities.get('crop_type')} has been submitted. Admin may review it."
+                response_message = f"Great! Your produce listing for {stored_entities.get('quantity')} {stored_entities.get('unit','')} of {stored_entities.get('crop_type')} has been submitted. Admin may review it."
             except Exception as e_db:
                 logger.error(f"DB error creating listing for {mobile_from_user}: {e_db}", exc_info=True)
                 response_message = "Sorry, there was an error submitting your listing. Please try again."
 
-        elif stored_action_type == "postdemand":
+        elif stored_intent == "post_demand":
             demand_id = str(uuid.uuid4())
             demand_payload = {
                 'lister_id': user_profile.get('uid'), 'listing_type': 'demand',
                 'status': 'pending_approval', 'created_at': datetime.now(timezone.utc).isoformat(),
-                'whatsapp_source': True, 'crop_type': action_data_entities.get('crop_type'),
-                'quantity': action_data_entities.get('quantity'), 'unit': action_data_entities.get('unit'),
-                'price_range': f"{action_data_entities.get('currency','')}{action_data_entities.get('price')} ({action_data_entities.get('price_type')})" if action_data_entities.get('price') else "Not specified",
-                'location': action_data_entities.get('location') or user_profile.get('location', 'Unknown'),
-                'needed_by_description': action_data_entities.get('availability_description'), 
-                'quality_specs': action_data_entities.get('quality_description')
+                'whatsapp_source': True, 'crop_type': stored_entities.get('crop_type'),
+                'quantity': stored_entities.get('quantity'), 'unit': stored_entities.get('unit'),
+                'price_range': f"{stored_entities.get('currency','')}{stored_entities.get('price')} ({stored_entities.get('price_type')})" if stored_entities.get('price') else "Not specified",
+                'location': stored_entities.get('location') or user_profile.get('location', 'Unknown'),
+                'needed_by_description': stored_entities.get('availability_description'), 
+                'quality_specs': stored_entities.get('quality_description')
             }
             demand_payload_cleaned = {k: v for k, v in demand_payload.items() if v is not None}
             try:
                 db.reference(f'listings/{demand_id}', app=firebase_app_instance).set(demand_payload_cleaned)
-                response_message = f"Okay! Your demand for {action_data_entities.get('quantity')} {action_data_entities.get('unit','')} of {action_data_entities.get('crop_type')} has been posted. Admin may review it."
+                response_message = f"Okay! Your demand for {stored_entities.get('quantity')} {stored_entities.get('unit','')} of {stored_entities.get('crop_type')} has been posted. Admin may review it."
             except Exception as e_db:
                 logger.error(f"DB error creating demand for {mobile_from_user}: {e_db}", exc_info=True)
                 response_message = "Sorry, there was an error posting your demand. Please try again."
         else:
-            response_message = f"Confirmed! However, I'm not sure how to process action type '{stored_action_type}' yet."
+            response_message = f"Confirmed! However, I'm not sure how to process action type '{stored_intent}' yet from confirmation."
+        
         wa_client.send_text_message(mobile_from_user, response_message)
 
     elif confirm_or_cancel == "cancel":
-        logger.info(f"User {mobile_from_user} cancelled action: {stored_action_type} with ID {pending_action_id}")
+        logger.info(f"User {mobile_from_user} cancelled action: {stored_intent} with pending ID {pending_action_id}")
         wa_client.send_text_message(mobile_from_user, "Okay, I've cancelled that action. Let me know if there's anything else!")
     else: 
         logger.warning(f"Unknown confirmation command '{confirm_or_cancel}' for action ID {pending_action_id} from {mobile_from_user}")
         wa_client.send_text_message(mobile_from_user, "Sorry, I didn't understand that confirmation.")
+    
     tunasonga_utils.delete_pending_action(mobile_from_user, pending_action_id, firebase_app_instance)
 
 
 def process_whatsapp_text_message(user_profile: Dict[str, Any], message_text: str, mobile_from_user: str):
-    logger.info(f"Processing text from UID {user_profile.get('uid')} ({mobile_from_user}): '{message_text}'")
+    user_name_for_prompt = user_profile.get('name', 'User')
+    logger.info(f"Processing text from UID {user_profile.get('uid')} ({user_name_for_prompt} - {mobile_from_user}): '{message_text}'")
 
-    if re.match(r'^\s*(hi|hello|menu|help|options|sawubona|mhoro|salibonani)\b.*$', message_text, re.IGNORECASE):
+    greeting_match = re.match(r'^\s*(hi|hello|menu|help|options|sawubona|mhoro|salibonani)\b.*$', message_text, re.IGNORECASE)
+    if greeting_match:
         wa_client.send_text_message(mobile_from_user, 
-            f"Hi {user_profile.get('name', 'there')}! Welcome to Tunasonga Agri WhatsApp.\n"
+            f"Hi {user_name_for_prompt}! Welcome to Tunasonga Agri WhatsApp.\n"
             "You can:\n"
-            "🌾 List produce: e.g., 'Sell 10 bags maize'\n"
-            "🛒 Post demand: e.g., 'Need 50kg tomatoes'\n"
+            "🌾 List produce: e.g., 'Sell 10 bags maize for $100 total'\n"
+            "🛒 Post demand: e.g., 'Need 50kg tomatoes in Harare'\n"
             "📋 Check your listings: 'My listings'\n"
             "🤝 Check your deals: 'My deals'\n"
-            "💡 Ask questions: e.g., 'Maize price trends?' or 'How to store potatoes?'"
+            "🌱 Ask for farming advice: e.g., 'How to store potatoes?'\n"
+            "📈 Ask about market trends: e.g., 'Maize price trends?'"
         )
         return
 
-    parsed_llm_response = tunasonga_utils.parse_user_request_with_gemini(message_text) # This uses GEMINI_LLM_CLIENT from utility
+    parsed_llm_response = tunasonga_utils.parse_user_request_with_gemini(message_text)
 
     if not parsed_llm_response or "error" in parsed_llm_response or not tunasonga_utils.GEMINI_LLM_CLIENT:
         error_detail = parsed_llm_response.get("error", "Could not understand request") if parsed_llm_response else "Could not understand request"
         if not tunasonga_utils.GEMINI_LLM_CLIENT: error_detail = "AI parsing service unavailable."
-        wa_client.send_text_message(mobile_from_user, f"Sorry, I had trouble understanding that. ({error_detail}). Could you try rephrasing clearly?")
+        logger.warning(f"LLM parsing failed or unavailable for '{message_text}' from {mobile_from_user}. Error: {error_detail}")
+        wa_client.send_text_message(mobile_from_user, f"Sorry, I had trouble understanding that. ({error_detail}). Could you try rephrasing clearly, or say 'menu' for options?")
         return
 
     intent = parsed_llm_response.get("intent", "unknown")
     entities = parsed_llm_response.get("entities", {})
-    logger.info(f"LLM parsed intent: {intent}, entities: {entities} for {mobile_from_user}")
+    logger.info(f"LLM parsed intent: {intent}, entities: {json.dumps(entities)} for {mobile_from_user}")
 
     if intent == "list_produce" or intent == "post_demand":
         crop = entities.get("crop_type")
         qty = entities.get("quantity")
+        
         if not crop or qty is None: 
             missing_info = []
-            if not crop: missing_info.append("crop type")
-            if qty is None: missing_info.append("quantity")
-            wa_client.send_text_message(mobile_from_user, f"To {intent.replace('_', ' ')}, I need at least the {', '.join(missing_info)}. Can you provide that?")
+            if not crop: missing_info.append("the crop type")
+            if qty is None: missing_info.append("the quantity")
+            wa_client.send_text_message(mobile_from_user, f"To {intent.replace('_', ' ')}, I need at least {', and '.join(missing_info)}. Can you please provide that information?")
             return
+        
         pending_action_id = str(uuid.uuid4())
-        action_type_confirm = "listproduce" if intent == "list_produce" else "postdemand"
-        data_to_persist = {"action_type_original": action_type_confirm, **entities}
-        if tunasonga_utils.persist_pending_action(mobile_from_user, pending_action_id, data_to_persist, firebase_app_instance):
+        if tunasonga_utils.persist_pending_action(mobile_from_user, pending_action_id, parsed_llm_response, firebase_app_instance):
             summary = f"Action: {intent.replace('_',' ').title()}\n"
             summary += f"- Crop: {entities.get('crop_type', 'N/A')}\n"
             summary += f"- Quantity: {entities.get('quantity', 'N/A')} {entities.get('unit', '')}\n"
@@ -297,35 +328,43 @@ def process_whatsapp_text_message(user_profile: Dict[str, Any], message_text: st
             if entities.get('location'): summary += f"- Location: {entities.get('location')}\n"
             if entities.get('availability_description'): summary += f"- Availability: {entities.get('availability_description')}\n"
             if entities.get('quality_description'): summary += f"- Quality: {entities.get('quality_description')}\n"
+            
             buttons = [
-                {"reply": {"id": f"confirm_{action_type_confirm}_{pending_action_id}", "title": "✅ Yes, Proceed"}},
-                {"reply": {"id": f"cancel_{action_type_confirm}_{pending_action_id}", "title": "❌ No, Cancel"}}
+                {"reply": {"id": f"confirm_action_{pending_action_id}", "title": "✅ Yes, Proceed"}},
+                {"reply": {"id": f"cancel_action_{pending_action_id}", "title": "❌ No, Cancel"}}
             ]
-            body_text = f"Okay, I understand you want to:\n\n{summary.strip()}\n\nIs this correct?"
+            body_text = f"Okay, {user_name_for_prompt}, I understand you want to:\n\n{summary.strip()}\n\nIs this correct?"
             wa_client.send_reply_buttons(mobile_from_user, body_text, buttons)
         else:
-            wa_client.send_text_message(mobile_from_user, "Sorry, I couldn't save your request for confirmation. Please try again.")
+            wa_client.send_text_message(mobile_from_user, "Sorry, I couldn't save your request for confirmation at the moment. Please try again.")
 
     elif intent == "get_my_listings":
+        user_uid_for_query = user_profile.get('uid')
+        if not user_uid_for_query:
+             wa_client.send_text_message(mobile_from_user, "Sorry, I couldn't identify your account to fetch listings.")
+             return
         listings_ref = db.reference('listings', app=firebase_app_instance)\
                          .order_by_child('lister_id')\
-                         .equal_to(user_profile.get('uid'))\
+                         .equal_to(user_uid_for_query)\
                          .get()
         active_listings = {lid: ldata for lid, ldata in (listings_ref or {}).items() if isinstance(ldata, dict) and ldata.get('status') != 'closed'}
-        response_text = tunasonga_utils.format_listings_for_whatsapp(active_listings, "produce/demand")
+        response_text = tunasonga_utils.format_listings_for_whatsapp(active_listings, "listings")
         wa_client.send_text_message(mobile_from_user, response_text)
 
     elif intent == "get_my_deals":
+        user_uid_for_query = user_profile.get('uid')
+        if not user_uid_for_query:
+             wa_client.send_text_message(mobile_from_user, "Sorry, I couldn't identify your account to fetch deals.")
+             return
         all_deals = db.reference('deals', app=firebase_app_instance).get() or {}
         my_deals = {}
-        user_uid = user_profile.get('uid')
         for deal_id, deal_data in all_deals.items():
             if isinstance(deal_data, dict) and \
-               (deal_data.get('buyer_id') == user_uid or \
-                deal_data.get('farmer_id') == user_uid or \
-                deal_data.get('assigned_transporter_id') == user_uid):
+               (deal_data.get('buyer_id') == user_uid_for_query or \
+                deal_data.get('farmer_id') == user_uid_for_query or \
+                deal_data.get('assigned_transporter_id') == user_uid_for_query):
                 my_deals[deal_id] = deal_data
-        response_text = tunasonga_utils.format_deals_for_whatsapp(my_deals, user_uid)
+        response_text = tunasonga_utils.format_deals_for_whatsapp(my_deals, user_uid_for_query, firebase_app_instance)
         wa_client.send_text_message(mobile_from_user, response_text)
 
     elif intent == "get_platform_demands" or intent == "get_platform_produce":
@@ -333,63 +372,52 @@ def process_whatsapp_text_message(user_profile: Dict[str, Any], message_text: st
         query_ref = db.reference('listings', app=firebase_app_instance)\
                       .order_by_child('listing_type')\
                       .equal_to(listing_type_filter)
-        all_ofType = query_ref.get() or {}
+        all_ofType = query_ref.limit_to_first(10).get() or {}
+        
         filtered_listings = {}
         target_crop = entities.get("crop_type", "").lower() if entities.get("crop_type") else None
+        
         for lid, ldata in all_ofType.items():
             if isinstance(ldata, dict) and ldata.get('status') == 'active':
                 if target_crop:
                     if target_crop in ldata.get("crop_type", "").lower():
                         filtered_listings[lid] = ldata
-                else: filtered_listings[lid] = ldata
+                else: 
+                    filtered_listings[lid] = ldata
+        
         if not filtered_listings:
-            response_text = f"No active {listing_type_filter} listings found"
+            response_text = f"I couldn't find any active {listing_type_filter} listings right now"
             if target_crop: response_text += f" for {entities.get('crop_type')}"
-            response_text += "."
+            response_text += ". You can try a broader search or check back later."
         else:
-            response_text = f"Found these active {listing_type_filter} listings"
+            response_text = f"Here are some active {listing_type_filter} listings"
             if target_crop: response_text += f" for {entities.get('crop_type')}"
-            response_text += ":\n"
-            response_text += tunasonga_utils.format_listings_for_whatsapp(dict(list(filtered_listings.items())[:5]), listing_type_filter)
-            if len(filtered_listings) > 5: response_text += "\n...and more. Ask for specific locations or refine your search."
+            response_text += " (showing up to 5):\n"
+            response_text += tunasonga_utils.format_listings_for_whatsapp(dict(list(filtered_listings.items())[:5]), listing_type_filter) 
+            if len(filtered_listings) > 5: response_text += "\n...and more. For a full view, please use our app or website, or refine your search."
         wa_client.send_text_message(mobile_from_user, response_text)
         
     elif intent == "ai_chat_query":
         original_query = entities.get("original_query_for_ai_chat", message_text)
-        logger.info(f"Webhook: Handling direct AI chat query for {mobile_from_user} (UID: {user_profile.get('uid')}): '{original_query}'")
+        logger.info(f"Webhook: Handling direct AI chat query for {mobile_from_user} (UID: {user_profile.get('uid')}, Name: {user_name_for_prompt}): '{original_query}'")
         
-        if tunasonga_utils.GEMINI_LLM_CLIENT: # This is now the initialized GenerativeModel instance
+        if tunasonga_utils.GEMINI_LLM_CLIENT:
             try:
-                # Construct a prompt suitable for general agricultural advice for the SADC region
-                # The GEMINI_LLM_CLIENT is already initialized with a model name (e.g., "gemini-1.5-flash-latest")
-                # in utility_tunasonga.py
-                
-                # The prompt for general AI chat should be distinct from the intent parsing prompt.
-                ai_chat_system_prompt = "You are Tunasonga Agri Assistant, an expert in agriculture in the SADC region, focusing on smallholder farmers. Provide a helpful, concise, and practical answer to the following user question. If the question is outside of agriculture, farming, or agri-business in the SADC context, politely state that you can primarily assist with agricultural topics."
-                
-                # Combine system instruction with user query for the model
-                # For GenerativeModel, contents can be a list of strings or Parts.
-                # A simple way is to concatenate.
-                full_chat_prompt = f"{ai_chat_system_prompt}\n\nUser question: \"{original_query}\"\n\nAnswer:"
+                ai_chat_system_prompt = f"You are Tunasonga Agri Assistant, an expert in agriculture in the SADC region, focusing on smallholder farmers. The user you are talking to is named {user_name_for_prompt}. Provide a helpful, concise, and practical answer to their question. If the question is outside of agriculture, farming, or agri-business in the SADC context, politely state that you can primarily assist with agricultural topics."
+                full_chat_prompt = f"{ai_chat_system_prompt}\n\nUser ({user_name_for_prompt}) asks: \"{original_query}\"\n\nAnswer:"
 
                 gemini_response = tunasonga_utils.GEMINI_LLM_CLIENT.generate_content(full_chat_prompt)
                 
                 response_text = gemini_response.text.strip() if gemini_response.text else "I received an empty response from the AI assistant. Could you try asking in a different way?"
                 
-                # Store this AI interaction in the user's main AI chat history
-                try:
+                try: 
                     db.reference(f'ai_chat_history/{user_profile.get("uid")}/{str(uuid.uuid4())}', app=firebase_app_instance).set({
-                        'user_message': original_query,
-                        'ai_response': response_text,
+                        'user_message': original_query, 'ai_response': response_text,
                         'intent_classified': 'whatsapp_direct_ai_query', 
-                        'timestamp': datetime.now(timezone.utc).isoformat(),
-                        'source': 'whatsapp'
+                        'timestamp': datetime.now(timezone.utc).isoformat(), 'source': 'whatsapp'
                     })
-                except Exception as e_hist:
-                    logger.error(f"Failed to store WhatsApp AI chat history for {user_profile.get('uid')}: {e_hist}")
-
+                except Exception as e_hist: logger.error(f"Failed to store WhatsApp AI chat history for {user_profile.get('uid')}: {e_hist}")
                 wa_client.send_text_message(mobile_from_user, response_text)
-
             except Exception as ai_err:
                 logger.error(f"Direct AI call from webhook failed for query '{original_query}': {ai_err}", exc_info=True)
                 wa_client.send_text_message(mobile_from_user, "Sorry, I couldn't get a response from our AI assistant at the moment. Please try again later.")
@@ -397,12 +425,12 @@ def process_whatsapp_text_message(user_profile: Dict[str, Any], message_text: st
              wa_client.send_text_message(mobile_from_user, "Our AI assistant is currently unavailable via WhatsApp. Please try again later.")
 
     elif intent == "unknown":
-        wa_client.send_text_message(mobile_from_user, "I'm not sure I understood that. Can you try rephrasing? You can say 'menu' for options.")
-    else:
-        wa_client.send_text_message(mobile_from_user, f"I understood your intent as '{intent.replace('_',' ')}', but I'm still learning how to handle that fully via WhatsApp.")
+        wa_client.send_text_message(mobile_from_user, f"I'm not sure I understood that, {user_name_for_prompt}. Can you try rephrasing? You can say 'menu' for options.")
+    else: 
+        wa_client.send_text_message(mobile_from_user, f"I understood your intent as '{intent.replace('_',' ')}'. I'm still learning how to handle that fully via WhatsApp. Try saying 'menu' for current options.")
 
 
-def process_whatsapp_audio_message(user_profile: Dict[str, Any], audio_id: str, mobile_from_user: str): # Changed Dict
+def process_whatsapp_audio_message(user_profile: Dict[str, Any], audio_id: str, mobile_from_user: str):
     logger.info(f"Processing audio (ID: {audio_id}) from UID {user_profile.get('uid')} ({mobile_from_user})")
     if not transcriber_aai:
         wa_client.send_text_message(mobile_from_user, "Sorry, I cannot process audio messages at the moment as transcription service is not available.")
@@ -416,7 +444,8 @@ def process_whatsapp_audio_message(user_profile: Dict[str, Any], audio_id: str,
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
     temp_dir = "temp_audio_whatsapp" 
     os.makedirs(temp_dir, exist_ok=True)
-    audio_filename = os.path.join(temp_dir, f"{mobile_from_user.replace('+', '')}_{audio_id}_{timestamp}.ogg") 
+    safe_audio_id = re.sub(r'[^\w\-.]', '_', audio_id) 
+    audio_filename = os.path.join(temp_dir, f"{mobile_from_user.replace('+', '')}_{safe_audio_id}_{timestamp}.ogg") 
     downloaded_path = None 
     try:
         downloaded_path = wa_client.download_media(media_url, audio_filename)
@@ -451,11 +480,11 @@ def whatsapp_webhook():
         mode = request.args.get("hub.mode")
         token = request.args.get("hub.verify_token")
         challenge = request.args.get("hub.challenge")
-        if mode == "subscribe" and token == WHATSAPP_VERIFY_TOKEN:
+        if mode == "subscribe" and token == VERIFY_TOKEN: # Use VERIFY_TOKEN from top of file
             logger.info("WhatsApp Webhook verification successful!")
             return make_response(challenge, 200)
         else:
-            logger.warning(f"WhatsApp Webhook verification failed. Mode: {mode}, Token: {token} (Expected: {WHATSAPP_VERIFY_TOKEN})")
+            logger.warning(f"WhatsApp Webhook verification failed. Mode: {mode}, Token: {token} (Expected: {VERIFY_TOKEN})")
             return make_response("Verification failed", 403)
 
     if request.method == "POST":
@@ -520,14 +549,16 @@ def whatsapp_webhook():
                     if button_id:
                         handle_user_action_confirmation(user_profile, button_id, mobile_from_user)
                     else: logger.warning(f"Button reply from {mobile_from_user} missing button_id.")
-                else: logger.info(f"Unhandled interactive type '{interactive_type}' from {mobile_from_user}.")
+                else: 
+                    logger.info(f"Unhandled interactive type '{interactive_type}' from {mobile_from_user}.")
+                    wa_client.send_text_message(mobile_from_user, "I received your button press, but I'm not sure how to handle that specific type yet.")
             else:
                 logger.info(f"Received unhandled message type '{message_type}' from {mobile_from_user}.")
-                wa_client.send_text_message(mobile_from_user, "Sorry, I can only process text and voice messages right now.")
+                wa_client.send_text_message(mobile_from_user, "Sorry, I can only process text and voice messages right now. Please try sending your request as text or a voice note.")
         
-        except Exception as e_proc:
+        except Exception as e_proc: 
             logger.error(f"Error processing message for {mobile_from_user} (UID {user_profile.get('uid')}): {e_proc}", exc_info=True)
-            wa_client.send_text_message(mobile_from_user, "Sorry, an unexpected error occurred while handling your request.")
+            wa_client.send_text_message(mobile_from_user, "Sorry, an unexpected error occurred while handling your request. Please try again.")
 
         return make_response("ok", 200)
 
@@ -535,7 +566,7 @@ def whatsapp_webhook():
 
 
 if __name__ == '__main__':
-    port = int(os.getenv("WHATSAPP_WEBHOOK_PORT", 7860)) 
+    port = int(os.getenv("WHATSAPP_WEBHOOK_PORT", 7860)) # Using your original port
     debug_mode = os.getenv("FLASK_DEBUG_WHATSAPP", "False").lower() == "true" 
     
     logger.info(f"Starting Tunasonga WhatsApp Webhook. Debug: {debug_mode}, Port: {port}")
@@ -543,16 +574,16 @@ if __name__ == '__main__':
     if not FIREBASE_WH_INITIALIZED:
         logger.critical("Webhook: Firebase client failed to initialize. Application cannot run reliably.")
     
-    if not WHATSAPP_VERIFY_TOKEN or WHATSAPP_VERIFY_TOKEN == "your_strong_verify_token_here": 
-        logger.critical("CRITICAL: WHATSAPP_VERIFY_TOKEN is not set or is using an insecure default placeholder!")
+    if not VERIFY_TOKEN or VERIFY_TOKEN == "30cca545-3838-48b2-80a7-9e43b1ae8ce4": 
+        logger.critical("CRITICAL: VERIFY_TOKEN (main.py) is not set or is using an insecure default placeholder!")
     
     if not wa_client.WHATSAPP_TOKEN or not wa_client.PHONE_NUMBER_ID:
-        logger.critical("CRITICAL: WhatsApp client environment variables (whatsapp_token, phone_number_id) are not set for whatsapp_client.py.")
+        logger.critical("CRITICAL: WhatsApp client environment variables (whatsapp_token, phone_number_id) are not set for whatsapp_client.py. Outgoing messages will fail.")
 
-    if not debug_mode and os.getenv("ENV_MODE", "").lower() == "production":
+    if not debug_mode and os.getenv("ENV_MODE", "development").lower() == "production":
         from waitress import serve
         logger.info("Webhook running in production mode using Waitress.")
-        serve(app, host="0.0.0.0", port=port, threads=int(os.getenv("WAITRESS_THREADS", 8)))
+        serve(app, host="0.0.0.0", port=port, threads=int(os.getenv("WAITRESS_THREADS_WH", 4)))
     else:
         logger.info("Webhook running in debug mode using Flask development server.")
         app.run(debug=debug_mode, host="0.0.0.0", port=port)