Update

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-executables-have-shebangs
       - id: check-json
@@ -18,13 +18,15 @@ repos:
     hooks:
       - id: docformatter
         args: ["--in-place"]
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.4
     hooks:
-      - id: isort
-        args: ["--profile", "black"]
+      - id: ruff
+        args: ["--fix"]
+      - id: ruff-format
+        args: ["--line-length", "119"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.14.0
     hooks:
       - id: mypy
         args: ["--ignore-missing-imports"]
@@ -35,14 +37,8 @@ repos:
             "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
+    rev: 0.8.1
     hooks:
       - id: nbstripout
         args:
@@ -51,7 +47,7 @@ repos:
             "metadata.interpreter metadata.kernelspec cell.metadata.pycharm",
           ]
   - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.8.5
+    rev: 1.9.1
     hooks:
       - id: nbqa-black
       - id: nbqa-pyupgrade

.python-version

@@ -0,0 +1 @@
+3.10

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "ms-python.python",
+        "charliermarsh.ruff",
+        "streetsidesoftware.code-spell-checker",
+        "tamasfe.even-better-toml"
+    ]
+}

.vscode/settings.json

@@ -2,29 +2,20 @@
     "editor.formatOnSave": true,
     "files.insertFinalNewline": false,
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.defaultFormatter": "charliermarsh.ruff",
         "editor.formatOnType": true,
         "editor.codeActionsOnSave": {
+            "source.fixAll.ruff": "explicit",
             "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"
-        }
+    "notebook.codeActionsOnSave": {
+        "source.organizeImports": "explicit"
+    }
 }

README.md

@@ -4,7 +4,7 @@ emoji: 👀
 colorFrom: blue
 colorTo: purple
 sdk: gradio
-sdk_version: 4.36.1
+sdk_version: 5.9.1
 app_file: app.py
 pinned: false
 license: cc-by-nc-sa-4.0

app.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import os
 import pathlib
 import shlex
@@ -24,20 +22,24 @@ if torch.cuda.is_available():
     MODEL_DIR = pathlib.Path("DDNM/hq_demo/data/pretrained")
     if not MODEL_DIR.exists():
         MODEL_DIR.mkdir()
-        subprocess.run(
+        subprocess.run(  # noqa: S603
             shlex.split("wget https://openaipublic.blob.core.windows.net/diffusion/jul-2021/256x256_classifier.pt"),
             cwd=MODEL_DIR.as_posix(),
+            check=False,
         )
-        subprocess.run(
+        subprocess.run(  # noqa: S603
             shlex.split("wget https://openaipublic.blob.core.windows.net/diffusion/jul-2021/256x256_diffusion.pt"),
             cwd=MODEL_DIR.as_posix(),
+            check=False,
         )
 
-with gr.Blocks(css="style.css") as demo:
+with gr.Blocks(css_paths="style.css") as demo:
     gr.Markdown(DESCRIPTION)
     with gr.Tabs():
         with gr.TabItem(label="Super-resolution"):
             create_demo_superresolution()
         with gr.TabItem(label="Colorization"):
             create_demo_colorization()
-demo.queue(api_open=False, max_size=5).launch()
+
+if __name__ == "__main__":
+    demo.queue(api_open=False, max_size=5).launch()

app_colorization.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import json
+import pathlib
 import shlex
 import subprocess
 
@@ -11,16 +10,17 @@ import gradio as gr
 
 def run(image_path: str, class_index: int, sigma_y: float) -> str:
     out_name = image_path.split("/")[-1].split(".")[0]
-    subprocess.run(
+    subprocess.run(  # noqa: S603
         shlex.split(
             f"python main.py --config confs/inet256.yml --deg colorization --scale 1 --class {class_index} --path_y {image_path} --save_path {out_name} --sigma_y {sigma_y}"
         ),
         cwd="DDNM/hq_demo",
+        check=False,
     )
     return f"DDNM/hq_demo/results/{out_name}/final/00000.png"
 
 
-def create_demo():
+def create_demo() -> gr.Blocks:
     examples = [
         [
             "sample_images/monarch_gray.png",
@@ -34,7 +34,7 @@ def create_demo():
         ],
     ]
 
-    with open("imagenet_classes.json") as f:
+    with pathlib.Path("imagenet_classes.json").open() as f:
         imagenet_class_names = json.load(f)
 
     with gr.Blocks() as demo:

app_superresolution.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import json
+import pathlib
 import shlex
 import subprocess
 
@@ -11,16 +10,17 @@ import gradio as gr
 
 def run(image_path: str, class_index: int, scale: str, sigma_y: float) -> str:
     out_name = image_path.split("/")[-1].split(".")[0]
-    subprocess.run(
+    subprocess.run(  # noqa: S603
         shlex.split(
             f"python main.py --config confs/inet256.yml --resize_y --deg sr_averagepooling --scale {scale} --class {class_index} --path_y {image_path} --save_path {out_name} --sigma_y {sigma_y}"
         ),
         cwd="DDNM/hq_demo",
+        check=False,
     )
     return f"DDNM/hq_demo/results/{out_name}/final/00000.png"
 
 
-def create_demo():
+def create_demo() -> gr.Blocks:
     examples = [
         [
             "DDNM/hq_demo/data/datasets/gts/inet256/323.png",
@@ -66,7 +66,7 @@ def create_demo():
         ],
     ]
 
-    with open("imagenet_classes.json") as f:
+    with pathlib.Path("imagenet_classes.json").open() as f:
         imagenet_class_names = json.load(f)
 
     with gr.Blocks() as demo:

pyproject.toml

@@ -0,0 +1,48 @@
+[project]
+name = "ddnm-hq"
+version = "0.1.0"
+description = ""
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "blobfile>=3.0.0",
+    "gradio>=5.9.1",
+    "torch==1.13.1",
+    "torchvision>=0.14.1",
+]
+
+[tool.ruff]
+line-length = 119
+
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+    "COM812", # missing-trailing-comma
+    "D203",   # one-blank-line-before-class
+    "D213",   # multi-line-summary-second-line
+    "E501",   # line-too-long
+    "SIM117", # multiple-with-statements
+]
+extend-ignore = [
+    "D100",    # undocumented-public-module
+    "D101",    # undocumented-public-class
+    "D102",    # undocumented-public-method
+    "D103",    # undocumented-public-function
+    "D104",    # undocumented-public-package
+    "D105",    # undocumented-magic-method
+    "D107",    # undocumented-public-init
+    "EM101",   # raw-string-in-exception
+    "FBT001",  # boolean-type-hint-positional-argument
+    "FBT002",  # boolean-default-value-positional-argument
+    "PD901",   # pandas-df-variable-name
+    "PGH003",  # blanket-type-ignore
+    "PLR0913", # too-many-arguments
+    "PLR0915", # too-many-statements
+    "TRY003",  # raise-vanilla-args
+]
+unfixable = [
+    "F401", # unused-import
+]
+
+[tool.ruff.format]
+docstring-code-format = true

requirements.txt

@@ -1,7 +1,190 @@
-blobfile==2.0.1
+# This file was autogenerated by uv via the following command:
+#    uv pip compile pyproject.toml -o requirements.txt
+aiofiles==23.2.1
+    # via gradio
+annotated-types==0.7.0
+    # via pydantic
+anyio==4.7.0
+    # via
+    #   gradio
+    #   httpx
+    #   starlette
+blobfile==3.0.0
+    # via ddnm-hq (pyproject.toml)
+certifi==2024.12.14
+    # via
+    #   httpcore
+    #   httpx
+    #   requests
+charset-normalizer==3.4.1
+    # via requests
+click==8.1.8
+    # via
+    #   typer
+    #   uvicorn
+exceptiongroup==1.2.2
+    # via anyio
+fastapi==0.115.6
+    # via gradio
+ffmpy==0.5.0
+    # via gradio
+filelock==3.16.1
+    # via
+    #   blobfile
+    #   huggingface-hub
+fsspec==2024.12.0
+    # via
+    #   gradio-client
+    #   huggingface-hub
+gradio==5.9.1
+    # via ddnm-hq (pyproject.toml)
+gradio-client==1.5.2
+    # via gradio
+h11==0.14.0
+    # via
+    #   httpcore
+    #   uvicorn
+httpcore==1.0.7
+    # via httpx
+httpx==0.28.1
+    # via
+    #   gradio
+    #   gradio-client
+    #   safehttpx
+huggingface-hub==0.27.0
+    # via
+    #   gradio
+    #   gradio-client
+idna==3.10
+    # via
+    #   anyio
+    #   httpx
+    #   requests
+jinja2==3.1.5
+    # via gradio
+lxml==5.3.0
+    # via blobfile
+markdown-it-py==3.0.0
+    # via rich
+markupsafe==2.1.5
+    # via
+    #   gradio
+    #   jinja2
+mdurl==0.1.2
+    # via markdown-it-py
 numpy==1.24.2
-Pillow==9.5.0
-PyYAML==6.0
+    # via
+    #   gradio
+    #   pandas
+    #   torchvision
+nvidia-cublas-cu11==11.10.3.66
+    # via
+    #   nvidia-cudnn-cu11
+    #   torch
+nvidia-cuda-nvrtc-cu11==11.7.99
+    # via torch
+nvidia-cuda-runtime-cu11==11.7.99
+    # via torch
+nvidia-cudnn-cu11==8.5.0.96
+    # via torch
+orjson==3.10.13
+    # via gradio
+packaging==24.2
+    # via
+    #   gradio
+    #   gradio-client
+    #   huggingface-hub
+pandas==2.2.3
+    # via gradio
+pillow==9.5.0
+    # via
+    #   gradio
+    #   torchvision
+pycryptodomex==3.21.0
+    # via blobfile
+pydantic==2.10.4
+    # via
+    #   fastapi
+    #   gradio
+pydantic-core==2.27.2
+    # via pydantic
+pydub==0.25.1
+    # via gradio
+pygments==2.18.0
+    # via rich
+python-dateutil==2.9.0.post0
+    # via pandas
+python-multipart==0.0.20
+    # via gradio
+pytz==2024.2
+    # via pandas
+pyyaml==6.0
+    # via
+    #   gradio
+    #   huggingface-hub
+requests==2.32.3
+    # via
+    #   huggingface-hub
+    #   torchvision
+rich==13.9.4
+    # via typer
+ruff==0.8.4
+    # via gradio
+safehttpx==0.1.6
+    # via gradio
+semantic-version==2.10.0
+    # via gradio
+setuptools==75.6.0
+    # via
+    #   nvidia-cublas-cu11
+    #   nvidia-cuda-runtime-cu11
+shellingham==1.5.4
+    # via typer
+six==1.17.0
+    # via python-dateutil
+sniffio==1.3.1
+    # via anyio
+starlette==0.41.3
+    # via
+    #   fastapi
+    #   gradio
+tomlkit==0.13.2
+    # via gradio
 torch==1.13.1
+    # via
+    #   ddnm-hq (pyproject.toml)
+    #   torchvision
 torchvision==0.14.1
+    # via ddnm-hq (pyproject.toml)
 tqdm==4.65.0
+    # via huggingface-hub
+typer==0.15.1
+    # via gradio
+typing-extensions==4.12.2
+    # via
+    #   anyio
+    #   fastapi
+    #   gradio
+    #   gradio-client
+    #   huggingface-hub
+    #   pydantic
+    #   pydantic-core
+    #   rich
+    #   torch
+    #   torchvision
+    #   typer
+    #   uvicorn
+tzdata==2024.2
+    # via pandas
+urllib3==2.3.0
+    # via
+    #   blobfile
+    #   requests
+uvicorn==0.34.0
+    # via gradio
+websockets==14.1
+    # via gradio-client
+wheel==0.45.1
+    # via
+    #   nvidia-cublas-cu11
+    #   nvidia-cuda-runtime-cu11