From c408a0b41cfffde184cad35b2d97346342947d83 Mon Sep 17 00:00:00 2001 From: yfszzx Date: Mon, 17 Oct 2022 22:28:43 +0800 Subject: fix two bug --- launch.py | 1 - 1 file changed, 1 deletion(-) (limited to 'launch.py') diff --git a/launch.py b/launch.py index 7520cfee..088eada1 100644 --- a/launch.py +++ b/launch.py @@ -11,7 +11,6 @@ python = sys.executable git = os.environ.get('GIT', "git") index_url = os.environ.get('INDEX_URL', "") - def extract_arg(args, name): return [x for x in args if x != name], name in args -- cgit v1.2.3 From de179cf8fd8191e1a6d288e7c29a16f53da1be88 Mon Sep 17 00:00:00 2001 From: yfszzx Date: Mon, 17 Oct 2022 22:38:46 +0800 Subject: fix two bug --- launch.py | 1 + 1 file changed, 1 insertion(+) (limited to 'launch.py') diff --git a/launch.py b/launch.py index 088eada1..7520cfee 100644 --- a/launch.py +++ b/launch.py @@ -11,6 +11,7 @@ python = sys.executable git = os.environ.get('GIT', "git") index_url = os.environ.get('INDEX_URL', "") + def extract_arg(args, name): return [x for x in args if x != name], name in args -- cgit v1.2.3 From fe9740d2f5fa057e02529f8a81de21333adf4234 Mon Sep 17 00:00:00 2001 From: judgeou Date: Sun, 23 Oct 2022 20:40:23 +0800 Subject: update deepdanbooru version --- launch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'launch.py') diff --git a/launch.py b/launch.py index 333f308a..8affd410 100644 --- a/launch.py +++ b/launch.py @@ -111,7 +111,7 @@ def prepare_enviroment(): gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379") clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1") - deepdanbooru_package = os.environ.get('DEEPDANBOORU_PACKAGE', "git+https://github.com/KichangKim/DeepDanbooru.git@edf73df4cdaeea2cf00e9ac08bd8a9026b7a7b26") + deepdanbooru_package = os.environ.get('DEEPDANBOORU_PACKAGE', "git+https://github.com/KichangKim/DeepDanbooru.git@d91a2963bf87c6a770d74894667e9ffa9f6de7ff") xformers_windows_package = os.environ.get('XFORMERS_WINDOWS_PACKAGE', 'https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl') -- 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 'launch.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 From 5a6e0cfba675c0f11ade7124cbeec1356c77beb2 Mon Sep 17 00:00:00 2001 From: AUTOMATIC <16777216c@gmail.com> Date: Sun, 30 Oct 2022 08:28:36 +0300 Subject: always add --api when running tests --- launch.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'launch.py') diff --git a/launch.py b/launch.py index 33f98343..958336f2 100644 --- a/launch.py +++ b/launch.py @@ -202,6 +202,9 @@ def prepare_enviroment(): def tests(argv): + if "--api" not in argv: + argv.append("--api") + 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: -- cgit v1.2.3