Update app.py

app.py

@@ -83,15 +83,26 @@ def enterpix(prompt, limit_size = 100, ratio_size = 256 + 128, use_key = "bigThu
     resp = list(map(lambda x: min_dim_to_size(x, ratio_size)[1], lex_))
     return resp
 
-def search(prompt, search_name):
+def search(prompt, search_name, im, func_name):
     if search_name == "lexica":
-        return lexica(prompt)
+        im_l = lexica(prompt)
     else:
-        return enterpix(prompt)
+        im_l = enterpix(prompt)
+    if im is None:
+        return im_l
+
+    hash_func = getattr(imagehash, func_name)
+
+    im_hash = hash_func(Image.fromarray(im))
+    t2_list = sorted(im_l, key = lambda imm:
+    hash_func(imm) - im_hash, reverse = False)
+    return t2_list
+    #return list(map(lambda x: x["name"], t2_list))
+
 
 with gr.Blocks(css="custom.css") as demo:
     title = gr.HTML(
-            """<h1><img src="https://i.imgur.com/52VJ8vS.png" alt="SD"> StableDiffusion Image Search </h1>""",
+            """<h1><img src="https://i.imgur.com/52VJ8vS.png" alt="SD"> StableDiffusion Search by Prompt order by Image</h1>""",
             elem_id="title",
     )
 
@@ -106,18 +117,7 @@ with gr.Blocks(css="custom.css") as demo:
                 placeholder="Enter prompt to search", elem_id="prompt")
                 #gr.Slider(label='Number of images ', minimum = 4, maximum = 20, step = 1, value = 4)]
                 text_button = gr.Button("Retrieve Images", elem_id="run_button")
-            i = gr.Image(elem_id="result-image")
-
-            gr.Examples(
-            [
-            ["Chinese Traditional Culture", "lexica", "images/AbsoluteReality.png"],
-            ["trending digital art", "lexica", "images/waifu.png"],
-            ["beautiful home", "enterpix", "images/Cyberpunk_Anime.png"],
-            ["interior design of living room", "enterpix", "images/DreamShaper.png"],
-            ],
-            inputs = [inputs, search_func_name, i],
-            label = "Examples"
-        )
+            i = gr.Image(elem_id="result-image", label = "Image upload or selected", height = 768 - 256 - 32)
 
         with gr.Column():
             title = gr.Markdown(
@@ -128,32 +128,44 @@ with gr.Blocks(css="custom.css") as demo:
             order_func_name = gr.Radio(choices=hash_func_name,
             value=hash_func_name[0], label="Order by", elem_id="order_radio")
 
-            outputs = gr.Gallery(lable='Output gallery', elem_id="gallery",).style(grid=5,height=768 - 128,
+            outputs = gr.Gallery(lable='Output gallery', elem_id="gallery",).style(grid=5,height=768 - 256,
                     allow_preview=False, label = "retrieve Images")
             #gr.Dataframe(label='prompts for corresponding images')]
 
-        #outputs.select(image_click, outputs, i, _js="(x) => x.splice(0,x.length)")
-        outputs.select(image_click, outputs, i,)
+    with gr.Row():
+        gr.Examples(
+            [
+            ["chinese zodiac signs", "lexica", "images/chinese_zodiac_signs.png", "average_hash"],
+            ["trending digital art", "lexica", "images/trending_digital_art.png", "colorhash"],
+            ["beautiful home", "enterpix", "images/beautiful_home.png", "dhash"],
+            ["interior design of living room", "enterpix", "images/interior_design_of_living_room.png", "whash"],
+            ],
+            inputs = [inputs, search_func_name, i, order_func_name],
+            label = "Examples"
+        )
+
+    #outputs.select(image_click, outputs, i, _js="(x) => x.splice(0,x.length)")
+    outputs.select(image_click, outputs, i,)
 
-        i.change(
+    i.change(
                 fn=swap_gallery,
                 inputs=[i, outputs, order_func_name],
                 outputs=outputs,
                 queue=False
                 )
-        order_func_name.change(
+    order_func_name.change(
                 fn=swap_gallery,
                 inputs=[i, outputs, order_func_name],
                 outputs=outputs,
                 queue=False
                 )
-        #### gr.Textbox().submit().success()
+    #### gr.Textbox().submit().success()
 
-        ### lexica
-        #text_button.click(lexica, inputs=inputs, outputs=outputs)
-        ### enterpix
-        #text_button.click(enterpix, inputs=inputs, outputs=outputs)
-        text_button.click(search, inputs=[inputs, search_func_name], outputs=outputs)
+    ### lexica
+    #text_button.click(lexica, inputs=inputs, outputs=outputs)
+    ### enterpix
+    #text_button.click(enterpix, inputs=inputs, outputs=outputs)
+    text_button.click(search, inputs=[inputs, search_func_name, i, order_func_name], outputs=outputs)