Update

README.md

@@ -4,7 +4,7 @@ emoji: 🐠
 colorFrom: green
 colorTo: blue
 sdk: gradio
-sdk_version: 3.19.1
+sdk_version: 3.34.0
 app_file: app.py
 pinned: false
 ---

app.py

@@ -15,13 +15,9 @@ import PIL.Image
 import torch
 import torchvision.transforms as T
 
-TITLE = 'RF5/danbooru-pretrained'
-DESCRIPTION = 'This is an unofficial demo for https://github.com/RF5/danbooru-pretrained.'
+DESCRIPTION = '# [RF5/danbooru-pretrained](https://github.com/RF5/danbooru-pretrained)'
 
-HF_TOKEN = os.getenv('HF_TOKEN')
-MODEL_REPO = 'hysts/danbooru-pretrained'
-MODEL_FILENAME = 'resnet50-13306192.pth'
-LABEL_FILENAME = 'class_names_6000.json'
+MODEL_REPO = 'public-data/danbooru-pretrained'
 
 
 def load_sample_image_paths() -> list[pathlib.Path]:
@@ -30,17 +26,14 @@ def load_sample_image_paths() -> list[pathlib.Path]:
         dataset_repo = 'hysts/sample-images-TADNE'
         path = huggingface_hub.hf_hub_download(dataset_repo,
                                                'images.tar.gz',
-                                               repo_type='dataset',
-                                               use_auth_token=HF_TOKEN)
+                                               repo_type='dataset')
         with tarfile.open(path) as f:
             f.extractall()
     return sorted(image_dir.glob('*'))
 
 
 def load_model(device: torch.device) -> torch.nn.Module:
-    path = huggingface_hub.hf_hub_download(MODEL_REPO,
-                                           MODEL_FILENAME,
-                                           use_auth_token=HF_TOKEN)
+    path = huggingface_hub.hf_hub_download(MODEL_REPO, 'resnet50-13306192.pth')
     state_dict = torch.load(path)
     model = torch.hub.load('RF5/danbooru-pretrained',
                            'resnet50',
@@ -52,9 +45,7 @@ def load_model(device: torch.device) -> torch.nn.Module:
 
 
 def load_labels() -> list[str]:
-    path = huggingface_hub.hf_hub_download(MODEL_REPO,
-                                           LABEL_FILENAME,
-                                           use_auth_token=HF_TOKEN)
+    path = huggingface_hub.hf_hub_download(MODEL_REPO, 'class_names_6000.json')
     with open(path) as f:
         labels = json.load(f)
     return labels
@@ -91,24 +82,31 @@ transform = T.Compose([
     T.Normalize(mean=[0.7137, 0.6628, 0.6519], std=[0.2970, 0.3017, 0.2979]),
 ])
 
-func = functools.partial(predict,
-                         transform=transform,
-                         device=device,
-                         model=model,
-                         labels=labels)
-
-gr.Interface(
-    fn=func,
-    inputs=[
-        gr.Image(label='Input', type='pil'),
-        gr.Slider(label='Score Threshold',
-                  minimum=0,
-                  maximum=1,
-                  step=0.05,
-                  value=0.4),
-    ],
-    outputs=gr.Label(label='Output'),
-    examples=examples,
-    title=TITLE,
-    description=DESCRIPTION,
-).queue().launch(show_api=False)
+fn = functools.partial(predict,
+                       transform=transform,
+                       device=device,
+                       model=model,
+                       labels=labels)
+
+with gr.Blocks(css='style.css') as demo:
+    gr.Markdown(DESCRIPTION)
+    with gr.Row():
+        with gr.Column():
+            image = gr.Image(label='Input', type='pil')
+            threshold = gr.Slider(label='Score Threshold',
+                                  minimum=0,
+                                  maximum=1,
+                                  step=0.05,
+                                  value=0.4)
+            run_button = gr.Button('Run')
+        with gr.Column():
+            result = gr.Label(label='Output')
+
+    inputs = [image, threshold]
+    gr.Examples(examples=examples,
+                inputs=inputs,
+                outputs=result,
+                fn=fn,
+                cache_examples=os.getenv('CACHE_EXAMPLES') == '1')
+    run_button.click(fn=fn, inputs=inputs, outputs=result, api_name='predict')
+demo.queue(max_size=15).launch()

style.css

@@ -0,0 +1,3 @@
+h1 {
+  text-align: center;
+}