Update app.py

app.py

@@ -1,32 +1,8 @@
 from share_btn import community_icon_html, loading_icon_html, share_js
-
 import os, subprocess
 import torch
 
-# def setup():
-#     install_cmds = [
-#         ['pip', 'install', 'ftfy', 'gradio', 'regex', 'tqdm', 'transformers==4.21.2', 'timm', 'fairscale', 'requests'],
-#         ['pip', 'install', 'open_clip_torch'],
-#         ['pip', 'install', '-e', 'git+https://github.com/pharmapsychotic/BLIP.git@lib#egg=blip'],
-#         ['git', 'clone', '-b', 'open-clip', 'https://github.com/pharmapsychotic/clip-interrogator.git']
-#     ]
-#     for cmd in install_cmds:
-#         print(subprocess.run(cmd, stdout=subprocess.PIPE).stdout.decode('utf-8'))
-
-# setup()
-
-# download cache files
-# print("Download preprocessed cache files...")
-# CACHE_URLS = [
-#     'https://huggingface.co/pharma/ci-preprocess/resolve/main/ViT-H-14_laion2b_s32b_b79k_artists.pkl',
-#     'https://huggingface.co/pharma/ci-preprocess/resolve/main/ViT-H-14_laion2b_s32b_b79k_flavors.pkl',
-#     'https://huggingface.co/pharma/ci-preprocess/resolve/main/ViT-H-14_laion2b_s32b_b79k_mediums.pkl',
-#     'https://huggingface.co/pharma/ci-preprocess/resolve/main/ViT-H-14_laion2b_s32b_b79k_movements.pkl',
-#     'https://huggingface.co/pharma/ci-preprocess/resolve/main/ViT-H-14_laion2b_s32b_b79k_trendings.pkl',
-# ]
-# os.makedirs('cache', exist_ok=True)
-# for url in CACHE_URLS:
-#     print(subprocess.run(['wget', url, '-P', 'cache'], stdout=subprocess.PIPE).stdout.decode('utf-8'))
+# (The setup function and cache download section has been commented out)
 
 import sys
 sys.path.append('src/blip')
@@ -36,6 +12,7 @@ import gradio as gr
 from clip_interrogator import Config, Interrogator
 import io 
 from PIL import Image
+
 config = Config()
 config.device = 'cuda' if torch.cuda.is_available() else 'cpu'
 config.blip_offload = False if torch.cuda.is_available() else True
@@ -57,8 +34,10 @@ def inference(input_images, mode, best_max_flavors):
         else:
             prompt_result = ci.interrogate_fast(image)
         prompt_results.append((image, prompt_result))  # Use dictionary to set image labels
-    return prompt_results
-
+    
+    # Convert prompt_results to text format
+    text_results = [f"Image {i+1}: {result[1]}" for i, result in enumerate(prompt_results)]
+    return "\n".join(text_results)
 
 title = """
     <div style="text-align: center; max-width: 500px; margin: 0 auto;">
@@ -162,16 +141,13 @@ with gr.Blocks(css=css) as block:
         
         submit_btn = gr.Button("Submit")
         
-        # rows, cols = NUM_IMAGES //3, 
-        gallery = gr.Gallery(
-            label="Outputs", show_label=True, elem_id="gallery", object_fit="contain", height="auto"
-        )
+        # Change from Gallery to Textbox for displaying results
+        result_textbox = gr.Textbox(label="Outputs", type="str", readonly=True, elem_id="output-textbox")
 
         with gr.Group(elem_id="share-btn-container"):
             loading_icon = gr.HTML(loading_icon_html, visible=False)
 
         gr.HTML(article)
-    submit_btn.click(fn=inference, inputs=[input_image,mode_input,flavor_input], outputs=[gallery], api_name="clipi2")
-
+    submit_btn.click(fn=inference, inputs=[input_image,mode_input,flavor_input], outputs=[result_textbox], api_name="clipi2")
     
-block.queue(max_size=32,concurrency_count=10).launch(show_api=False)
+block.queue(max_size=32,concurrency_count=10).launch(show_api=False)