From af45b5a11a8a393ed404be3ce0ecac14338155c7 Mon Sep 17 00:00:00 2001 From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com> Date: Sat, 29 Oct 2022 18:26:28 +0300 Subject: Testing with API added --- test/txt2img_test.py | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 test/txt2img_test.py (limited to 'test/txt2img_test.py') diff --git a/test/txt2img_test.py b/test/txt2img_test.py new file mode 100644 index 00000000..9484fd99 --- /dev/null +++ b/test/txt2img_test.py @@ -0,0 +1,80 @@ +import unittest +import requests +import time + +url_txt2img = "http://localhost:7860/sdapi/v1/txt2img" +simple_txt2img = { + "enable_hr": False, + "denoising_strength": 0, + "firstphase_width": 0, + "firstphase_height": 0, + "prompt": "example prompt", + "styles": [ + "" + ], + "seed": -1, + "subseed": -1, + "subseed_strength": 0, + "seed_resize_from_h": -1, + "seed_resize_from_w": -1, + "batch_size": 1, + "n_iter": 1, + "steps": 5, + "cfg_scale": 7, + "width": 64, + "height": 64, + "restore_faces": False, + "tiling": False, + "negative_prompt": "", + "eta": 0, + "s_churn": 0, + "s_tmax": 0, + "s_tmin": 0, + "s_noise": 1, + "sampler_index": "Euler a" +} + +class TestTxt2ImgWorking(unittest.TestCase): + def test_txt2img_simple_performed(self): + self.assertEqual(requests.post(url_txt2img, json=simple_txt2img).status_code, 200) + + def test_txt2img_with_negative_prompt_performed(self): + params = simple_txt2img.copy() + params["negative_prompt"] = "example negative prompt" + self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + + def test_txt2img_not_square_image_performed(self): + params = simple_txt2img.copy() + params["height"] = 128 + self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + + def test_txt2img_with_hrfix_performed(self): + params = simple_txt2img.copy() + params["enable_hr"] = True + self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + + def test_txt2img_with_restore_faces_performed(self): + params = simple_txt2img.copy() + params["restore_faces"] = True + self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + + def test_txt2img_with_tiling_faces_performed(self): + params = simple_txt2img.copy() + params["tiling"] = True + self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + + def test_txt2img_with_vanilla_sampler_performed(self): + params = simple_txt2img.copy() + params["sampler_index"] = "PLMS" + self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + + def test_txt2img_multiple_batches_performed(self): + params = simple_txt2img.copy() + params["n_iter"] = 2 + self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + +class TestTxt2ImgCorrectness(unittest.TestCase): + pass + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 2f3d8172c3fe80ea64ebe5c797835ca15c2e595f Mon Sep 17 00:00:00 2001 From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com> Date: Sat, 29 Oct 2022 21:43:32 +0300 Subject: img2img test template and setUp added --- test/extras_test.py | 0 test/img2img_test.py | 59 ++++++++++++++++++++++ test/test_files/img2img_basic.png | Bin 0 -> 9932 bytes test/test_files/mask_basic.png | Bin 0 -> 362 bytes test/txt2img_test.py | 102 ++++++++++++++++++-------------------- 5 files changed, 106 insertions(+), 55 deletions(-) create mode 100644 test/extras_test.py create mode 100644 test/img2img_test.py create mode 100644 test/test_files/img2img_basic.png create mode 100644 test/test_files/mask_basic.png (limited to 'test/txt2img_test.py') diff --git a/test/extras_test.py b/test/extras_test.py new file mode 100644 index 00000000..e69de29b diff --git a/test/img2img_test.py b/test/img2img_test.py new file mode 100644 index 00000000..d8ed309d --- /dev/null +++ b/test/img2img_test.py @@ -0,0 +1,59 @@ +import unittest +import requests +from gradio.processing_utils import encode_pil_to_base64 +from PIL import Image + +class Img2ImgWorking(unittest.TestCase): + def setUp(self): + self.url_img2img = "http://localhost:7860/sdapi/v1/img2img" + self.simple_img2img = { + "init_images": [ + encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png")) + ], + "resize_mode": 0, + "denoising_strength": 0.75, + "mask": None, + "mask_blur": 4, + "inpainting_fill": 0, + "inpaint_full_res": False, + "inpaint_full_res_padding": 0, + "inpainting_mask_invert": 0, + "prompt": "example prompt", + "styles": [ + "" + ], + "seed": -1, + "subseed": -1, + "subseed_strength": 0, + "seed_resize_from_h": -1, + "seed_resize_from_w": -1, + "batch_size": 1, + "n_iter": 1, + "steps": 3, + "cfg_scale": 7, + "width": 64, + "height": 64, + "restore_faces": False, + "tiling": False, + "negative_prompt": "", + "eta": 0, + "s_churn": 0, + "s_tmax": 0, + "s_tmin": 0, + "s_noise": 1, + "override_settings": {}, + "sampler_index": "Euler a", + "include_init_images": False + } + def test_img2img_simple_performed(self): + self.assertEqual(requests.post(self.url_img2img, json=self.simple_img2img).status_code, 200) + + def test_inpainting_masked_performed(self): + self.simple_img2img["mask"] = encode_pil_to_base64(Image.open(r"test/test_files/mask_basic.png")) + self.assertEqual(requests.post(self.url_img2img, json=self.simple_img2img).status_code, 200) + +class TestImg2ImgCorrectness(unittest.TestCase): + pass + +if __name__ == "__main__": + unittest.main() \ No newline at end of file diff --git a/test/test_files/img2img_basic.png b/test/test_files/img2img_basic.png new file mode 100644 index 00000000..49a42048 Binary files /dev/null and b/test/test_files/img2img_basic.png differ diff --git a/test/test_files/mask_basic.png b/test/test_files/mask_basic.png new file mode 100644 index 00000000..0c2e9a68 Binary files /dev/null and b/test/test_files/mask_basic.png differ diff --git a/test/txt2img_test.py b/test/txt2img_test.py index 9484fd99..ad27686a 100644 --- a/test/txt2img_test.py +++ b/test/txt2img_test.py @@ -1,77 +1,69 @@ import unittest import requests -import time - -url_txt2img = "http://localhost:7860/sdapi/v1/txt2img" -simple_txt2img = { - "enable_hr": False, - "denoising_strength": 0, - "firstphase_width": 0, - "firstphase_height": 0, - "prompt": "example prompt", - "styles": [ - "" - ], - "seed": -1, - "subseed": -1, - "subseed_strength": 0, - "seed_resize_from_h": -1, - "seed_resize_from_w": -1, - "batch_size": 1, - "n_iter": 1, - "steps": 5, - "cfg_scale": 7, - "width": 64, - "height": 64, - "restore_faces": False, - "tiling": False, - "negative_prompt": "", - "eta": 0, - "s_churn": 0, - "s_tmax": 0, - "s_tmin": 0, - "s_noise": 1, - "sampler_index": "Euler a" -} class TestTxt2ImgWorking(unittest.TestCase): + def setUp(self): + self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img" + self.simple_txt2img = { + "enable_hr": False, + "denoising_strength": 0, + "firstphase_width": 0, + "firstphase_height": 0, + "prompt": "example prompt", + "styles": [ + "" + ], + "seed": -1, + "subseed": -1, + "subseed_strength": 0, + "seed_resize_from_h": -1, + "seed_resize_from_w": -1, + "batch_size": 1, + "n_iter": 1, + "steps": 3, + "cfg_scale": 7, + "width": 64, + "height": 64, + "restore_faces": False, + "tiling": False, + "negative_prompt": "", + "eta": 0, + "s_churn": 0, + "s_tmax": 0, + "s_tmin": 0, + "s_noise": 1, + "sampler_index": "Euler a" + } def test_txt2img_simple_performed(self): - self.assertEqual(requests.post(url_txt2img, json=simple_txt2img).status_code, 200) + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) def test_txt2img_with_negative_prompt_performed(self): - params = simple_txt2img.copy() - params["negative_prompt"] = "example negative prompt" - self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + self.simple_txt2img["negative_prompt"] = "example negative prompt" + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) def test_txt2img_not_square_image_performed(self): - params = simple_txt2img.copy() - params["height"] = 128 - self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + self.simple_txt2img["height"] = 128 + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) def test_txt2img_with_hrfix_performed(self): - params = simple_txt2img.copy() - params["enable_hr"] = True - self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + self.simple_txt2img["enable_hr"] = True + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) def test_txt2img_with_restore_faces_performed(self): - params = simple_txt2img.copy() - params["restore_faces"] = True - self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + self.simple_txt2img["restore_faces"] = True + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) def test_txt2img_with_tiling_faces_performed(self): - params = simple_txt2img.copy() - params["tiling"] = True - self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + self.simple_txt2img["tiling"] = True + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) def test_txt2img_with_vanilla_sampler_performed(self): - params = simple_txt2img.copy() - params["sampler_index"] = "PLMS" - self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + self.simple_txt2img["sampler_index"] = "PLMS" + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) def test_txt2img_multiple_batches_performed(self): - params = simple_txt2img.copy() - params["n_iter"] = 2 - self.assertEqual(requests.post(url_txt2img, json=params).status_code, 200) + self.simple_txt2img["n_iter"] = 2 + self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) class TestTxt2ImgCorrectness(unittest.TestCase): pass -- cgit v1.2.3 From 59dfe0845d964868e92572c78a420b6d68c46ea4 Mon Sep 17 00:00:00 2001 From: AUTOMATIC <16777216c@gmail.com> Date: Sun, 30 Oct 2022 08:22:44 +0300 Subject: launch tests from launch.py with --tests commandline argument --- .gitignore | 2 ++ launch.py | 19 +++++++++++++++++++ run_tests.bat | 15 --------------- test/extras_test.py | 6 +++--- test/img2img_test.py | 12 ++++++------ test/server_poll.py | 28 +++++++++++++++------------- test/txt2img_test.py | 8 +++++--- 7 files changed, 50 insertions(+), 40 deletions(-) delete mode 100644 run_tests.bat (limited to 'test/txt2img_test.py') diff --git a/.gitignore b/.gitignore index 8fa05852..ee53044c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ notification.mp3 /textual_inversion .vscode /extensions +/test/stdout.txt +/test/stderr.txt diff --git a/launch.py b/launch.py index 8affd410..33f98343 100644 --- a/launch.py +++ b/launch.py @@ -128,10 +128,12 @@ def prepare_enviroment(): blip_commit_hash = os.environ.get('BLIP_COMMIT_HASH', "48211a1594f1321b00f14c9f7a5b4813144b2fb9") sys.argv += shlex.split(commandline_args) + test_argv = [x for x in sys.argv if x != '--tests'] sys.argv, skip_torch_cuda_test = extract_arg(sys.argv, '--skip-torch-cuda-test') sys.argv, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers') sys.argv, update_check = extract_arg(sys.argv, '--update-check') + sys.argv, run_tests = extract_arg(sys.argv, '--tests') xformers = '--xformers' in sys.argv deepdanbooru = '--deepdanbooru' in sys.argv ngrok = '--ngrok' in sys.argv @@ -194,6 +196,23 @@ def prepare_enviroment(): print("Exiting because of --exit argument") exit(0) + if run_tests: + tests(test_argv) + exit(0) + + +def tests(argv): + print(f"Launching Web UI in another process for testing with arguments: {' '.join(argv[1:])}") + + with open('test/stdout.txt', "w", encoding="utf8") as stdout, open('test/stderr.txt', "w", encoding="utf8") as stderr: + proc = subprocess.Popen([sys.executable, *argv], stdout=stdout, stderr=stderr) + + import test.server_poll + test.server_poll.run_tests() + + print(f"Stopping Web UI process with id {proc.pid}") + proc.kill() + def start_webui(): print(f"Launching Web UI with arguments: {' '.join(sys.argv[1:])}") diff --git a/run_tests.bat b/run_tests.bat deleted file mode 100644 index 3a63f034..00000000 --- a/run_tests.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off -set ERROR_REPORTING=FALSE -set COMMANDLINE_ARGS= --api -echo Launching SDWebUI... -start "SDWebUITest" webui.bat - -if not defined PYTHON (set PYTHON=python) -if not defined VENV_DIR (set VENV_DIR=venv) -set PYTHON="%~dp0%VENV_DIR%\Scripts\Python.exe" -%PYTHON% test/server_poll.py -for /f "tokens=2 delims=," %%a in ('tasklist /v /fo csv ^| findstr /i "SDWebUITest"') do set "$PID=%%a" - -taskkill /PID %$PID% >nul 2>&1 - -pause diff --git a/test/extras_test.py b/test/extras_test.py index 2e1764d9..9b8ce0f0 100644 --- a/test/extras_test.py +++ b/test/extras_test.py @@ -1,7 +1,5 @@ import unittest -import requests -from gradio.processing_utils import encode_pil_to_base64 -from PIL import Image + class TestExtrasWorking(unittest.TestCase): def setUp(self): @@ -22,8 +20,10 @@ class TestExtrasWorking(unittest.TestCase): "image": "" } + class TestExtrasCorrectness(unittest.TestCase): pass + if __name__ == "__main__": unittest.main() diff --git a/test/img2img_test.py b/test/img2img_test.py index 61e3e285..012a9580 100644 --- a/test/img2img_test.py +++ b/test/img2img_test.py @@ -3,13 +3,12 @@ import requests from gradio.processing_utils import encode_pil_to_base64 from PIL import Image + class TestImg2ImgWorking(unittest.TestCase): def setUp(self): self.url_img2img = "http://localhost:7860/sdapi/v1/img2img" self.simple_img2img = { - "init_images": [ - encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png")) - ], + "init_images": [encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))], "resize_mode": 0, "denoising_strength": 0.75, "mask": None, @@ -19,9 +18,7 @@ class TestImg2ImgWorking(unittest.TestCase): "inpaint_full_res_padding": 0, "inpainting_mask_invert": 0, "prompt": "example prompt", - "styles": [ - "" - ], + "styles": [], "seed": -1, "subseed": -1, "subseed_strength": 0, @@ -45,6 +42,7 @@ class TestImg2ImgWorking(unittest.TestCase): "sampler_index": "Euler a", "include_init_images": False } + def test_img2img_simple_performed(self): self.assertEqual(requests.post(self.url_img2img, json=self.simple_img2img).status_code, 200) @@ -52,8 +50,10 @@ class TestImg2ImgWorking(unittest.TestCase): self.simple_img2img["mask"] = encode_pil_to_base64(Image.open(r"test/test_files/mask_basic.png")) self.assertEqual(requests.post(self.url_img2img, json=self.simple_img2img).status_code, 200) + class TestImg2ImgCorrectness(unittest.TestCase): pass + if __name__ == "__main__": unittest.main() diff --git a/test/server_poll.py b/test/server_poll.py index 8c0436f8..eeefb7eb 100644 --- a/test/server_poll.py +++ b/test/server_poll.py @@ -2,16 +2,18 @@ import unittest import requests import time -timeout_threshold = 240 -start_time = time.time() -while time.time()-start_time < timeout_threshold: - try: - requests.head("http://localhost:7860/") - break - except requests.exceptions.ConnectionError: - pass -if time.time()-start_time < timeout_threshold: - suite = unittest.TestLoader().discover('', pattern='*_test.py') - result = unittest.TextTestRunner(verbosity=2).run(suite) -else: - print("Launch unsuccessful") + +def run_tests(): + timeout_threshold = 240 + start_time = time.time() + while time.time()-start_time < timeout_threshold: + try: + requests.head("http://localhost:7860/") + break + except requests.exceptions.ConnectionError: + pass + if time.time()-start_time < timeout_threshold: + suite = unittest.TestLoader().discover('', pattern='*_test.py') + result = unittest.TextTestRunner(verbosity=2).run(suite) + else: + print("Launch unsuccessful") diff --git a/test/txt2img_test.py b/test/txt2img_test.py index ad27686a..1936e07e 100644 --- a/test/txt2img_test.py +++ b/test/txt2img_test.py @@ -1,6 +1,7 @@ import unittest import requests + class TestTxt2ImgWorking(unittest.TestCase): def setUp(self): self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img" @@ -10,9 +11,7 @@ class TestTxt2ImgWorking(unittest.TestCase): "firstphase_width": 0, "firstphase_height": 0, "prompt": "example prompt", - "styles": [ - "" - ], + "styles": [], "seed": -1, "subseed": -1, "subseed_strength": 0, @@ -34,6 +33,7 @@ class TestTxt2ImgWorking(unittest.TestCase): "s_noise": 1, "sampler_index": "Euler a" } + def test_txt2img_simple_performed(self): self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) @@ -65,8 +65,10 @@ class TestTxt2ImgWorking(unittest.TestCase): self.simple_txt2img["n_iter"] = 2 self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) + class TestTxt2ImgCorrectness(unittest.TestCase): pass + if __name__ == "__main__": unittest.main() -- cgit v1.2.3