workflow

app/ai/graph.py

@@ -1,4 +1,4 @@
-# app/ai/graph.py - COMPLETE WORKING WORKFLOW
+# app/ai/graph.py - COMPLETE LANGGRAPH WORKFLOW
 from langgraph.graph import StateGraph, START, END
 from typing import Dict
 from structlog import get_logger
@@ -6,8 +6,8 @@ from structlog import get_logger
 from app.ai.state import ChatState
 from app.ai.nodes.intent_node import intent_node
 from app.ai.nodes.draft_node import draft_node
-from app.ai.nodes.search_node import search_node  # Existing
-from app.ai.nodes.publish_node import publish_node  # Existing
+from app.ai.nodes.search_node import search_node
+from app.ai.nodes.publish_node import publish_node
 
 logger = get_logger(__name__)
 
@@ -25,64 +25,41 @@ workflow.add_node("publish", publish_node)
 
 # ===== ROUTING LOGIC =====
 def route_from_intent(state: Dict) -> str:
-    """
-    Route based on intent detected
-    
-    Returns next node name:
-    - "draft" if listing intent
-    - "search" if search intent
-    - END if greeting
-    """
+    """Route based on intent"""
     intent = state.get("intent")
     
-    logger.info(f"🔀 Routing", intent=intent)
+    logger.info(f"🔀 Routing from intent", intent=intent)
     
     if intent == "list":
         return "draft"
     elif intent == "search":
         return "search"
     elif intent == "my_listings":
-        return "search"  # Use search node to fetch user's listings
+        return "search"  # Reuse search node
     else:
         return END
 
 
 def route_from_draft(state: Dict) -> str:
-    """
-    Route from draft node based on status
-    
-    Returns:
-    - "publish" if publishing
-    - END if discarded/complete
-    """
+    """Route from draft"""
     status = state.get("status")
     
-    logger.info(f"🔀 Draft routing", status=status)
+    logger.info(f"🔀 Routing from draft", status=status)
     
     if status == "publishing":
         return "publish"
     elif status == "discarded":
         return END
     elif status == "preview_shown":
-        # Stay in preview, wait for user input
         return END
     else:
-        # Still collecting/checking optional
         return END
 
 
 def route_after_publish(state: Dict) -> str:
-    """Route after publishing"""
-    status = state.get("status")
-    
-    logger.info(f"🔀 Publish routing", status=status)
-    
-    if status == "published":
-        return END
-    elif status == "error":
-        return END
-    else:
-        return END
+    """Route after publish"""
+    logger.info(f"🔀 Routing after publish")
+    return END
 
 
 # ===== ADD EDGES =====

app/ai/nodes/draft_node.py

@@ -1,5 +1,5 @@
 # app/ai/nodes/draft_node.py - COMPLETE WORKING VERSION
-import datetime
+import re
 from typing import Dict, List
 from structlog import get_logger
 
@@ -9,28 +9,15 @@ logger = get_logger(__name__)
 # AMENITY ICONS
 # ============================================
 AMENITY_ICONS = {
-    "wifi": "📶",
-    "parking": "🅿️",
-    "furnished": "🛋️",
-    "washing machine": "🧼",
-    "washing": "🧼",
-    "dryer": "🔥",
-    "balcony": "🏖️",
-    "pool": "🏊",
-    "gym": "💪",
-    "garden": "🌿",
-    "air conditioning": "❄️",
-    "ac": "❄️",
-    "kitchen": "🍳",
-    "security": "🔒",
-    "elevator": "🛗",
-    "laundry": "🧺",
-    "heating": "🔥",
+    "wifi": "📶", "parking": "🅿️", "furnished": "🛋️", "washing machine": "🧼",
+    "washing": "🧼", "dryer": "🔥", "balcony": "🏖️", "pool": "🏊", "gym": "💪",
+    "garden": "🌿", "air conditioning": "❄️", "ac": "❄️", "kitchen": "🍳",
+    "security": "🔒", "elevator": "🛗", "laundry": "🧺", "heating": "🔥", "hot water": "🚿",
 }
 
 
 def add_amenity_icons(amenities: List[str]) -> str:
-    """Convert amenity list to icon format"""
+    """Convert amenity list to emoji format"""
     if not amenities:
         return ""
     
@@ -44,11 +31,10 @@ def add_amenity_icons(amenities: List[str]) -> str:
 
 
 def generate_title(state: Dict) -> str:
-    """Generate listing title from fields"""
+    """Generate professional title"""
     bedrooms = state.get("bedrooms", "N/A")
     location = state.get("location", "N/A").title()
     listing_type = state.get("listing_type", "rental").title()
-    
     return f"{bedrooms}-Bedroom {listing_type} in {location}"
 
 
@@ -63,58 +49,56 @@ def generate_description(state: Dict) -> str:
     amenities = state.get("amenities", [])
     requirements = state.get("requirements")
     
-    # Build description
     parts = []
-    
-    # Main description
     parts.append(f"Spacious {bedrooms}-bedroom, {bathrooms}-bathroom property in {location}.")
     
-    # Amenities
     if amenities:
         amenities_str = ", ".join(amenities)
         parts.append(f"Features include: {amenities_str}.")
     
-    # Price
     parts.append(f"Price: {price:,.0f} {currency} per {price_type}.")
     
-    # Requirements
     if requirements:
-        parts.append(f"Requirements: {requirements}.")
+        if "deposit" in requirements.lower() or "require" in requirements.lower():
+            parts.append("Special requirements apply.")
     
     return " ".join(parts)
 
 
 async def draft_node(state: Dict) -> Dict:
-    """
-    Process draft creation and display
-    
-    States:
-    - collecting → asking for missing fields
-    - checking_optional → asking about amenities
-    - draft_ready → generate preview
-    - preview_shown → waiting for user action (publish/edit/discard)
-    """
+    """Process draft creation, preview, edits, and actions"""
     
     current_status = state.get("status", "greeting")
     logger.info(f"📄 Draft Node", status=current_status)
     
-    # ===== COLLECTING REQUIRED FIELDS =====
-    if current_status == "collecting":
-        # Ask for next missing field - reply already set in intent_node
+    # ===== COLLECTING / CHECKING_OPTIONAL =====
+    if current_status in ["collecting", "checking_optional"]:
+        from app.ai.nodes.intent_node import extract_amenities, get_missing_fields
+        
+        new_amenities = extract_amenities(state["messages"][-1]["content"])
+        if new_amenities:
+            state["amenities"] = list(set(state.get("amenities", []) + new_amenities))
+        
+        user_msg = state["messages"][-1]["content"].lower()
+        if any(w in user_msg for w in ["require", "deposit", "condition", "no ", "must"]):
+            state["requirements"] = state["messages"][-1]["content"]
+        
+        missing = get_missing_fields(state)
+        state["missing_fields"] = missing
+        
+        if not missing and current_status == "checking_optional":
+            state["status"] = "draft_ready"
+        
         return state
     
-    # ===== CHECKING OPTIONAL FIELDS =====
-    if current_status == "checking_optional":
-        # User just answered optional fields question
-        # Next: Generate draft preview
-        state["status"] = "draft_ready"
+    # ===== GENERATE DRAFT PREVIEW =====
+    if current_status == "draft_ready":
+        logger.info("📄 Generating draft preview")
         
-        # Generate title and description
         title = generate_title(state)
         description = generate_description(state)
         amenities_with_icons = add_amenity_icons(state.get("amenities", []))
         
-        # Build draft preview
         draft_preview = {
             "title": title,
             "description": description,
@@ -133,16 +117,13 @@ async def draft_node(state: Dict) -> Dict:
         
         state["draft_preview"] = draft_preview
         
-        # Build preview message
-        images_section = f"📷 Images: {len(draft_preview['images'])} uploaded" if draft_preview['images'] else "📷 No images yet"
+        images_section = f"📷 {len(draft_preview['images'])} images" if draft_preview['images'] else "📷 No images"
         
         preview_text = f"""
 ┌────────────────────────────────────────────────────────────────┐
-🏠 LISTING PREVIEW
+🏠 {draft_preview['title']}
 └────────────────────────────────────────────────────────────────┘
 
-**{draft_preview['title']}**
-
 📍 Location: {draft_preview['location']}
 🛏️ Bedrooms: {draft_preview['bedrooms']}
 🚿 Bathrooms: {draft_preview['bathrooms']}
@@ -155,84 +136,94 @@ async def draft_node(state: Dict) -> Dict:
 
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-✅ Ready to publish? Say **"publish"** to make it live!
-You can also say **"edit"** to change something or **"discard"** to start over.
+Ready? Say 'publish' to make it live, 'edit' to change, or 'discard' to start over.
 """
         
         state["status"] = "preview_shown"
         state["ai_reply"] = preview_text
-        
-        logger.info(f"📊 Draft preview generated: {title}")
+        logger.info("✅ Preview generated")
     
     # ===== PREVIEW SHOWN - WAITING FOR ACTION =====
     elif current_status == "preview_shown":
-        # Check for user actions
+        from app.ai.nodes.intent_node import translate_to_language
+        
         last_msg = state["messages"][-1]["content"].lower()
         
-        if any(k in last_msg for k in ["publish", "publier", "go live", "post", "confirm", "yes", "ok"]):
+        if any(k in last_msg for k in ["publish", "publier", "go live", "post", "confirm", "yes", "ok", "okay"]):
             state["status"] = "publishing"
-            state["ai_reply"] = "✅ Publishing your listing now..."
-            logger.info(f"📤 Publishing triggered")
+            publish_msg = "Publishing your listing..."
+            state["ai_reply"] = await translate_to_language(publish_msg, state.get("user_language", "English"))
+            logger.info("📤 Publishing triggered")
+            return state
         
-        elif any(k in last_msg for k in ["edit", "change", "modifier", "update", "correction"]):
+        if any(k in last_msg for k in ["edit", "change", "modifier", "update", "correction", "fix"]):
             state["status"] = "editing"
-            state["ai_reply"] = "What would you like to change? (e.g., location, price, bedrooms, amenities)"
-            logger.info(f"✏️ Edit mode triggered")
+            edit_msg = "What would you like to change? (e.g., price, bedrooms, location, amenities)"
+            state["ai_reply"] = await translate_to_language(edit_msg, state.get("user_language", "English"))
+            logger.info("✏️ Edit mode triggered")
+            return state
         
-        elif any(k in last_msg for k in ["discard", "delete", "cancel", "annuler", "remove"]):
+        if any(k in last_msg for k in ["discard", "delete", "cancel", "annuler", "remove", "start over"]):
             state["status"] = "discarded"
-            # Clear draft fields
-            for key in ["location", "bedrooms", "bathrooms", "price", "listing_type", "price_type", "amenities", "requirements", "draft_preview"]:
+            for key in ["location", "bedrooms", "bathrooms", "price", "listing_type", "price_type", "amenities", "requirements", "draft_preview", "image_urls"]:
                 state.pop(key, None)
-            state["ai_reply"] = "✅ Draft cleared. What would you like to do next?"
-            logger.info(f"🗑️ Draft discarded")
+            discard_msg = "✅ Draft cleared. What would you like to do next?"
+            state["ai_reply"] = await translate_to_language(discard_msg, state.get("user_language", "English"))
+            logger.info("🗑️ Draft discarded")
+            return state
         
-        else:
-            # User asked a question or gave feedback
-            state["ai_reply"] = "You can say **'publish'** to list it, **'edit'** to change something, or **'discard'** to start over."
+        state["ai_reply"] = "You can say 'publish' to list it, 'edit' to change something, or 'discard' to start over."
     
     # ===== EDITING =====
     elif current_status == "editing":
-        # User is in edit mode
+        from app.ai.nodes.intent_node import extract_number, extract_location
+        
         last_msg = state["messages"][-1]["content"]
         
-        # Simple field detection for edits
         if "price" in last_msg.lower():
-            # Extract new price
-            import re
-            prices = re.findall(r'(\d+)[k,.]?', last_msg.lower())
-            if prices:
-                new_price = float(prices[0]) * (1000 if 'k' in last_msg.lower() else 1)
+            new_price = extract_number(last_msg)
+            if new_price:
                 state["price"] = new_price
                 state["ai_reply"] = f"✅ Price updated to {new_price:,.0f}! Here's the updated preview:"
         
         elif "bedroom" in last_msg.lower() or "bed" in last_msg.lower():
-            import re
             nums = re.findall(r'(\d+)', last_msg)
             if nums:
                 state["bedrooms"] = int(nums[0])
                 state["ai_reply"] = f"✅ Bedrooms updated to {nums[0]}! Here's the updated preview:"
         
         elif "bathroom" in last_msg.lower() or "bath" in last_msg.lower():
-            import re
             nums = re.findall(r'(\d+)', last_msg)
             if nums:
                 state["bathrooms"] = int(nums[0])
                 state["ai_reply"] = f"✅ Bathrooms updated to {nums[0]}! Here's the updated preview:"
         
-        elif "location" in last_msg.lower():
-            # Extract location from edit message
-            from app.ai.nodes.intent_node import extract_location
+        elif "location" in last_msg.lower() or "city" in last_msg.lower():
             new_location = extract_location(last_msg)
             if new_location:
                 state["location"] = new_location
+                try:
+                    from app.ml.models.ml_listing_extractor import get_ml_extractor
+                    ml = get_ml_extractor()
+                    currency, country, city, conf = await ml.infer_currency(state)
+                    if currency:
+                        state["currency"] = currency
+                except:
+                    pass
                 state["ai_reply"] = f"✅ Location updated to {new_location}! Here's the updated preview:"
         
+        elif "amenities" in last_msg.lower():
+            from app.ai.nodes.intent_node import extract_amenities
+            new_amenities = extract_amenities(last_msg)
+            if new_amenities:
+                state["amenities"] = list(set(state.get("amenities", []) + new_amenities))
+                state["ai_reply"] = f"✅ Amenities updated! Here's the updated preview:"
+        
         else:
-            state["ai_reply"] = "I didn't understand what to change. Please say 'price', 'location', 'bedrooms', or 'bathrooms' and the new value."
+            state["ai_reply"] = "I didn't understand. Please say 'price', 'location', 'bedrooms', 'bathrooms', or 'amenities' and the new value."
             return state
         
-        # Regenerate draft preview
+        # Regenerate preview
         title = generate_title(state)
         description = generate_description(state)
         amenities_with_icons = add_amenity_icons(state.get("amenities", []))
@@ -255,16 +246,13 @@ You can also say **"edit"** to change something or **"discard"** to start over.
         
         state["draft_preview"] = draft_preview
         
-        # Show updated preview
-        images_section = f"📷 Images: {len(draft_preview['images'])} uploaded" if draft_preview['images'] else "📷 No images yet"
+        images_section = f"📷 {len(draft_preview['images'])} images" if draft_preview['images'] else "📷 No images"
         
         preview_text = f"""
 ┌────────────────────────────────────────────────────────────────┐
-🏠 UPDATED PREVIEW
+🏠 {draft_preview['title']}
 └────────────────────────────────────────────────────────────────┘
 
-**{draft_preview['title']}**
-
 📍 Location: {draft_preview['location']}
 🛏️ Bedrooms: {draft_preview['bedrooms']}
 🚿 Bathrooms: {draft_preview['bathrooms']}
@@ -277,12 +265,11 @@ You can also say **"edit"** to change something or **"discard"** to start over.
 
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-✅ Ready? Say **"publish"** to make it live!
-Or continue editing.
+Ready? Say 'publish' or 'edit' again, or 'discard'.
 """
         
         state["status"] = "preview_shown"
         state["ai_reply"] = preview_text
-        logger.info(f"🔄 Draft updated and preview regenerated")
+        logger.info("🔄 Preview regenerated")
     
     return state

app/ai/nodes/intent_node.py

@@ -1,4 +1,4 @@
-# app/ai/nodes/intent_node.py - COMPLETE WORKING VERSION (DeepSeek)
+# app/ai/nodes/intent_node.py - COMPLETE WORKING VERSION
 import json
 import re
 import os
@@ -23,58 +23,123 @@ client = AsyncOpenAI(
 )
 
 # ============================================
-# LANGUAGE DETECTION
+# ML EXTRACTOR - Robust extraction
 # ============================================
-def detect_language(text: str) -> str:
-    """
-    Detect user's language from their message
-    Returns: 'english', 'french', 'yoruba', 'spanish', 'portuguese'
-    """
-    text_lower = text.lower()
-    
-    # French keywords
-    if any(w in text_lower for w in ["bonjour", "prix", "loyer", "appartement", "chambre", "français", "merci", "svp"]):
-        return "french"
-    
-    # Spanish keywords
-    if any(w in text_lower for w in ["hola", "precio", "alquiler", "habitación", "español", "gracias", "por favor"]):
-        return "spanish"
-    
-    # Portuguese keywords
-    if any(w in text_lower for w in ["olá", "preço", "aluguel", "quarto", "português", "obrigado", "por favor"]):
-        return "portuguese"
-    
-    # Yoruba keywords
-    if any(w in text_lower for w in ["bawo", "owo", "ile", "odun", "yoruba", "e kaaro"]):
-        return "yoruba"
+try:
+    from app.ml.models.ml_listing_extractor import get_ml_extractor
+    ml_extractor = get_ml_extractor()
+    ML_AVAILABLE = True
+    logger.info("✅ ML Extractor available")
+except Exception as e:
+    ml_extractor = None
+    ML_AVAILABLE = False
+    logger.warning(f"⚠️ ML Extractor not available: {e}")
+
+
+# ============================================
+# LANGUAGE DETECTION - Using LLM
+# ============================================
+async def detect_language_with_llm(text: str) -> str:
+    """Detect user's language using DeepSeek LLM"""
+    try:
+        response = await client.chat.completions.create(
+            model=MODEL,
+            messages=[
+                {
+                    "role": "user",
+                    "content": f"What language is this text written in? Reply with ONLY the language name:\n\n{text[:200]}"
+                }
+            ],
+            temperature=0,
+            max_tokens=20,
+        )
+        language = response.choices[0].message.content.strip()
+        logger.info(f"🌍 Language detected: {language}")
+        return language
+    except Exception as e:
+        logger.warning(f"⚠️ Language detection failed: {e}")
+        return "English"
+
+
+# ============================================
+# TRANSLATE TEXT - Using LLM
+# ============================================
+async def translate_to_language(text: str, language: str) -> str:
+    """Translate text to user's language"""
+    if language.lower() == "english":
+        return text
     
-    return "english"
+    try:
+        response = await client.chat.completions.create(
+            model=MODEL,
+            messages=[
+                {
+                    "role": "user",
+                    "content": f"Translate this to {language} language. Reply with ONLY the translation:\n\n{text}"
+                }
+            ],
+            temperature=0,
+            max_tokens=300,
+        )
+        return response.choices[0].message.content.strip()
+    except Exception as e:
+        logger.warning(f"⚠️ Translation failed: {e}")
+        return text
+
+
+# ============================================
+# GENERATE EXAMPLE - Using LLM
+# ============================================
+async def generate_listing_example(language: str) -> str:
+    """Generate property listing example in user's language"""
+    try:
+        response = await client.chat.completions.create(
+            model=MODEL,
+            messages=[
+                {
+                    "role": "user",
+                    "content": f"""Generate a helpful property listing example in {language} language.
+
+Show them an example of what they could say when listing a property.
+Include: bedrooms, bathrooms, location, price, amenities, and requirements.
+Make it friendly and realistic.
+End with: "Tell me about your property! 🏠"
+
+Start with: "📝 Here's how to list a property:"
+"""
+                }
+            ],
+            temperature=0.3,
+            max_tokens=400,
+        )
+        return response.choices[0].message.content.strip()
+    except Exception as e:
+        logger.warning(f"⚠️ Example generation failed: {e}")
+        return f"📝 Tell me about the property you want to list!"
 
 
 # ============================================
 # FIELD EXTRACTION HELPERS
 # ============================================
 def detect_listing_type(text: str) -> Optional[str]:
-    """Auto-detect listing type from user's message"""
+    """Auto-detect listing type"""
     text_lower = text.lower()
-    
     if any(w in text_lower for w in ["short stay", "airbnb", "nightly", "daily", "weekly"]):
         return "short-stay"
-    elif any(w in text_lower for w in ["sale", "sell", "selling", "for sale", "vendre", "à vendre"]):
+    elif any(w in text_lower for w in ["sale", "sell", "selling", "for sale", "vendre"]):
         return "sale"
-    elif any(w in text_lower for w in ["roommate", "sharing", "flatmate", "colocataire", "coloca"]):
+    elif any(w in text_lower for w in ["roommate", "sharing", "flatmate", "colocataire"]):
         return "roommate"
     else:
         return "rent"
 
 
 def detect_price_type(text: str) -> Optional[str]:
-    """Auto-detect price type from user's message"""
+    """Auto-detect price type"""
     text_lower = text.lower()
-    
-    if any(w in text_lower for w in ["nightly", "night", "daily", "day", "par nuit", "nuit"]):
+    if any(w in text_lower for w in ["nightly", "night", "daily", "day", "par nuit"]):
         return "nightly"
-    elif any(w in text_lower for w in ["yearly", "year", "annually", "par an", "annuel"]):
+    elif any(w in text_lower for w in ["yearly", "year", "annually", "par an"]):
         return "yearly"
     else:
         return "monthly"
@@ -94,29 +159,20 @@ def extract_number(text: str) -> Optional[float]:
 
 
 def extract_location(text: str) -> Optional[str]:
-    """Extract location (city name) from text"""
+    """Extract location (city name)"""
     cities = {
-        "lagos": "lagos",
-        "cotonou": "cotonou",
-        "calavi": "calavi",
-        "paris": "paris",
-        "london": "london",
-        "nairobi": "nairobi",
-        "accra": "accra",
-        "johannesburg": "johannesburg",
-        "lyon": "lyon",
-        "marseille": "marseille",
-        "kinshasa": "kinshasa",
-        "dakar": "dakar",
-        "kampala": "kampala",
-        "cape town": "cape town",
+        "lagos": "lagos", "cotonou": "cotonou", "calavi": "calavi",
+        "paris": "paris", "london": "london", "lyon": "lyon",
+        "marseille": "marseille", "nairobi": "nairobi", "accra": "accra",
+        "johannesburg": "johannesburg", "kinshasa": "kinshasa", "dakar": "dakar",
+        "kampala": "kampala", "cape town": "cape town", "madrid": "madrid",
+        "barcelona": "barcelona", "lisbon": "lisbon",
     }
     
     text_lower = text.lower()
     for city_key, city_val in cities.items():
         if city_key in text_lower:
             return city_val
-    
     return None
 
 
@@ -125,7 +181,7 @@ def extract_amenities(text: str) -> List[str]:
     amenities_list = [
         "wifi", "parking", "furnished", "washing machine", "dryer",
         "balcony", "pool", "gym", "garden", "air conditioning", "kitchen",
-        "ac", "washer", "elevator", "security", "laundry", "heating"
+        "ac", "washer", "elevator", "security", "laundry", "heating", "hot water"
     ]
     
     found_amenities = []
@@ -147,7 +203,7 @@ def extract_amenities(text: str) -> List[str]:
 # REQUIRED FIELDS CHECK
 # ============================================
 def get_missing_fields(state: Dict) -> List[str]:
-    """Check which required fields are still missing"""
+    """Check which required fields are missing"""
     required = ["location", "bedrooms", "bathrooms", "price", "listing_type", "price_type"]
     missing = []
     
@@ -159,33 +215,21 @@ def get_missing_fields(state: Dict) -> List[str]:
     return missing
 
 
-def get_next_question(missing_fields: List[str], language: str = "english") -> Optional[str]:
-    """Generate the next question to ask user"""
+def get_next_question_en(missing_fields: List[str]) -> Optional[str]:
+    """Get next question in English"""
     if not missing_fields:
         return None
     
     questions = {
-        "english": {
-            "location": "What city/area is the property in?",
-            "bedrooms": "How many bedrooms does it have?",
-            "bathrooms": "How many bathrooms?",
-            "price": "What's the price?",
-            "listing_type": "Is it for rent, short-stay, sale, or roommate?",
-            "price_type": "Is that monthly, nightly, or yearly?",
-        },
-        "french": {
-            "location": "Dans quelle ville se trouve le bien ?",
-            "bedrooms": "Combien de chambres ?",
-            "bathrooms": "Combien de salles de bain ?",
-            "price": "Quel est le prix ?",
-            "listing_type": "Est-ce pour la location, court séjour, vente ou colocation ?",
-            "price_type": "Est-ce mensuel, nuitée ou annuel ?",
-        },
+        "location": "What city/area is the property in?",
+        "bedrooms": "How many bedrooms does it have?",
+        "bathrooms": "How many bathrooms?",
+        "price": "What's the price?",
+        "listing_type": "Is it for rent, short-stay, sale, or roommate?",
+        "price_type": "Is that monthly, nightly, or yearly?",
     }
     
-    next_field = missing_fields[0]
-    lang_questions = questions.get(language, questions["english"])
-    return lang_questions.get(next_field, "Tell me more about the property")
+    return questions.get(missing_fields[0], "Tell me more about the property")
 
 
 # ============================================
@@ -193,37 +237,26 @@ def get_next_question(missing_fields: List[str], language: str = "english") -> O
 # ============================================
 @retry(stop=stop_after_attempt(3), wait=wait_exponential(multiplier=1, min=1, max=5))
 async def intent_node(state: Dict) -> Dict:
-    """
-    Main intent detection & extraction node using DeepSeek
-    
-    Flow:
-    1. Detect language (once per conversation)
-    2. Determine intent from user message
-    3. Extract fields progressively
-    4. Check for missing required fields
-    5. Return next action for workflow
-    """
+    """Main intent detection & extraction node"""
     
     user_id = state.get("user_id", "unknown")
-    user_role = state.get("user_role", "landlord")
     human_msg = state["messages"][-1]["content"]
     
-    logger.info("🤖 Intent Node", user_id=user_id, msg=human_msg[:80])
+    logger.info(f"🤖 Intent Node", user_id=user_id, msg=human_msg[:80])
     
-    # ===== Step 1: Detect Language (once) =====
+    # ===== DETECT LANGUAGE =====
     if "user_language" not in state:
-        state["user_language"] = detect_language(human_msg)
+        state["user_language"] = await detect_language_with_llm(human_msg)
     
     language = state["user_language"]
-    logger.info(f"🌍 Language detected: {language}")
+    logger.info(f"🌍 Language: {language}")
     
-    # ===== Step 2: Determine Intent =====
+    # ===== DETERMINE INTENT =====
     last_msg_lower = human_msg.lower().strip()
     
-    # Intent keywords
     if any(k in last_msg_lower for k in ["list", "publish", "create", "post", "sell", "rent out", "louer", "vendre"]):
         intent = "list"
-    elif any(k in last_msg_lower for k in ["search", "find", "show", "look", "browse", "apartments", "houses", "chercher", "apartment", "maison"]):
+    elif any(k in last_msg_lower for k in ["search", "find", "show", "look", "browse", "apartments", "houses"]):
         intent = "search"
     elif any(k in last_msg_lower for k in ["my listings", "my properties", "my apartments", "mes annonces"]):
         intent = "my_listings"
@@ -232,70 +265,116 @@ async def intent_node(state: Dict) -> Dict:
     
     logger.info(f"📍 Intent: {intent}")
     
-    # ===== Step 3: Route Based on Intent =====
-    
+    # ===== LIST INTENT =====
     if intent == "list":
-        # LISTING CREATION FLOW
         state["intent"] = "list"
         state["allowed"] = True
         
-        # Extract fields from user message
-        location = extract_location(human_msg)
-        if location:
-            state["location"] = location
+        # First time - show example
+        is_first_list = not state.get("location") and not state.get("bedrooms")
         
-        bedrooms = extract_number(human_msg)
-        if bedrooms and bedrooms <= 20:  # Sanity check
-            state["bedrooms"] = int(bedrooms)
-        
-        bathrooms = extract_number(human_msg.split("bathroom")[-1] if "bathroom" in human_msg else human_msg)
-        if bathrooms and bathrooms <= 20:
-            state["bathrooms"] = int(bathrooms)
-        
-        price = extract_number(human_msg)
-        if price and price > 0:
-            state["price"] = float(price)
-        
-        state["listing_type"] = detect_listing_type(human_msg)
-        state["price_type"] = detect_price_type(human_msg)
+        if is_first_list:
+            example_msg = await generate_listing_example(language)
+            state["status"] = "collecting"
+            state["ai_reply"] = example_msg
+            logger.info("📝 Showing example")
+            return state
         
-        # Extract amenities
-        amenities = extract_amenities(human_msg)
-        if amenities:
-            state["amenities"] = list(set(state.get("amenities", []) + amenities))
+        # Extract fields using ML
+        if ML_AVAILABLE and ml_extractor:
+            try:
+                location = extract_location(human_msg)
+                if location:
+                    state["location"] = location
+                
+                bedrooms_match = re.search(r'(\d+)\s*(?:bed|bedroom|chambre)', human_msg.lower())
+                if bedrooms_match:
+                    state["bedrooms"] = int(bedrooms_match.group(1))
+                
+                bathrooms_match = re.search(r'(\d+)\s*(?:bath|bathroom|salle de bain)', human_msg.lower())
+                if bathrooms_match:
+                    state["bathrooms"] = int(bathrooms_match.group(1))
+                
+                price = extract_number(human_msg)
+                if price and price > 0:
+                    state["price"] = float(price)
+                
+                state["listing_type"] = detect_listing_type(human_msg)
+                state["price_type"] = detect_price_type(human_msg)
+                
+                amenities = extract_amenities(human_msg)
+                if amenities:
+                    state["amenities"] = list(set(state.get("amenities", []) + amenities))
+                
+                if any(w in human_msg.lower() for w in ["require", "deposit", "condition", "need"]):
+                    state["requirements"] = human_msg
+                
+                # Infer currency
+                if state.get("location") and not state.get("currency"):
+                    try:
+                        currency, country, city, conf = await ml_extractor.infer_currency(state)
+                        if currency:
+                            state["currency"] = currency
+                    except:
+                        state["currency"] = "XOF"
+                
+            except Exception as e:
+                logger.warning(f"⚠️ ML extraction error: {e}")
+                location = extract_location(human_msg)
+                if location:
+                    state["location"] = location
+                bedrooms = extract_number(human_msg)
+                if bedrooms and bedrooms <= 20:
+                    state["bedrooms"] = int(bedrooms)
+                price = extract_number(human_msg)
+                if price and price > 0:
+                    state["price"] = float(price)
+                state["listing_type"] = detect_listing_type(human_msg)
+                state["price_type"] = detect_price_type(human_msg)
+                amenities = extract_amenities(human_msg)
+                if amenities:
+                    state["amenities"] = list(set(state.get("amenities", []) + amenities))
+                state["currency"] = "XOF"
+        else:
+            location = extract_location(human_msg)
+            if location:
+                state["location"] = location
+            bedrooms = extract_number(human_msg)
+            if bedrooms and bedrooms <= 20:
+                state["bedrooms"] = int(bedrooms)
+            price = extract_number(human_msg)
+            if price and price > 0:
+                state["price"] = float(price)
+            state["listing_type"] = detect_listing_type(human_msg)
+            state["price_type"] = detect_price_type(human_msg)
+            amenities = extract_amenities(human_msg)
+            if amenities:
+                state["amenities"] = list(set(state.get("amenities", []) + amenities))
+            state["currency"] = "XOF"
         
-        # Determine status and next action
+        # Check missing fields
         missing = get_missing_fields(state)
         state["missing_fields"] = missing
         
         if missing:
-            # Still collecting required fields
             state["status"] = "collecting"
-            state["next_question"] = get_next_question(missing, language)
-            
-            # Build friendly reply
-            if state.get("bedrooms") and state.get("location"):
-                state["ai_reply"] = f"Great! {state['bedrooms']}-bed in {state['location']}. {state['next_question']}"
-            else:
-                state["ai_reply"] = state["next_question"]
+            question_en = get_next_question_en(missing)
+            state["next_question"] = question_en
+            state["ai_reply"] = await translate_to_language(question_en, language)
         else:
-            # All required fields present, ask about optional
             state["status"] = "checking_optional"
-            if language == "french":
-                state["ai_reply"] = "Parfait ! Des équipements ou exigences particulières ?"
-            else:
-                state["ai_reply"] = "Perfect! Any amenities or special requirements?"
+            optional_q = "Perfect! Any amenities or special requirements?"
+            state["ai_reply"] = await translate_to_language(optional_q, language)
         
-        logger.info(f"📋 Listing status: {state['status']}, missing: {missing}")
+        logger.info(f"📋 Listing: status={state['status']}, missing={missing}")
     
+    # ===== SEARCH INTENT =====
     elif intent == "search":
-        # SEARCH FLOW
         state["intent"] = "search"
         state["status"] = "searching"
         state["search_query"] = human_msg
         state["allowed"] = True
         
-        # Extract search filters
         location = extract_location(human_msg)
         if location:
             state["location"] = location
@@ -308,7 +387,6 @@ async def intent_node(state: Dict) -> Dict:
         if amenities:
             state["amenities"] = amenities
         
-        # Extract price range
         prices = re.findall(r'(\d+)[k,.]?', human_msg.lower())
         if prices:
             if len(prices) >= 2:
@@ -317,38 +395,29 @@ async def intent_node(state: Dict) -> Dict:
             else:
                 state["max_price"] = float(prices[0]) * (1000 if 'k' in human_msg.lower() else 1)
         
-        if language == "french":
-            state["ai_reply"] = "Recherche en cours..."
-        else:
-            state["ai_reply"] = "Searching for properties..."
-        
-        logger.info(f"🔍 Search: {location}, bedrooms: {bedrooms}, max_price: {state.get('max_price')}")
+        searching_msg = "Searching for properties..."
+        state["ai_reply"] = await translate_to_language(searching_msg, language)
+        logger.info(f"🔍 Search initiated")
     
+    # ===== MY LISTINGS INTENT =====
     elif intent == "my_listings":
-        # MY LISTINGS FLOW
         state["intent"] = "my_listings"
         state["status"] = "fetching_listings"
         state["allowed"] = True
         
-        if language == "french":
-            state["ai_reply"] = "Récupération de vos annonces..."
-        else:
-            state["ai_reply"] = "Fetching your listings..."
-        
+        fetching_msg = "Fetching your listings..."
+        state["ai_reply"] = await translate_to_language(fetching_msg, language)
         logger.info(f"📚 My listings requested")
     
+    # ===== GREETING =====
     else:
-        # GREETING / CASUAL CHAT
         state["intent"] = "greeting"
         state["status"] = "greeting"
         state["allowed"] = True
         
-        if language == "french":
-            state["ai_reply"] = "Bonjour ! 👋 Je suis Aida, l'assistant IA immobilier de Lojiz. Je peux vous aider à lister une propriété, rechercher des biens, ou discuter de l'immobilier. Qu'aimeriez-vous faire ?"
-        else:
-            state["ai_reply"] = "Hello! 👋 I'm Aida, Lojiz's real estate AI assistant. I can help you list a property, search for homes, or chat about real estate. What would you like to do?"
-        
-        logger.info(f"👋 Greeting mode")
+        greeting_msg = "Hello! 👋 I'm Aida, Lojiz's real estate AI assistant. I can help you list a property, search for homes, or chat about real estate. What would you like to do?"
+        state["ai_reply"] = await translate_to_language(greeting_msg, language)
+        logger.info(f"👋 Greeting in {language}")
     
     logger.info(f"✅ Intent node complete", intent=state.get("intent"), status=state.get("status"))
     return state

app/ai/routes/chat.py

@@ -1,4 +1,4 @@
-# app/routes/chat.py - COMPLETE WORKING API ROUTE
+# app/routes/chat.py - COMPLETE AIDA CHAT ROUTES
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.security import HTTPBearer
 from pydantic import BaseModel
@@ -17,14 +17,8 @@ security = HTTPBearer()
 # ============================================
 # REQUEST/RESPONSE MODELS
 # ============================================
-class MessageHistory(BaseModel):
-    """Chat message"""
-    role: str  # 'user' or 'assistant'
-    content: str
-
-
 class AskBody(BaseModel):
-    """Chat request"""
+    """Chat request body"""
     message: str
     thread_id: Optional[str] = None
 
@@ -32,7 +26,7 @@ class AskBody(BaseModel):
 class AskResponse(BaseModel):
     """Chat response"""
     text: str  # Main AI reply
-    intent: Optional[str] = None  # 'list' | 'search' | 'greeting'
+    intent: Optional[str] = None  # 'list' | 'search' | 'greeting' | 'my_listings'
     status: Optional[str] = None  # Current flow state
     draft_preview: Optional[Dict[str, Any]] = None  # For listings
     search_results: Optional[List[Dict]] = None  # For searches

app/ai/service.py

@@ -1,4 +1,4 @@
-# app/ai/service.py - COMPLETE WORKING SERVICE
+# app/ai/service.py - COMPLETE SERVICE LAYER
 import json
 from typing import Dict, Any
 from structlog import get_logger
@@ -51,7 +51,6 @@ async def aida_chat_sync(
             "amenities": [],
             "image_urls": [],
             "search_results": [],
-            "user_corrections": {},
         }
         
         logger.info(f"📊 Initial state created")

app/ai/state.py

@@ -1,45 +1,41 @@
-# app/ai/state.py - Complete State Definition
+# app/ai/state.py - Complete State Definition for LangGraph
 from typing import TypedDict, List, Optional, Dict, Any
-from datetime import datetime
 
 class ChatState(TypedDict, total=False):
     """Complete state for Aida AI conversation"""
     
     # ============ User Info ============
-    user_id: str                    # Current user
+    user_id: str                    # Current user ID
     user_role: str                  # 'landlord' or 'renter'
-    user_language: str              # Detected language (english, french, yoruba, etc)
+    user_language: str              # Detected language (English, French, Yoruba, etc)
     
     # ============ Conversation ============
     messages: List[Dict[str, str]]  # Chat history: [{"role": "user"/"assistant", "content": "..."}]
     
     # ============ Intent & Status ============
-    intent: str                     # 'list' | 'search' | 'greeting' | 'my_listings' | 'edit_listing'
-    status: str                     # Current flow state (see below)
+    intent: str                     # 'list' | 'search' | 'greeting' | 'my_listings'
+    status: str                     # Current flow state
     allowed: bool                   # Permission check passed?
     
     # ============ Listing Creation Fields ============
-    location: Optional[str]
-    bedrooms: Optional[int]
-    bathrooms: Optional[int]
-    price: Optional[float]
+    location: Optional[str]         # City name
+    bedrooms: Optional[int]         # Number of bedrooms
+    bathrooms: Optional[int]        # Number of bathrooms
+    price: Optional[float]          # Price amount
     price_type: Optional[str]       # 'monthly' | 'nightly' | 'yearly'
     listing_type: Optional[str]     # 'rent' | 'short-stay' | 'sale' | 'roommate'
-    amenities: List[str]
-    requirements: Optional[str]
-    currency: Optional[str]
+    amenities: List[str]            # List of amenities
+    requirements: Optional[str]     # Special requirements
+    currency: Optional[str]         # Currency code (XOF, NGN, EUR, etc)
     
     # ============ Search Fields ============
-    search_query: Optional[str]
-    min_price: Optional[float]
-    max_price: Optional[float]
+    search_query: Optional[str]     # User's search query
+    min_price: Optional[float]      # Minimum price filter
+    max_price: Optional[float]      # Maximum price filter
     
     # ============ Collection Flow ============
     missing_fields: List[str]       # Fields still needed
-    next_question: Optional[str]    # What to ask user next
-    
-    # ============ Corrections (IMPORTANT) ============
-    user_corrections: Dict[str, Any]  # Track user-corrected fields {field: value}
+    next_question: Optional[str]    # Next question to ask user
     
     # ============ Draft & Preview ============
     draft_preview: Optional[Dict[str, Any]]  # Formatted draft shown to user
@@ -48,55 +44,10 @@ class ChatState(TypedDict, total=False):
     mongo_id: Optional[str]         # MongoDB ID after publish
     
     # ============ Images ============
-    image_urls: List[str]
+    image_urls: List[str]           # Cloudflare image URLs
     
     # ============ Results ============
-    search_results: List[Dict[str, Any]]
+    search_results: List[Dict[str, Any]]  # Search results
     
     # ============ AI Response ============
-    ai_reply: str                   # What Aida says to user
-
-
-# ============ Status Flow Definition ============
-"""
-LISTING CREATION FLOW:
-  'greeting' 
-    ↓ (user says "list")
-  'collecting' → asking for missing required fields one-by-one
-    ↓ (all required fields complete)
-  'checking_optional' → asking about amenities/requirements
-    ↓ (optional fields handled)
-  'draft_ready' → draft generated, ready to show
-    ↓ (show preview to user)
-  'preview_shown' → user sees draft, can edit/publish/discard
-    ↓ (user says "publish")
-  'publishing' → saving to MongoDB
-    ↓
-  'published' → success
-    ↓ (user says "edit")
-  'editing' → user provides new value
-    ↓
-  'preview_shown' → updated draft shown (loop back)
-    ↓ (user says "discard")
-  'discarded' → draft cleared, back to greeting
-
-SEARCH FLOW:
-  'greeting'
-    ↓ (user says "search")
-  'collecting' → extracting all search filters
-    ↓
-  'searching' → querying Qdrant
-    ↓
-  'results_shown' → displaying results
-    ↓
-  'greeting' → ready for next action
-
-MY LISTINGS FLOW:
-  'greeting'
-    ↓ (user says "show my listings")
-  'fetching_listings' → getting user's listings from MongoDB
-    ↓
-  'listings_shown' → displaying list
-    ↓
-  'greeting' → ready for next action
-"""
+    ai_reply: str                   # What Aida says to user