From d93485a90890da14918fcb3fd2386358ebfc6bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20Sad=C4=B1k=20=C3=96zbek?= Date: Sun, 7 Jan 2024 22:59:16 +0300 Subject: [PATCH] Potential None error fix in prepare_img_gen_request --- modules/api/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/api/api.py b/modules/api/api.py index aab2fe99e..965910b15 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -261,12 +261,12 @@ class Api: return script_args def prepare_img_gen_request(self, request, img_gen_type: str): - if hasattr(request, "face_id") and request.face_id and not request.script_name and "FaceID" not in request.alwayson_scripts.keys(): + if hasattr(request, "face_id") and request.face_id and not request.script_name and (not request.alwayson_scripts or "FaceID" not in request.alwayson_scripts.keys()): request.script_name = "FaceID" request.script_args = [request.face_id.scale, request.face_id.image] del request.face_id - if hasattr(request, "ip_adapter") and request.ip_adapter and request.script_name != "IP Adapter" and "IP Adapter" not in request.alwayson_scripts.keys(): + if hasattr(request, "ip_adapter") and request.ip_adapter and request.script_name != "IP Adapter" and (not request.alwayson_scripts or "IP Adapter" not in request.alwayson_scripts.keys()): request.alwayson_scripts = {} if request.alwayson_scripts is None else request.alwayson_scripts request.alwayson_scripts["IP Adapter"] = { "args": [request.ip_adapter.adapter, request.ip_adapter.scale, request.ip_adapter.image]