update-gradio (#3)

- Update licence (128831be86625cf07c820ec3746883d7ead110b3)
- Update requirements (480bc123d88871d3641d3ca177ff3d66d93a609c)
- Update interaction code (04dd7ac440b8da8386a4d36c08b23e7af4dd296e)

LICENCE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 Alessandro Conti
+Copyright (c) 2024 Alessandro Conti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@ emoji: 🌍
 colorFrom: green
 colorTo: yellow
 sdk: gradio
-sdk_version: '4.36.0'
+sdk_version: '4.44.1'
 python_version: '3.9'
 app_file: app.py
 pinned: false

app.py

@@ -43,7 +43,7 @@ MODEL = AutoModel.from_pretrained("altndrr/cased", trust_remote_code=True).to(DE
 PROCESSOR = CLIPProcessor.from_pretrained("openai/clip-vit-large-patch14")
 
 
-def save_original_image(image: gr.Image):
+def image_preprocess(image: gr.Image):
     if image is None:
         return None, None
 
@@ -51,13 +51,6 @@ def save_original_image(image: gr.Image):
     size = min(size) if isinstance(size, tuple) else size
     image = resize(image, size)
 
-    return image, image.copy()
-
-
-def prepare_image(image: gr.Image):
-    if image is None:
-        return None, None
-
     PROCESSOR.image_processor.do_normalize = False
     image_tensor = PROCESSOR(images=[image], return_tensors="pt", padding=True)
     PROCESSOR.image_processor.do_normalize = True
@@ -87,9 +80,8 @@ with gr.Blocks(analytics_enabled=True, title=PAPER_TITLE, theme="soft") as demo:
     gr.Markdown(MARKDOWN_DESCRIPTION)
     with gr.Row():
         with gr.Column():
-            curr_image = gr.Image(label="input", type="pil")
-            _orig_image = gr.Image(
-                label="orig. image", type="pil", visible=False, interactive=False
+            curr_image = gr.Image(
+                label="input", type="pil", sources=["upload", "webcam", "clipboard"]
             )
             alpha_slider = gr.Slider(0.0, 1.0, value=0.7, step=0.1, label="alpha")
             with gr.Row():
@@ -97,9 +89,13 @@ with gr.Blocks(analytics_enabled=True, title=PAPER_TITLE, theme="soft") as demo:
                 run_button = gr.Button(value="Submit", variant="primary")
         with gr.Column():
             output_label = gr.Label(label="output", num_top_classes=5)
+
+    _orig_image = gr.Image(label="original image", type="pil", visible=False, interactive=False)
+    _example_image = gr.Image(label="example image", type="pil", visible=False, interactive=False)
+
     examples = gr.Examples(
         examples=glob(os.path.join(os.path.dirname(__file__), "examples", "*.jpg")),
-        inputs=[_orig_image],
+        inputs=[_example_image],
         outputs=[output_label],
         fn=image_inference,
         cache_examples=True,
@@ -108,10 +104,10 @@ with gr.Blocks(analytics_enabled=True, title=PAPER_TITLE, theme="soft") as demo:
 
     # INTERACTIONS
     # - change
-    _orig_image.change(prepare_image, [_orig_image], [curr_image, _orig_image])
+    _example_image.change(image_preprocess, [_example_image], [curr_image, _orig_image])
 
     # - upload
-    curr_image.upload(save_original_image, [curr_image], [curr_image, _orig_image])
+    curr_image.upload(image_preprocess, [curr_image], [curr_image, _orig_image])
     curr_image.upload(lambda: None, [], [output_label])
 
     # - clear

requirements.txt

@@ -1,8 +1,9 @@
-torch==2.0.1
-torchvision==0.15.2
-faiss-cpu==1.7.4
-flair==0.13.0
-gradio==4.7.1
-inflect==7.0.0
-nltk==3.8.1
-transformers==4.35.1
+torch>=2,<3
+torchvision>=0,<1
+faiss-cpu>=1,<2
+flair>=0,<1
+gradio==4.44.1
+inflect>=7,<8
+nltk>=3,<4
+pyarrow>=18,<19
+transformers>=4,<5