Update app.py

app.py

@@ -5,16 +5,17 @@ import math
 import re
 from deep_translator import GoogleTranslator
 import warnings
-import xgboost as xgb
 
 warnings.filterwarnings("ignore")
 
 # Load models
-xgb_model = xgb.Booster()
-xgb_model.load_model("xgb_model.json")
-rf = joblib.load("rf_model.pkl")
+from xgboost import Booster
+xgb = Booster()
+xgb.load_model("xgb_model.json")
 
-# Load catalog and sizes
+rf = joblib.load("rf_model.pkl")  # Needs scikit-learn
+
+# Load tile catalog and sizes
 with open("tile_catalog.json", "r", encoding="utf-8") as f:
     tile_catalog = json.load(f)
 
@@ -30,28 +31,33 @@ def translate(text, lang="en"):
         return text
 
 def extract_tile_area(msg, unit):
-    msg = msg.lower().replace("feet", "").replace("ft", "").replace("mm", "").strip()
-    msg = re.sub(r"\s*(x|\u00d7|\*|into)\s*", "x", msg)
-    parts = msg.split("x")
-
-    try:
+    msg = msg.lower().replace("×", "x").replace("into", "x").replace("*", "x")
+    msg = msg.replace("mm", "").replace("ft", "").replace("feet", "").strip()
+    
+    if "x" in msg:
+        parts = re.split(r"x", msg)
         if len(parts) == 2:
-            val1 = float(re.sub(r"[^\d.]", "", parts[0]))
-            val2 = float(re.sub(r"[^\d.]", "", parts[1]))
-            sqft = (val1 * val2) / 92903.04 if unit == "mm" else val1 * val2
-            return round(sqft, 2)
-        elif len(parts) == 1 and parts[0]:
-            return float(re.sub(r"[^\d.]", "", parts[0]))
-        else:
+            try:
+                val1 = float(re.sub(r"[^\d.]", "", parts[0]))
+                val2 = float(re.sub(r"[^\d.]", "", parts[1]))
+                if unit == "mm":
+                    sqft = (val1 * val2) / 92903.04
+                else:
+                    sqft = val1 * val2
+                return round(sqft, 2)
+            except:
+                return None
+    else:
+        # Single value fallback for ft
+        try:
+            val = float(re.sub(r"[^\d.]", "", msg))
+            return val if unit == "ft" else None
+        except:
             return None
-    except:
-        return None
 
 def chat_fn(message, history, user_state={}):
-    if "step" not in user_state and message.strip().lower() in ["floor", "wall"]:
-        user_state.clear()
+    message = message.strip().lower()
 
-    # Language detection
     if "lang" not in user_state:
         try:
             user_state["lang"] = GoogleTranslator(source="auto", target="en").detect(message)
@@ -60,59 +66,59 @@ def chat_fn(message, history, user_state={}):
     lang = user_state["lang"]
     def reply(text): return translate(text, lang)
 
-    # Greeting handling
-    if message.strip().lower() in ["hi", "hello", "hey", "start", "tile", "help"]:
-        return reply("\U0001F44B Hello! I'm TileBot, your assistant for tile estimates.\nAre you planning for Floor or Wall tiles?"), None, user_state
+    # Greeting handler
+    if message in ["hi", "hello", "hey", "start", "help"]:
+        user_state.clear()
+        return reply("👋 Hello! Are you planning for Floor or Wall tiles?"), None, user_state
 
-    # Start conversation
-    if "step" not in user_state:
-        if message.lower() in ["floor", "wall"]:
-            user_state["tile_type"] = message.capitalize()
-            user_state["step"] = "get_length"
-            return reply(f"You selected {user_state['tile_type']} tiles.\nEnter the length of the space in feet:"), None, user_state
-        return reply("Hi! Are you planning for Floor or Wall tiles?"), None, user_state
+    if message in ["floor", "wall"]:
+        user_state.clear()
+        user_state["tile_type"] = message.capitalize()
+        user_state["step"] = "get_length"
+        return reply(f"Great! You chose {user_state['tile_type']} tiles.\nPlease enter the **length** of the space in feet:"), None, user_state
 
-    if user_state["step"] == "get_length":
+    # Stepwise logic
+    if user_state.get("step") == "get_length":
         try:
-            user_state["length"] = float(message)
+            user_state["length"] = float(re.sub(r"[^\d.]", "", message))
             user_state["step"] = "get_width"
-            return reply("Now enter the width of the space in feet:"), None, user_state
+            return reply("Now enter the **width** of the space in feet:"), None, user_state
         except:
-            return reply("That doesn't seem like a number. Please enter the length in feet (e.g. 12)."), None, user_state
+            return reply("Please enter a valid number for length (e.g. 12.5):"), None, user_state
 
-    if user_state["step"] == "get_width":
+    if user_state.get("step") == "get_width":
         try:
-            user_state["width"] = float(message)
+            user_state["width"] = float(re.sub(r"[^\d.]", "", message))
             user_state["area"] = round(user_state["length"] * user_state["width"], 2)
             user_state["step"] = "get_unit"
-            return reply("Got it! Would you like to enter tile size in mm or ft?"), None, user_state
+            return reply(f"Your total area is {user_state['area']} sq.ft.\nWould you like to enter tile size in **mm** or **ft**?"), None, user_state
         except:
-            return reply("Please enter a valid width in feet (e.g. 10)."), None, user_state
+            return reply("Please enter a valid number for width (e.g. 10):"), None, user_state
 
-    if user_state["step"] == "get_unit":
-        if message.lower() not in ["mm", "ft"]:
-            return reply("Please type either mm or ft to choose your preferred unit."), None, user_state
-        user_state["unit"] = message.lower()
+    if user_state.get("step") == "get_unit":
+        if message not in ["mm", "ft"]:
+            return reply("Please type either **mm** or **ft** to choose your preferred unit."), None, user_state
+        user_state["unit"] = message
         user_state["step"] = "get_tile_size"
-        unit_label = "mm" if user_state["unit"] == "mm" else "feet"
-        return reply(f"Please enter the tile size in {unit_label} (e.g. 600 x 600, 2 x 2, or 4):"), None, user_state
+        return reply(f"Enter the tile size in {message.upper()} (e.g. 600x600 or 2x2):"), None, user_state
 
-    if user_state["step"] == "get_tile_size":
-        area = extract_tile_area(message, user_state["unit"])
-        if not area or area <= 0:
-            return reply("\u274C That tile size didn’t work. Try something like:\n- `600 x 600`\n- `2 x 2`\n- `4` (if in ft)"), None, user_state
+    if user_state.get("step") == "get_tile_size":
+        area_per_tile = extract_tile_area(message, user_state["unit"])
+        if not area_per_tile:
+            return reply("I couldn't understand that size. Try something like `600x600`, `2x2`, or just `4` if square in ft."), None, user_state
 
-        user_state["tile_area"] = area
+        user_state["tile_area"] = area_per_tile
         user_state["step"] = "done"
 
         area_needed = user_state["area"]
         tile_type = user_state["tile_type"]
-        tile_needed = math.ceil((area_needed / area) * 1.1)
+        tile_needed = math.ceil((area_needed / area_per_tile) * 1.1)
 
+        # Suggest tiles
         best = []
         for tile in tile_catalog:
             if tile["type"].lower() == tile_type.lower():
-                per_box = tile["coverage"] / area
+                per_box = tile["coverage"] / area_per_tile
                 if per_box > 0:
                     boxes = math.ceil(tile_needed / per_box)
                     total = boxes * tile["price"]
@@ -128,44 +134,35 @@ def chat_fn(message, history, user_state={}):
         best.sort(key=lambda x: x["total"])
         top3 = best[:3]
 
-        summary = f"""
-\U0001F9F1 Tile Type: {tile_type}
-\U0001F4D0 Space: {user_state['length']} ft x {user_state['width']} ft
-\U0001F4CF Area to Cover: {area_needed} sq.ft
-\U0001F9EE Tile Size Area: {round(area, 2)} sq.ft
-\U0001F522 Estimated Tiles Needed: {tile_needed} (with 10% buffer)
+        summary = f"""🧱 Tile Type: {tile_type}
+📏 Area: {area_needed} sq.ft
+🧮 Tile Size Area: {round(area_per_tile, 2)} sq.ft
+🔢 Tiles Needed: {tile_needed} (10% extra included)
 
-\U0001F3AF Top Suggestions:
+🎯 Top Recommendations:
 """
         for i, t in enumerate(top3, 1):
-            summary += f"\n{i}. {t['name']} ({t['size']})\n   ₹{t['price']} per box → ~{t['boxes']} boxes\n   {t['url']}\n"
+            summary += f"{i}. {t['name']} ({t['size']}) – ₹{t['price']} per box, ~{t['boxes']} boxes\n   🔗 {t['url']}\n"
 
-        summary += "\nType 'Floor' or 'Wall' to start another estimate."
+        summary += "\nType 'Floor' or 'Wall' to start over."
+
+        user_state["summary"] = summary
         return reply(summary), None, user_state
 
-    return reply("I didn't understand that. Please continue or type 'Floor' or 'Wall' to start over."), None, user_state
-
-# Interface
-with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", radius_size="lg")) as demo:
-    gr.Markdown(
-        """
-        # 🧱 <span style="color:#3B82F6">TileBot</span> – Smart Tile Estimator  
-        Welcome! I'm here to help you estimate tiles for your floor or wall.
-
-        🔹 Start with **"Floor"** or **"Wall"**  
-        📀 Enter **length and width** (in feet)  
-        📏 Then your tile size (in `mm` or `ft`) – like `600 x 600`, `2x2`, or `4`  
-        📋 I’ll recommend tiles and calculate how many you need.
-        """,
-        elem_id="header"
-    )
+    return reply("👋 Please type 'Floor' or 'Wall' to begin tile estimation."), None, user_state
 
-    chatbot = gr.ChatInterface(
+# UI setup
+with gr.Blocks() as demo:
+    gr.ChatInterface(
         fn=chat_fn,
-        type="messages",
-        chatbot=gr.Chatbot(height=500, bubble_full_width=False),
+        title="🧱 TileBot – Smart Tile Estimator",
+        description=(
+            "Plan your tile needs easily. Just type `hi` to begin or start with `Floor` or `Wall`.\n"
+            "I’ll ask for room size, tile size, and recommend the best fit tiles."
+        ),
+        theme=gr.themes.Soft(),
+        retry_btn=None,
+        undo_btn=None
     )
 
-    gr.Markdown("---\nNeed to start over? Just type **Floor** or **Wall** again.")
-
 demo.launch()