UI cleanup

localizations/zh_CN.json

@@ -301,8 +301,9 @@
     "Save a copy of embedding to log directory every N steps, 0 to disable": "每 N 步将 embedding 的副本保存到日志目录，0 表示禁用",
     "Save images with embedding in PNG chunks": "保存图像，并在 PNG 图片文件中嵌入 embedding 文件",
     "Read parameters (prompt, etc...) from txt2img tab when making previews": "进行预览时，从文生图选项卡中读取参数（提示词等）",
-    "Train Hypernetwork": "训练 Hypernetwork",
     "Train Embedding": "训练 Embedding",
+    "Train Hypernetwork": "训练 Hypernetwork",
+    "Train Dreambooth": "训练 Dreambooth",
     "Create an aesthetic embedding out of any number of images": "从任意数量的图像中创建美术风格 embedding",
     "Create images embedding": "生成图集 embedding",
     "Favorites": "收藏夹(已保存)",
@@ -618,12 +619,10 @@
     "favorites": "收藏夹(已保存)",
     "others": "其他",
     "Collect": "收藏(保存)",
-    "Create & Train Embedding": "创建并训练 Embedding",
     "Train an embedding; you must specify a directory with a set of 1:1 ratio images": "训练 embedding； 必须指定一组具有 1:1 比例图像的目录",
     "Embedding settings": "Embedding 设置",
     "Image preprocess settings": "图像预处理设置",
     "Train settings": "训练设置",
-    "Create & Train Hypernetwork": "创建并训练 Hypernetwork",
     "Train an hypernetwork; you must specify a directory with a set of 1:1 ratio images": "训练 hypernetwork； 必须指定一组具有 1:1 比例图像的目录",
     "Hypernetwork settings": "Hypernetwork 设置",
     "Sign Options": "登陆选项",

localizations/zh_TW.json

@@ -313,8 +313,9 @@
     "Save a copy of embedding to log directory every N steps, 0 to disable": "每 N 步將 embedding 的副本儲存到日誌目錄,0 表示禁用",
     "Save images with embedding in PNG chunks": "儲存圖像,並在 PNG 圖片檔案中嵌入 embedding 檔案",
     "Read parameters (prompt, etc...) from txt2img tab when making previews": "進行預覽時,從文生圖頁籤中讀取參數（提示詞等）",
-    "Train Hypernetwork": "訓練超網路（Hypernetwork）",
     "Train Embedding": "訓練 Embedding",
+    "Train Hypernetwork": "訓練 Hypernetwork",
+    "Train Dreambooth": "訓練 Dreambooth",
     "Create an aesthetic embedding out of any number of images": "從任意數量的圖像中建立美術風格 embedding",
     "Create images embedding": "生成圖集 embedding",
     "txt2img history": "文生圖歷史記錄",
@@ -607,12 +608,10 @@
     "Install": "安裝",
     "Installing...": "安裝中…",
     "Installed": "已安裝",
-    "Create & Train Embedding": "創建並訓練 Embedding",
     "Train an embedding; you must specify a directory with a set of 1:1 ratio images": "訓練 embedding; 必須指定一組具有 1:1 比例圖像的目錄",
     "Embedding settings": "Embedding 設置",
     "Image preprocess settings": "圖像預處理設置",
     "Train settings": "訓練設置",
-    "Create & Train Hypernetwork": "創建並訓練 Hypernetwork",
     "Train an hypernetwork; you must specify a directory with a set of 1:1 ratio images": "訓練 hypernetwork; 必須指定一組具有 1:1 比例圖像的目錄",
     "Hypernetwork settings": "Hypernetwork 設置",
     "Sign Options": "登陸選項",

modules/shared.py

@@ -275,8 +275,6 @@ def list_checkpoint_tiles():
 
 
 def refresh_checkpoints(sagemaker_endpoint=None):
-    print('sagemaker_endpoint2:', sagemaker_endpoint)
-
     import modules.sd_models
     return modules.sd_models.list_models(sagemaker_endpoint)
 
@@ -300,8 +298,6 @@ def list_sagemaker_endpoints():
 def refresh_sagemaker_endpoints(username=None):
     global industrial_model, api_endpoint, sagemaker_endpoints
 
-    print('username2:', username)
-
     sagemaker_endpoints = []
 
     if not username:

modules/ui.py

@@ -532,7 +532,6 @@ def refresh():
         return gr.update(**(args or {}))
 
     def refresh_sagemaker_endpoints(username):
-        print('username:', username)
         refresh_method(username)
         args = refreshed_args() if callable(refreshed_args) else refreshed_args
 
@@ -542,7 +541,6 @@ def refresh_sagemaker_endpoints(username):
         return gr.update(**(args or {}))
 
     def refresh_checkpoints(sagemaker_endpoint):
-        print('sagemaker_endpoint:', sagemaker_endpoint)
         refresh_method(sagemaker_endpoint)
         args = refreshed_args() if callable(refreshed_args) else refreshed_args
 
@@ -674,6 +672,14 @@ def create_ui():
     modules.scripts.scripts_current = modules.scripts.scripts_txt2img
     modules.scripts.scripts_txt2img.initialize_scripts(is_img2img=False)
 
+    interfaces = []
+    ui_tabs = script_callbacks.ui_tabs_callback()
+    for ui_tab in ui_tabs:
+        if ui_tab[2] != 'dreambooth_interface':
+            interfaces += [ui_tab]
+        else:
+            dreambooth_tab = ui_tab[0]
+
     def create_setting_component(key, is_quicksettings=False):
         def fun():
             return opts.data[key] if key in opts.data else opts.data_labels[key].default
@@ -787,7 +793,7 @@ def run_settings_single(value, key, username):
             return gr.update(value=value), opts.dumpjson()
 
     with gr.Blocks(analytics_enabled=False) as settings_interface:
-        shared.username_state = gr.Text(value='', visible=True)
+        shared.username_state = gr.Text(value='', visible=False)
         dummy_component = gr.Label(visible=False)
 
         settings_submit = gr.Button(value="Apply settings", variant='primary')
@@ -1676,7 +1682,7 @@ def update_orig(image, state):
                         outputs=[],
                     )
                 else:
-                    with gr.Tab(label="Create & Train Embedding"):
+                    with gr.Tab(label="Train Embedding"):
                         gr.HTML(value="<p style='margin-bottom: 0.7em'>Train an embedding; you must specify a directory with a set of 1:1 ratio images <a href=\"https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Textual-Inversion\" style=\"font-weight:bold;\">[wiki]</a></p>")
 
                         with gr.Box():
@@ -1759,7 +1765,7 @@ def update_orig(image, state):
                             with gr.Column():
                                 create_train_embedding = gr.Button(value="Train Embedding", variant='primary', visible=False)
 
-                    with gr.Tab(label="Create & Train Hypernetwork"):
+                    with gr.Tab(label="Train Hypernetwork"):
                         gr.HTML(value="<p style='margin-bottom: 0.7em'>Train an hypernetwork; you must specify a directory with a set of 1:1 ratio images <a href=\"https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Textual-Inversion\" style=\"font-weight:bold;\">[wiki]</a></p>")
 
                         with gr.Box():
@@ -1845,6 +1851,9 @@ def update_orig(image, state):
                             with gr.Column():
                                 create_train_hypernetwork = gr.Button(value="Train Hypernetwork", variant='primary', visible=False)
 
+                    with gr.Tab(label="Train Dreambooth"):
+                        dreambooth_tab.render()
+
                 def sagemaker_train_embedding(
                         username,
                         new_embedding_name,
@@ -2314,6 +2323,7 @@ def user_signout():
                         shared.sd_model.sd_model_name = sd_models.checkpoints_list[key].model_name
                         break            
 
+            opts.data = shared.default_options
             response = {
                 shared.username_state: gr.update(value=username),
                 user_login_row: gr.update(visible=False),
@@ -2364,6 +2374,8 @@ def user_delete(login_username, login_password, login_email):
             response = requests.post(url=f'{shared.api_endpoint}/sd/user', json=inputs)
             if response.status_code == 200:
                 username = ''            
+                opts.data = shared.default_options
+
                 for key in sd_models.checkpoints_list:
                     if sd_models.checkpoints_list[key].title == opts.data['sd_model_checkpoint']:
                         shared.sd_model.sd_model_name = sd_models.checkpoints_list[key].model_name
@@ -2426,7 +2438,7 @@ def user_delete(login_username, login_password, login_email):
         )
 
     if cmd_opts.pureui:
-        interfaces = [
+        interfaces += [
             (txt2img_interface, "txt2img", "txt2img"),
             (img2img_interface, "img2img", "img2img"),
             (extras_interface, "Extras", "extras"),
@@ -2435,7 +2447,7 @@ def user_delete(login_username, login_password, login_email):
             (user_interface, "User", "user")
         ]
     else:
-        interfaces = [
+        interfaces += [
             (txt2img_interface, "txt2img", "txt2img"),
             (img2img_interface, "img2img", "img2img"),
             (extras_interface, "Extras", "extras"),
@@ -2460,7 +2472,7 @@ def user_delete(login_username, login_password, login_email):
     if not cmd_opts.no_progressbar_hiding:
         css += css_hide_progressbar
 
-    interfaces += script_callbacks.ui_tabs_callback()
+#    interfaces += script_callbacks.ui_tabs_callback()
     interfaces += [(settings_interface, "Settings", "settings")]
 
     extensions_interface = ui_extensions.create_ui()
@@ -2474,6 +2486,7 @@ def user_delete(login_username, login_password, login_email):
 
         parameters_copypaste.integrate_settings_paste_fields(component_dict)
         parameters_copypaste.run_bind()
+        shared.default_options = shared.opts.data
 
         with gr.Tabs(elem_id="tabs") as tabs:
             for interface, label, ifid in interfaces: