From c8b106a4710fae0d353267d0d380b862946194ac Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 26 Sep 2023 06:57:19 -0400 Subject: [PATCH] cleanup --- modules/sd_samplers_diffusers.py | 1 - .../textual_inversion/textual_inversion.py | 1 + modules/ui_common.py | 4 +++- .../ui_extra_networks_textual_inversion.py | 21 +++++++++---------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/sd_samplers_diffusers.py b/modules/sd_samplers_diffusers.py index 2a3cd4a28..8d3fd6407 100644 --- a/modules/sd_samplers_diffusers.py +++ b/modules/sd_samplers_diffusers.py @@ -97,7 +97,6 @@ class DiffusionSampler: if 'predict_x0' in self.config: self.config['predict_x0'] = opts.uni_pc_variant if name == 'DPM++ 2M': - print('HERE', opts.schedulers_dpm_solver) self.config['algorithm_type'] = opts.schedulers_dpm_solver if 'beta_start' in self.config and opts.schedulers_beta_start > 0: self.config['beta_start'] = opts.schedulers_beta_start diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py index 69126a337..7adc9e7ac 100644 --- a/modules/textual_inversion/textual_inversion.py +++ b/modules/textual_inversion/textual_inversion.py @@ -262,6 +262,7 @@ class EmbeddingDatabase: self.previously_displayed_embeddings = displayed_embeddings shared.log.info(f"Loaded embeddings: loaded={len(self.word_embeddings)} skipped={len(self.skipped_embeddings)}") + def find_embedding_at_position(self, tokens, offset): token = tokens[offset] possible_matches = self.ids_lookup.get(token, None) diff --git a/modules/ui_common.py b/modules/ui_common.py index ea948bf6b..6912b495e 100644 --- a/modules/ui_common.py +++ b/modules/ui_common.py @@ -152,7 +152,9 @@ def create_output_panel(tabname, outdir): import modules.generation_parameters_copypaste as parameters_copypaste def open_folder(gallery): - if gallery is not None and len(gallery) > 0: + if type(gallery) is str: + folder = gallery + elif gallery is not None and len(gallery) > 0: folder = os.path.dirname(gallery[-1]['name']) else: folder = shared.opts.outdir_samples or outdir diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py index 3be7309b3..dc892e572 100644 --- a/modules/ui_extra_networks_textual_inversion.py +++ b/modules/ui_extra_networks_textual_inversion.py @@ -19,19 +19,18 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage): sd_models.model_data.sd_model.embedding_db.load_textual_inversion_embeddings(force_reload=True) def list_items(self): + def list_folder(folder): + for filename in os.listdir(folder): + fn = os.path.join(folder, filename) + if os.path.isfile(fn) and (fn.lower().endswith(".pt") or fn.lower().endswith(".safetensors")): + embedding = Embedding(vec=0, name=os.path.basename(fn), filename=fn) + embedding.filename = fn + embeddings.append(embedding) + elif os.path.isdir(fn) and not fn.startswith('.'): + list_folder(fn) + if sd_models.model_data.sd_model is None: embeddings = [] - - def list_folder(folder): - for filename in os.listdir(folder): - fn = os.path.join(folder, filename) - if os.path.isfile(fn) and (fn.lower().endswith(".pt") or fn.lower().endswith(".safetensors")): - embedding = Embedding(vec=0, name=os.path.basename(fn), filename=fn) - embedding.filename = fn - embeddings.append(embedding) - elif os.path.isdir(fn) and not fn.startswith('.'): - list_folder(fn) - list_folder(shared.opts.embeddings_dir) elif shared.backend == shared.Backend.ORIGINAL: embeddings = list(sd_hijack.model_hijack.embedding_db.word_embeddings.values())