diff --git a/hakuimg/blend.py b/hakuimg/blend.py index c37ac95..35b49cc 100644 --- a/hakuimg/blend.py +++ b/hakuimg/blend.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from PIL import Image, ImageFilter, ImageColor import numpy as np import cv2 diff --git a/hakuimg/blur.py b/hakuimg/blur.py index 5b22413..a6a9cf5 100644 --- a/hakuimg/blur.py +++ b/hakuimg/blur.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from PIL import Image, ImageFilter diff --git a/hakuimg/color.py b/hakuimg/color.py index 0426f6d..60c0e1c 100644 --- a/hakuimg/color.py +++ b/hakuimg/color.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from PIL import Image, ImageEnhance import cv2 import numpy as np diff --git a/hakuimg/curve.py b/hakuimg/curve.py index b62889a..72f623d 100644 --- a/hakuimg/curve.py +++ b/hakuimg/curve.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Any +from typing import Any, Tuple, List, Union from numpy.typing import NDArray import cv2 @@ -62,7 +62,7 @@ def run( ): def curve( img: NDArray, - *args: list[int] + *args: List[int] ): nonlocal points #all, r, g, b diff --git a/hakuimg/dither.py b/hakuimg/dither.py index ee46eb9..3927277 100644 --- a/hakuimg/dither.py +++ b/hakuimg/dither.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Any +from typing import Any, Tuple, List, Union from numpy.typing import NDArray from itertools import product @@ -35,7 +35,7 @@ def dithering( def run( src, k: int = 3, -) -> tuple[Image.Image, list[list[str|float]]]: +): def calc(): pass return Image.fromarray(result) \ No newline at end of file diff --git a/hakuimg/neon.py b/hakuimg/neon.py index 6554e23..439aa58 100644 --- a/hakuimg/neon.py +++ b/hakuimg/neon.py @@ -1,8 +1,3 @@ -from __future__ import annotations - -from typing import Any -from numpy.typing import NDArray - import cv2 from PIL import Image import numpy as np diff --git a/hakuimg/pixel.py b/hakuimg/pixel.py index d360cb4..0c81f53 100644 --- a/hakuimg/pixel.py +++ b/hakuimg/pixel.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Any +from typing import Any, Tuple, List, Union from numpy.typing import NDArray import cv2 @@ -92,7 +92,7 @@ def pixelize( precise: int, mode: str = 'dithering', resize: bool = True -) -> tuple[NDArray[Any], NDArray[Any]]: +) -> Tuple[NDArray[Any], NDArray[Any]]: ''' Use down scale and up scale to make pixel image. @@ -150,7 +150,7 @@ def run( mode: str = 'kmeans', precise: int = 10, resize: bool = True -) -> tuple[Image.Image, list[list[str|float]]]: +) -> Tuple[Image.Image, List[List[Union[str, float]]]]: #print('Start process.') #print('Read raw image... ', end='', flush=True) img = read_img_as_array(src) diff --git a/hakuimg/sketch.py b/hakuimg/sketch.py index a93ef19..cc085b6 100644 --- a/hakuimg/sketch.py +++ b/hakuimg/sketch.py @@ -1,11 +1,8 @@ -from __future__ import annotations - from PIL import Image import cv2 import numpy as np - def fix_float(val, eps=1e-3): return float(val)-eps diff --git a/scripts/main.py b/scripts/main.py index 141375d..085f1a6 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -1,4 +1,5 @@ from __future__ import annotations +from typing import Any, Tuple, List, Union from modules import shared from modules import scripts @@ -26,7 +27,7 @@ UI part inpaint_base: gr.Image inpaint_mask: gr.Image -all_btns: list[tuple[gr.Button, ...]] = [] +all_btns: List[Tuple[gr.Button, ...]] = [] layers = int(shared.opts.data.get('hakuimg_layer_num', 5)) points = int(shared.opts.data.get('hakuimg_curve_points', 3))