From 3bf31eb4fdf6ea860be2c9ceefebac81bfb86c13 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 19 Jul 2025 11:33:16 -0400 Subject: [PATCH] linting Signed-off-by: Vladimir Mandic --- modules/api/nudenet.py | 18 +++++++++--------- scripts/nudenet/nudenet.py | 2 +- scripts/nudenet_ext.py | 15 ++++++--------- wiki | 2 +- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/modules/api/nudenet.py b/modules/api/nudenet.py index 391a581fa..4756d42f3 100644 --- a/modules/api/nudenet.py +++ b/modules/api/nudenet.py @@ -10,7 +10,7 @@ def nudenet_censor( method: str = Body('pixelate', title='nudenet censorship method'), overlay: str = Body('', title='nudenet overlay image path'), ): - from scripts.nudenet import nudenet + from scripts.nudenet import nudenet # pylint: disable=no-name-in-module base64image = image image = api.decode_base64_to_image(image) if nudenet.detector is None: @@ -27,7 +27,7 @@ def prompt_check( lang: str = Body("eng", title='allowed languages'), alphabet: str = Body("latn", title='allowed alphabets'), ): - from scripts.nudenet import langdetect + from scripts.nudenet import langdetect # pylint: disable=no-name-in-module res = langdetect.lang_detect(prompt) res = ','.join(res) if isinstance(res, list) else res lang = [a.strip() for a in lang.split(',')] if lang else [] @@ -41,7 +41,7 @@ def image_guard( image: str = Body("", title='input image'), policy: str = Body("", title='optional policy definition'), ): - from scripts.nudenet import imageguard + from scripts.nudenet import imageguard # pylint: disable=no-name-in-module image = api.decode_base64_to_image(image) res = imageguard.image_guard(image=image, policy=policy) return res @@ -51,14 +51,14 @@ def banned_words( words: str = Body("", title='comma separated list of banned words'), prompt: str = Body("", title='prompt text'), ): - from scripts.nudenet import bannedwords + from scripts.nudenet import bannedwords # pylint: disable=no-name-in-module found = bannedwords.check_banned(words=words, prompt=prompt) return found def register_api(): - from modules.shared import api - api.add_api_route("/sdapi/v1//nudenet", nudenet_censor, methods=["POST"], response_model=dict) - api.add_api_route("/sdapi/v1//prompt-lang", prompt_check, methods=["POST"], response_model=dict) - api.add_api_route("/sdapi/v1//image-guard", image_guard, methods=["POST"], response_model=dict) - api.add_api_route("/sdapi/v1//prompt-banned", banned_words, methods=["POST"], response_model=list) + from modules.shared import api as api_instance + api_instance.add_api_route("/sdapi/v1//nudenet", nudenet_censor, methods=["POST"], response_model=dict) + api_instance.add_api_route("/sdapi/v1//prompt-lang", prompt_check, methods=["POST"], response_model=dict) + api_instance.add_api_route("/sdapi/v1//image-guard", image_guard, methods=["POST"], response_model=dict) + api_instance.add_api_route("/sdapi/v1//prompt-banned", banned_words, methods=["POST"], response_model=list) diff --git a/scripts/nudenet/nudenet.py b/scripts/nudenet/nudenet.py index 1a59e568c..67b29b6a6 100755 --- a/scripts/nudenet/nudenet.py +++ b/scripts/nudenet/nudenet.py @@ -58,7 +58,7 @@ class NudeDetector: from modules import shared global session # pylint: disable=global-statement - self.model_path = hf.hf_hub_download( + self.model_path = model or hf.hf_hub_download( repo_id='vladmandic/nudenet', filename='nudenet.onnx', cache_dir=shared.opts.diffusers_dir, diff --git a/scripts/nudenet_ext.py b/scripts/nudenet_ext.py index f60bd2647..3f99eb8e6 100644 --- a/scripts/nudenet_ext.py +++ b/scripts/nudenet_ext.py @@ -1,12 +1,9 @@ -# built-in imports and third party imports import gradio as gr -# import required modules from sdnext -from modules import scripts, scripts_postprocessing, script_callbacks, processing, images # pylint: disable=import-error -# import actual nudenet module relative to extension root -from scripts.nudenet import nudenet # pylint: disable=wrong-import-order -from scripts.nudenet import langdetect # pylint: disable=wrong-import-order -from scripts.nudenet import imageguard # pylint: disable=wrong-import-order -from scripts.nudenet import bannedwords # pylint: disable=wrong-import-order +from modules import scripts, scripts_postprocessing, processing, images +from scripts.nudenet import nudenet # pylint: disable=no-name-in-module +from scripts.nudenet import langdetect # pylint: disable=no-name-in-module +from scripts.nudenet import imageguard # pylint: disable=no-name-in-module +from scripts.nudenet import bannedwords # pylint: disable=no-name-in-module # main ui @@ -80,7 +77,7 @@ def process( info = processing.create_infotext(p) images.save_image(nudes.output, path=p.outpath_samples, seed=p.seed, prompt=p.prompt, info=info, p=p, suffix="-censored") meta = '; '.join([f'{d["label"]}:{d["score"]}' for d in nudes.detections]) # add all metadata - nsfw = any([d["label"] in nudenet.nsfw for d in nudes.detections]) # noqa:C419 + nsfw = any([d["label"] in nudenet.nsfw for d in nudes.detections]) # noqa:C419 # pylint: disable=use-a-generator if metadata and p is not None: p.extra_generation_params["NudeNet"] = meta p.extra_generation_params["NSFW"] = nsfw diff --git a/wiki b/wiki index d069faf08..ec43678ec 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit d069faf08f7a7b46f844488bd973de8790015ed1 +Subproject commit ec43678ec8e119579312f4e036fa186071c065c3