diff --git a/scepter/studio/inference/inference.py b/scepter/studio/inference/inference.py index 323ee4c..5f8e2ff 100644 --- a/scepter/studio/inference/inference.py +++ b/scepter/studio/inference/inference.py @@ -158,7 +158,8 @@ class InferenceUI(): self.check_box_for_setting.change( change_setting_tab, inputs=[self.check_box_for_setting], - outputs=[self.mantra_state, self.tuner_state, self.control_state]) + outputs=[self.mantra_state, self.tuner_state, self.control_state], + queue=False) if __name__ == '__main__': diff --git a/scepter/studio/inference/inference_ui/control_ui.py b/scepter/studio/inference/inference_ui/control_ui.py index 5068465..1610cf3 100644 --- a/scepter/studio/inference/inference_ui/control_ui.py +++ b/scepter/studio/inference/inference_ui/control_ui.py @@ -131,7 +131,8 @@ class ControlUI(UIBase): self.crop_type, diffusion_ui.output_height, diffusion_ui.output_width ], - outputs=[self.cond_image]) + outputs=[self.cond_image], + queue=False) def change_control_mode(control_mode, diffusion_model): default_choices = self.pipe_manager.module_level_choices @@ -153,4 +154,5 @@ class ControlUI(UIBase): self.control_mode.change( change_control_mode, inputs=[self.control_mode, model_manage_ui.diffusion_model], - outputs=[self.control_model]) + outputs=[self.control_model], + queue=False) diff --git a/scepter/studio/inference/inference_ui/diffusion_ui.py b/scepter/studio/inference/inference_ui/diffusion_ui.py index 69451a3..2c4d74d 100644 --- a/scepter/studio/inference/inference_ui/diffusion_ui.py +++ b/scepter/studio/inference/inference_ui/diffusion_ui.py @@ -165,7 +165,9 @@ class DiffusionUI(UIBase): outputs=[self.seed_panel, self.image_seed], queue=False, show_progress=False) - self.refresh_seed.click(refresh_seed, outputs=[self.image_seed]) + self.refresh_seed.click(refresh_seed, + outputs=[self.image_seed], + queue=False) def change_height(h): if h not in self.cur_h_level_dict: @@ -179,4 +181,5 @@ class DiffusionUI(UIBase): self.output_height.change(change_height, inputs=[self.output_height], - outputs=[self.output_width]) + outputs=[self.output_width], + queue=False) diff --git a/scepter/studio/inference/inference_ui/gallery_ui.py b/scepter/studio/inference/inference_ui/gallery_ui.py index df2108c..9f4fb4b 100644 --- a/scepter/studio/inference/inference_ui/gallery_ui.py +++ b/scepter/studio/inference/inference_ui/gallery_ui.py @@ -198,4 +198,5 @@ class GalleryUI(UIBase): outputs=[ self.before_refine_panel, self.before_refine_gallery, self.output_gallery - ]) + ], + queue=True) diff --git a/scepter/studio/inference/inference_ui/mantra_ui.py b/scepter/studio/inference/inference_ui/mantra_ui.py index 19c3e7c..407bb3c 100644 --- a/scepter/studio/inference/inference_ui/mantra_ui.py +++ b/scepter/studio/inference/inference_ui/mantra_ui.py @@ -152,4 +152,5 @@ class MantraUI(UIBase): self.style_template, self.style_negative_template, self.style_example, self.style_example_prompt - ]) + ], + queue=False) diff --git a/scepter/studio/inference/inference_ui/model_manage_ui.py b/scepter/studio/inference/inference_ui/model_manage_ui.py index 8861ad0..fb962c9 100644 --- a/scepter/studio/inference/inference_ui/model_manage_ui.py +++ b/scepter/studio/inference/inference_ui/model_manage_ui.py @@ -196,4 +196,5 @@ class ModelManageUI(UIBase): diffusion_ui.sampler, diffusion_ui.discretization, diffusion_ui.sample_steps, diffusion_ui.guide_scale, diffusion_ui.guide_rescale - ]) + ], + queue=False) diff --git a/scepter/studio/inference/inference_ui/tuner_ui.py b/scepter/studio/inference/inference_ui/tuner_ui.py index 14ff853..488de78 100644 --- a/scepter/studio/inference/inference_ui/tuner_ui.py +++ b/scepter/studio/inference/inference_ui/tuner_ui.py @@ -116,4 +116,5 @@ class TunerUI(UIBase): outputs=[ self.tuner_type, self.base_model, self.tuner_desc, self.tuner_example, self.tuner_prompt_example - ]) + ], + queue=False) diff --git a/scepter/studio/preprocess/caption_editor_ui/create_dataset_ui.py b/scepter/studio/preprocess/caption_editor_ui/create_dataset_ui.py index a683a23..f1b7dc9 100644 --- a/scepter/studio/preprocess/caption_editor_ui/create_dataset_ui.py +++ b/scepter/studio/preprocess/caption_editor_ui/create_dataset_ui.py @@ -410,7 +410,9 @@ class CreateDatasetUI(UIBase): if len(self.dataset_list) > 0 else '', choices=self.dataset_list) - self.refresh_dataset_name.click(refresh, outputs=[self.dataset_name]) + self.refresh_dataset_name.click(refresh, + outputs=[self.dataset_name], + queue=False) def confirm_create_dataset(user_name, create_mode, file_url, file_path, panel_state): @@ -491,25 +493,31 @@ class CreateDatasetUI(UIBase): self.btn_create_datasets.click(show_dataset_panel, [], [ self.file_panel, self.dataset_panel, self.btn_panel, self.panel_state, self.user_data_name, self.create_mode - ]) + ], + queue=False) self.btn_create_datasets_from_file.click(show_file_panel, [], [ self.file_panel, self.dataset_panel, self.btn_panel, self.panel_state, self.user_data_name, self.file_path, self.file_path_url, self.create_mode - ]) + ], + queue=False) # Click Refresh self.random_data_button.click(get_random_dataset_name, [], - [self.user_data_name]) + [self.user_data_name], + queue=False) - self.file_path.clear(clear_file, outputs=[self.file_path_url]) + self.file_path.clear(clear_file, + outputs=[self.file_path_url], + queue=False) # Click Confirm self.confirm_data_button.click(confirm_create_dataset, [ self.user_data_name, self.create_mode, self.file_path_url, self.file_path, self.panel_state - ], [self.panel_state, self.dataset_name]) + ], [self.panel_state, self.dataset_name], + queue=False) def show_edit_panel(panel_state, data_name): if panel_state: @@ -527,7 +535,8 @@ class CreateDatasetUI(UIBase): gallery_dataset.gallery_panel, gallery_dataset.upload_panel, export_dataset.export_panel, self.modify_panel, self.file_panel, self.btn_panel, self.user_data_name_state - ]) + ], + queue=False) def modify_data_name(user_name, prev_data_name): print( @@ -583,7 +592,8 @@ class CreateDatasetUI(UIBase): self.modify_data_button.click( modify_data_name, inputs=[self.user_data_name, self.user_data_name_state], - outputs=[self.user_data_name_state, self.dataset_name]) + outputs=[self.user_data_name_state, self.dataset_name], + queue=False) def dataset_change(user_name): if user_name is None or user_name == '': @@ -602,4 +612,5 @@ class CreateDatasetUI(UIBase): self.dataset_panel, self.file_panel, self.panel_state, self.user_data_name, gallery_dataset.gallery_state - ]) + ], + queue=False) diff --git a/scepter/studio/preprocess/caption_editor_ui/dataset_gallery_ui.py b/scepter/studio/preprocess/caption_editor_ui/dataset_gallery_ui.py index d723f73..30d4e13 100644 --- a/scepter/studio/preprocess/caption_editor_ui/dataset_gallery_ui.py +++ b/scepter/studio/preprocess/caption_editor_ui/dataset_gallery_ui.py @@ -116,7 +116,8 @@ class DatasetGalleryUI(UIBase): self.gallery_state.change(change_gallery, inputs=[create_dataset.user_data_name], - outputs=[self.gl_dataset_images]) + outputs=[self.gl_dataset_images], + queue=False) def select_image(dataset_name, evt: gr.SelectData): meta_data = create_dataset.meta_dict[dataset_name] @@ -167,16 +168,19 @@ class DatasetGalleryUI(UIBase): self.gl_dataset_images, self.ori_caption, self.edit_caption, self.info - ]) + ], + queue=False) self.gl_dataset_images.change( change_image, inputs=[create_dataset.user_data_name], - outputs=[self.ori_caption, self.edit_caption, self.info]) + outputs=[self.ori_caption, self.edit_caption, self.info], + queue=False) self.modify_button.click( change_caption, inputs=[create_dataset.user_data_name, self.edit_caption], - outputs=[self.ori_caption]) + outputs=[self.ori_caption], + queue=False) def delete_file(dataset_name): cursor = create_dataset.meta_dict[dataset_name]['cursor'] @@ -218,7 +222,8 @@ class DatasetGalleryUI(UIBase): outputs=[ self.gl_dataset_images, self.ori_caption, self.edit_caption, self.info - ]) + ], + queue=False) def add_file(dataset_name, upload_image, caption): if 'image' in upload_image: @@ -275,7 +280,8 @@ class DatasetGalleryUI(UIBase): outputs=[ self.gl_dataset_images, self.ori_caption, self.edit_caption, self.info - ]) + ], + queue=False) def edit_caption_change(dataset_name, edit_caption): meta = create_dataset.meta_dict[dataset_name] @@ -285,4 +291,5 @@ class DatasetGalleryUI(UIBase): self.edit_caption.change( edit_caption_change, - inputs=[create_dataset.user_data_name, self.edit_caption]) + inputs=[create_dataset.user_data_name, self.edit_caption], + queue=False) diff --git a/scepter/studio/preprocess/caption_editor_ui/export_dataset_ui.py b/scepter/studio/preprocess/caption_editor_ui/export_dataset_ui.py index 24abb61..d4d1ef1 100644 --- a/scepter/studio/preprocess/caption_editor_ui/export_dataset_ui.py +++ b/scepter/studio/preprocess/caption_editor_ui/export_dataset_ui.py @@ -72,7 +72,8 @@ class ExportDatasetUI(UIBase): self.export_to_zip.click(export_zip, inputs=[create_dataset.user_data_name], - outputs=[self.export_url]) + outputs=[self.export_url], + queue=False) def export_csv(dataset_name): meta = create_dataset.meta_dict[dataset_name] @@ -136,4 +137,5 @@ class ExportDatasetUI(UIBase): self.go_to_train.click( go_to_train, inputs=[create_dataset.user_data_name], - outputs=[manager.tabs, manager.self_train.trainer_ui.ms_data_name]) + outputs=[manager.tabs, manager.self_train.trainer_ui.ms_data_name], + queue=False) diff --git a/scepter/studio/self_train/self_train_ui/inference_ui.py b/scepter/studio/self_train/self_train_ui/inference_ui.py index 787fd3c..5d1f630 100644 --- a/scepter/studio/self_train/self_train_ui/inference_ui.py +++ b/scepter/studio/self_train/self_train_ui/inference_ui.py @@ -140,4 +140,5 @@ class InferenceUI(UIBase): manager.tabs, manager.inference.tuner_ui.custom_tuner_model, manager.inference.model_manage_ui.diffusion_model, manager.inference.setting_tab - ]) + ], + queue=False) diff --git a/scepter/tools/webui.py b/scepter/tools/webui.py index ea4abd3..d08c364 100644 --- a/scepter/tools/webui.py +++ b/scepter/tools/webui.py @@ -34,7 +34,9 @@ if __name__ == '__main__': parser.add_argument('--cfg', dest='config', type=str, - default='/config/config.yaml') + default=os.path.join( + os.path.dirname(scepter.dirname), + 'scepter/methods/studio/scepter_ui.yaml')) parser.add_argument('--debug', dest='debug', action='store_true',