Update app.py

app.py

@@ -752,20 +752,59 @@ def get_veterinary_product_matches(query: str) -> List[Dict[str, Any]]:
     return unique_matches
 
 def normalize(text: str) -> str:
-    """Normalize text for search"""
-    if not text:
-        return ""
+    """Normalize text for better matching"""
+    return re.sub(r'[^\w\s\u0600-\u06FF]', '', text).lower().strip()
+
+def apply_intelligent_corrections(query: str) -> str:
+    """Apply intelligent corrections to common misspellings and variations"""
+    corrections = {
+        # Common misspellings
+        'hydropex': 'hydropex',
+        'respira': 'respira aid plus',
+        'bromacid': 'bromacid',
+        'heposel': 'heposel',
+        'tribiotic': 'tribiotic',
+        'para ce': 'para c.e',
+        'phytosal': 'phyto-sal',
+        'mycopex': 'mycopex super',
+        'eflin': 'eflin kt-20',
+        'salcozine': 'salcozine st-30',
+        'oftilex': 'oftilex ua-10',
+        'biscomin': 'biscomin 10',
+        'apvita': 'apvita plus',
+        'b gaspro': 'b-g aspro-c',
+        'ec immune': 'ec-immune',
+        'liverpex': 'liverpex',
+        'symodex': 'symodex',
+        'adek': 'adek gold',
+        'immuno dx': 'immuno dx',
+        
+        # Category corrections
+        'respiratory': 'respiratory',
+        'liver': 'liver health',
+        'antibiotic': 'antibiotics',
+        'vitamin': 'vitamins',
+        'supplement': 'supplements',
+        'immune': 'immune system',
+        
+        # Common variations
+        'apex': 'apex biotical',
+        'aapex': 'apex biotical',
+    }
     
-    # Convert to lowercase and remove extra whitespace
-    normalized = text.lower().strip()
+    normalized_query = query.lower().strip()
     
-    # Remove special characters but keep spaces
-    normalized = re.sub(r'[^\w\s]', '', normalized)
+    # Check for exact matches first
+    if normalized_query in corrections:
+        return corrections[normalized_query]
     
-    # Replace multiple spaces with single space
-    normalized = re.sub(r'\s+', ' ', normalized)
+    # Check for partial matches
+    for wrong, correct in corrections.items():
+        if wrong in normalized_query:
+            return normalized_query.replace(wrong, correct)
     
-    return normalized
+    # If no corrections found, return original
+    return query
 
 # Enhanced context management with veterinary domain awareness
 class VeterinaryContextManager:
@@ -1837,9 +1876,73 @@ async def process_incoming_message(from_number: str, msg: dict):
             logger.warning(f"[Process] Language detection failed: {e}, defaulting to English")
             reply_language = 'en'
 
-        # Only use keyword logic for strict menu navigation
-        menu_commands = ['main', 'menu', 'start', 'home', 'back', '1', '2', '3', '4', '5']
-        if message_body.lower().strip() in menu_commands:
+        # Check for greetings with multilingual support
+        if is_greeting(message_body):
+            # Check if user is currently in AI chat mode - if so, don't trigger menu mode
+            if current_state == 'ai_chat_mode':
+                logger.info(f"[Process] Greeting detected in AI chat mode, treating as AI query: {message_body}")
+                # Treat greeting as a general query in AI chat mode
+                await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
+                return
+            else:
+                # Only trigger menu mode if not in AI chat mode
+                # Generate welcome message in detected language
+                if reply_language == 'ur':
+                    welcome_msg = (
+                        "🤖 ویٹرنری ورچوئل اسسٹنٹ\n\n"
+                        "آپ مجھ سے پوچھ سکتے ہیں:\n"
+                        "* ویٹرنری سوالات\n"
+                        "* پروڈکٹ کی سفارشات\n"
+                        "* علاج کے مشورے\n"
+                        "* عمومی معلومات\n\n"
+                        "💬 'main' لکھ کر مین مینو پر واپس جائیں۔"
+                    )
+                else:
+                    welcome_msg = generate_veterinary_welcome_message()
+                
+                send_whatsjet_message(from_number, welcome_msg)
+                context_manager.update_context(
+                    from_number, 
+                    current_state='main_menu', 
+                    current_menu='main_menu', 
+                    current_menu_options=list(MENU_CONFIG['main_menu']['option_descriptions'].values()),
+                    reply_language=reply_language
+                )
+                return
+
+        # 🎯 PRIORITY 1: Navigation commands - work from ANY state
+        # Check for "main" command - now works for both text and voice
+        if current_state != 'main_menu' and current_state != 'ai_chat_mode':  # Only check for main if not already in main menu and not in AI chat mode
+            mapped_navigation = process_intelligent_voice_command(message_body, current_state, user_context)
+            if mapped_navigation == 'main':
+                logger.info(f"[Process] Navigation command detected: '{message_body}' -> 'main'")
+                # Generate welcome message in detected language
+                if reply_language == 'ur':
+                    welcome_msg = (
+                        "🤖 ویٹرنری ورچوئل اسسٹنٹ\n\n"
+                        "آپ مجھ سے پوچھ سکتے ہیں:\n"
+                        "* ویٹرنری سوالات\n"
+                        "* پروڈکٹ کی سفارشات\n"
+                        "* علاج کے مشورے\n"
+                        "* عمومی معلومات\n\n"
+                        "💬 'main' لکھ کر مین مینو پر واپس جائیں۔"
+                    )
+                else:
+                    welcome_msg = generate_veterinary_welcome_message()
+                
+                send_whatsjet_message(from_number, welcome_msg)
+                context_manager.update_context(
+                    from_number, 
+                    current_state='main_menu', 
+                    current_menu='main_menu', 
+                    current_menu_options=list(MENU_CONFIG['main_menu']['option_descriptions'].values()),
+                    reply_language=reply_language
+                )
+                return
+        
+        # Also check for text-based navigation commands
+        if message_body.lower() in ['main', 'menu', 'start', 'home', 'back']:
+            # Generate welcome message in detected language
             if reply_language == 'ur':
                 welcome_msg = (
                     "🤖 ویٹرنری ورچوئل اسسٹنٹ\n\n"
@@ -1852,6 +1955,7 @@ async def process_incoming_message(from_number: str, msg: dict):
                 )
             else:
                 welcome_msg = generate_veterinary_welcome_message()
+            
             send_whatsjet_message(from_number, welcome_msg)
             context_manager.update_context(
                 from_number, 
@@ -1861,7 +1965,252 @@ async def process_incoming_message(from_number: str, msg: dict):
                 reply_language=reply_language
             )
             return
-        # All other queries: always use OpenAI/gpt-4o for intelligent response
+        
+        # 🎯 PRIORITY 2: State-specific handling (contact_request, availability_request, ai_chat_mode, clarification)
+        if current_state == 'contact_request':
+            await handle_contact_request_response(from_number, message_body)
+            return
+        elif current_state == 'availability_request':
+            await handle_availability_request_response(from_number, message_body)
+            return
+        elif current_state == 'ai_chat_mode':
+            await handle_ai_chat_mode(from_number, message_body, reply_language)
+            return
+        elif user_context.get('awaiting_clarification', False):
+            # Handle clarification responses
+            await handle_clarification_response(from_number, message_body, user_context)
+            return
+        
+        # 🎯 PRIORITY 3: Menu selection validation and handling
+        if current_state == 'main_menu':
+            # Validate menu selection
+            is_valid, validation_message = validate_menu_selection(message_body, current_state, user_context)
+            
+            if not is_valid:
+                send_whatsjet_message(from_number, validation_message)
+                return
+            
+            # Handle valid menu selection
+            if message_body == '1':
+                # Product Search
+                context_manager.update_context(
+                    from_number,
+                    current_state='product_inquiry',
+                    current_menu='product_inquiry',
+                    current_menu_options=['main'],
+                    reply_language=reply_language
+                )
+                if reply_language == 'ur':
+                    message = (
+                        "🔍 *پروڈکٹ سرچ*\n\n"
+                        "براہ کرم پروڈکٹ کا نام، زمرہ، یا علامات لکھیں:\n\n"
+                        "📝 *مثال:*\n"
+                        "• Hydropex\n"
+                        "• سانس کی بیماری\n"
+                        "• جگر کی صحت\n"
+                        "• اینٹی بائیوٹکس\n\n"
+                        "💬 'main' لکھ کر مین مینو پر واپس جائیں۔"
+                    )
+                else:
+                    message = (
+                        "🔍 *Product Search*\n\n"
+                        "Please enter a product name, category, or symptoms:\n\n"
+                        "📝 *Examples:*\n"
+                        "• Hydropex\n"
+                        "• Respiratory disease\n"
+                        "• Liver health\n"
+                        "• Antibiotics\n\n"
+                        "💬 Type 'main' to return to main menu"
+                    )
+                send_whatsjet_message(from_number, message)
+                return
+                
+            elif message_body == '2':
+                # Category Browse
+                categories = get_all_categories()
+                if reply_language == 'ur':
+                    message = "📂 *زمرے براؤز کریں:*\n\n"
+                    for i, category in enumerate(categories, 1):
+                        message += f"{format_number_with_emoji(i)} {category}\n"
+                    message += "\n💬 اپنا انتخاب لکھیں یا 'main' لکھ کر مین مینو پر واپس جائیں۔"
+                else:
+                    message = "📂 *Browse Categories:*\n\n"
+                    for i, category in enumerate(categories, 1):
+                        message += f"{format_number_with_emoji(i)} {category}\n"
+                    message += "\n💬 Type your choice or 'main' to return to main menu"
+                
+                send_whatsjet_message(from_number, message)
+                context_manager.update_context(
+                    from_number,
+                    current_state='category_selection',
+                    current_menu='category_selection',
+                    current_menu_options=categories,
+                    reply_language=reply_language
+                )
+                return
+                
+            elif message_body == '3':
+                # Catalog Download
+                await send_catalog_pdf(from_number)
+                return
+                
+            elif message_body == '4':
+                # AI Chat Mode
+                context_manager.update_context(
+                    from_number,
+                    current_state='ai_chat_mode',
+                    current_menu='ai_chat_mode',
+                    current_menu_options=['main'],
+                    reply_language='ur'
+                )
+                if reply_language == 'ur':
+                    message = (
+                        "🤖 ویٹرنری ورچوئل اسسٹنٹ\n\n"
+                        "آپ مجھ سے پوچھ سکتے ہیں:\n"
+                        "* ویٹرنری سوالات\n"
+                        "* پروڈکٹ کی سفارشات\n"
+                        "* علاج کے مشورے\n"
+                        "* عمومی معلومات\n\n"
+                        "💬 'main' لکھ کر مین مینو پر واپس جائیں۔"
+                    )
+                else:
+                    message = (
+                        "🤖 Veterinary Virtual Assistant\n\n"
+                        "You can ask me about:\n"
+                        "* Veterinary questions\n"
+                        "* Product recommendations\n"
+                        "* Treatment advice\n"
+                        "* General information\n\n"
+                        "💬 Type 'main' to return to main menu"
+                    )
+                send_whatsjet_message(from_number, message)
+                return
+        
+        # 🎯 PRIORITY 4: Category selection handling
+        elif current_state == 'category_selection':
+            await handle_category_selection(message_body, from_number)
+            return
+        
+        # 🎯 PRIORITY 5: Product inquiry handling
+        elif current_state == 'product_inquiry':
+            # Check for voice commands first
+            mapped_command = process_intelligent_voice_command(message_body, current_state, user_context)
+            if mapped_command != message_body:
+                logger.info(f"[Voice Command] Processing: '{message_body}' in state: {current_state}")
+                message_body = mapped_command
+                logger.info(f"[Voice Command] Mapped to: '{message_body}'")
+            
+            # Search for products
+            matches = get_veterinary_product_matches(message_body)
+            
+            if matches:
+                logger.info(f"[Process] Product query detected from menu state '{current_state}': '{message_body}' -> Found {len(matches)} products")
+                
+                # Apply intelligent corrections
+                corrected_query = apply_intelligent_corrections(message_body)
+                if corrected_query != message_body:
+                    logger.info(f"[Query] Applied correction: '{message_body}' -> '{corrected_query}'")
+                    matches = get_veterinary_product_matches(corrected_query)
+                
+                # Handle product matches
+                if len(matches) == 1:
+                    # Single product match - show detailed info
+                    product = matches[0]
+                    context_manager.update_context(from_number, current_product=product)
+                    await send_product_with_image(from_number, product, user_context)
+                    
+                    # Send follow-up options
+                    await handle_veterinary_product_followup(message_body, from_number)
+                    
+                elif len(matches) <= 5:
+                    # Multiple products - show list
+                    if reply_language == 'ur':
+                        response = f"🔍 *{len(matches)} پروڈکٹ ملے:*\n\n"
+                    else:
+                        response = f"🔍 *Found {len(matches)} products:*\n\n"
+                    
+                    for i, product in enumerate(matches, 1):
+                        product_name = product.get('Product Name', 'N/A')
+                        category = product.get('Category', 'N/A')
+                        if reply_language == 'ur':
+                            response += f"{format_number_with_emoji(i)} {product_name} ({category})\n"
+                        else:
+                            response += f"{format_number_with_emoji(i)} {product_name} ({category})\n"
+                    
+                    if reply_language == 'ur':
+                        response += "\n💬 اپنا انتخاب لکھیں یا 'main' لکھ کر مین مینو پر واپس جائیں۔"
+                    else:
+                        response += "\n💬 Type your choice or 'main' to return to main menu"
+                    
+                    send_whatsjet_message(from_number, response)
+                    context_manager.update_context(
+                        from_number,
+                        current_state='product_selection',
+                        current_menu='product_selection',
+                        current_menu_options=[p.get('Product Name', 'N/A') for p in matches],
+                        reply_language=reply_language
+                    )
+                    
+                else:
+                    # Too many matches - ask for clarification
+                    if reply_language == 'ur':
+                        response = f"🔍 *{len(matches)} سے زیادہ پروڈکٹ ملے۔ براہ کرم مزید تفصیل دیں:*\n\n"
+                    else:
+                        response = f"🔍 *Found {len(matches)}+ products. Please be more specific:*\n\n"
+                    
+                    # Show first 10 matches as examples
+                    for i, product in enumerate(matches[:10], 1):
+                        product_name = product.get('Product Name', 'N/A')
+                        category = product.get('Category', 'N/A')
+                        if reply_language == 'ur':
+                            response += f"{format_number_with_emoji(i)} {product_name} ({category})\n"
+                        else:
+                            response += f"{format_number_with_emoji(i)} {product_name} ({category})\n"
+                    
+                    if reply_language == 'ur':
+                        response += "\n💬 براہ کرم مزید تفصیل دیں یا 'main' لکھ کر مین مینو پر واپس جائیں۔"
+                    else:
+                        response += "\n💬 Please provide more details or type 'main' to return to main menu"
+                    
+                    send_whatsjet_message(from_number, response)
+                    context_manager.update_context(from_number, awaiting_clarification=True)
+                    
+            else:
+                # No matches found - use OpenAI for intelligent response
+                await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
+                return
+        
+        # 🎯 PRIORITY 6: Product selection handling
+        elif current_state == 'product_selection':
+            # Handle product selection from list
+            try:
+                selection_index = int(message_body) - 1
+                menu_options = user_context.get('current_menu_options', [])
+                
+                if 0 <= selection_index < len(menu_options):
+                    selected_product_name = menu_options[selection_index]
+                    # Find the product in the database
+                    if products_df is not None and not products_df.empty:
+                        product_match = products_df[products_df['Product Name'].str.contains(selected_product_name, case=False, na=False)]
+                        if not product_match.empty:
+                            product = product_match.iloc[0].to_dict()
+                            context_manager.update_context(from_number, current_product=product)
+                            await send_product_with_image(from_number, product, user_context)
+                            await handle_veterinary_product_followup(selected_product_name, from_number)
+                            return
+                
+                # Invalid selection
+                if reply_language == 'ur':
+                    send_whatsjet_message(from_number, "❌ *غلط انتخاب۔ براہ کرم دوبارہ کوشش کریں یا 'main' لکھ کر مین مینو پر واپس جائیں۔*")
+                else:
+                    send_whatsjet_message(from_number, "❌ *Invalid selection. Please try again or type 'main' to return to main menu.*")
+                    
+            except ValueError:
+                # Not a number - treat as general query
+                await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
+                return
+        
+        # 🎯 PRIORITY 7: All other queries - use OpenAI for intelligent response
         await handle_general_query_with_ai(from_number, message_body, user_context, reply_language)
         return