Update app.py

app.py

@@ -4,15 +4,15 @@ import json
 import math
 import re
 from deep_translator import GoogleTranslator
-import warnings
 from xgboost import Booster
+import warnings
 
 warnings.filterwarnings("ignore")
 
 # Load models
 xgb = Booster()
 xgb.load_model("xgb_model.json")
-rf = joblib.load("rf_model.pkl")  # Requires scikit-learn
+rf = joblib.load("rf_model.pkl")
 
 # Load tile catalog and sizes
 with open("tile_catalog.json", "r", encoding="utf-8") as f:
@@ -30,9 +30,15 @@ def translate(text, lang="en"):
         return text
 
 def extract_tile_area(msg, unit):
-    msg = msg.lower().replace("×", "x").replace("into", "x").replace("*", "x")
+    msg = msg.lower().replace("×", "x").replace("into", "x").replace("*", "x").replace("x", "x")
     msg = msg.replace("mm", "").replace("ft", "").replace("feet", "").strip()
-
+    
+    # match single value (like 2 or 4)
+    if re.fullmatch(r"\d+(\.\d+)?", msg):
+        val = float(msg)
+        return round(val * val, 2) if unit == "ft" else None
+    
+    # match pattern like 2x2 or 600x600
     if "x" in msg:
         parts = re.split(r"x", msg)
         if len(parts) == 2:
@@ -46,12 +52,7 @@ def extract_tile_area(msg, unit):
                 return round(sqft, 2)
             except:
                 return None
-    else:
-        try:
-            val = float(re.sub(r"[^\d.]", "", msg))
-            return val if unit == "ft" else None
-        except:
-            return None
+    return None
 
 def chat_fn(message, history, user_state={}):
     message = message.strip().lower()
@@ -64,23 +65,23 @@ def chat_fn(message, history, user_state={}):
     lang = user_state["lang"]
     def reply(text): return translate(text, lang)
 
-    # Greeting handler
+    # Reset / greet
     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
     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
+        return reply(f"Great! You chose {user_state['tile_type']} tiles.\nPlease enter the **length** of your space in feet:"), None, user_state
 
-    # Stepwise input
     if user_state.get("step") == "get_length":
         try:
             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 your space in feet:"), None, user_state
         except:
             return reply("Please enter a valid number for length (e.g. 12.5):"), None, user_state
 
@@ -98,25 +99,24 @@ def chat_fn(message, history, user_state={}):
             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"
-        return reply(f"Enter the tile size in {message.upper()} (e.g. 600x600 or 2x2 or 4):"), None, user_state
+        return reply(f"Enter the tile size in {message.upper()} (e.g. 600x600, 2x2, or 4):"), 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` (for square tile in ft)."), None, user_state
+        tile_area = extract_tile_area(message, user_state["unit"])
+        if not tile_area:
+            return reply("❌ I couldn't understand the tile size. Try `600x600`, `2x2`, or just `4`."), None, user_state
 
-        user_state["tile_area"] = area_per_tile
+        user_state["tile_area"] = tile_area
         user_state["step"] = "done"
 
         area_needed = user_state["area"]
         tile_type = user_state["tile_type"]
-        tile_needed = math.ceil((area_needed / area_per_tile) * 1.1)
+        tile_needed = math.ceil((area_needed / tile_area) * 1.1)
 
-        # Suggest tiles
         best = []
         for tile in tile_catalog:
             if tile["type"].lower() == tile_type.lower():
-                per_box = tile["coverage"] / area_per_tile
+                per_box = tile["coverage"] / tile_area
                 if per_box > 0:
                     boxes = math.ceil(tile_needed / per_box)
                     total = boxes * tile["price"]
@@ -134,30 +134,26 @@ def chat_fn(message, history, user_state={}):
 
         summary = f"""🧱 Tile Type: {tile_type}
 📏 Area: {area_needed} sq.ft
-🧮 Tile Size Area: {round(area_per_tile, 2)} sq.ft
+🧮 Tile Size Area: {tile_area} sq.ft
 🔢 Tiles Needed: {tile_needed} (10% extra included)
 
-🎯 Top Recommendations:
+🎯 Top Suggestions:
 """
         for i, t in enumerate(top3, 1):
-            summary += f"{i}. {t['name']} ({t['size']}) – ₹{t['price']} per box, ~{t['boxes']} boxes\n   🔗 {t['url']}\n"
+            summary += f"{i}. {t['name']} ({t['size']}) – ₹{t['price']}/box (~{t['boxes']} boxes)\n🔗 {t['url']}\n"
 
-        summary += "\nType 'Floor' or 'Wall' to start over."
+        summary += "\nType 'Floor' or 'Wall' to start again."
 
-        user_state["summary"] = summary
         return reply(summary), None, user_state
 
-    return reply("👋 Please type 'Floor' or 'Wall' to begin tile estimation."), None, user_state
+    return reply("Type 'hi' or 'floor' or 'wall' to begin!"), None, user_state
 
-# Gradio UI
+# UI
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.ChatInterface(
         fn=chat_fn,
         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 for your space."
-        )
+        description="Type `hi`, `floor`, or `wall` to begin. I'll guide you step-by-step to estimate tile needs."
     )
 
 demo.launch()