From f3e64b1fa5ae9757cc67b8eb198b01e76a6c3c7c Mon Sep 17 00:00:00 2001 From: Symbiomatrix Date: Sun, 3 Mar 2024 13:47:39 +0200 Subject: [PATCH 1/2] Update tag_autocomplete_helper.py --- scripts/tag_autocomplete_helper.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/tag_autocomplete_helper.py b/scripts/tag_autocomplete_helper.py index b3a7b47..d8605d0 100644 --- a/scripts/tag_autocomplete_helper.py +++ b/scripts/tag_autocomplete_helper.py @@ -186,15 +186,15 @@ def get_embeddings(sd_model): continue if emb.shape is None: - emb_unknown.append((Path(emb.filename), key, "")) + emb_unknown.append((Path(emb.filename), Path(emb.filename).relative_to(EMB_PATH).as_posix(), "")) elif emb.shape == V1_SHAPE: - emb_v1.append((Path(emb.filename), key, "v1")) + emb_v1.append((Path(emb.filename), Path(emb.filename).relative_to(EMB_PATH).as_posix(), "v1")) elif emb.shape == V2_SHAPE: - emb_v2.append((Path(emb.filename), key, "v2")) + emb_v2.append((Path(emb.filename), Path(emb.filename).relative_to(EMB_PATH).as_posix(), "v2")) elif emb.shape == VXL_SHAPE: - emb_vXL.append((Path(emb.filename), key, "vXL")) + emb_vXL.append((Path(emb.filename), Path(emb.filename).relative_to(EMB_PATH).as_posix(), "vXL")) else: - emb_unknown.append((Path(emb.filename), key, "")) + emb_unknown.append((Path(emb.filename), Path(emb.filename).relative_to(EMB_PATH).as_posix(), "")) results = sort_models(emb_v1) + sort_models(emb_v2) + sort_models(emb_vXL) + sort_models(emb_unknown) except AttributeError: From 0903259ddf1b3ad2045510b58db49a2de9aa2ca2 Mon Sep 17 00:00:00 2001 From: Symbiomatrix Date: Sun, 3 Mar 2024 13:49:36 +0200 Subject: [PATCH 2/2] Update ext_embeddings.js --- javascript/ext_embeddings.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/javascript/ext_embeddings.js b/javascript/ext_embeddings.js index 1a7ae86..bb4826d 100644 --- a/javascript/ext_embeddings.js +++ b/javascript/ext_embeddings.js @@ -29,7 +29,11 @@ class EmbeddingParser extends BaseTagParser { // Add final results let finalResults = []; tempResults.forEach(t => { - let result = new AutocompleteResult(t[0].trim(), ResultType.embedding) + let lastDot = t[0].lastIndexOf(".") > -1 ? t[0].lastIndexOf(".") : t[0].length; + let lastSlash = t[0].lastIndexOf("/") > -1 ? t[0].lastIndexOf("/") : -1; + let name = t[0].trim().substring(lastSlash + 1, lastDot); + + let result = new AutocompleteResult(name, ResultType.embedding) result.sortKey = t[1]; result.meta = t[2] + " Embedding"; finalResults.push(result); @@ -62,4 +66,4 @@ PARSERS.push(new EmbeddingParser(EMB_TRIGGER)); // Add our utility functions to their respective queues QUEUE_FILE_LOAD.push(load); -QUEUE_SANITIZE.push(sanitize); \ No newline at end of file +QUEUE_SANITIZE.push(sanitize);