thread safe extra network list_items

AUTOMATIC1111 · Sep 3, 2023 · aab385d · aab385d
1 parent d39440b
commit aab385d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -66,11 +66,11 @@ def create_item(self, name, index=None, enable_filter=True):
         return item
 
     def list_items(self):
-        for index, name in enumerate(networks.available_networks):
-            item = self.create_item(name, index)
-
-            if item is not None:
-                yield item
+        with self.thread_lock:
+            for index, name in enumerate(networks.available_networks):
+                item = self.create_item(name, index)
+                if item is not None:
+                    yield item
 
     def allowed_directories_for_previews(self):
         return [shared.cmd_opts.lora_dir, shared.cmd_opts.lyco_dir_backcompat]

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
@@ -1,6 +1,7 @@
 import os.path
 import urllib.parse
 from pathlib import Path
+from threading import Lock
 
 from modules import shared, ui_extra_networks_user_metadata, errors, extra_networks
 from modules.images import read_info_from_image, save_image_with_geninfo
@@ -94,6 +95,7 @@ def __init__(self, title):
         self.allow_negative_prompt = False
         self.metadata = {}
         self.items = {}
+        self.thread_lock = Lock()
 
     def refresh(self):
         pass

diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
@@ -30,9 +30,9 @@ def create_item(self, name, index=None, enable_filter=True):
         }
 
     def list_items(self):
-        names = list(sd_models.checkpoints_list)
-        for index, name in enumerate(names):
-            yield self.create_item(name, index)
+        with self.thread_lock:
+            for index, name in enumerate(sd_models.checkpoints_list):
+                yield self.create_item(name, index)
 
     def allowed_directories_for_previews(self):
         return [v for v in [shared.cmd_opts.ckpt_dir, sd_models.model_path] if v is not None]

diff --git a/modules/ui_extra_networks_hypernets.py b/modules/ui_extra_networks_hypernets.py
@@ -31,8 +31,9 @@ def create_item(self, name, index=None, enable_filter=True):
         }
 
     def list_items(self):
-        for index, name in enumerate(shared.hypernetworks):
-            yield self.create_item(name, index)
+        with self.thread_lock:
+            for index, name in enumerate(shared.hypernetworks):
+                yield self.create_item(name, index)
 
     def allowed_directories_for_previews(self):
         return [shared.cmd_opts.hypernetwork_dir]

diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py
@@ -29,8 +29,9 @@ def create_item(self, name, index=None, enable_filter=True):
         }
 
     def list_items(self):
-        for index, name in enumerate(sd_hijack.model_hijack.embedding_db.word_embeddings):
-            yield self.create_item(name, index)
+        with self.thread_lock:
+            for index, name in enumerate(sd_hijack.model_hijack.embedding_db.word_embeddings):
+                yield self.create_item(name, index)
 
     def allowed_directories_for_previews(self):
         return list(sd_hijack.model_hijack.embedding_db.embedding_dirs)