Update

.pre-commit-config.yaml

@@ -1,35 +1,60 @@
 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']
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.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: 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.7.5
+    hooks:
+      - id: docformatter
+        args: ["--in-place"]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        args: ["--profile", "black"]
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.10.0
+    hooks:
+      - id: mypy
+        args: ["--ignore-missing-imports"]
+        additional_dependencies:
+          [
+            "types-python-slugify",
+            "types-requests",
+            "types-PyYAML",
+            "types-pytz",
+          ]
+  - repo: https://github.com/psf/black
+    rev: 24.4.2
+    hooks:
+      - id: black
+        language_version: python3.10
+        args: ["--line-length", "119"]
+  - repo: https://github.com/kynan/nbstripout
+    rev: 0.7.1
+    hooks:
+      - id: nbstripout
+        args:
+          [
+            "--extra-keys",
+            "metadata.interpreter metadata.kernelspec cell.metadata.pycharm",
+          ]
+  - repo: https://github.com/nbQA-dev/nbQA
+    rev: 1.8.5
+    hooks:
+      - id: nbqa-black
+      - id: nbqa-pyupgrade
+        args: ["--py37-plus"]
+      - id: nbqa-isort
+        args: ["--float-to-top"]

.style.yapf

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

.vscode/settings.json

@@ -0,0 +1,30 @@
+{
+    "editor.formatOnSave": true,
+    "files.insertFinalNewline": false,
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnType": true,
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": "explicit"
+        }
+    },
+    "[jupyter]": {
+        "files.insertFinalNewline": false
+    },
+    "black-formatter.args": [
+        "--line-length=119"
+    ],
+    "isort.args": ["--profile", "black"],
+    "flake8.args": [
+        "--max-line-length=119"
+    ],
+    "ruff.lint.args": [
+        "--line-length=119"
+    ],
+    "notebook.output.scrolling": true,
+    "notebook.formatOnCellExecution": true,
+    "notebook.formatOnSave.enabled": true,
+        "notebook.codeActionsOnSave": {
+            "source.organizeImports": "explicit"
+        }
+}

README.md

@@ -4,7 +4,7 @@ emoji: 😻
 colorFrom: green
 colorTo: gray
 sdk: gradio
-sdk_version: 3.36.1
+sdk_version: 4.33.0
 app_file: app.py
 pinned: false
 ---

app.py

@@ -11,32 +11,24 @@ import PIL.Image
 import torch
 import torch.nn as nn
 
-sys.path.insert(0, 'Anime2Sketch')
+sys.path.insert(0, "Anime2Sketch")
 
 from data import read_img_path, tensor_to_img
 from model import UnetGenerator
 
-TITLE = 'Anime2Sketch'
-DESCRIPTION = 'https://github.com/Mukosame/Anime2Sketch'
+TITLE = "Anime2Sketch"
+DESCRIPTION = "https://github.com/Mukosame/Anime2Sketch"
 
 
 def load_model(device: torch.device) -> nn.Module:
-    norm_layer = functools.partial(nn.InstanceNorm2d,
-                                   affine=False,
-                                   track_running_stats=False)
-    model = UnetGenerator(3,
-                          1,
-                          8,
-                          64,
-                          norm_layer=norm_layer,
-                          use_dropout=False)
-
-    path = huggingface_hub.hf_hub_download('public-data/Anime2Sketch',
-                                           'netG.pth')
+    norm_layer = functools.partial(nn.InstanceNorm2d, affine=False, track_running_stats=False)
+    model = UnetGenerator(3, 1, 8, 64, norm_layer=norm_layer, use_dropout=False)
+
+    path = huggingface_hub.hf_hub_download("public-data/Anime2Sketch", "netG.pth")
     ckpt = torch.load(path)
     for key in list(ckpt.keys()):
-        if 'module.' in key:
-            ckpt[key.replace('module.', '')] = ckpt[key]
+        if "module." in key:
+            ckpt[key.replace("module.", "")] = ckpt[key]
             del ckpt[key]
     model.load_state_dict(ckpt)
     model.to(device)
@@ -44,11 +36,12 @@ def load_model(device: torch.device) -> nn.Module:
     return model
 
 
+device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
+model = load_model(device)
+
+
 @torch.inference_mode()
-def run(image_file: str,
-        model: nn.Module,
-        device: torch.device,
-        load_size: int = 512) -> PIL.Image.Image:
+def run(image_file: str, load_size: int = 512) -> PIL.Image.Image:
     tensor, orig_size = read_img_path(image_file, load_size)
     tensor = tensor.to(device)
     out = model(tensor)
@@ -58,18 +51,14 @@ def run(image_file: str,
     return res
 
 
-device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
-model = load_model(device)
-
-fn = functools.partial(run, model=model, device=device)
-
-examples = [['Anime2Sketch/test_samples/madoka.jpg']]
-
-gr.Interface(
-    fn=fn,
-    inputs=gr.Image(label='Input', type='filepath'),
-    outputs=gr.Image(label='Output'),
-    examples=examples,
+demo = gr.Interface(
+    fn=run,
+    inputs=gr.Image(label="Input", type="filepath"),
+    outputs=gr.Image(label="Output"),
+    examples=["Anime2Sketch/test_samples/madoka.jpg"],
     title=TITLE,
     description=DESCRIPTION,
-).queue().launch()
+)
+
+if __name__ == "__main__":
+    demo.queue().launch()

requirements.txt

@@ -1,4 +1,4 @@
-numpy==1.23.5
-Pillow==10.0.0
+numpy==1.26.4
+Pillow==10.3.0
 torch==2.0.1
 torchvision==0.15.2