From 27b9ec60e4ede748ec23615fecddb70e48daa623 Mon Sep 17 00:00:00 2001
From: Brad Smith <bradster@infinitewarp.com>
Date: Sat, 8 Apr 2023 15:58:00 -0400
Subject: sort embeddings by name (case insensitive)

---
 modules/textual_inversion/textual_inversion.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules/textual_inversion/textual_inversion.py')

diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py
index d2e62e58..7c50839f 100644
--- a/modules/textual_inversion/textual_inversion.py
+++ b/modules/textual_inversion/textual_inversion.py
@@ -2,7 +2,7 @@ import os
 import sys
 import traceback
 import inspect
-from collections import namedtuple
+from collections import namedtuple, OrderedDict
 
 import torch
 import tqdm
@@ -108,7 +108,7 @@ class DirWithTextualInversionEmbeddings:
 class EmbeddingDatabase:
     def __init__(self):
         self.ids_lookup = {}
-        self.word_embeddings = {}
+        self.word_embeddings = OrderedDict()
         self.skipped_embeddings = {}
         self.expected_shape = -1
         self.embedding_dirs = {}
@@ -233,6 +233,9 @@ class EmbeddingDatabase:
             self.load_from_dir(embdir)
             embdir.update()
 
+        # re-sort word_embeddings because load_from_dir may not load in alphabetic order.
+        self.word_embeddings = {e.name: e for e in sorted(self.word_embeddings.values(), key=lambda e: e.name.lower())}
+
         displayed_embeddings = (tuple(self.word_embeddings.keys()), tuple(self.skipped_embeddings.keys()))
         if self.previously_displayed_embeddings != displayed_embeddings:
             self.previously_displayed_embeddings = displayed_embeddings
-- 
cgit v1.2.1


From dab5002c59ce1f68deae5e6e0c03e5e2c27155db Mon Sep 17 00:00:00 2001
From: Brad Smith <bradster@infinitewarp.com>
Date: Thu, 13 Apr 2023 23:12:33 -0400
Subject: sort self.word_embeddings without instantiating it a new dict

---
 modules/textual_inversion/textual_inversion.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'modules/textual_inversion/textual_inversion.py')

diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py
index 7c50839f..379df243 100644
--- a/modules/textual_inversion/textual_inversion.py
+++ b/modules/textual_inversion/textual_inversion.py
@@ -2,7 +2,7 @@ import os
 import sys
 import traceback
 import inspect
-from collections import namedtuple, OrderedDict
+from collections import namedtuple
 
 import torch
 import tqdm
@@ -108,7 +108,7 @@ class DirWithTextualInversionEmbeddings:
 class EmbeddingDatabase:
     def __init__(self):
         self.ids_lookup = {}
-        self.word_embeddings = OrderedDict()
+        self.word_embeddings = {}
         self.skipped_embeddings = {}
         self.expected_shape = -1
         self.embedding_dirs = {}
@@ -234,7 +234,10 @@ class EmbeddingDatabase:
             embdir.update()
 
         # re-sort word_embeddings because load_from_dir may not load in alphabetic order.
-        self.word_embeddings = {e.name: e for e in sorted(self.word_embeddings.values(), key=lambda e: e.name.lower())}
+        # using a temporary copy so we don't reinitialize self.word_embeddings in case other objects have a reference to it.
+        sorted_word_embeddings = {e.name: e for e in sorted(self.word_embeddings.values(), key=lambda e: e.name.lower())}
+        self.word_embeddings.clear()
+        self.word_embeddings.update(sorted_word_embeddings)
 
         displayed_embeddings = (tuple(self.word_embeddings.keys()), tuple(self.skipped_embeddings.keys()))
         if self.previously_displayed_embeddings != displayed_embeddings:
-- 
cgit v1.2.1