Update app.py

app.py

@@ -47,49 +47,88 @@ lawn = st.checkbox("Lawn/Garden 🌳")
 if st.button("Generate Professional Plan"):
     prompt = f"""
     Design a house plan for a {plot_length}x{plot_width} ft plot following architectural best practices.
-    Return response in JSON format with:
-    1. 'floor_plan': 2D layout with room dimensions and positions
-    2. 'visualization_tips': Simple tips for visualizing the space
-    3. 'material_suggestions': Recommended materials
-    4. 'warnings': Any size violations
+    Return response in STRICT JSON format with these EXACT keys:
+    {{
+        "floor_plan": {{
+            "rooms": [
+                {{
+                    "name": "string",
+                    "x": number,
+                    "y": number,
+                    "width": number,
+                    "height": number
+                }}
+            ],
+            "washrooms": [
+                {{
+                    "name": "string",
+                    "x": number,
+                    "y": number,
+                    "width": number,
+                    "height": number
+                }}
+            ]
+        }},
+        "visualization_tips": ["string"],
+        "material_suggestions": ["string"],
+        "warnings": ["string"]
+    }}
+
+    Requirements:
+    1. All dimensions must be numbers (not arrays)
+    2. Positions must be x,y coordinates as separate numbers
+    3. Room names should be clear (e.g., "Master Bedroom")
+    4. Include at least {master_bed} master bedroom(s) and {bedrooms} standard bedroom(s)
     """
-    
+
     try:
         response = client.chat.completions.create(
             messages=[{"role": "user", "content": prompt}],
             model="llama3-70b-8192",
-            response_format={"type": "json_object"}
+            response_format={"type": "json_object"},
+            temperature=0.3  # More deterministic output
         )
+        
+        # Parse and validate response
         plan = json.loads(response.choices[0].message.content)
-
+        
+        # Validate required fields
+        required_keys = ["floor_plan", "visualization_tips", "material_suggestions", "warnings"]
+        for key in required_keys:
+            if key not in plan:
+                raise ValueError(f"Missing required key: {key}")
+        
+        if "rooms" not in plan["floor_plan"]:
+            raise ValueError("Missing rooms in floor plan")
+        
         st.success("✅ Professionally Designed Plan Generated!")
         
         # --- 2D Visualization ---
         st.header("📐 2D Floor Plan")
         
-        # Create figure
         fig, ax = plt.subplots(figsize=(10, 8))
+        colors = plt.cm.tab20.colors
         
         # Plot rooms
-        for room in plan['floor_plan']['rooms']:
+        for i, room in enumerate(plan['floor_plan']['rooms']):
             rect = plt.Rectangle(
                 (room['x'], room['y']), 
                 room['width'], 
                 room['height'],
                 linewidth=2,
                 edgecolor='black',
-                facecolor=np.random.rand(3,))
+                facecolor=colors[i % len(colors)])
             ax.add_patch(rect)
             
             # Add room label
             center_x = room['x'] + room['width']/2
             center_y = room['y'] + room['height']/2
             ax.text(center_x, center_y, 
-                   f"{room['width']}x{room['height']}ft",
+                   f"{room.get('name', 'Room')}\n{room['width']}x{room['height']}ft",
                    ha='center', va='center', fontsize=8)
         
         # Plot washrooms
-        for washroom in plan['floor_plan']['washrooms']:
+        for washroom in plan['floor_plan'].get('washrooms', []):
             rect = plt.Rectangle(
                 (washroom['x'], washroom['y']), 
                 washroom['width'], 
@@ -99,6 +138,10 @@ if st.button("Generate Professional Plan"):
                 facecolor='lightblue',
                 hatch='/')
             ax.add_patch(rect)
+            ax.text(washroom['x'] + washroom['width']/2,
+                   washroom['y'] + washroom['height']/2,
+                   "Bath",
+                   ha='center', va='center', fontsize=8)
         
         # Set plot limits and labels
         ax.set_xlim(0, plot_length)
@@ -112,26 +155,26 @@ if st.button("Generate Professional Plan"):
         # --- 3D Visualization ---
         st.header("✨ 3D Visualization")
         
-        # Create simple 3D representation
         fig_3d = go.Figure()
         
         # Add rooms as 3D boxes
-        for room in plan['floor_plan']['rooms']:
+        for i, room in enumerate(plan['floor_plan']['rooms']):
             fig_3d.add_trace(go.Mesh3d(
                 x=[room['x'], room['x'], room['x']+room['width'], room['x']+room['width'], room['x']],
                 y=[room['y'], room['y']+room['height'], room['y']+room['height'], room['y'], room['y']],
                 z=[0, 0, 0, 0, 0],
-                opacity=0.8,
-                color='lightgray',
-                showscale=False
+                opacity=0.7,
+                color=f'rgb({colors[i][0]*255},{colors[i][1]*255},{colors[i][2]*255})',
+                name=room.get('name', 'Room'),
+                showlegend=True
             ))
             fig_3d.add_trace(go.Mesh3d(
                 x=[room['x'], room['x'], room['x']+room['width'], room['x']+room['width'], room['x']],
                 y=[room['y'], room['y']+room['height'], room['y']+room['height'], room['y'], room['y']],
                 z=[10, 10, 10, 10, 10],
-                opacity=0.8,
-                color='lightgray',
-                showscale=False
+                opacity=0.7,
+                color=f'rgb({colors[i][0]*255},{colors[i][1]*255},{colors[i][2]*255})',
+                showlegend=False
             ))
         
         fig_3d.update_layout(
@@ -142,7 +185,8 @@ if st.button("Generate Professional Plan"):
                 aspectmode='manual',
                 aspectratio=dict(x=1, y=plot_width/plot_length, z=0.2)
             ),
-            margin=dict(r=20, l=10, b=10, t=30)
+            margin=dict(r=20, l=10, b=10, t=30),
+            legend=dict(x=1, y=1)
         )
         st.plotly_chart(fig_3d)
         
@@ -159,8 +203,10 @@ if st.button("Generate Professional Plan"):
         for warning in plan['warnings']:
             st.markdown(f"- ⚠️ {warning}")
         
+    except json.JSONDecodeError:
+        st.error("Failed to parse the AI response. Please try again.")
     except Exception as e:
-        st.error(f"Error: {e}. Check your API key or try again later.")
+        st.error(f"Error: {str(e)}. Please adjust your inputs and try again.")
 
 # Footer
 st.markdown("---")