Added examples for text and reduced image results from 18 to 8

app.py

@@ -90,9 +90,9 @@ IPFS_IMAGE_IDS_PATH = os.path.join(INDEX_FOLDER, IPFS_IMAGE_IDS_FILE_NAME)
 MIN_TOKEN_ID = 1
 MAX_TOKEN_ID = 20000
 GATEWAY_QUERY_BATCH_SIZE = 100
-VISION_MODEL_INPUT_BATCH_SIZE = 9
+VISION_MODEL_INPUT_BATCH_SIZE = 4
 TEXT_MODEL_INPUT_BATCH_SIZE = 10
-SEARCH_RESULTS_DISPLAY_COUNT = 9
+SEARCH_RESULTS_DISPLAY_COUNT = 4
 LOG_DISPLAY_THRESHOLD = 1000
 RANDOM_SEED = 7
 np.random.seed(RANDOM_SEED)
@@ -557,34 +557,16 @@ def read_ipfs_image_ids(image_ids_path):
 
 import gradio as gr
 
-# Download some images from ipfs ids to boot strap image search App
-# loaded_ipfs_image_ids = list(read_ipfs_image_ids(IPFS_IMAGE_IDS_PATH))
-# download_images(loaded_ipfs_image_ids[:30])
-
-# # Load Image index
-# image_index_prefix = index_name.replace(',', '_')
-# image_index_file_name = f"{image_index_prefix}.index"
-# index_path = os.path.join(INDEX_FOLDER, image_index_file_name)
-# loaded_image_index = faiss.read_index(index_path)
-# # Load Image Id map
-# id_map_file_name = f"{image_index_prefix}_image_ids.pickle"
-# id_map_path = os.path.join(INDEX_FOLDER, id_map_file_name)
-# with open(id_map_path, 'rb') as f:
-#     loaded_image_ids_map = pickle.load(f)
-
 print(f"Text Index size: {text_index.ntotal}")
 print(f"Image Index size: {image_index.ntotal}")
 print(f"Ids size: {len(content_ids_map)}")
 
-# def load_resized_image(img_path, max_width = 224, max_height=224):
-#     img = Image.open(img_path).convert('RGB')
-#     # img.thumbnail((max_width,max_height))
-#     img = np.asarray(img)
-#     return img
-
 def search_images_by_image(query_image):
     return search_images('', query_image)
 
+def search_images_by_text(query_text):
+    return search_images(query_text, None)
+
 def search_images(query_text, query_image):
     images_to_download = []
     # print(f"Received {query_text}:{query_image}")
@@ -633,124 +615,85 @@ def search_images(query_text, query_image):
         diatance_html = f"Distance: {distance_rounded}"
 
         image_objects.append(f"{diatance_html} - {link_html}")
+    # image_objects.append(query_text, query_image)
     
     return image_objects
 
-examples_paths = [f"{EXAMPLES_FOLDER}/e{n}.jpeg" for n in range(4)]
-# examples=gr.Examples()
+example_images = [f"{EXAMPLES_FOLDER}/e{n}.jpeg" for n in range(4)]
+example_text = ["surrealism art","3d art", "psychedelic art","Glitch Art"] #,"Photo of a Unicorn"
+examples_queries = [example_images, example_text]
+# print(examples_queries)
+outputs = []
 with gr.Blocks() as demo:
     gr.Markdown(value = '# Makers Place NFTs search')
     with gr.Row():
         with gr.Column(scale=0.5):            
-            query_text = gr.Textbox(label="query_text", value="")
-            query_image = gr.Image(label="query_image")
+            query_text = gr.Textbox(label="Text", value="")
+            query_image = gr.Image(label="Image")
             search_btn = gr.Button("Search")
-            examples=gr.Examples(
-                examples=examples_paths, 
-                inputs=query_image)
+            examples_text_display=gr.Examples(
+                examples=example_text, 
+                inputs=query_text
+                )
+            examples_image_display=gr.Examples(
+                examples=example_images, 
+                inputs=query_image
+                )            
         with gr.Column(scale=10):       
-            with gr.Tab("Image Index Results"):
-                with gr.Row():
-                    with gr.Column():   
-                        img_result_0_image = gr.Image(label="img_result_0_image") # type="pil",
-                        img_result_0_label = gr.HTML(value = '-')
-                        img_result_0_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        img_result_1_image = gr.Image(label="img_result_1_image")
-                        img_result_1_label = gr.HTML(value = '-')
-                        img_result_1_btn = gr.Button("Related Images")  
-                    with gr.Column():
-                        img_result_2_image = gr.Image(label="img_result_2_image")
-                        img_result_2_label = gr.HTML(value = '-')
-                        img_result_2_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        img_result_3_image = gr.Image(label="img_result_3_image")
-                        img_result_3_label = gr.HTML(value = '-')
-                        img_result_3_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        img_result_4_image = gr.Image(label="img_result_4_image")
-                        img_result_4_label = gr.HTML(value = '-')
-                        img_result_4_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        img_result_5_image = gr.Image(label="img_result_5_image")
-                        img_result_5_label = gr.HTML(value = '-')
-                        img_result_5_btn = gr.Button("Related Images")  
-                    with gr.Column():
-                        img_result_6_image = gr.Image(label="img_result_6_image")
-                        img_result_6_label = gr.HTML(value = '-')
-                        img_result_6_btn = gr.Button("Related Images")             
-                    with gr.Column():
-                        img_result_7_image = gr.Image(label="img_result_7_image")
-                        img_result_7_label = gr.HTML(value = '-')
-                        img_result_7_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        img_result_8_image = gr.Image(label="img_result_8_image")
-                        img_result_8_label = gr.HTML(value = '-')
-                        img_result_8_btn = gr.Button("Related Images")
-            with gr.Tab("Text Index Results"):
-                with gr.Row():      
-                    with gr.Column():
-                        result_0_image = gr.Image(label="result_0_image") # type="pil",
-                        result_0_label = gr.HTML(value = '-')
-                        result_0_btn = gr.Button("Related Images")    
-                    with gr.Column():
-                        result_1_image = gr.Image(label="result_1_image")
-                        result_1_label = gr.HTML(value = '-')
-                        result_1_btn = gr.Button("Related Images")  
-                    with gr.Column():
-                        result_2_image = gr.Image(label="result_2_image")
-                        result_2_label = gr.HTML(value = '-')
-                        result_2_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        result_3_image = gr.Image(label="result_3_image")
-                        result_3_label = gr.HTML(value = '-')
-                        result_3_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        result_4_image = gr.Image(label="result_4_image")
-                        result_4_label = gr.HTML(value = '', show_progress=False)
-                        result_4_btn = gr.Button("Related Images") 
-                    with gr.Column():
-                        result_5_image = gr.Image(label="result_5_image")
-                        result_5_label = gr.HTML(value = '-')
-                        result_5_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        result_6_image = gr.Image(label="result_6_image")
-                        result_6_label = gr.HTML(value = '-')
-                        result_6_btn = gr.Button("Related Images")                         
-                    with gr.Column():
-                        result_7_image = gr.Image(label="result_7_image")
-                        result_7_label = gr.HTML(value = '-')
-                        result_7_btn = gr.Button("Related Images")
-                    with gr.Column():
-                        result_8_image = gr.Image(label="result_8_image")
-                        result_8_label = gr.HTML(value = '-')
-                        result_8_btn = gr.Button("Related Images")
-            
+            with gr.Row():
+                gr.HTML(value="<font size='+3'>Image Index Results</font>")
+            with gr.Row():
+                with gr.Column(min_width=224):   
+                    img_result_0_image = gr.Image(label="img_result_0_image") # type="pil",
+                    img_result_0_label = gr.HTML(value = '-')
+                    img_result_0_btn = gr.Button("Related Images")
+                with gr.Column(min_width=224):  
+                    img_result_1_image = gr.Image(label="img_result_1_image")
+                    img_result_1_label = gr.HTML(value = '-')
+                    img_result_1_btn = gr.Button("Related Images")  
+                with gr.Column(min_width=224):  
+                    img_result_2_image = gr.Image(label="img_result_2_image")
+                    img_result_2_label = gr.HTML(value = '-')
+                    img_result_2_btn = gr.Button("Related Images")
+                with gr.Column(min_width=224):  
+                    img_result_3_image = gr.Image(label="img_result_3_image")
+                    img_result_3_label = gr.HTML(value = '-')
+                    img_result_3_btn = gr.Button("Related Images")
+            with gr.Row():
+                gr.HTML(value="<br><br> <font size='+3'>Text Index Results</font>")
+            with gr.Row():
+                with gr.Column(min_width=224):
+                    result_0_image = gr.Image(label="result_0_image") # type="pil",
+                    result_0_label = gr.HTML(value = '-')
+                    result_0_btn = gr.Button("Related Images")    
+                with gr.Column(min_width=224):
+                    result_1_image = gr.Image(label="result_1_image")
+                    result_1_label = gr.HTML(value = '-')
+                    result_1_btn = gr.Button("Related Images")  
+                with gr.Column(min_width=224):
+                    result_2_image = gr.Image(label="result_2_image")
+                    result_2_label = gr.HTML(value = '-')
+                    result_2_btn = gr.Button("Related Images")
+                with gr.Column(min_width=224):
+                    result_3_image = gr.Image(label="result_3_image")
+                    result_3_label = gr.HTML(value = '-')
+                    result_3_btn = gr.Button("Related Images")                            
 
     inputs = [query_text, query_image]
-    buttons = [result_0_btn,result_1_btn,result_2_btn,result_3_btn,
-               result_4_btn,result_5_btn,result_6_btn,result_7_btn,
-               result_8_btn,
-               img_result_0_btn,img_result_1_btn,img_result_2_btn,img_result_3_btn,
-               img_result_4_btn,img_result_5_btn,img_result_6_btn,img_result_7_btn,
-               img_result_8_btn
-               ]
-    labels = [ result_0_label,result_1_label,result_2_label,result_3_label,
-            result_4_label,result_5_label,result_6_label,result_7_label,
-            result_8_label,
-            img_result_0_label,img_result_1_label,img_result_2_label,img_result_3_label,
-            img_result_4_label,img_result_5_label,img_result_6_label,img_result_7_label,
-            img_result_8_label,
-            ]   
-    images = [result_0_image,result_1_image,result_2_image,result_3_image, 
-            result_4_image,result_5_image,result_6_image,result_7_image,result_8_image,
-            img_result_0_image,img_result_1_image,img_result_2_image,img_result_3_image, 
-            img_result_4_image,img_result_5_image,img_result_6_image,img_result_7_image,
-            img_result_8_image]         
+    buttons = [
+        result_0_btn,result_1_btn,result_2_btn,result_3_btn,
+        img_result_0_btn,img_result_1_btn,img_result_2_btn,img_result_3_btn,
+    ]
+    labels = [
+        result_0_label,result_1_label,result_2_label,result_3_label,
+        img_result_0_label,img_result_1_label,img_result_2_label,img_result_3_label,
+    ]   
+    images = [
+        result_0_image,result_1_image,result_2_image,result_3_image, 
+        img_result_0_image,img_result_1_image,img_result_2_image,img_result_3_image
+    ]
     outputs = images + labels
 
-    # examples.
-
     search_btn.click(fn=search_images, inputs=inputs, outputs=outputs)
     
     for i in range(len(buttons)):
@@ -758,10 +701,10 @@ with gr.Blocks() as demo:
                        inputs=images[i], outputs=outputs)
     
 
-# demo.launch(share=True, debug=True,)
+demo.queue(concurrency_count=2, max_size=5)
 demo.launch(debug=True)
 
-# demo.close()
+demo.close()
 
 # file_name = "mp_nft_data_np_array_12k.pickle"
 # file_path = os.path.join(INDEX_FOLDER, file_name)