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"
+        }
+}

app.py

@@ -11,17 +11,17 @@ import gradio as gr
 import PIL.Image
 from manga_ocr import MangaOcr
 
-DESCRIPTION = '# [Manga OCR](https://github.com/kha-white/manga-ocr)'
+DESCRIPTION = "# [Manga OCR](https://github.com/kha-white/manga-ocr)"
 
 
 def download_sample_images() -> list[pathlib.Path]:
-    image_dir = pathlib.Path('images')
+    image_dir = pathlib.Path("images")
     if not image_dir.exists():
         image_dir.mkdir()
         for index in range(12):
-            url = f'https://raw.githubusercontent.com/kha-white/manga-ocr/master/assets/examples/{index:02d}.jpg'
-            urllib.request.urlretrieve(url, image_dir / f'{index:02d}.jpg')
-    return sorted(image_dir.rglob('*.jpg'))
+            url = f"https://raw.githubusercontent.com/kha-white/manga-ocr/master/assets/examples/{index:02d}.jpg"
+            urllib.request.urlretrieve(url, image_dir / f"{index:02d}.jpg")
+    return sorted(image_dir.rglob("*.jpg"))
 
 
 def run(image: PIL.Image.Image, mocr: MangaOcr) -> str:
@@ -34,18 +34,16 @@ fn = functools.partial(run, mocr=mocr)
 image_paths = download_sample_images()
 examples = [[path.as_posix()] for path in image_paths]
 
-with gr.Blocks(css='style.css') as demo:
+with gr.Blocks(css="style.css") as demo:
     gr.Markdown(DESCRIPTION)
     with gr.Row():
         with gr.Column():
-            image = gr.Image(label='Input', type='pil')
-            run_button = gr.Button('Run')
+            image = gr.Image(label="Input", type="pil")
+            run_button = gr.Button("Run")
         with gr.Column():
-            result = gr.Text(label='Output')
-    gr.Examples(examples=examples,
-                inputs=image,
-                outputs=result,
-                fn=fn,
-                cache_examples=os.getenv('CACHE_EXAMPLES') == '1')
-    run_button.click(fn=fn, inputs=image, outputs=result, api_name='run')
+            result = gr.Text(label="Output")
+    gr.Examples(
+        examples=examples, inputs=image, outputs=result, fn=fn, cache_examples=os.getenv("CACHE_EXAMPLES") == "1"
+    )
+    run_button.click(fn=fn, inputs=image, outputs=result, api_name="run")
 demo.queue().launch()

style.css

@@ -1,7 +1,11 @@
 h1 {
   text-align: center;
+  display: block;
 }
 
 #duplicate-button {
   margin: auto;
+  color: #fff;
+  background: #1565c0;
+  border-radius: 100vh;
 }