removed Find1 button

app.py

@@ -6,13 +6,13 @@ from setup import *
 from PIL import Image
 import time
 
-thumbnail_width = 300
 def show_result(search_request, 
                 search_result, 
                 img_dir,
                 container,
                 search_time) :
 
+    thumbnail_width = 300
     container.header("It took me "+ "{:.2f}".format(search_time)+ " sec  to find \"" +search_request+ "\" for you !")
     i = 0
     for _ in range(0, 3):
@@ -53,23 +53,12 @@ def show_landing() :
                                    'Search ...')
 
 
-    col1, col2, col3 = st.columns(3)
+    col1, col2 = st.columns(2)
 
-    if col1.button('Find Release 1!') and os.path.exists('img'):
+    if col1.button('Find!') and os.path.exists(IMAGE_DIR) :
         results = st.container()
         start_time = time.time()
-        search_result = search1(search_request)
-        end_time = time.time()
-        show_result(search_request, 
-                    search_result,
-                    'img/',
-                    results,
-                    end_time - start_time)
-
-    if col2.button('Find Release 2!') and os.path.exists(IMAGE_DIR) :
-        results = st.container()
-        start_time = time.time()
-        search_result = search2(search_request)
+        search_result = search(search_request)
         end_time = time.time()
         show_result(search_request,
                     search_result,
@@ -77,10 +66,10 @@ def show_landing() :
                     results,
                     end_time - start_time)
 
-    if col3.button('Find Release 3!') and os.path.exists(IMAGE_DIR) :
+    if col2.button('Find with faiss!') and os.path.exists(IMAGE_DIR) :
         results = st.container()
         start_time = time.time()
-        search_result = search3(search_request)
+        search_result = searchWithFaiss(search_request)
         end_time = time.time()
         show_result(search_request,
                     search_result,

main.py

@@ -4,30 +4,7 @@ from dataframe import *
 from model import *
 
 
-images = ["Girl.jpg",
-          "Cat In Hat.jpg",
-          "Cat In The Hat.jpg",
-          "Fox In Socks.jpg",
-          "Green Eggs And Ham.jpg",
-          "Green Eggs with Ham.jpg",
-          "Grinch.jpg",
-          "Horton.jpg",
-          "Lorax.jpg",
-          "Thing1 and Thing2.jpg",
-          "Turtle.jpg",
-          "One Fish.jpg",
-          "Two Fish.jpg"]
-
-
-
-def search1(search_prompt : str):
-    """
-    Given a search_prompt, return an array of pictures to display
-    """
-    
-    return  [ (images[i], images[i].split('.')[0], '') for i in random.sample(range(len(images)), 4) ]
-
-def search2(search_prompt : str) :
+def search(search_prompt : str) :
 
     # Set the device
     device = "cuda" if torch.cuda.is_available() else "cpu"
@@ -46,7 +23,7 @@ def search2(search_prompt : str) :
                             device = device,
                             top_K=4)
 
-def search3(search_prompt : str) :
+def searchWithFaiss(search_prompt : str) :
 
     # Set the device
     device = "cuda" if torch.cuda.is_available() else "cpu"