Update

.pre-commit-config.yaml

@@ -0,0 +1,35 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.2.0
+  hooks:
+  - id: check-executables-have-shebangs
+  - id: check-json
+  - id: check-merge-conflict
+  - id: check-shebang-scripts-are-executable
+  - id: check-toml
+  - id: check-yaml
+  - id: double-quote-string-fixer
+  - id: end-of-file-fixer
+  - id: mixed-line-ending
+    args: ['--fix=lf']
+  - id: requirements-txt-fixer
+  - id: trailing-whitespace
+- repo: https://github.com/myint/docformatter
+  rev: v1.4
+  hooks:
+  - id: docformatter
+    args: ['--in-place']
+- repo: https://github.com/pycqa/isort
+  rev: 5.12.0
+  hooks:
+    - id: isort
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v0.991
+  hooks:
+    - id: mypy
+      args: ['--ignore-missing-imports']
+- repo: https://github.com/google/yapf
+  rev: v0.32.0
+  hooks:
+  - id: yapf
+    args: ['--parallel', '--in-place']

.style.yapf

@@ -0,0 +1,5 @@
+[style]
+based_on_style = pep8
+blank_line_before_nested_class_or_def = false
+spaces_before_comment = 2
+split_before_logical_operator = true

README.md

@@ -4,35 +4,7 @@ emoji: 🐠
 colorFrom: green
 colorTo: blue
 sdk: gradio
-sdk_version: 3.0.5
+sdk_version: 3.19.1
 app_file: app.py
 pinned: false
 ---
-
-# Configuration
-
-`title`: _string_
-Display title for the Space
-
-`emoji`: _string_
-Space emoji (emoji-only character allowed)
-
-`colorFrom`: _string_
-Color for Thumbnail gradient (red, yellow, green, blue, indigo, purple, pink, gray)
-
-`colorTo`: _string_
-Color for Thumbnail gradient (red, yellow, green, blue, indigo, purple, pink, gray)
-
-`sdk`: _string_
-Can be either `gradio`, `streamlit`, or `static`
-
-`sdk_version` : _string_
-Only applicable for `streamlit` SDK.  
-See [doc](https://hf.co/docs/hub/spaces) for more info on supported versions.
-
-`app_file`: _string_
-Path to your main application file (which contains either `gradio` or `streamlit` Python code, or `static` html code).
-Path is relative to the root of the repository.
-
-`pinned`: _boolean_
-Whether the Space stays on top of your list.

app.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import argparse
 import functools
 import json
 import os
@@ -18,30 +17,13 @@ import torchvision.transforms as T
 
 TITLE = 'RF5/danbooru-pretrained'
 DESCRIPTION = 'This is an unofficial demo for https://github.com/RF5/danbooru-pretrained.'
-ARTICLE = '<center><img src="https://visitor-badge.glitch.me/badge?page_id=hysts.danbooru_pretrained" alt="visitor badge"/></center>'
 
-TOKEN = os.environ['TOKEN']
+HF_TOKEN = os.getenv('HF_TOKEN')
 MODEL_REPO = 'hysts/danbooru-pretrained'
 MODEL_FILENAME = 'resnet50-13306192.pth'
 LABEL_FILENAME = 'class_names_6000.json'
 
 
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--device', type=str, default='cpu')
-    parser.add_argument('--score-slider-step', type=float, default=0.05)
-    parser.add_argument('--score-threshold', type=float, default=0.4)
-    parser.add_argument('--theme', type=str, default='dark-grass')
-    parser.add_argument('--live', action='store_true')
-    parser.add_argument('--share', action='store_true')
-    parser.add_argument('--port', type=int)
-    parser.add_argument('--disable-queue',
-                        dest='enable_queue',
-                        action='store_false')
-    parser.add_argument('--allow-flagging', type=str, default='never')
-    return parser.parse_args()
-
-
 def load_sample_image_paths() -> list[pathlib.Path]:
     image_dir = pathlib.Path('images')
     if not image_dir.exists():
@@ -49,7 +31,7 @@ def load_sample_image_paths() -> list[pathlib.Path]:
         path = huggingface_hub.hf_hub_download(dataset_repo,
                                                'images.tar.gz',
                                                repo_type='dataset',
-                                               use_auth_token=TOKEN)
+                                               use_auth_token=HF_TOKEN)
         with tarfile.open(path) as f:
             f.extractall()
     return sorted(image_dir.glob('*'))
@@ -58,7 +40,7 @@ def load_sample_image_paths() -> list[pathlib.Path]:
 def load_model(device: torch.device) -> torch.nn.Module:
     path = huggingface_hub.hf_hub_download(MODEL_REPO,
                                            MODEL_FILENAME,
-                                           use_auth_token=TOKEN)
+                                           use_auth_token=HF_TOKEN)
     state_dict = torch.load(path)
     model = torch.hub.load('RF5/danbooru-pretrained',
                            'resnet50',
@@ -72,7 +54,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=TOKEN)
+                                           use_auth_token=HF_TOKEN)
     with open(path) as f:
         labels = json.load(f)
     return labels
@@ -96,55 +78,37 @@ def predict(image: PIL.Image.Image, score_threshold: float,
     return res
 
 
-def main():
-    args = parse_args()
-    device = torch.device(args.device)
-
-    image_paths = load_sample_image_paths()
-    examples = [[path.as_posix(), args.score_threshold]
-                for path in image_paths]
-
-    model = load_model(device)
-    labels = load_labels()
-
-    transform = T.Compose([
-        T.Resize(360),
-        T.ToTensor(),
-        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)
-    func = functools.update_wrapper(func, predict)
-
-    gr.Interface(
-        func,
-        [
-            gr.inputs.Image(type='pil', label='Input'),
-            gr.inputs.Slider(0,
-                             1,
-                             step=args.score_slider_step,
-                             default=args.score_threshold,
-                             label='Score Threshold'),
-        ],
-        gr.outputs.Label(label='Output'),
-        examples=examples,
-        title=TITLE,
-        description=DESCRIPTION,
-        article=ARTICLE,
-        theme=args.theme,
-        allow_flagging=args.allow_flagging,
-        live=args.live,
-    ).launch(
-        enable_queue=args.enable_queue,
-        server_port=args.port,
-        share=args.share,
-    )
-
-
-if __name__ == '__main__':
-    main()
+image_paths = load_sample_image_paths()
+examples = [[path.as_posix(), 0.4] for path in image_paths]
+
+device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
+model = load_model(device)
+labels = load_labels()
+
+transform = T.Compose([
+    T.Resize(360),
+    T.ToTensor(),
+    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)

requirements.txt

@@ -1,2 +1,2 @@
-torch>=1.10.1
-torchvision>=0.11.2
+torch==1.13.1
+torchvision==0.14.1