From a5457dcc1c952a400b84a2ab90eade47c0d7fed7 Mon Sep 17 00:00:00 2001 From: Chenlei Hu Date: Sun, 19 May 2024 21:22:14 -0400 Subject: [PATCH] Set default value of ControlNetUnit.enabled to True (#2912) --- internal_controlnet/args.py | 2 +- scripts/controlnet_ui/controlnet_ui_group.py | 2 +- tests/web_api/detect_test.py | 1 + tests/web_api/generation_test.py | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal_controlnet/args.py b/internal_controlnet/args.py index c936c56fe..77cca660e 100644 --- a/internal_controlnet/args.py +++ b/internal_controlnet/args.py @@ -73,7 +73,7 @@ class Config: loopback: bool = False # General fields. - enabled: bool = False + enabled: bool = True module: str = "none" @validator("module", always=True, pre=True) diff --git a/scripts/controlnet_ui/controlnet_ui_group.py b/scripts/controlnet_ui/controlnet_ui_group.py index c37407d64..0861363dc 100644 --- a/scripts/controlnet_ui/controlnet_ui_group.py +++ b/scripts/controlnet_ui/controlnet_ui_group.py @@ -666,7 +666,7 @@ def render(self, tabname: str, elem_id_tabname: str) -> None: self.pulid_mode, ) - unit = gr.State(ControlNetUnit()) + unit = gr.State(ControlNetUnit(enabled=False)) # It is necessary to update unit state actively to avoid potential # flaky racing issue. diff --git a/tests/web_api/detect_test.py b/tests/web_api/detect_test.py index 557378901..ae608bedf 100644 --- a/tests/web_api/detect_test.py +++ b/tests/web_api/detect_test.py @@ -94,6 +94,7 @@ def test_inpaint_mask(module: str): @disable_in_cq @pytest.mark.parametrize("img_index", [i for i, _ in enumerate(portrait_imgs)]) +@pytest.mark.skip(reason="test is for SDXL only") def test_pulid(img_index: int): """PuLID preprocessor should not memory leak.""" payload = dict( diff --git a/tests/web_api/generation_test.py b/tests/web_api/generation_test.py index 0bb817247..f88a6797a 100644 --- a/tests/web_api/generation_test.py +++ b/tests/web_api/generation_test.py @@ -310,6 +310,7 @@ def test_ip_adapter_auto(): @disable_in_cq @pytest.mark.parametrize("img_index", [i for i, _ in enumerate(portrait_imgs)]) +@pytest.mark.skip(reason="test is for SDXL only") def test_pulid(img_index: int): """PuLID should not memory leak.""" assert APITestTemplate(