Some updates (#53)

- Update styles.css (799e2f1429fdcf64cb13d6985f63f4e66c089a87)
- Update gradio version (47c00601dfff07de43a39f9fbc79036d9e824b21)
- Update links (315fd245d742dd68e94def99b99f7ce70671a2a8)
- Update (863b4ea4a68fdbc029f499cde1765504640cc12c)
- Use gradio_client.file (64325c91c9feea5268366b2327267bbe72e8c1f7)
- Not use gradio_client.file for Fuyu-8B. (fd31c8672c4b463924740ca81f91b4b5bea6c48f)

README.md

@@ -4,7 +4,7 @@ emoji: 🔥
 colorFrom: yellow
 colorTo: pink
 sdk: gradio
-sdk_version: 4.26.0
+sdk_version: 4.28.3
 app_file: app.py
 pinned: false
 ---

app.py

@@ -1,19 +1,16 @@
 from __future__ import annotations
 
-import os
-
 import gradio as gr
 import torch
-from gradio_client import Client
-from gradio_client.client import Job
+from gradio_client import Client, file
 
 DESCRIPTION = "# Comparing image captioning models"
 ORIGINAL_SPACE_INFO = """\
-- [GIT-large fine-tuned on COCO](https://huggingface.co/spaces/library-samples/image-captioning-with-git)
-- [BLIP-large](https://huggingface.co/spaces/library-samples/image-captioning-with-blip)
+- [GIT-large fine-tuned on COCO](https://huggingface.co/spaces/hysts/image-captioning-with-git)
+- [BLIP-large](https://huggingface.co/spaces/hysts/image-captioning-with-blip)
 - [BLIP-2 OPT 6.7B](https://huggingface.co/spaces/merve/BLIP2-with-transformers)
-- [BLIP-2 T5-XXL](https://huggingface.co/spaces/hysts/BLIP2-with-transformers)
-- [InstructBLIP](https://huggingface.co/spaces/library-samples/InstructBLIP)
+- [BLIP-2 T5-XXL](https://huggingface.co/spaces/hysts/BLIP2)
+- [InstructBLIP](https://huggingface.co/spaces/hysts/InstructBLIP)
 - [Fuyu-8B](https://huggingface.co/spaces/adept/fuyu-8b-demo)
 """
 
@@ -26,32 +23,29 @@ torch.hub.download_url_to_file(
 )
 
 
-def generate_caption_git(image_path: str, return_job: bool = False) -> str | Job:
+def generate_caption_git(image_path: str) -> str:
     try:
         client = Client("hysts/image-captioning-with-git")
-        fn = client.submit if return_job else client.predict
-        return fn(image_path, api_name="/caption")
+        return client.predict(file(image_path), api_name="/caption")
     except Exception:
         gr.Warning("The GIT-large Space is currently unavailable. Please try again later.")
         return ""
 
 
-def generate_caption_blip(image_path: str, return_job: bool = False) -> str | Job:
+def generate_caption_blip(image_path: str) -> str:
     try:
         client = Client("hysts/image-captioning-with-blip")
-        fn = client.submit if return_job else client.predict
-        return fn(image_path, "A picture of", api_name="/caption")
+        return client.predict(file(image_path), "A picture of", api_name="/caption")
     except Exception:
         gr.Warning("The BLIP-large Space is currently unavailable. Please try again later.")
         return ""
 
 
-def generate_caption_blip2_opt(image_path: str, return_job: bool = False) -> str | Job:
+def generate_caption_blip2_opt(image_path: str) -> str:
     try:
         client = Client("merve/BLIP2-with-transformers")
-        fn = client.submit if return_job else client.predict
-        return fn(
-            image_path,
+        return client.predict(
+            file(image_path),
             "Beam search",
             1,  # temperature
             1,  # length penalty
@@ -63,12 +57,11 @@ def generate_caption_blip2_opt(image_path: str, return_job: bool = False) -> str
         return ""
 
 
-def generate_caption_blip2_t5xxl(image_path: str, return_job: bool = False) -> str | Job:
+def generate_caption_blip2_t5xxl(image_path: str) -> str:
     try:
-        client = Client("hysts/BLIP2-with-transformers")
-        fn = client.submit if return_job else client.predict
-        return fn(
-            image_path,
+        client = Client("hysts/BLIP2")
+        return client.predict(
+            file(image_path),
             "Beam search",
             1,  # temperature
             1,  # length penalty
@@ -84,12 +77,11 @@ def generate_caption_blip2_t5xxl(image_path: str, return_job: bool = False) -> s
         return ""
 
 
-def generate_caption_instructblip(image_path: str, return_job: bool = False) -> str | Job:
+def generate_caption_instructblip(image_path: str) -> str:
     try:
         client = Client("hysts/InstructBLIP")
-        fn = client.submit if return_job else client.predict
-        return fn(
-            image_path,
+        return client.predict(
+            file(image_path),
             "Describe the image.",
             "Beam search",
             5,  # beam size
@@ -106,28 +98,19 @@ def generate_caption_instructblip(image_path: str, return_job: bool = False) ->
         return ""
 
 
-def generate_caption_fuyu(image_path: str, return_job: bool = False) -> str | Job:
+def generate_caption_fuyu(image_path: str) -> str:
     try:
         client = Client("adept/fuyu-8b-demo")
-        fn = client.submit if return_job else client.predict
-        return fn(image_path, "Generate a coco style caption.\n", fn_index=3)
+        return client.predict(
+            image_path,
+            "Generate a coco style caption.\n",
+            fn_index=3,
+        )
     except Exception:
         gr.Warning("The Fuyu-8B Space is currently unavailable. Please try again later.")
         return ""
 
 
-def generate_captions(image_path: str) -> tuple[str, str, str, str, str, str]:
-    jobs = [
-        generate_caption_git(image_path, return_job=True),
-        generate_caption_blip(image_path, return_job=True),
-        generate_caption_blip2_opt(image_path, return_job=True),
-        generate_caption_blip2_t5xxl(image_path, return_job=True),
-        generate_caption_instructblip(image_path, return_job=True),
-        generate_caption_fuyu(image_path, return_job=True),
-    ]
-    return tuple(job.result() if job else "" for job in jobs)
-
-
 with gr.Blocks(css="style.css") as demo:
     gr.Markdown(DESCRIPTION)
     with gr.Row():
@@ -142,14 +125,6 @@ with gr.Blocks(css="style.css") as demo:
             out_instructblip = gr.Textbox(label="InstructBLIP")
             out_fuyu = gr.Textbox(label="Fuyu-8B")
 
-    outputs = [
-        out_git,
-        out_blip,
-        out_blip2_opt,
-        out_blip2_t5xxl,
-        out_instructblip,
-        out_fuyu,
-    ]
     gr.Examples(
         examples=[
             "cats.jpg",
@@ -157,20 +132,26 @@ with gr.Blocks(css="style.css") as demo:
             "astronaut.jpg",
         ],
         inputs=input_image,
-        outputs=outputs,
-        fn=generate_captions,
-        cache_examples=os.getenv("CACHE_EXAMPLES") == "1",
     )
 
     with gr.Accordion(label="The original Spaces can be found here:", open=False):
         gr.Markdown(ORIGINAL_SPACE_INFO)
 
-    run_button.click(
-        fn=generate_captions,
-        inputs=input_image,
-        outputs=outputs,
-        api_name="caption",
-    )
+    fn_out_pairs = [
+        (generate_caption_git, out_git),
+        (generate_caption_blip, out_blip),
+        (generate_caption_blip2_opt, out_blip2_opt),
+        (generate_caption_blip2_t5xxl, out_blip2_t5xxl),
+        (generate_caption_instructblip, out_instructblip),
+        (generate_caption_fuyu, out_fuyu),
+    ]
+    for fn, out in fn_out_pairs:
+        run_button.click(
+            fn=fn,
+            inputs=input_image,
+            outputs=out,
+            api_name=False,
+        )
 
 if __name__ == "__main__":
-    demo.queue(max_size=20).launch()
+    demo.queue(max_size=20, api_open=False).launch(show_api=False)

style.css

@@ -1,4 +1,4 @@
 h1 {
   text-align: center;
+  display: block;
 }
-