Merge branch 'dev' into move-start-timer

5 files changed, 12 insertions, 5 deletions

diff --git a/extensions-builtin/Lora/extra_networks_lora.py b/extensions-builtin/Lora/extra_networks_lora.py
index 084c41d0..ba2945c6 100644
--- a/extensions-builtin/Lora/extra_networks_lora.py
+++ b/extensions-builtin/Lora/extra_networks_lora.py
@@ -25,7 +25,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
             te_multiplier = float(params.positional[1]) if len(params.positional) > 1 else 1.0

             te_multiplier = float(params.named.get("te", te_multiplier))

 

-            unet_multiplier = float(params.positional[2]) if len(params.positional) > 2 else 1.0

+            unet_multiplier = float(params.positional[2]) if len(params.positional) > 2 else te_multiplier

             unet_multiplier = float(params.named.get("unet", unet_multiplier))

 

             dyn_dim = int(params.positional[3]) if len(params.positional) > 3 else None

diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py
index 7b4c0312..af8188e3 100644
--- a/extensions-builtin/Lora/networks.py
+++ b/extensions-builtin/Lora/networks.py
@@ -11,7 +11,7 @@ import network_full
 import torch

 from typing import Union

 

-from modules import shared, devices, sd_models, errors, scripts, sd_hijack, paths

+from modules import shared, devices, sd_models, errors, scripts, sd_hijack

 

 module_types = [

     network_lora.ModuleTypeLora(),

@@ -399,7 +399,7 @@ def list_available_networks():
     os.makedirs(shared.cmd_opts.lora_dir, exist_ok=True)

 

     candidates = list(shared.walk_files(shared.cmd_opts.lora_dir, allowed_extensions=[".pt", ".ckpt", ".safetensors"]))

-    candidates += list(shared.walk_files(os.path.join(paths.models_path, "LyCORIS"), allowed_extensions=[".pt", ".ckpt", ".safetensors"]))

+    candidates += list(shared.walk_files(shared.cmd_opts.lyco_dir_backcompat, allowed_extensions=[".pt", ".ckpt", ".safetensors"]))

     for filename in candidates:

         if os.path.isdir(filename):

             continue

diff --git a/extensions-builtin/Lora/preload.py b/extensions-builtin/Lora/preload.py
index 863dc5c0..50961be3 100644
--- a/extensions-builtin/Lora/preload.py
+++ b/extensions-builtin/Lora/preload.py
@@ -4,3 +4,4 @@ from modules import paths
 

 def preload(parser):

     parser.add_argument("--lora-dir", type=str, help="Path to directory with Lora networks.", default=os.path.join(paths.models_path, 'Lora'))

+    parser.add_argument("--lyco-dir-backcompat", type=str, help="Path to directory with LyCORIS networks (for backawards compatibility; can also use --lyco-dir).", default=os.path.join(paths.models_path, 'LyCORIS'))

diff --git a/extensions-builtin/Lora/ui_edit_user_metadata.py b/extensions-builtin/Lora/ui_edit_user_metadata.py
index c8730443..2ca997f7 100644
--- a/extensions-builtin/Lora/ui_edit_user_metadata.py
+++ b/extensions-builtin/Lora/ui_edit_user_metadata.py
@@ -1,3 +1,4 @@
+import datetime

 import html

 import random

 

@@ -71,6 +72,7 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor)
         keys = {

             'ss_sd_model_name': "Model:",

             'ss_clip_skip': "Clip skip:",

+            'ss_network_module': "Kohya module:",

         }

 

         for key, label in keys.items():

@@ -78,6 +80,10 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor)
             if value is not None and str(value) != "None":

                 table.append((label, html.escape(value)))

 

+        ss_training_started_at = metadata.get('ss_training_started_at')

+        if ss_training_started_at:

+            table.append(("Date trained:", datetime.datetime.utcfromtimestamp(float(ss_training_started_at)).strftime('%Y-%m-%d %H:%M')))

+

         ss_bucket_info = metadata.get("ss_bucket_info")

         if ss_bucket_info and "buckets" in ss_bucket_info:

             resolutions = {}

diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index 4b32098b..3629e5c0 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -3,7 +3,7 @@ import os
 import network

 import networks

 

-from modules import shared, ui_extra_networks, paths

+from modules import shared, ui_extra_networks

 from modules.ui_extra_networks import quote_js

 from ui_edit_user_metadata import LoraUserMetadataEditor

 

@@ -72,7 +72,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
                 yield item

 

     def allowed_directories_for_previews(self):

-        return [shared.cmd_opts.lora_dir, os.path.join(paths.models_path, "LyCORIS")]

+        return [shared.cmd_opts.lora_dir, shared.cmd_opts.lyco_dir_backcompat]

 

     def create_user_metadata_editor(self, ui, tabname):

         return LoraUserMetadataEditor(ui, tabname, self)