Update app.py

app.py

@@ -5,7 +5,7 @@ import numpy as np
 import json
 import math
 import xgboost as xgb
-import os
+import re
 
 app = Flask(__name__, static_folder='.', static_url_path='/')
 CORS(app)
@@ -20,11 +20,9 @@ except Exception as e:
     print(f"❌ Error loading models: {e}")
     raise e
 
-# Load tile data
+# Load tile catalog
 with open("tile_catalog.json", "r", encoding="utf-8") as f:
     tile_catalog = json.load(f)
-with open("tile_sizes.json", "r", encoding="utf-8") as f:
-    tile_sizes = json.load(f)
 
 @app.route("/")
 def index():
@@ -34,14 +32,14 @@ def index():
 def recommend():
     try:
         data = request.get_json()
-        tile_type = data.get("tile_type", "").lower()
+        tile_type = data.get("tile_type", "").strip().lower()
         coverage = float(data.get("coverage", 1))
         area = float(data.get("area", 1))
         price_range = data.get("price_range", [1, 100])
         preferred_sizes = data.get("preferred_sizes", [])
 
-        if coverage <= 0 or area <= 0:
-            return jsonify({"error": "Please enter valid positive values for area and coverage."}), 400
+        if area <= 0 or coverage <= 0:
+            return jsonify({"error": "Please enter valid area and coverage values."}), 400
 
         features = prepare_features(tile_type, coverage, area, price_range)
         xgb_pred = xgb_model.predict(xgb.DMatrix(features))[0]
@@ -64,27 +62,37 @@ def calculate():
         data = request.get_json()
         tile_type = data.get("tile_type", "").strip().lower()
         area = float(data.get("area", 0))
-        tile_size = data.get("tile_size", "").strip()
+        tile_size_raw = data.get("tile_size", "").strip()
 
         if not tile_type:
-            return jsonify({"error": "Please select a tile type (e.g., Floor or Wall)."}), 400
+            return jsonify({"error": "Please select a tile type (e.g., floor, wall)."}), 400
         if area <= 0:
-            return jsonify({"error": "Area must be a positive number."}), 400
-        if tile_size not in tile_sizes:
-            return jsonify({"error": f"Invalid tile size '{tile_size}'. Please select a valid size."}), 400
+            return jsonify({"error": "Area must be greater than 0."}), 400
+
+        # Extract tile length and width in feet using regex
+        match = re.match(r"(\d+(\.\d+)?)\s*(ft|feet)?\s*[xX×*]\s*(\d+(\.\d+)?)\s*(ft|feet)?", tile_size_raw)
+        if not match:
+            return jsonify({"error": f"Invalid tile size format: '{tile_size_raw}'. Please enter like '2 x 2 ft'."}), 400
 
-        # Fetch tile size info
-        info = tile_sizes[tile_size]
-        per_tile_area = info["area_sqft"]
-        if per_tile_area <= 0:
-            return jsonify({"error": f"Tile size '{tile_size}' has invalid area data."}), 400
+        length_ft = float(match.group(1))
+        width_ft = float(match.group(4))
+        if length_ft <= 0 or width_ft <= 0:
+            return jsonify({"error": "Tile dimensions must be greater than 0."}), 400
 
-        tiles_needed = math.ceil((area / per_tile_area) * 1.1)
-        boxes = math.ceil(tiles_needed / info.get("tiles_per_box", 10))
+        tile_area = length_ft * width_ft  # in sq.ft
+        tiles_needed = math.ceil((area / tile_area) * 1.1)  # +10% buffer
+        boxes = math.ceil(tiles_needed / 10)  # assuming 10 tiles per box
 
-        matches = [p for p in tile_catalog if p["type"].lower() == tile_type and p["size"] == tile_size]
+        # Filter matching products by type and approximate size
+        matches = [
+            p for p in tile_catalog
+            if p["type"].lower() == tile_type
+        ]
 
         return jsonify({
+            "tile_type": tile_type,
+            "area_sqft": area,
+            "tile_size": f"{length_ft:.2f} ft x {width_ft:.2f} ft",
             "tiles_needed": tiles_needed,
             "boxes_needed": boxes,
             "matching_products": matches[:3],
@@ -92,7 +100,7 @@ def calculate():
         })
     except Exception as e:
         print("❌ Error in /calculate:", str(e))
-        return jsonify({"error": "Please ensure valid tile type, size, and area are provided."}), 500
+        return jsonify({"error": "An error occurred. Please check your input values."}), 500
 
 def prepare_features(tile_type, coverage, area, price_range):
     tile_type_num = 0 if tile_type == "floor" else 1
@@ -111,7 +119,6 @@ def filter_products(tile_type, price_range, preferred_sizes):
             continue
         if preferred_sizes and product["size"] not in preferred_sizes:
             continue
-
         price_score = 1 - (product["price"] - min_price) / (max_price - min_price + 1e-6)
         size_score = 1 if product["size"] in preferred_sizes else 0.5
         score = round((price_score + size_score) / 2, 2)