From 0391bcf3177c1c7cd7729f226eaaaacdb501d6b8 Mon Sep 17 00:00:00 2001 From: Bingsu Date: Wed, 3 May 2023 12:16:24 +0900 Subject: [PATCH] fix: no __future__ import --- adetailer/__version__.py | 2 +- adetailer/common.py | 6 ++---- adetailer/mediapipe.py | 4 ++-- adetailer/ultralytics.py | 5 ++--- controlnet_ext/controlnet_ext.py | 2 -- install.py | 5 ++--- pyproject.toml | 2 +- scripts/!adetailer.py | 2 -- 8 files changed, 10 insertions(+), 18 deletions(-) diff --git a/adetailer/__version__.py b/adetailer/__version__.py index 87294f2..f1b49f9 100644 --- a/adetailer/__version__.py +++ b/adetailer/__version__.py @@ -1 +1 @@ -__version__ = "23.5.3" +__version__ = "23.5.3.post0" diff --git a/adetailer/common.py b/adetailer/common.py index 41c03ff..db8e5b2 100644 --- a/adetailer/common.py +++ b/adetailer/common.py @@ -1,9 +1,7 @@ -from __future__ import annotations - from collections import OrderedDict from dataclasses import dataclass from pathlib import Path -from typing import Optional +from typing import Optional, Union import cv2 import numpy as np @@ -20,7 +18,7 @@ class PredictOutput: preview: Optional[Image.Image] = None -def get_models(model_dir: str | Path) -> OrderedDict[str, str | None]: +def get_models(model_dir: Union[str, Path]) -> OrderedDict[str, Optional[str]]: model_dir = Path(model_dir) if model_dir.is_dir(): model_paths = [ diff --git a/adetailer/mediapipe.py b/adetailer/mediapipe.py index 7ebc61b..35027e5 100644 --- a/adetailer/mediapipe.py +++ b/adetailer/mediapipe.py @@ -1,4 +1,4 @@ -from __future__ import annotations +from typing import Union import mediapipe as mp import numpy as np @@ -9,7 +9,7 @@ from adetailer.common import create_mask_from_bbox def mediapipe_predict( - model_type: int | str, image: Image.Image, confidence: float = 0.3 + model_type: Union[int, str], image: Image.Image, confidence: float = 0.3 ) -> PredictOutput: if isinstance(model_type, str): model_type = mediapipe_model_name_to_type(model_type) diff --git a/adetailer/ultralytics.py b/adetailer/ultralytics.py index 5fb2372..80dc55f 100644 --- a/adetailer/ultralytics.py +++ b/adetailer/ultralytics.py @@ -1,6 +1,5 @@ -from __future__ import annotations - from pathlib import Path +from typing import Union import cv2 from PIL import Image @@ -11,7 +10,7 @@ from adetailer.common import create_mask_from_bbox def ultralytics_predict( - model_path: str | Path, + model_path: Union[str, Path], image: Image.Image, confidence: float = 0.3, device: str = "", diff --git a/controlnet_ext/controlnet_ext.py b/controlnet_ext/controlnet_ext.py index 3bb4d63..7101450 100644 --- a/controlnet_ext/controlnet_ext.py +++ b/controlnet_ext/controlnet_ext.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import importlib from functools import lru_cache from pathlib import Path diff --git a/install.py b/install.py index 7139da4..d91fee4 100644 --- a/install.py +++ b/install.py @@ -1,15 +1,14 @@ -from __future__ import annotations - import importlib.util import subprocess import sys from importlib.metadata import version # python >= 3.8 +from typing import Optional from packaging.version import parse def is_installed( - package: str, min_version: str | None = None, max_version: str | None = None + package: str, min_version: Optional[str] = None, max_version: Optional[str] = None ): try: spec = importlib.util.find_spec(package) diff --git a/pyproject.toml b/pyproject.toml index e574a62..834ee14 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ description = "An object detection and auto-mask extension for stable diffusion authors = [ {name = "dowon", email = "ks2515@naver.com"}, ] -requires-python = ">=3.8,<3.12" +requires-python = ">=3.9,<3.12" readme = "README.md" license = {text = "AGPL-3.0"} diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index cadcbe5..68b4baf 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import platform import sys from copy import copy