Update app.py

app.py

@@ -1,12 +1,6 @@
-Room: 15x12x10 ft
-Wall Thickness: 0.75 ft
-Openings:
-- Door: 3x7 ft
-- Window: 4x4 ft
-Beams: Yes
 import streamlit as st
-import fitz  # PyMuPDF
-import re
+import ezdxf
+import io
 
 # Constants
 BRICK_VOLUME_CFT = (9/12) * (4.5/12) * (3/12)  # in cft
@@ -15,44 +9,57 @@ SAND_RATIO = 5 / 6
 CEMENT_DENSITY_KG_PER_CFT = 1440 / 35.3147
 CEMENT_BAG_WEIGHT_KG = 50
 
-st.set_page_config(page_title="Smart Estimator", page_icon="📐")
-st.title("📐 Smart Quantity Estimator from Building Layout PDF")
-
-uploaded_pdf = st.file_uploader("Upload your house layout PDF", type=["pdf"])
-
-def extract_text_from_pdf(file):
-    doc = fitz.open(stream=file.read(), filetype="pdf")
-    text = ""
-    for page in doc:
-        text += page.get_text()
-    return text
-
-def parse_dimensions(text):
-    rooms = re.findall(r'Room:\s*(\d+\.?\d*)x(\d+\.?\d*)x(\d+\.?\d*)\s*ft', text)
-    wall_thickness = re.search(r'Wall Thickness:\s*(\d+\.?\d*)\s*ft', text)
-    openings = re.findall(r'(Door|Window|Opening):\s*(\d+\.?\d*)x(\d+\.?\d*)\s*ft', text)
-    beams = 'Beams: Yes' in text
-
-    return {
-        "rooms": [(float(l), float(w), float(h)) for l, w, h in rooms],
-        "wall_thickness": float(wall_thickness.group(1)) if wall_thickness else 0.75,
-        "openings": [(typ, float(l), float(h)) for typ, l, h in openings],
-        "has_beams": beams
-    }
-
-def estimate(rooms, wall_thickness, openings, has_beams):
+st.set_page_config(page_title="CAD-based Quantity Estimator", page_icon="📐")
+st.title("📐 Brick, Cement & Sand Estimation from AutoCAD (.dxf)")
+
+uploaded_file = st.file_uploader("Upload your .dxf AutoCAD file", type=["dxf"])
+
+def extract_from_dxf(file):
+    doc = ezdxf.read(file)
+    msp = doc.modelspace()
+
+    rooms = []
+    wall_thickness = 0.75  # Default
+    openings = []
+
+    for entity in msp:
+        if entity.dxftype() == "TEXT":
+            content = entity.dxf.text.lower()
+            if "room" in content and "x" in content:
+                try:
+                    dims = content.split(":")[1].strip().split("x")
+                    l, w, h = map(float, dims)
+                    rooms.append((l, w, h))
+                except:
+                    continue
+            elif "wall thickness" in content:
+                try:
+                    wt = float(content.split(":")[1].strip())
+                    wall_thickness = wt
+                except:
+                    continue
+            elif any(x in content for x in ["door", "window", "opening"]):
+                try:
+                    dims = content.split(":")[1].strip().split("x")
+                    l, h = map(float, dims)
+                    openings.append(("opening", l, h))
+                except:
+                    continue
+
+    return rooms, wall_thickness, openings
+
+def estimate(rooms, wall_thickness, openings):
     wall_volume = 0
     for length, width, height in rooms:
         wall_area = 2 * (length + width) * height
         wall_volume += wall_area * wall_thickness
 
     opening_volume = sum(l * h * wall_thickness for _, l, h in openings)
-    
+
     beam_volume = 0
-    if has_beams:
-        for _, l, _ in openings:
-            beam_len = l + 1  # add 1ft
-            beam_volume += beam_len * 0.75 * 0.75
+    for _, l, _ in openings:
+        beam_len = l + 1  # add 1ft
+        beam_volume += beam_len * 0.75 * 0.75
 
     net_volume = wall_volume - opening_volume - beam_volume
 
@@ -66,18 +73,24 @@ def estimate(rooms, wall_thickness, openings, has_beams):
 
     return number_of_bricks, sand_volume, cement_bags
 
-if uploaded_pdf:
-    text = extract_text_from_pdf(uploaded_pdf)
-    st.text_area("📄 Extracted Text", text, height=300)
+if uploaded_file:
+    st.success("✅ File uploaded. Parsing...")
+    rooms, wall_thickness, openings = extract_from_dxf(io.BytesIO(uploaded_file.read()))
 
-    data = parse_dimensions(text)
+    if rooms:
+        st.write(f"🧱 Rooms Detected: {len(rooms)}")
+        for i, r in enumerate(rooms, 1):
+            st.write(f"Room {i}: {r[0]}x{r[1]}x{r[2]} ft")
 
-    if data["rooms"]:
-        bricks, sand, cement = estimate(data["rooms"], data["wall_thickness"], data["openings"], data["has_beams"])
+        st.write(f"📏 Wall Thickness: {wall_thickness} ft")
+        st.write(f"🚪 Openings Detected: {len(openings)}")
+
+        bricks, sand, cement = estimate(rooms, wall_thickness, openings)
 
         st.subheader("📊 Estimated Quantities:")
         st.write(f"🧱 **Bricks Needed:** {bricks:,} bricks")
         st.write(f"🏖️ **Sand Needed:** {sand:.2f} cft")
         st.write(f"🪣 **Cement Needed:** {cement} bags (50kg each)")
     else:
-        st.warning("No room dimensions found in the PDF. Please make sure your format is correct.")
+        st.warning("No room data found. Please check the .dxf text format.")
+