add Rye config for local development + linting

.gitignore

@@ -163,3 +163,5 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+requirements-dev.lock

.python-version

@@ -0,0 +1 @@
+3.12.2

pyproject.toml

@@ -0,0 +1,54 @@
+[project]
+name = "enhancer"
+version = "0.1.0"
+description = "Finegrain Image Enhancer"
+authors = [
+    { name = "Laurent Fainsin", email = "[email protected]" }
+]
+dependencies = [
+    "gradio>=4.42.0",
+    "pillow>=10.4.0",
+    "gradio-imageslider>=0.0.20",
+    "pillow-heif>=0.18.0",
+    "refiners @ git+https://github.com/finegrain-ai/refiners",
+    "spaces>=0.29.3",
+    "numpy<2.0.0",
+]
+readme = "README.md"
+requires-python = ">= 3.12, <3.13"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.rye]
+managed = true
+dev-dependencies = []
+
+[tool.hatch.metadata]
+allow-direct-references = true
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/enhancer"]
+
+[tool.ruff]
+src = ["src"]  # https://docs.astral.sh/ruff/settings/#src
+exclude = ["esrgan_model.py"]
+line-length = 120
+target-version = "py312"
+
+[tool.ruff.lint]
+select = [
+  "E",   # pycodestyle errors
+  "W",   # pycodestyle warnings
+  "F",   # pyflakes
+  "UP",  # pyupgrade
+  "A",   # flake8-builtins
+  "B",   # flake8-bugbear
+  "Q",   # flake8-quotes
+  "I",   # isort
+]
+
+[tool.pyright]
+include = ["src"]
+exclude = ["**/__pycache__"]

requirements.lock

@@ -0,0 +1,231 @@
+# generated by rye
+# use `rye lock` or `rye sync` to update this lockfile
+#
+# last locked with the following flags:
+#   pre: false
+#   features: []
+#   all-features: false
+#   with-sources: false
+#   generate-hashes: false
+#   universal: false
+
+-e file:.
+aiofiles==23.2.1
+    # via gradio
+annotated-types==0.7.0
+    # via pydantic
+anyio==4.4.0
+    # via gradio
+    # via httpx
+    # via starlette
+certifi==2024.8.30
+    # via httpcore
+    # via httpx
+    # via requests
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
+    # via typer
+    # via uvicorn
+contourpy==1.3.0
+    # via matplotlib
+cycler==0.12.1
+    # via matplotlib
+fastapi==0.113.0
+    # via gradio
+ffmpy==0.4.0
+    # via gradio
+filelock==3.15.4
+    # via huggingface-hub
+    # via torch
+    # via triton
+fonttools==4.53.1
+    # via matplotlib
+fsspec==2024.9.0
+    # via gradio-client
+    # via huggingface-hub
+    # via torch
+gradio==4.42.0
+    # via enhancer
+    # via gradio-imageslider
+    # via spaces
+gradio-client==1.3.0
+    # via gradio
+gradio-imageslider==0.0.20
+    # via enhancer
+h11==0.14.0
+    # via httpcore
+    # via uvicorn
+httpcore==1.0.5
+    # via httpx
+httpx==0.27.2
+    # via gradio
+    # via gradio-client
+    # via spaces
+huggingface-hub==0.24.6
+    # via gradio
+    # via gradio-client
+idna==3.8
+    # via anyio
+    # via httpx
+    # via requests
+importlib-resources==6.4.4
+    # via gradio
+jaxtyping==0.2.34
+    # via refiners
+jinja2==3.1.4
+    # via gradio
+    # via torch
+kiwisolver==1.4.7
+    # via matplotlib
+markdown-it-py==3.0.0
+    # via rich
+markupsafe==2.1.5
+    # via gradio
+    # via jinja2
+matplotlib==3.9.2
+    # via gradio
+mdurl==0.1.2
+    # via markdown-it-py
+mpmath==1.3.0
+    # via sympy
+networkx==3.3
+    # via torch
+numpy==1.26.4
+    # via contourpy
+    # via enhancer
+    # via gradio
+    # via matplotlib
+    # via pandas
+    # via refiners
+nvidia-cublas-cu12==12.1.3.1
+    # via nvidia-cudnn-cu12
+    # via nvidia-cusolver-cu12
+    # via torch
+nvidia-cuda-cupti-cu12==12.1.105
+    # via torch
+nvidia-cuda-nvrtc-cu12==12.1.105
+    # via torch
+nvidia-cuda-runtime-cu12==12.1.105
+    # via torch
+nvidia-cudnn-cu12==9.1.0.70
+    # via torch
+nvidia-cufft-cu12==11.0.2.54
+    # via torch
+nvidia-curand-cu12==10.3.2.106
+    # via torch
+nvidia-cusolver-cu12==11.4.5.107
+    # via torch
+nvidia-cusparse-cu12==12.1.0.106
+    # via nvidia-cusolver-cu12
+    # via torch
+nvidia-nccl-cu12==2.20.5
+    # via torch
+nvidia-nvjitlink-cu12==12.6.68
+    # via nvidia-cusolver-cu12
+    # via nvidia-cusparse-cu12
+nvidia-nvtx-cu12==12.1.105
+    # via torch
+orjson==3.10.7
+    # via gradio
+packaging==24.1
+    # via gradio
+    # via gradio-client
+    # via huggingface-hub
+    # via matplotlib
+    # via refiners
+    # via spaces
+pandas==2.2.2
+    # via gradio
+pillow==10.4.0
+    # via enhancer
+    # via gradio
+    # via gradio-imageslider
+    # via matplotlib
+    # via pillow-heif
+    # via refiners
+pillow-heif==0.18.0
+    # via enhancer
+psutil==5.9.8
+    # via spaces
+pydantic==2.8.2
+    # via fastapi
+    # via gradio
+    # via spaces
+pydantic-core==2.20.1
+    # via pydantic
+pydub==0.25.1
+    # via gradio
+pygments==2.18.0
+    # via rich
+pyparsing==3.1.4
+    # via matplotlib
+python-dateutil==2.9.0.post0
+    # via matplotlib
+    # via pandas
+python-multipart==0.0.9
+    # via gradio
+pytz==2024.1
+    # via pandas
+pyyaml==6.0.2
+    # via gradio
+    # via huggingface-hub
+refiners @ git+https://github.com/finegrain-ai/refiners@cf247a1b20609479565618f49bf70c8aa65a7cfd
+    # via enhancer
+requests==2.32.3
+    # via huggingface-hub
+    # via spaces
+rich==13.8.0
+    # via typer
+ruff==0.6.4
+    # via gradio
+safetensors==0.4.5
+    # via refiners
+semantic-version==2.10.0
+    # via gradio
+setuptools==74.1.2
+    # via torch
+shellingham==1.5.4
+    # via typer
+six==1.16.0
+    # via python-dateutil
+sniffio==1.3.1
+    # via anyio
+    # via httpx
+spaces==0.30.1
+    # via enhancer
+starlette==0.38.4
+    # via fastapi
+sympy==1.13.2
+    # via torch
+tomlkit==0.12.0
+    # via gradio
+torch==2.4.1
+    # via refiners
+tqdm==4.66.5
+    # via huggingface-hub
+triton==3.0.0
+    # via torch
+typeguard==2.13.3
+    # via jaxtyping
+typer==0.12.5
+    # via gradio
+typing-extensions==4.12.2
+    # via fastapi
+    # via gradio
+    # via gradio-client
+    # via huggingface-hub
+    # via pydantic
+    # via pydantic-core
+    # via spaces
+    # via torch
+    # via typer
+tzdata==2024.1
+    # via pandas
+urllib3==2.2.2
+    # via gradio
+    # via requests
+uvicorn==0.30.6
+    # via gradio
+websockets==12.0
+    # via gradio-client

src/app.py

@@ -1,12 +1,12 @@
 from pathlib import Path
 
 import gradio as gr
+import pillow_heif
 import spaces
 import torch
 from gradio_imageslider import ImageSlider
 from huggingface_hub import hf_hub_download
 from PIL import Image
-import pillow_heif
 from refiners.fluxion.utils import manual_seed
 from refiners.foundationals.latent_diffusion import Solver, solvers
 
@@ -22,12 +22,24 @@ TITLE = """
     Image Enhancer Powered By Refiners
   </h1>
 
-  <div style="display: flex; align-items: center; justify-content: center; gap: 0.5rem; margin-bottom: 0.5rem; font-size: 1.25rem; flex-wrap: wrap;">
+  <div style="
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+    margin-bottom: 0.5rem;
+    font-size: 1.25rem;
+    flex-wrap: wrap;
+  ">
     <a href="https://blog.finegrain.ai/posts/reproducing-clarity-upscaler/" target="_blank">[Blog Post]</a>
     <a href="https://github.com/finegrain-ai/refiners" target="_blank">[Refiners]</a>
     <a href="https://finegrain.ai/" target="_blank">[Finegrain]</a>
-    <a href="https://huggingface.co/spaces/finegrain/finegrain-object-eraser" target="_blank">[Finegrain Object Eraser]</a>
-    <a href="https://huggingface.co/spaces/finegrain/finegrain-object-cutter" target="_blank">[Finegrain Object Cutter]</a>
+    <a href="https://huggingface.co/spaces/finegrain/finegrain-object-eraser" target="_blank">
+        [Finegrain Object Eraser]
+    </a>
+    <a href="https://huggingface.co/spaces/finegrain/finegrain-object-cutter" target="_blank">
+        [Finegrain Object Cutter]
+    </a>
   </div>
 
   <p>
@@ -108,11 +120,6 @@ CHECKPOINTS = ESRGANUpscalerCheckpoints(
     },
 )
 
-LORA_SCALES = {
-    "more_details": 0.5,
-    "sdxl_render": 1.0,
-}
-
 # initialize the enhancer, on the cpu
 DEVICE_CPU = torch.device("cpu")
 DTYPE = torch.bfloat16 if torch.cuda.is_bf16_supported() else torch.float32
@@ -154,7 +161,7 @@ def process(
         tile_size=(tile_height, tile_width),
         denoise_strength=denoise_strength,
         num_inference_steps=num_inference_steps,
-        loras_scale=LORA_SCALES,
+        loras_scale={"more_details": 0.5, "sdxl_render": 1.0},
         solver_type=solver_type,
     )