Revert "thread safe extra network list_items"

This reverts commit aab385d01b4311726127397552d791f4d71b7147.

5 files changed, 12 insertions, 16 deletions

diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index e9f30062..55409a78 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -66,11 +66,11 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
         return item

 

     def list_items(self):

-        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

+        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
index 564bab7f..063bd7b8 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -1,7 +1,6 @@
 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

@@ -95,7 +94,6 @@ class ExtraNetworksPage:
         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
index 2753214f..ca6c2607 100644
--- a/modules/ui_extra_networks_checkpoints.py
+++ b/modules/ui_extra_networks_checkpoints.py
@@ -30,9 +30,9 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
         }

 

     def list_items(self):

-        with self.thread_lock:

-            for index, name in enumerate(sd_models.checkpoints_list):

-                yield self.create_item(name, index)

+        names = list(sd_models.checkpoints_list)

+        for index, name in enumerate(names):

+            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
index 411b4f11..4cedf085 100644
--- a/modules/ui_extra_networks_hypernets.py
+++ b/modules/ui_extra_networks_hypernets.py
@@ -31,9 +31,8 @@ class ExtraNetworksPageHypernetworks(ui_extra_networks.ExtraNetworksPage):
         }

 

     def list_items(self):

-        with self.thread_lock:

-            for index, name in enumerate(shared.hypernetworks):

-                yield self.create_item(name, index)

+        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
index d25b45d6..55ef0ea7 100644
--- a/modules/ui_extra_networks_textual_inversion.py
+++ b/modules/ui_extra_networks_textual_inversion.py
@@ -29,9 +29,8 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage):
         }

 

     def list_items(self):

-        with self.thread_lock:

-            for index, name in enumerate(sd_hijack.model_hijack.embedding_db.word_embeddings):

-                yield self.create_item(name, index)

+        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)