From 26477e07a453b3de02e5c50b8321012e0f2bb93a Mon Sep 17 00:00:00 2001 From: "agentd00nut@gmail.com" Date: Sat, 2 Dec 2023 20:39:14 -0500 Subject: [PATCH 1/3] precommit formatting --- novelai_api/_high_level.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/novelai_api/_high_level.py b/novelai_api/_high_level.py index 32a2b09..fe8d07e 100644 --- a/novelai_api/_high_level.py +++ b/novelai_api/_high_level.py @@ -298,12 +298,17 @@ async def _generate( global_settings.rep_pen_whitelist = repetition_penalty_default_whitelist params = { - "repetition_penalty_whitelist": list(set( - item for sublist in [ - global_params.pop("repetition_penalty_whitelist", []), - preset_params.pop("repetition_penalty_whitelist", []), - ] for inner_list in sublist for item in inner_list - )) + "repetition_penalty_whitelist": list( + set( + item + for sublist in [ + global_params.pop("repetition_penalty_whitelist", []), + preset_params.pop("repetition_penalty_whitelist", []), + ] + for inner_list in sublist + for item in inner_list + ) + ) } params.update(preset_params) From 03d3a5aaaaa0fc343578dc39c7c92a27949a66c9 Mon Sep 17 00:00:00 2001 From: "agentd00nut@gmail.com" Date: Sat, 2 Dec 2023 21:00:07 -0500 Subject: [PATCH 2/3] Add `.copy` to test_samplers; --- tests/api/test_imagegen_samplers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/api/test_imagegen_samplers.py b/tests/api/test_imagegen_samplers.py index 5771ccf..0240354 100644 --- a/tests/api/test_imagegen_samplers.py +++ b/tests/api/test_imagegen_samplers.py @@ -41,6 +41,7 @@ async def test_samplers( logger.info(f"Testing model {model} with sampler {sampler}") preset = ImagePreset(sampler=sampler) + preset.copy() # Furry doesn't have UCPreset.Preset_Low_Quality_Bad_Anatomy if model is ImageModel.Furry: From 52df5f26b115c0e37acf438bd62341edf408916e Mon Sep 17 00:00:00 2001 From: "agentd00nut@gmail.com" Date: Sat, 2 Dec 2023 21:01:37 -0500 Subject: [PATCH 3/3] Update _type_mapping, allow .copy() to work. --- novelai_api/ImagePreset.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/novelai_api/ImagePreset.py b/novelai_api/ImagePreset.py index e737757..bdacc8b 100644 --- a/novelai_api/ImagePreset.py +++ b/novelai_api/ImagePreset.py @@ -199,6 +199,7 @@ class ImagePreset: } _TYPE_MAPPING = { + "legacy": bool, "quality_toggle": bool, "resolution": (ImageResolution, tuple), "uc_preset": (UCPreset, NoneType), @@ -208,6 +209,7 @@ class ImagePreset: "noise": (int, float), "strength": (int, float), "scale": (int, float), + "uncond_scale": (int, float), "steps": int, "uc": str, "smea": bool, @@ -219,6 +221,8 @@ class ImagePreset: "decrisper": bool, "add_original_image": bool, "mask": str, + "cfg_rescale": float, + "noise_schedule": str, } # type completion for __setitem__ and __getitem__