commit37

app.py

@@ -1086,136 +1086,125 @@ button[role="tab"]:hover {
 
 """
 
-
 with gr.Blocks(css=custom_css) as demo:
-  with gr.Column(elem_id="app-bg"):
-    # with gr.Column(elem_id="main-container"):
-      gr.Markdown("# 🛍️ Fashion Product Hybrid Search")
-
-      alpha = gr.Slider(0, 1, value=0.5, label="Hybrid Weight (alpha: 0=sparse, 1=dense)")
-
-      with gr.Tabs():
-          with gr.Tab("Text Search"):
-              query = gr.Textbox(
-                  label="Text Query",
-                  placeholder="e.g., floral summer dress for women"
-              )
-              gender_dropdown = gr.Dropdown(
-                  ["", "Men", "Women", "Boys", "Girls", "Kids", "Unisex"],
-                  label="Gender Filter (optional)"
-              )
-              text_search_btn = gr.Button("Search by Text", elem_classes="search-btn")
-          with gr.Tab("🎙️ Voice Search"):
-            voice_input = gr.Audio(label="Speak Your Query", type="filepath")
-            voice_gender_dropdown = gr.Dropdown(["", "Men", "Women", "Boys", "Girls", "Kids", "Unisex"], label="Gender")
-            voice_search_btn = gr.Button("Search by Voice")
-
-
-          with gr.Tab("Image Search"):
-              # image_input = gr.Image(
-              #     type="pil",
-              #     label="Upload an image",
-              #     sources=["upload", "clipboard"],
-              #     height=256,
-              #     width=356
-              # )
-              image_input = gr.Image(
-                type="pil",
-                label="Upload an image",
-                sources=["upload", "clipboard"],
-                # tool=None,
-                height=400
-              )
-
-              image_gender_dropdown = gr.Dropdown(
-                  ["", "Men", "Women", "Boys", "Girls", "Kids", "Unisex"],
-                  label="Gender Filter (optional)"
-              )
-              image_search_btn = gr.Button("Search by Image", elem_classes="search-btn")
-
-      gallery = gr.Gallery(label="Search Results", columns=6, height=None)
-      load_more_btn = gr.Button("Load More")
-
-    # --- UI State Holders ---
-      search_offset = gr.State(0)
-      current_query = gr.State("")
-      current_image = gr.State(None)
-      current_gender = gr.State("")
-      shown_results = gr.State([])
-      shown_ids = gr.State(set())
-
-    # --- Unified Search Function ---
-    def unified_search(q, uploaded_image, a, offset, gender_ui):
-        start = 0
-        end = 12
-
-        filters = extract_intent_from_openai(q) if q.strip() else {}
-        gender_override = gender_ui if gender_ui else filters.get("gender")
-
-        if uploaded_image is not None:
-            results = search_by_image(uploaded_image, a, start, end)
-        elif q.strip():
-            results = search_fashion(q, a, start, end, gender_override)
-        else:
-            results = []
-
-        seen_ids = {r[1] for r in results}
-        return results, end, q, uploaded_image, gender_override, results, seen_ids
-
-    # Text Search
-    # Text Search
-    text_search_btn.click(
-      unified_search,
-      inputs=[query, gr.State(None), alpha, search_offset, gender_dropdown],
-      outputs=[gallery, search_offset, current_query, current_image, current_gender, shown_results, shown_ids]
-    )
-
-    voice_search_btn.click(
-    handle_voice_search,
-    inputs=[voice_input, alpha, search_offset, voice_gender_dropdown],
-    outputs=[gallery, search_offset, current_query, current_image, current_gender, shown_results, shown_ids]
-)
-
-    # Image Search
-    image_search_btn.click(
-        unified_search,
-        inputs=[gr.State(""), image_input, alpha, search_offset, image_gender_dropdown],
-        outputs=[gallery, search_offset, current_query, current_image, current_gender, shown_results, shown_ids]
-    )
-
-    # --- Load More Button ---
-    def load_more_fn(a, offset, q, img, gender_ui, prev_results, prev_ids):
-        start = offset
-        end = offset + 12
-        gender_override = gender_ui
-
-        if img is not None:
-            new_results = search_by_image(img, a, start, end)
-        elif q.strip():
-            new_results = search_fashion(q, a, start, end, gender_override)
-        else:
-            new_results = []
-
-        filtered_new = []
-        new_ids = set()
-        for item in new_results:
-            img_obj, caption = item
-            if caption not in prev_ids:
-                filtered_new.append(item)
-                new_ids.add(caption)
-
-        combined = prev_results + filtered_new
-        updated_ids = prev_ids.union(new_ids)
+    with gr.Column(elem_id="app-bg"):
+        gr.Markdown("# 🛍️ Fashion Product Hybrid Search")
+
+        alpha = gr.Slider(0, 1, value=0.5, label="Hybrid Weight (alpha: 0=sparse, 1=dense)")
+
+        with gr.Tabs():
+            with gr.Tab("Text Search"):
+                query = gr.Textbox(
+                    label="Text Query",
+                    placeholder="e.g., floral summer dress for women"
+                )
+                gender_dropdown = gr.Dropdown(
+                    ["", "Men", "Women", "Boys", "Girls", "Kids", "Unisex"],
+                    label="Gender Filter (optional)"
+                )
+                text_search_btn = gr.Button("Search by Text", elem_classes="search-btn")
+
+            with gr.Tab("🎙️ Voice Search"):
+                voice_input = gr.Audio(label="Speak Your Query", type="filepath")
+                voice_gender_dropdown = gr.Dropdown(
+                    ["", "Men", "Women", "Boys", "Girls", "Kids", "Unisex"],
+                    label="Gender"
+                )
+                voice_search_btn = gr.Button("Search by Voice")
+
+            with gr.Tab("Image Search"):
+                image_input = gr.Image(
+                    type="pil",
+                    label="Upload an image",
+                    sources=["upload", "clipboard"],
+                    height=400
+                )
+                image_gender_dropdown = gr.Dropdown(
+                    ["", "Men", "Women", "Boys", "Girls", "Kids", "Unisex"],
+                    label="Gender Filter (optional)"
+                )
+                image_search_btn = gr.Button("Search by Image", elem_classes="search-btn")
+
+        gallery = gr.Gallery(label="Search Results", columns=6, height=None)
+        load_more_btn = gr.Button("Load More")
+
+        # --- UI State Holders ---
+        search_offset = gr.State(0)
+        current_query = gr.State("")
+        current_image = gr.State(None)
+        current_gender = gr.State("")
+        shown_results = gr.State([])
+        shown_ids = gr.State(set())
+
+        # --- Unified Search Function ---
+        def unified_search(q, uploaded_image, a, offset, gender_ui):
+            start = 0
+            end = 12
+            filters = extract_intent_from_openai(q) if q.strip() else {}
+            gender_override = gender_ui if gender_ui else filters.get("gender")
+
+            if uploaded_image is not None:
+                results = search_by_image(uploaded_image, a, start, end)
+            elif q.strip():
+                results = search_fashion(q, a, start, end, gender_override)
+            else:
+                results = []
+
+            seen_ids = {r[1] for r in results}
+            return results, end, q, uploaded_image, gender_override, results, seen_ids
+
+        # --- Text Search Click Handler ---
+        text_search_btn.click(
+            unified_search,
+            inputs=[query, gr.State(None), alpha, search_offset, gender_dropdown],
+            outputs=[gallery, search_offset, current_query, current_image, current_gender, shown_results, shown_ids]
+        )
 
-        return combined, end, combined, updated_ids
+        # --- Voice Search Click Handler ---
+        voice_search_btn.click(
+            handle_voice_search,
+            inputs=[voice_input, alpha, search_offset, voice_gender_dropdown],
+            outputs=[gallery, search_offset, current_query, current_image, current_gender, shown_results, shown_ids]
+        )
 
-    load_more_btn.click(
-        load_more_fn,
-        inputs=[alpha, search_offset, current_query, current_image, current_gender, shown_results, shown_ids],
-        outputs=[gallery, search_offset, shown_results, shown_ids]
-    )
+        # --- Image Search Click Handler ---
+        image_search_btn.click(
+            unified_search,
+            inputs=[gr.State(""), image_input, alpha, search_offset, image_gender_dropdown],
+            outputs=[gallery, search_offset, current_query, current_image, current_gender, shown_results, shown_ids]
+        )
 
-    # gr.Markdown("🧠 Powered by OpenAI + Hybrid AI Fashion Search")
+        # --- Load More Button Function ---
+        def load_more_fn(a, offset, q, img, gender_ui, prev_results, prev_ids):
+            start = offset
+            end = offset + 12
+            gender_override = gender_ui
+
+            if img is not None:
+                new_results = search_by_image(img, a, start, end)
+            elif q.strip():
+                new_results = search_fashion(q, a, start, end, gender_override)
+            else:
+                new_results = []
+
+            filtered_new = []
+            new_ids = set()
+            for item in new_results:
+                img_obj, caption = item
+                if caption not in prev_ids:
+                    filtered_new.append(item)
+                    new_ids.add(caption)
+
+            combined = prev_results + filtered_new
+            updated_ids = prev_ids.union(new_ids)
+
+            return combined, end, combined, updated_ids
+
+        load_more_btn.click(
+            load_more_fn,
+            inputs=[alpha, search_offset, current_query, current_image, current_gender, shown_results, shown_ids],
+            outputs=[gallery, search_offset, shown_results, shown_ids]
+        )
 
 demo.launch()