Update

.pre-commit-config.yaml

@@ -1,35 +1,61 @@
+exclude: ^patch
 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"
+        }
+}

app.py

@@ -16,24 +16,24 @@ import numpy as np
 import PIL.Image
 import torch
 
-if os.getenv('SYSTEM') == 'spaces':
-    with open('patch') as f:
-        subprocess.run(shlex.split('patch -p1'), cwd='gan-control', stdin=f)
+if os.getenv("SYSTEM") == "spaces":
+    with open("patch") as f:
+        subprocess.run(shlex.split("patch -p1"), cwd="gan-control", stdin=f)
 
-sys.path.insert(0, 'gan-control/src')
+sys.path.insert(0, "gan-control/src")
 
 from gan_control.inference.controller import Controller
 
-TITLE = 'GAN-Control'
-DESCRIPTION = 'https://github.com/amazon-research/gan-control'
+TITLE = "GAN-Control"
+DESCRIPTION = "https://github.com/amazon-research/gan-control"
 
 
 def download_models() -> None:
-    model_dir = pathlib.Path('controller_age015id025exp02hai04ori02gam15')
+    model_dir = pathlib.Path("controller_age015id025exp02hai04ori02gam15")
     if not model_dir.exists():
         path = huggingface_hub.hf_hub_download(
-            'public-data/gan-control',
-            'controller_age015id025exp02hai04ori02gam15.tar.gz')
+            "public-data/gan-control", "controller_age015id025exp02hai04ori02gam15.tar.gz"
+        )
         with tarfile.open(path) as f:
             f.extractall()
 
@@ -55,33 +55,31 @@ def run(
 ) -> PIL.Image.Image:
     seed = int(np.clip(seed, 0, np.iinfo(np.uint32).max))
     batch_size = nrows * ncols
-    latent_size = controller.config.model_config['latent_size']
-    latent = torch.from_numpy(
-        np.random.RandomState(seed).randn(batch_size,
-                                          latent_size)).float().to(device)
+    latent_size = controller.config.model_config["latent_size"]
+    latent = torch.from_numpy(np.random.RandomState(seed).randn(batch_size, latent_size)).float().to(device)
 
     initial_image_tensors, initial_latent_z, initial_latent_w = controller.gen_batch(
-        latent=latent, truncation=truncation)
-    res0 = controller.make_resized_grid_image(initial_image_tensors,
-                                              nrow=ncols)
+        latent=latent, truncation=truncation
+    )
+    res0 = controller.make_resized_grid_image(initial_image_tensors, nrow=ncols)
 
     pose_control = torch.tensor([[yaw, pitch, 0]], dtype=torch.float32)
     image_tensors, _, modified_latent_w = controller.gen_batch_by_controls(
-        latent=initial_latent_w,
-        input_is_latent=True,
-        orientation=pose_control)
+        latent=initial_latent_w, input_is_latent=True, orientation=pose_control
+    )
     res1 = controller.make_resized_grid_image(image_tensors, nrow=ncols)
 
     age_control = torch.tensor([[age]], dtype=torch.float32)
     image_tensors, _, modified_latent_w = controller.gen_batch_by_controls(
-        latent=initial_latent_w, input_is_latent=True, age=age_control)
+        latent=initial_latent_w, input_is_latent=True, age=age_control
+    )
     res2 = controller.make_resized_grid_image(image_tensors, nrow=ncols)
 
-    hair_color = torch.tensor([[hair_color_r, hair_color_g, hair_color_b]],
-                              dtype=torch.float32) / 255
+    hair_color = torch.tensor([[hair_color_r, hair_color_g, hair_color_b]], dtype=torch.float32) / 255
     hair_color = torch.clamp(hair_color, 0, 1)
     image_tensors, _, modified_latent_w = controller.gen_batch_by_controls(
-        latent=initial_latent_w, input_is_latent=True, hair=hair_color)
+        latent=initial_latent_w, input_is_latent=True, hair=hair_color
+    )
     res3 = controller.make_resized_grid_image(image_tensors, nrow=ncols)
 
     return res0, res1, res2, res3
@@ -89,54 +87,30 @@ def run(
 
 download_models()
 
-device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
-path = 'controller_age015id025exp02hai04ori02gam15/'
+device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
+path = "controller_age015id025exp02hai04ori02gam15/"
 controller = Controller(path, device)
 fn = functools.partial(run, controller=controller, device=device)
 
 gr.Interface(
     fn=fn,
     inputs=[
-        gr.Slider(label='Seed', minimum=0, maximum=1000000, step=1, value=0),
-        gr.Slider(label='Truncation',
-                  minimum=0,
-                  maximum=1,
-                  step=0.1,
-                  value=0.7),
-        gr.Slider(label='Yaw', minimum=-90, maximum=90, step=1, value=30),
-        gr.Slider(label='Pitch', minimum=-90, maximum=90, step=1, value=0),
-        gr.Slider(label='Age', minimum=15, maximum=75, step=1, value=75),
-        gr.Slider(label='Hair Color (R)',
-                  minimum=0,
-                  maximum=255,
-                  step=1,
-                  value=186),
-        gr.Slider(label='Hair Color (G)',
-                  minimum=0,
-                  maximum=255,
-                  step=1,
-                  value=158),
-        gr.Slider(label='Hair Color (B)',
-                  minimum=0,
-                  maximum=255,
-                  step=1,
-                  value=92),
-        gr.Slider(label='Number of Rows',
-                  minimum=1,
-                  maximum=3,
-                  step=1,
-                  value=1),
-        gr.Slider(label='Number of Columns',
-                  minimum=1,
-                  maximum=5,
-                  step=1,
-                  value=5),
+        gr.Slider(label="Seed", minimum=0, maximum=1000000, step=1, value=0),
+        gr.Slider(label="Truncation", minimum=0, maximum=1, step=0.1, value=0.7),
+        gr.Slider(label="Yaw", minimum=-90, maximum=90, step=1, value=30),
+        gr.Slider(label="Pitch", minimum=-90, maximum=90, step=1, value=0),
+        gr.Slider(label="Age", minimum=15, maximum=75, step=1, value=75),
+        gr.Slider(label="Hair Color (R)", minimum=0, maximum=255, step=1, value=186),
+        gr.Slider(label="Hair Color (G)", minimum=0, maximum=255, step=1, value=158),
+        gr.Slider(label="Hair Color (B)", minimum=0, maximum=255, step=1, value=92),
+        gr.Slider(label="Number of Rows", minimum=1, maximum=3, step=1, value=1),
+        gr.Slider(label="Number of Columns", minimum=1, maximum=5, step=1, value=5),
     ],
     outputs=[
-        gr.Image(label='Generated Image', type='pil'),
-        gr.Image(label='Head Pose Controlled', type='pil'),
-        gr.Image(label='Age Controlled', type='pil'),
-        gr.Image(label='Hair Color Controlled', type='pil'),
+        gr.Image(label="Generated Image", type="pil"),
+        gr.Image(label="Head Pose Controlled", type="pil"),
+        gr.Image(label="Age Controlled", type="pil"),
+        gr.Image(label="Hair Color Controlled", type="pil"),
     ],
     title=TITLE,
     description=DESCRIPTION,