Merge pull request #2017 from wkpark/kohya_gui

refactor kohya_gui parts
bmaltais · Mar 1, 2024 · 9eb335b · 9eb335b
2 parents 3d4af1e + a2450b1
commit 9eb335b
Show file tree

Hide file tree

Showing 45 changed files with 5,090 additions and 5,039 deletions.
diff --git a/dreambooth_gui.py b/dreambooth_gui.py
diff --git a/finetune_gui.py b/finetune_gui.py
diff --git a/kohya_gui.py b/kohya_gui.py
@@ -4,13 +4,12 @@
 from dreambooth_gui import dreambooth_tab
 from finetune_gui import finetune_tab
 from textual_inversion_gui import ti_tab
-from library.utilities import utilities_tab
+from kohya_gui.utilities import utilities_tab
 from lora_gui import lora_tab
-from library.class_lora_tab import LoRATools
+from kohya_gui.class_lora_tab import LoRATools
 
-import os
-from library.custom_logging import setup_logging
-from library.localization_ext import add_javascript
+from kohya_gui.custom_logging import setup_logging
+from kohya_gui.localization_ext import add_javascript
 
 # Set up logging
 log = setup_logging()

diff --git a/kohya_gui/__init__.py b/kohya_gui/__init__.py
@@ -0,0 +1 @@
+"""empty"""
diff --git a/library/basic_caption_gui.py → kohya_gui/basic_caption_gui.py b/library/basic_caption_gui.py → kohya_gui/basic_caption_gui.py
@@ -4,7 +4,7 @@
 from .common_gui import get_folder_path, add_pre_postfix, find_replace
 import os
 
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()

diff --git a/library/blip_caption_gui.py → kohya_gui/blip_caption_gui.py b/library/blip_caption_gui.py → kohya_gui/blip_caption_gui.py
@@ -3,7 +3,7 @@
 import subprocess
 import os
 from .common_gui import get_folder_path, add_pre_postfix
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()

diff --git a/library/class_advanced_training.py → kohya_gui/class_advanced_training.py b/library/class_advanced_training.py → kohya_gui/class_advanced_training.py
diff --git a/library/class_basic_training.py → kohya_gui/class_basic_training.py b/library/class_basic_training.py → kohya_gui/class_basic_training.py
diff --git a/library/class_command_executor.py → kohya_gui/class_command_executor.py b/library/class_command_executor.py → kohya_gui/class_command_executor.py
@@ -1,6 +1,6 @@
 import subprocess
 import psutil
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()

diff --git a/library/class_configuration_file.py → kohya_gui/class_configuration_file.py b/library/class_configuration_file.py → kohya_gui/class_configuration_file.py
diff --git a/library/class_dreambooth_gui.py → kohya_gui/class_dreambooth_gui.py b/library/class_dreambooth_gui.py → kohya_gui/class_dreambooth_gui.py
@@ -6,10 +6,10 @@
 from .class_basic_training import BasicTraining
 from .class_advanced_training import AdvancedTraining
 from .class_sample_images import SampleImages
-from library.dreambooth_folder_creation_gui import (
+from .dreambooth_folder_creation_gui import (
     gradio_dreambooth_folder_creation_tab,
 )
-from library.dataset_balancing_gui import gradio_dataset_balancing_tab
+from .dataset_balancing_gui import gradio_dataset_balancing_tab
 from .common_gui import color_aug_changed
 
 

diff --git a/library/class_folders.py → kohya_gui/class_folders.py b/library/class_folders.py → kohya_gui/class_folders.py
diff --git a/library/class_lora_tab.py → kohya_gui/class_lora_tab.py b/library/class_lora_tab.py → kohya_gui/class_lora_tab.py
@@ -1,17 +1,17 @@
 import gradio as gr
-from library.merge_lora_gui import GradioMergeLoRaTab
-from library.svd_merge_lora_gui import gradio_svd_merge_lora_tab
-from library.verify_lora_gui import gradio_verify_lora_tab
-from library.resize_lora_gui import gradio_resize_lora_tab
-from library.extract_lora_gui import gradio_extract_lora_tab
-from library.convert_lcm_gui import gradio_convert_lcm_tab
-from library.extract_lycoris_locon_gui import gradio_extract_lycoris_locon_tab
-from library.extract_lora_from_dylora_gui import gradio_extract_dylora_tab
-from library.merge_lycoris_gui import gradio_merge_lycoris_tab
+from .merge_lora_gui import GradioMergeLoRaTab
+from .svd_merge_lora_gui import gradio_svd_merge_lora_tab
+from .verify_lora_gui import gradio_verify_lora_tab
+from .resize_lora_gui import gradio_resize_lora_tab
+from .extract_lora_gui import gradio_extract_lora_tab
+from .convert_lcm_gui import gradio_convert_lcm_tab
+from .extract_lycoris_locon_gui import gradio_extract_lycoris_locon_tab
+from .extract_lora_from_dylora_gui import gradio_extract_dylora_tab
+from .merge_lycoris_gui import gradio_merge_lycoris_tab
 
 # Deprecated code
-from library.dataset_balancing_gui import gradio_dataset_balancing_tab
-from library.dreambooth_folder_creation_gui import (
+from .dataset_balancing_gui import gradio_dataset_balancing_tab
+from .dreambooth_folder_creation_gui import (
     gradio_dreambooth_folder_creation_tab,
 )
 

diff --git a/library/class_sample_images.py → kohya_gui/class_sample_images.py b/library/class_sample_images.py → kohya_gui/class_sample_images.py
@@ -3,7 +3,7 @@
 import gradio as gr
 from easygui import msgbox
 
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()

diff --git a/library/class_sdxl_parameters.py → kohya_gui/class_sdxl_parameters.py b/library/class_sdxl_parameters.py → kohya_gui/class_sdxl_parameters.py
diff --git a/library/class_source_model.py → kohya_gui/class_source_model.py b/library/class_source_model.py → kohya_gui/class_source_model.py
diff --git a/library/common_gui.py → kohya_gui/common_gui.py b/library/common_gui.py → kohya_gui/common_gui.py
@@ -8,7 +8,7 @@
 import sys
 import json
 
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 from datetime import datetime
 
 # Set up logging

diff --git a/library/convert_lcm_gui.py → kohya_gui/convert_lcm_gui.py b/library/convert_lcm_gui.py → kohya_gui/convert_lcm_gui.py
@@ -5,7 +5,7 @@
     get_saveasfilename_path,
     get_file_path,
 )
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()

diff --git a/library/convert_model_gui.py → kohya_gui/convert_model_gui.py b/library/convert_model_gui.py → kohya_gui/convert_model_gui.py
@@ -5,7 +5,7 @@
 import shutil
 from .common_gui import get_folder_path, get_file_path
 
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()

diff --git a/library/custom_logging.py → kohya_gui/custom_logging.py b/library/custom_logging.py → kohya_gui/custom_logging.py
diff --git a/library/dataset_balancing_gui.py → kohya_gui/dataset_balancing_gui.py b/library/dataset_balancing_gui.py → kohya_gui/dataset_balancing_gui.py
@@ -4,7 +4,7 @@
 from easygui import msgbox, boolbox
 from .common_gui import get_folder_path
 
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()

diff --git a/library/dreambooth_folder_creation_gui.py → kohya_gui/dreambooth_folder_creation_gui.py b/library/dreambooth_folder_creation_gui.py → kohya_gui/dreambooth_folder_creation_gui.py
@@ -4,7 +4,7 @@
 import shutil
 import os
 
-from library.custom_logging import setup_logging
+from .custom_logging import setup_logging
 
 # Set up logging
 log = setup_logging()