Update app.py

app.py

@@ -21,23 +21,15 @@ st.markdown("""
 </style>
 """, unsafe_allow_html=True)
 
-def filter_images(images_data, selected_options):
-    filtered_images = []
-
+# Function to filter images based on selected options and category
+def filter_images(images_data, selected_options, category):
+    matched_images = []
     for image_name, image_info in images_data.items():
-        matches_all = True  # A flag to check if the image matches all selected attributes
-
-        for attribute, selected_values in selected_options.items():
-            if selected_values:  # Check if any value is selected for this attribute
-                image_attribute_value = image_info.get('attributes', {}).get(attribute)
-                if image_attribute_value not in selected_values:
-                    matches_all = False
-                    break  # Break the loop if any attribute does not match
-
-        if matches_all:
-            filtered_images.append(image_name)
-
-    return filtered_images
+        if image_info['category'] == category:
+            if all(image_info['attributes'][attribute] in options 
+                   for attribute, options in selected_options.items()):
+                matched_images.append(image_name)
+    return matched_images
 
 
     
@@ -65,12 +57,11 @@ def main_page(furniture_data):
         selected_options[attribute] = st.multiselect(f'Choose {attribute}', options, key=key)
 
     if st.button('Show Filtered Images'):
-        print(selected_options)
-        print(images_data)
+        images_data = load_images()
         # Assuming images_data is loaded from your JSON file
         images_data = load_images()  # Make sure this function is defined and loads your images data
     
-        filtered_images = filter_images(images_data, selected_options)
+        filtered_images = filter_images(images_data, selected_options, selected_category)
     
         if filtered_images:
             for image in filtered_images:
@@ -89,7 +80,7 @@ def tiktok_video_page():
 
 # Main app logic
 furniture_data = load_furniture_data()
-images_data = load_images()
+
 if 'page' not in st.session_state:
     st.session_state.page = 'main'