diff --git a/.vscode/settings.json b/.vscode/settings.json index d412e41..4537890 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,5 @@ "python.linting.enabled": true, "python.formatting.provider": "yapf", "DockerRun.DisableDockerrc": true, - "augment.enableAutomaticCompletions": false + "augment.enableAutomaticCompletions": true } \ No newline at end of file diff --git a/js/localization.js b/assets/js/localization.js similarity index 100% rename from js/localization.js rename to assets/js/localization.js diff --git a/js/script.js b/assets/js/script.js similarity index 100% rename from js/script.js rename to assets/js/script.js diff --git a/style.css b/assets/style.css similarity index 100% rename from style.css rename to assets/style.css diff --git a/dreambooth_gui.py b/deprecated/dreambooth_gui.py similarity index 96% rename from dreambooth_gui.py rename to deprecated/dreambooth_gui.py index 998a53b..d37e48c 100644 --- a/dreambooth_gui.py +++ b/deprecated/dreambooth_gui.py @@ -20,8 +20,8 @@ def UI(**kwargs): headless = kwargs.get("headless", False) log.info(f"headless: {headless}") - if os.path.exists("./style.css"): - with open(os.path.join("./style.css"), "r", encoding="utf8") as file: + if os.path.exists("./assets/style.css"): + with open(os.path.join("./assets/style.css"), "r", encoding="utf8") as file: log.info("Load CSS...") css += file.read() + "\n" diff --git a/finetune_gui.py b/deprecated/finetune_gui.py similarity index 95% rename from finetune_gui.py rename to deprecated/finetune_gui.py index 73eb81a..c610dc6 100644 --- a/finetune_gui.py +++ b/deprecated/finetune_gui.py @@ -19,8 +19,8 @@ def UI(**kwargs): headless = kwargs.get("headless", False) log.info(f"headless: {headless}") - if os.path.exists("./style.css"): - with open(os.path.join("./style.css"), "r", encoding="utf8") as file: + if os.path.exists("./assets/style.css"): + with open(os.path.join("./assets/style.css"), "r", encoding="utf8") as file: log.info("Load CSS...") css += file.read() + "\n" diff --git a/lora_gui.py b/deprecated/lora_gui.py similarity index 96% rename from lora_gui.py rename to deprecated/lora_gui.py index dd18859..532bbdd 100644 --- a/lora_gui.py +++ b/deprecated/lora_gui.py @@ -22,8 +22,8 @@ def UI(**kwargs): headless = kwargs.get("headless", False) log.info(f"headless: {headless}") - if os.path.exists("./style.css"): - with open(os.path.join("./style.css"), "r", encoding="utf8") as file: + if os.path.exists("./assets/style.css"): + with open(os.path.join("./assets/style.css"), "r", encoding="utf8") as file: log.info("Load CSS...") css += file.read() + "\n" diff --git a/textual_inversion_gui.py b/deprecated/textual_inversion_gui.py similarity index 96% rename from textual_inversion_gui.py rename to deprecated/textual_inversion_gui.py index 0ebc0f2..a78b022 100644 --- a/textual_inversion_gui.py +++ b/deprecated/textual_inversion_gui.py @@ -20,8 +20,8 @@ def UI(**kwargs): headless = kwargs.get("headless", False) log.info(f"headless: {headless}") - if os.path.exists("./style.css"): - with open(os.path.join("./style.css"), "r", encoding="utf8") as file: + if os.path.exists("./assets/style.css"): + with open(os.path.join("./assets/style.css"), "r", encoding="utf8") as file: log.info("Load CSS...") css += file.read() + "\n" diff --git a/utilities_gui.py b/deprecated/utilities_gui.py similarity index 92% rename from utilities_gui.py rename to deprecated/utilities_gui.py index 65cc066..5cf8bc4 100644 --- a/utilities_gui.py +++ b/deprecated/utilities_gui.py @@ -15,8 +15,8 @@ log = setup_logging() def UI(**kwargs): css = '' - if os.path.exists('./style.css'): - with open(os.path.join('./style.css'), 'r', encoding='utf8') as file: + if os.path.exists('./assets/style.css'): + with open(os.path.join('./assets/style.css'), 'r', encoding='utf8') as file: print('Load CSS...') css += file.read() + '\n' diff --git a/kohya_gui.py b/kohya_gui.py index 9d58fcd..cb98ef9 100644 --- a/kohya_gui.py +++ b/kohya_gui.py @@ -2,11 +2,11 @@ import gradio as gr import os import argparse from kohya_gui.class_gui_config import KohyaSSGUIConfig -from dreambooth_gui import dreambooth_tab -from finetune_gui import finetune_tab -from textual_inversion_gui import ti_tab +from kohya_gui.dreambooth_gui import dreambooth_tab +from kohya_gui.finetune_gui import finetune_tab +from kohya_gui.textual_inversion_gui import ti_tab from kohya_gui.utilities import utilities_tab -from lora_gui import lora_tab +from kohya_gui.lora_gui import lora_tab from kohya_gui.class_lora_tab import LoRATools from kohya_gui.custom_logging import setup_logging @@ -23,8 +23,8 @@ def UI(**kwargs): headless = kwargs.get("headless", False) log.info(f"headless: {headless}") - if os.path.exists("./style.css"): - with open(os.path.join("./style.css"), "r", encoding="utf8") as file: + if os.path.exists("./assets/style.css"): + with open(os.path.join("./assets/style.css"), "r", encoding="utf8") as file: log.debug("Load CSS...") css += file.read() + "\n" diff --git a/kohya_gui/localization_ext.py b/kohya_gui/localization_ext.py index e718ac7..782e267 100644 --- a/kohya_gui/localization_ext.py +++ b/kohya_gui/localization_ext.py @@ -10,9 +10,9 @@ def file_path(fn): def js_html_str(language): head = f'\n' head += ( - f'\n' + f'\n' ) - head += f'\n' + head += f'\n' return head