source

app/ai/graph.py

@@ -1,4 +1,4 @@
-# app/ai/graph.py – FINAL POST-DRAFT ROUTING
+# app/ai/graph.py – FINAL (LangGraph only)
 from langgraph.graph import StateGraph, START, END
 from app.ai.state import ChatState
 from app.ai.nodes.intent_node        import intent_node
@@ -44,7 +44,7 @@ workflow.add_conditional_edges("check_permissions", route_from_permissions,
 
 workflow.add_edge("search_listings", END)
 
-# ---------- POST-DRAFT DECISION (language-agnostic keywords) ----------
+# ---------- POST-DRAFT ROUTING (language-agnostic) ----------
 _KEYWORDS_PUBLISH = {"publish", "publier", "go live", "post it", "list it", "confirm", "yes", "ok", "okay"}
 _KEYWORDS_EDIT    = {"edit", "modifier", "change", "update", "correction", "fix"}
 _KEYWORDS_DISCARD = {"discard", "delete", "cancel", "annuler", "remove", "start over"}
@@ -57,10 +57,18 @@ def route_after_draft(state: ChatState):
         return "handle_edit"
     if any(k in last for k in _KEYWORDS_DISCARD):
         return "handle_discard"
-    # treat as fresh intent
+    return "parse_intent"   # fall back to normal intent
+
+def gate_before_intent(state: ChatState):
+    # if draft is on screen, go straight to post-draft router
+    if state.get("status") == "preview_shown":
+        return "route_after_draft"
     return "parse_intent"
 
-workflow.add_conditional_edges("create_draft", route_after_draft,
+workflow.add_conditional_edges(START, gate_before_intent,
+                               {"route_after_draft": "route_after_draft",
+                                "parse_intent": "parse_intent"})
+workflow.add_conditional_edges("route_after_draft", route_after_draft,
                                {"handle_publish": "handle_publish",
                                 "handle_edit":    "handle_edit",
                                 "handle_discard": "handle_discard",

app/ai/nodes/draft_node.py

@@ -1,4 +1,4 @@
-# app/ai/nodes/draft_node.py - Fix location persistence + add amenity icons
+# app/ai/nodes/draft_node.py – COMPLETE FILE (final)
 import datetime
 from typing import Dict
 from bson import ObjectId
@@ -14,7 +14,7 @@ logger = get_logger(__name__)
 client = AsyncOpenAI(api_key=settings.OPENAI_API_KEY)
 ml_extractor = get_ml_extractor()
 
-# ========== AMENITY ICONS MAPPING ==========
+# ========== AMENITY ICONS ==========
 AMENITY_ICONS = {
     "wifi": "📶",
     "parking": "🅿️",
@@ -32,58 +32,49 @@ AMENITY_ICONS = {
 }
 
 def _add_amenity_icons(amenities: list) -> str:
-    """Convert amenities list to string with icons."""
     if not amenities:
         return ""
-    
     icons_text = []
     for amenity in amenities:
         amenity_lower = amenity.lower().strip()
         icon = AMENITY_ICONS.get(amenity_lower, "✓")
         icons_text.append(f"{icon} {amenity.title()}")
-    
     return " | ".join(icons_text)
 
 def _generate_title(state: Dict) -> str:
-    """Generate professional title from listing data."""
     bedrooms = state.get("bedrooms", "")
-    # ✅ CRITICAL: Use current location from state, not regenerated
     location = state.get("location", "").title()
     listing_type = state.get("listing_type", "").title()
-    
     if bedrooms and location:
         return f"{bedrooms}-Bedroom {listing_type} in {location}"
     return f"Property in {location}"
 
 def _generate_description(state: Dict) -> str:
-    """Generate professional description from listing data."""
     bedrooms = state.get("bedrooms", "")
     bathrooms = state.get("bathrooms", "")
-    # ✅ CRITICAL: Use current location from state, not regenerated
     location = state.get("location", "").title()
     amenities = state.get("amenities", [])
     price = state.get("price", "")
     price_type = state.get("price_type", "").title()
     listing_type = state.get("listing_type", "").title()
     requirements = state.get("requirements", "")
-    
+
     desc = f"Spacious {bedrooms}-bedroom, {bathrooms}-bathroom {listing_type} "
     desc += f"located in {location}. "
-    
+
     if price:
         desc += f"Priced at {price:,} {price_type}. "
-    
+
     if amenities:
-        amenities_str = ", ".join(amenities)
-        desc += f"Fully furnished with modern amenities including {amenities_str}. "
-    
+        desc += f"Fully furnished with modern amenities including {', '.join(amenities)}. "
+
     if requirements:
         desc += f"Requirements: {requirements}. "
-    
+
     desc += "Perfect for large families or shared accommodation."
     return desc
 
-# ---------- node ----------
+# ========== MAIN NODE ==========
 async def draft_node(state: Dict) -> Dict:
     """
     LangGraph node:
@@ -92,106 +83,102 @@ async def draft_node(state: Dict) -> Dict:
     - Move to "draft_ready"
     - Or status == "draft_ready" → show preview
     """
-    
+
     # ✅ NEW: Check if amenities/requirements are missing
     if state.get("status") == "checking_optional":
         amenities = state.get("amenities", [])
         requirements = state.get("requirements")
-        
-        # Ask about missing optional fields
+
         missing_optional = []
         if not amenities:
             missing_optional.append("amenities")
         if not requirements:
             missing_optional.append("requirements")
-        
+
         if missing_optional:
             state["status"] = "collecting_optional"
             state["missing_fields"] = missing_optional
-            
+
             questions = []
             if "amenities" in missing_optional:
                 questions.append("Any amenities? (e.g., wifi, parking, balcony, pool, furnished, kitchen, dryer, garden, etc.)")
             if "requirements" in missing_optional:
                 questions.append("Any special requirements for renters?")
-            
+
             state["ai_reply"] = "Just a couple more things...\n\n" + "\n".join([f"• {q}" for q in questions])
             logger.info("ℹ️ Asking for optional fields", missing=missing_optional)
             return state
         else:
             # All optional fields provided, move to draft
             state["status"] = "draft_ready"
-    
+
     # Only process if listing creation with all fields ready
     if state.get("intent") != "list" or state.get("status") != "draft_ready":
         return state
-    
+
     user_id = state.get("user_id")
-    
+
     # ✅ ML VALIDATION before drafting
     try:
         validation = ml_extractor.validate_all_fields(state, user_id)
-        
+
         if not validation["all_valid"]:
-            # Fields failed validation, go back to collecting
             issues_text = "\n".join([f"❌ {issue}" for issue in validation["issues"]])
             state["ai_reply"] = f"""I found some issues with your listing:
 
 {issues_text}
 
 Let me ask again - could you clarify these fields?"""
-            
+
             state["status"] = "collecting"
-            # Re-populate missing fields based on validation
             state["missing_fields"] = [
                 field for field, result in validation["field_validations"].items()
                 if not result["is_valid"]
             ]
-            
+
             logger.warning("🚫 Fields failed ML validation", issues=validation["issues"])
             return state
-        
+
         logger.info("✅ All fields passed ML validation", user_id=user_id)
-    
+
     except Exception as e:
         logger.error("❌ ML validation error", exc_info=e)
         state["ai_reply"] = "Sorry, I couldn't validate your listing. Please try again."
         state["status"] = "error"
         return state
-    
+
     # Generate title and description
-    # ✅ CRITICAL: These use state's current location (corrected by user)
     title = _generate_title(state)
     description = _generate_description(state)
     amenities_with_icons = _add_amenity_icons(state.get("amenities", []))
-    
+
     # ✅ Get images from state (if any were uploaded)
     images = state.get("draft", {}).get("images", []) if isinstance(state.get("draft"), dict) else []
-    
+
     # Build draft preview with all fields including images and icons
     draft_preview = {
         "title": title,
         "description": description,
-        "location": state.get("location", "").title(),  # ✅ Use current location
+        "location": state.get("location", "").title(),
         "bedrooms": state.get("bedrooms"),
         "bathrooms": state.get("bathrooms"),
         "price": state.get("price"),
         "price_type": state.get("price_type"),
         "listing_type": state.get("listing_type"),
         "amenities": state.get("amenities", []),
-        "amenities_with_icons": amenities_with_icons,  # ✅ NEW: Add icons
+        "amenities_with_icons": amenities_with_icons,
         "requirements": state.get("requirements"),
         "currency": state.get("currency", "XOF"),
-        "images": images,  # ✅ INCLUDE IMAGES
+        "images": images,
         "field_confidences": validation["field_validations"],
     }
-    
+
     logger.info("🎯 Draft preview generated",
                 title=title,
-                location=state.get("location"),  # ✅ Log actual location
+                location=state.get("location"),
                 image_count=len(images),
                 amenities=state.get("amenities", []))
-    
+
     # Build nice preview message for user
     images_section = ""
     if images:
@@ -200,7 +187,7 @@ Let me ask again - could you clarify these fields?"""
             images_section += f"   {idx}. {img_url[:60]}...\n"
         if len(images) > 3:
             images_section += f"   ... and {len(images) - 3} more\n"
-    
+
     preview_text = f"""
 ┌────────────────────────────────────────────────────────────────────────┐
 🏠 LISTING PREVIEW
@@ -219,7 +206,7 @@ Let me ask again - could you clarify these fields?"""
 {images_section}
 └────────────────────────────────────────────────────────────────────────┘
 """
-    
+
     # ✅ Check if images uploaded, ask if not
     if not images:
         preview_text += """
@@ -233,8 +220,12 @@ Then say **publish** to make it live!
 ✅ Perfect! Say **publish** to make your listing live!
 """
         state["status"] = "preview_shown"  # ✅ Ready to publish
-    
+
     state["draft_preview"] = draft_preview
     state["ai_reply"] = preview_text
-    
+
+    # ------------------------------------------------------------------
+    #  FINAL FLAG – triggers the gate in graph.py
+    # ------------------------------------------------------------------
+    state["status"] = "preview_shown"
     return state