Some improvements

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     build:
       context: .
       dockerfile: ./docker/Dockerfile
+    command: ["gradio", "app.py", "--demo-name=app"]
     environment:
       GRADIO_SERVER_NAME: 0.0.0.0
       GRADIO_SERVER_PORT: 7860

docker/Dockerfile

@@ -28,6 +28,7 @@ RUN apt-get install -y --no-install-recommends libssl-dev libffi-dev
 
 COPY ./app.py /app/app.py
 COPY ./src /app/src/
+COPY ./images /app/images/
 
 COPY ./requirements.txt /tmp/requirements.txt
 

requirements.txt

@@ -4,7 +4,7 @@ fairscale
 ftfy
 Pillow
 timm
-transformers==4.15.0
+transformers==4.37.2
 open_clip_torch==2.14.0
 requests
 clip-interrogator==0.5.4

src/app.py

@@ -11,4 +11,5 @@ def run():
     app = gr.TabbedInterface([interrogation_page, logs_page], [
         "Interrogation",  "Logs"
     ])
+
     app.queue().launch(show_error=True)

src/pages/interrogation.py

@@ -1,6 +1,7 @@
 import gradio as gr
 
 from src.storage.state import state as State
+from src.modules.logger import logger as Logger
 
 from src.scenarios.interrogation import image_analysis, image_to_prompt
 from src.repositories.images import images as ImagesRepo
@@ -36,12 +37,13 @@ CSS = """
 """
 
 
-def select_image(galley):
-    gr.Warning(f"Your choice is #{galley.index}, with image: {galley.value['image']['path']}!")
-    State.set_current_image(galley.value['image']['path'])
+def select_image(selection: gr.SelectData):
+    Logger.info("Image selected")
+    State.set_current_image(selection.value['image']['path'])
 
 
 def selected_image_process():
+    Logger.info("Selected image process")
     image_path = State.get_current_image()
     if not image_path:
         gr.Warning("No image selected!")
@@ -62,10 +64,12 @@ def build():
                     elem_id="gallery",
                     columns=[2], rows=[2],
                     object_fit="contain",
-                    height="auto"
+                    height=800,
+                    allow_preview=False,
+                    selected_index=None,
                 )
 
-                gallery.change(select_image, inputs=[gallery], outputs=[])
+                gallery.select(select_image, inputs=None, outputs=None)
                 button = gr.Button("Analyze")
 
             with gr.Column():

src/pages/logs.py

@@ -16,7 +16,7 @@ def test(message):
 
 
 def build():
-    with gr.Blocks() as demo:
+    with gr.Blocks() as block:
         gr.Markdown(
             """
             # Logs page!
@@ -28,6 +28,6 @@ def build():
         add_btn.click(fn=read_logs, outputs=logs_element)
         clear_btn = gr.Button("Clean")
         clear_btn.click(fn=clear_logs, outputs=logs_element)
-        demo.load(read_logs, None, logs_element, every=10)
+        block.load(read_logs, None, logs_element, every=10)
 
-    return demo
+    return block

src/repositories/images.py

@@ -6,11 +6,11 @@ class Images:
 
     def __init__(self):
         self.images = [
-            "https://cdn.pixabay.com/photo/2022/03/27/11/23/cat-7094808_1280.jpg",
-            "https://cdn.pixabay.com/photo/2022/03/27/11/23/cat-7094808_1280.jpg",
-            "https://cdn.pixabay.com/photo/2022/03/27/11/23/cat-7094808_1280.jpg",
-            "https://cdn.pixabay.com/photo/2022/03/27/11/23/cat-7094808_1280.jpg",
-            "https://cdn.pixabay.com/photo/2022/03/27/11/23/cat-7094808_1280.jpg"
+            "/app/images/cat.jpg",
+            "/app/images/cat.jpg",
+            "/app/images/cat.jpg",
+            "/app/images/cat.jpg",
+            "/app/images/cat.jpg"
         ]
 
     def get_images(self):

src/scenarios/interrogation.py

@@ -1,18 +1,18 @@
 import os
 
-from src.modules.clip_model_loader import clip_model_loader as ClipModelLoader
+from src.modules.models.clip_model_loader import clip_model_loader as ClipModelLoader
 from src.storage.state import state as State
 
 
 def image_to_prompt(image_path):
-    state.begin()
+    State.begin()
     result = ClipModelLoader.image_to_prompt(image_path)
-    state.end()
+    State.end()
     return result
 
 
 def image_analysis(image_path):
-    state.begin()
+    State.begin()
     result = ClipModelLoader.image_analyse(image_path)
-    state.end()
+    State.end()
     return result

src/storage/state.py

@@ -16,6 +16,10 @@ class State:
         # Prediction
         self._current_image = None
 
+    def _check_lock_assert(self):
+        if self._lock:
+            raise Exception('State locked')
+
     # State begin - end
     def begin(self):
         self._check_lock_assert()