diff --git a/imaginairy/api.py b/imaginairy/api.py index 27d74fe..33bffa6 100755 --- a/imaginairy/api.py +++ b/imaginairy/api.py @@ -48,9 +48,13 @@ if IMAGINAIRY_SAFETY_MODE in {"disabled", "classify"}: elif IMAGINAIRY_SAFETY_MODE == "filter": IMAGINAIRY_SAFETY_MODE = SafetyMode.STRICT -DEFAULT_MODEL_WEIGHTS_LOCATION = ( - "https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media" -) +MODEL_LOCATIONS = { + "sd-1.4": "https://huggingface.co/bstddev/sd-v1-4/resolve/main/sd-v1-4.ckpt", + "sd-1.5": "https://huggingface.co/acheong08/SD-V1-5-cloned/resolve/main/v1-5-pruned-emaonly.ckpt", +} + +DEFAULT_MODEL = "sd-1.5" +DEFAULT_MODEL_WEIGHTS_LOCATION = MODEL_LOCATIONS[DEFAULT_MODEL] def load_model_from_config( @@ -146,7 +150,10 @@ def imagine_image_files( img_str = "" if prompt.init_image: img_str = f"_img2img-{prompt.init_image_strength}" - basefilename = f"{base_count:06}_{prompt.seed}_{prompt.sampler_type}{prompt.steps}_PS{prompt.prompt_strength}{img_str}_{prompt_normalized(prompt.prompt_text)}" + basefilename = ( + f"{base_count:06}_{prompt.seed}_{prompt.sampler_type.replace('_', '')}{prompt.steps}_" + f"PS{prompt.prompt_strength}{img_str}_{prompt_normalized(prompt.prompt_text)}" + ) for image_type in result.images: subpath = os.path.join(outdir, image_type) diff --git a/tests/expected_output/test_clip_masking_.png b/tests/expected_output/test_clip_masking_.png index 20c81dc..48746fe 100644 Binary files a/tests/expected_output/test_clip_masking_.png and b/tests/expected_output/test_clip_masking_.png differ diff --git a/tests/expected_output/test_clip_masking__mask*6_g.png b/tests/expected_output/test_clip_masking__mask*6_g.png index 47a471b..6bebb04 100644 Binary files a/tests/expected_output/test_clip_masking__mask*6_g.png and b/tests/expected_output/test_clip_masking__mask*6_g.png differ diff --git a/tests/expected_output/test_clip_masking__mask+101_g.png b/tests/expected_output/test_clip_masking__mask+101_g.png index 7d48deb..2d7d51f 100644 Binary files a/tests/expected_output/test_clip_masking__mask+101_g.png and b/tests/expected_output/test_clip_masking__mask+101_g.png differ diff --git a/tests/expected_output/test_clip_masking__mask+11_g.png b/tests/expected_output/test_clip_masking__mask+11_g.png index 9fcf6be..cf0da6f 100644 Binary files a/tests/expected_output/test_clip_masking__mask+11_g.png and b/tests/expected_output/test_clip_masking__mask+11_g.png differ diff --git a/tests/expected_output/test_cliptext_inpainting_pearl_doctor_.png b/tests/expected_output/test_cliptext_inpainting_pearl_doctor_.png index eeb5ab8..ca4fe76 100644 Binary files a/tests/expected_output/test_cliptext_inpainting_pearl_doctor_.png and b/tests/expected_output/test_cliptext_inpainting_pearl_doctor_.png differ diff --git a/tests/expected_output/test_fix_faces_.png b/tests/expected_output/test_fix_faces_.png index 720b575..c14c351 100644 Binary files a/tests/expected_output/test_fix_faces_.png and b/tests/expected_output/test_fix_faces_.png differ diff --git a/tests/expected_output/test_imagine[ddim]_.png b/tests/expected_output/test_imagine[ddim]_.png index 156d035..6f96901 100644 Binary files a/tests/expected_output/test_imagine[ddim]_.png and b/tests/expected_output/test_imagine[ddim]_.png differ diff --git a/tests/expected_output/test_imagine[k_dpm_2]_.png b/tests/expected_output/test_imagine[k_dpm_2]_.png index ae8d3bc..44bfb78 100644 Binary files a/tests/expected_output/test_imagine[k_dpm_2]_.png and b/tests/expected_output/test_imagine[k_dpm_2]_.png differ diff --git a/tests/expected_output/test_imagine[k_dpm_2_a]_.png b/tests/expected_output/test_imagine[k_dpm_2_a]_.png index 69faae5..ea8b551 100644 Binary files a/tests/expected_output/test_imagine[k_dpm_2_a]_.png and b/tests/expected_output/test_imagine[k_dpm_2_a]_.png differ diff --git a/tests/expected_output/test_imagine[k_dpm_adaptive]_.png b/tests/expected_output/test_imagine[k_dpm_adaptive]_.png index c2a16c4..458dd33 100644 Binary files a/tests/expected_output/test_imagine[k_dpm_adaptive]_.png and b/tests/expected_output/test_imagine[k_dpm_adaptive]_.png differ diff --git a/tests/expected_output/test_imagine[k_dpm_fast]_.png b/tests/expected_output/test_imagine[k_dpm_fast]_.png index cca1a76..8daf5a1 100644 Binary files a/tests/expected_output/test_imagine[k_dpm_fast]_.png and b/tests/expected_output/test_imagine[k_dpm_fast]_.png differ diff --git a/tests/expected_output/test_imagine[k_euler]_.png b/tests/expected_output/test_imagine[k_euler]_.png index e6f6967..3f22058 100644 Binary files a/tests/expected_output/test_imagine[k_euler]_.png and b/tests/expected_output/test_imagine[k_euler]_.png differ diff --git a/tests/expected_output/test_imagine[k_euler_a]_.png b/tests/expected_output/test_imagine[k_euler_a]_.png index ff501a8..65b42f0 100644 Binary files a/tests/expected_output/test_imagine[k_euler_a]_.png and b/tests/expected_output/test_imagine[k_euler_a]_.png differ diff --git a/tests/expected_output/test_imagine[k_heun]_.png b/tests/expected_output/test_imagine[k_heun]_.png index 1bf5482..003ddea 100644 Binary files a/tests/expected_output/test_imagine[k_heun]_.png and b/tests/expected_output/test_imagine[k_heun]_.png differ diff --git a/tests/expected_output/test_imagine[k_lms]_.png b/tests/expected_output/test_imagine[k_lms]_.png index 898c339..0e8cf1a 100644 Binary files a/tests/expected_output/test_imagine[k_lms]_.png and b/tests/expected_output/test_imagine[k_lms]_.png differ diff --git a/tests/expected_output/test_imagine[plms]_.png b/tests/expected_output/test_imagine[plms]_.png index 95134c3..38d48a5 100644 Binary files a/tests/expected_output/test_imagine[plms]_.png and b/tests/expected_output/test_imagine[plms]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[ddim]_.png b/tests/expected_output/test_img2img_beach_to_sunset[ddim]_.png index ef2f2b8..cb28992 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[ddim]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[ddim]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2]_.png index fa6b5a7..1e25c86 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2_a]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2_a]_.png index 06ac49c..3e8418f 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2_a]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_2_a]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_adaptive]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_adaptive]_.png index 3d6ac95..c3374d6 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_adaptive]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_adaptive]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_fast]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_fast]_.png index 66365f8..c148a3f 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_fast]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_dpm_fast]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_euler]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_euler]_.png index 3c44c0f..7fdbbbe 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_euler]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_euler]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_euler_a]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_euler_a]_.png index 6762cc8..5460d70 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_euler_a]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_euler_a]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_heun]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_heun]_.png index cf2e1aa..f01fcdf 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_heun]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_heun]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[k_lms]_.png b/tests/expected_output/test_img2img_beach_to_sunset[k_lms]_.png index e424601..52c419f 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[k_lms]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[k_lms]_.png differ diff --git a/tests/expected_output/test_img2img_beach_to_sunset[plms]_.png b/tests/expected_output/test_img2img_beach_to_sunset[plms]_.png index 2f4b5b6..546da71 100644 Binary files a/tests/expected_output/test_img2img_beach_to_sunset[plms]_.png and b/tests/expected_output/test_img2img_beach_to_sunset[plms]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[ddim]_.png b/tests/expected_output/test_img_to_img_from_url_cats[ddim]_.png index a6a2a87..b7d55d3 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[ddim]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[ddim]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2]_.png index 77eee9f..56d8c27 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2_a]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2_a]_.png index 5dfc5ab..674f210 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2_a]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_2_a]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_adaptive]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_adaptive]_.png index a0dbf58..8819aac 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_adaptive]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_adaptive]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_fast]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_fast]_.png index 3c34db6..0d1e7d0 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_fast]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_dpm_fast]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_euler]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_euler]_.png index 0955c19..85a80dc 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_euler]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_euler]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_euler_a]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_euler_a]_.png index 3cc652f..1ee41a6 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_euler_a]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_euler_a]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_heun]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_heun]_.png index ee46dcb..536db57 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_heun]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_heun]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[k_lms]_.png b/tests/expected_output/test_img_to_img_from_url_cats[k_lms]_.png index 03c5459..b52a269 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[k_lms]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[k_lms]_.png differ diff --git a/tests/expected_output/test_img_to_img_from_url_cats[plms]_.png b/tests/expected_output/test_img_to_img_from_url_cats[plms]_.png index c6bb43f..b231a2b 100644 Binary files a/tests/expected_output/test_img_to_img_from_url_cats[plms]_.png and b/tests/expected_output/test_img_to_img_from_url_cats[plms]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.05]_.png index aa75ac2..a369369 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.2]_.png index b6f5d8f..db20fa5 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0]_.png index 234aa88..073d28c 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-1]_.png index 1c4449c..52605a1 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[ddim-1]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.05]_.png index 9ce9769..4766aea 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.2]_.png index 16460bc..fc7c057 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0]_.png index f79be11..7a5ef16 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-1]_.png index c796285..fafd4d3 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2-1]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.05]_.png index 2c40265..8eb162f 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.2]_.png index 775ba0c..9e4e9fd 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0]_.png index 3ab3e1e..3bfbd9b 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-1]_.png index c796285..fafd4d3 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_2_a-1]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.05]_.png index 96a43ae..50ca81a 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.2]_.png index c59792e..6980b25 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0]_.png index 9743ea9..8f50c27 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_adaptive-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.05]_.png index dcb34ef..1d0cb8a 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.2]_.png index cee23e5..67bd042 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0]_.png index c922873..1370708 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_dpm_fast-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.05]_.png index f2de089..7269a73 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.2]_.png index 6f07b89..03364e1 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0]_.png index 4f687a8..b6dd4d6 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-1]_.png index c796285..fafd4d3 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler-1]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.05]_.png index cdd070c..df1f5b9 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.2]_.png index 7c4f4cf..e621fc5 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0]_.png index 5facdf1..2aef6d4 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-1]_.png index c796285..fafd4d3 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_euler_a-1]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.05]_.png index 2e25451..d918092 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.2]_.png index 5ed0f3d..3570072 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0]_.png index 6e61802..6e751d5 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-1]_.png index c796285..fafd4d3 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_heun-1]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.05]_.png index 4ae78a3..dc1eedc 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.2]_.png index 8b6736f..dbfcd61 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0]_.png index 00dd415..8dc8e23 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-1]_.png index c796285..f25909d 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[k_lms-1]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.05]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.05]_.png index 05f81b4..f8b7613 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.05]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.05]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.2]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.2]_.png index 9c2ce90..fe08d17 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.2]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0.2]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0]_.png index e05c6f8..30ffaee 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-0]_.png differ diff --git a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-1]_.png b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-1]_.png index 1c4449c..52605a1 100644 Binary files a/tests/expected_output/test_img_to_img_fruit_2_gold[plms-1]_.png and b/tests/expected_output/test_img_to_img_fruit_2_gold[plms-1]_.png differ diff --git a/tests/expected_output/test_inpainting_bench_.png b/tests/expected_output/test_inpainting_bench_.png index 55c598f..ecb10f8 100644 Binary files a/tests/expected_output/test_inpainting_bench_.png and b/tests/expected_output/test_inpainting_bench_.png differ diff --git a/tests/test_enhancers.py b/tests/test_enhancers.py index bda77f7..5279ab6 100644 --- a/tests/test_enhancers.py +++ b/tests/test_enhancers.py @@ -38,7 +38,7 @@ def test_clip_masking(filename_base_for_outputs): ) img_path = f"{filename_base_for_outputs}_mask{mask_modifier}_g.png" assert_image_similar_to_expectation( - pred_grayscale, img_path=img_path, threshold=0 + pred_grayscale, img_path=img_path, threshold=100 ) img_path = f"{filename_base_for_outputs}_mask{mask_modifier}_bin.png" @@ -54,6 +54,7 @@ def test_clip_masking(filename_base_for_outputs): mask_mode="keep", upscale=False, fix_faces=True, + seed=42, ) result = next(imagine(prompt))