Refactor UI dropdowns and update prompt logic to include 'None' as a valid choice. Enhanced validation for floor, wall, and accessory options to prevent 'Keep Existing' or 'None' selections from being processed. This improves user experience by providing clearer options and ensuring valid inputs.

app.py

@@ -257,43 +257,19 @@ def create_ui(model: DesignModel):
                     gr.Markdown("## 🏠 Basic Settings")
                     with gr.Row():
                         room_type = gr.Dropdown(
-                            choices=[
-                                "Living Room", "Bedroom", "Kitchen", "Dining Room",
-                                "Bathroom", "Home Office", "Kids Room", "Master Bedroom",
-                                "Guest Room", "Studio Apartment", "Entryway", "Hallway",
-                                "Game Room", "Library", "Home Theater", "Gym"
-                            ],
                             label="Room Type",
-                            value="Living Room"
+                            choices=["None"] + ["Living Room", "Bedroom", "Dining Room", "Kitchen", "Bathroom", "Home Office", "Master Bedroom", "Guest Room", "Study Room", "Game Room", "Media Room", "Nursery", "Gym", "Library"],
+                            value="None"
                         )
                         style_preset = gr.Dropdown(
-                            choices=[
-                                "Modern", "Contemporary", "Minimalist", "Industrial",
-                                "Scandinavian", "Mid-Century Modern", "Traditional",
-                                "Transitional", "Farmhouse", "Rustic", "Bohemian",
-                                "Art Deco", "Coastal", "Mediterranean", "Japanese",
-                                "French Country", "Victorian", "Colonial", "Gothic",
-                                "Baroque", "Rococo", "Neoclassical", "Eclectic",
-                                "Zen", "Tropical", "Shabby Chic", "Hollywood Regency",
-                                "Southwestern", "Asian Fusion", "Retro"
-                            ],
                             label="Design Style",
-                            value="Modern"
+                            choices=["None"] + ["Modern", "Contemporary", "Minimalist", "Industrial", "Scandinavian", "Mid-Century Modern", "Traditional", "Transitional", "Farmhouse", "Rustic", "Bohemian", "Art Deco", "Coastal", "Mediterranean", "Japanese", "French Country", "Victorian", "Colonial", "Gothic", "Baroque", "Rococo", "Neoclassical", "Eclectic", "Zen", "Tropical", "Shabby Chic", "Hollywood Regency", "Southwestern", "Asian Fusion", "Retro"],
+                            value="None"
                         )
                         color_scheme = gr.Dropdown(
-                            choices=[
-                                "Neutral", "Monochromatic", "Minimalist White",
-                                "Warm Gray", "Cool Gray", "Earth Tones",
-                                "Pastel", "Bold Primary", "Jewel Tones",
-                                "Black and White", "Navy and Gold", "Forest Green",
-                                "Desert Sand", "Ocean Blue", "Sunset Orange",
-                                "Deep Purple", "Emerald Green", "Ruby Red",
-                                "Sapphire Blue", "Golden Yellow", "Sage Green",
-                                "Dusty Rose", "Charcoal", "Cream", "Burgundy",
-                                "Teal", "Copper", "Silver", "Bronze", "Slate"
-                            ],
                             label="Color Mood",
-                            value="Neutral"
+                            choices=["None"] + ["Neutral", "Monochromatic", "Minimalist White", "Warm Gray", "Cool Gray", "Earth Tones", "Pastel", "Bold Primary", "Jewel Tones", "Black and White", "Navy and Gold", "Forest Green", "Desert Sand", "Ocean Blue", "Sunset Orange", "Deep Purple", "Emerald Green", "Ruby Red", "Sapphire Blue", "Golden Yellow", "Sage Green", "Dusty Rose", "Charcoal", "Cream", "Burgundy", "Teal", "Copper", "Silver", "Bronze", "Slate"],
+                            value="None"
                         )
 
             # Row 2 - Surface Finishes
@@ -820,48 +796,48 @@ def update_prompt(room, style, colors, floor_t, floor_c, floor_p,
                  sconce_en, sconce_col, sconce_style,
                  shelf_en, shelf_col, shelf_size,
                  plants_en, plants_type, plants_size):
-    # Start with basic room and style
+    # Start with basic room, style, and color scheme (these should always be included as they have valid defaults)
     prompt_parts = [f"Design a {style} {room.lower()} with a {colors} color scheme"]
     
-    # Add floor details only if type is not "Keep Existing"
-    if floor_t and floor_t != "Keep Existing":
+    # Add floor details only if not "Keep Existing" or "None"
+    if floor_t not in ["Keep Existing", "None"]:
         floor_desc = floor_t
-        if floor_c and floor_c != "Keep Existing":
+        if floor_c not in ["Keep Existing", "None"]:
             floor_desc += f" in {floor_c}"
-        if floor_p and floor_p != "Keep Existing":
+        if floor_p not in ["Keep Existing", "None"]:
             floor_desc += f" with {floor_p} pattern"
         prompt_parts.append(f"featuring {floor_desc} flooring")
     
-    # Add wall details only if type is not "Keep Existing"
-    if wall_t and wall_t != "Keep Existing":
+    # Add wall details only if not "Keep Existing" or "None"
+    if wall_t not in ["Keep Existing", "None"]:
         wall_desc = wall_t
-        if wall_c and wall_c != "Keep Existing":
+        if wall_c not in ["Keep Existing", "None"]:
             wall_desc += f" in {wall_c}"
-        if wall_f and wall_f != "Keep Existing":
+        if wall_f not in ["Keep Existing", "None"]:
             wall_desc += f" with {wall_f} finish"
         prompt_parts.append(f"with {wall_desc} walls")
     
-    # Add accessories only if enabled AND properties are selected and not "Keep Existing" or "None"
+    # Add accessories only if enabled AND properties are not "Keep Existing" or "None"
     accessories = []
     
     # Art Print
-    if art_en and art_col and art_col not in ["Keep Existing", "None"]:
+    if art_en and art_col not in ["Keep Existing", "None"] and art_size not in ["Keep Existing", "None"]:
         accessories.append(f"{art_size} {art_col} Art Print")
     
     # Mirror
-    if mirror_en and mirror_fr and mirror_fr not in ["Keep Existing", "None"]:
+    if mirror_en and mirror_fr not in ["Keep Existing", "None"] and mirror_size not in ["Keep Existing", "None"]:
         accessories.append(f"{mirror_size} Mirror with {mirror_fr} frame")
     
     # Wall Sconce
-    if sconce_en and sconce_col and sconce_col not in ["Keep Existing", "None"]:
+    if sconce_en and sconce_col not in ["Keep Existing", "None"] and sconce_style not in ["Keep Existing", "None"]:
         accessories.append(f"{sconce_style} {sconce_col} Wall Sconce")
     
     # Floating Shelves
-    if shelf_en and shelf_col and shelf_col not in ["Keep Existing", "None"]:
+    if shelf_en and shelf_col not in ["Keep Existing", "None"] and shelf_size not in ["Keep Existing", "None"]:
         accessories.append(f"{shelf_size} {shelf_col} Floating Shelves")
     
     # Wall Plants
-    if plants_en and plants_type and plants_type not in ["Keep Existing", "None"]:
+    if plants_en and plants_type not in ["Keep Existing", "None"] and plants_size not in ["Keep Existing", "None"]:
         accessories.append(f"{plants_size} {plants_type}")
     
     # Only add accessories section if there are any accessories