Merge branch 'main' into feature-sort-by-frequent-use

README_ZH.md

@@ -13,6 +13,12 @@
 你可以按照[以下方法](#installation)下载或拷贝文件，也可以使用[Releases](https://github.com/DominikDoom/a1111-sd-webui-tagcomplete/releases)中打包好的文件。
 
 ## 常见问题 & 已知缺陷:
+- 很多中国用户都报告过此扩展名和其他扩展名的 JavaScript 文件被阻止的问题。
+常见的罪魁祸首是 IDM / Internet Download Manager 浏览器插件，它似乎出于安全目的阻止了本地文件请求。
+如果您安装了 IDM，请确保在使用 webui 时禁用以下插件：
+
+    ![image](https://github.com/DominikDoom/a1111-sd-webui-tagcomplete/assets/34448969/d253a4a9-71ab-4b5f-80c4-5aa926fc1fc9)
+
 - 当`replaceUnderscores`选项开启时, 脚本只会替换Tag的一部分如果Tag包含多个单词,比如将`atago (azur lane)`修改`atago`为`taihou`并使用自动补全时.会得到 `taihou (azur lane), lane)`的结果, 因为脚本没有把后面的部分认为成同一个Tag。
 
 ## 演示与截图

javascript/tagAutocomplete.js

@@ -1,4 +1,5 @@
 const styleColors = {
+    "--results-neutral-text": ["#e0e0e0","black"],
     "--results-bg": ["#0b0f19", "#ffffff"],
     "--results-border-color": ["#4b5563", "#e5e7eb"],
     "--results-border-width": ["1px", "1.5px"],
@@ -35,6 +36,7 @@ const autocompleteCSS = `
     .autocompleteResults {
         background-color: var(--results-bg) !important;
         border: var(--results-border-width) solid var(--results-border-color) !important;
+        color: var(--results-neutral-text) !important;
         border-radius: 12px !important;
         height: fit-content;
         flex-basis: fit-content;

scripts/shared_paths.py

@@ -6,31 +6,34 @@ try:
     from modules.paths import extensions_dir, script_path
 
     # Webui root path
-    FILE_DIR = Path(script_path)
+    FILE_DIR = Path(script_path).absolute()
 
     # The extension base path
-    EXT_PATH = Path(extensions_dir)
+    EXT_PATH = Path(extensions_dir).absolute()
 except ImportError:
     # Webui root path
     FILE_DIR = Path().absolute()
     # The extension base path
-    EXT_PATH = FILE_DIR.joinpath("extensions")
+    EXT_PATH = FILE_DIR.joinpath("extensions").absolute()
 
 # Tags base path
-TAGS_PATH = Path(scripts.basedir()).joinpath("tags")
+TAGS_PATH = Path(scripts.basedir()).joinpath("tags").absolute()
 
 # The path to the folder containing the wildcards and embeddings
-WILDCARD_PATH = FILE_DIR.joinpath("scripts/wildcards")
-EMB_PATH = Path(shared.cmd_opts.embeddings_dir)
-HYP_PATH = Path(shared.cmd_opts.hypernetwork_dir)
+WILDCARD_PATH = FILE_DIR.joinpath("scripts/wildcards").absolute()
+EMB_PATH = Path(shared.cmd_opts.embeddings_dir).absolute()
+HYP_PATH = Path(shared.cmd_opts.hypernetwork_dir).absolute()
 
 try:
-    LORA_PATH = Path(shared.cmd_opts.lora_dir)
+    LORA_PATH = Path(shared.cmd_opts.lora_dir).absolute()
 except AttributeError:
     LORA_PATH = None
 
 try:
-    LYCO_PATH = Path(shared.cmd_opts.lyco_dir_backcompat)
+    try:
+        LYCO_PATH = Path(shared.cmd_opts.lyco_dir_backcompat).absolute()
+    except:
+        LYCO_PATH = Path(shared.cmd_opts.lyco_dir).absolute() # attempt original non-backcompat path
 except AttributeError:
     LYCO_PATH = None
 
@@ -49,7 +52,7 @@ def find_ext_wildcard_paths():
         getattr(shared.cmd_opts, "wildcards_dir", None),    # Cmd arg from the wildcard extension
         getattr(opts, "wildcard_dir", None),                # Custom path from sd-dynamic-prompts
     ]
-    for path in [Path(p) for p in custom_paths if p is not None]:
+    for path in [Path(p).absolute() for p in custom_paths if p is not None]:
         if path.exists():
             found.append(path)
 
@@ -61,8 +64,8 @@ WILDCARD_EXT_PATHS = find_ext_wildcard_paths()
 
 # The path to the temporary files
 # In the webui root, on windows it exists by default, on linux it doesn't
-STATIC_TEMP_PATH = FILE_DIR.joinpath("tmp")
-TEMP_PATH = TAGS_PATH.joinpath("temp")  # Extension specific temp files
+STATIC_TEMP_PATH = FILE_DIR.joinpath("tmp").absolute()
+TEMP_PATH = TAGS_PATH.joinpath("temp").absolute()  # Extension specific temp files
 
 # Make sure these folders exist
 if not TEMP_PATH.exists():

scripts/tag_autocomplete_helper.py

@@ -218,14 +218,77 @@ def get_hypernetworks():
     return sort_models(all_hypernetworks)
 
 model_keyword_installed = write_model_keyword_path()
+
+
+def _get_lora():
+    """
+    Write a list of all lora.
+    Fallback method for when the built-in Lora.networks module is not available.
+    """
+    # Get a list of all lora in the folder
+    lora_paths = [
+        Path(l)
+        for l in glob.glob(LORA_PATH.joinpath("**/*").as_posix(), recursive=True)
+    ]
+    # Get hashes
+    valid_loras = [
+        lf
+        for lf in lora_paths
+        if lf.suffix in {".safetensors", ".ckpt", ".pt"} and lf.is_file()
+    ]
+
+    return valid_loras
+
+
+def _get_lyco():
+    """
+    Write a list of all LyCORIS/LOHA from https://github.com/KohakuBlueleaf/a1111-sd-webui-lycoris
+    Fallback method for when the built-in Lora.networks module is not available.
+    """
+    # Get a list of all LyCORIS in the folder
+    lyco_paths = [
+        Path(ly)
+        for ly in glob.glob(LYCO_PATH.joinpath("**/*").as_posix(), recursive=True)
+    ]
+
+    # Get hashes
+    valid_lycos = [
+        lyf
+        for lyf in lyco_paths
+        if lyf.suffix in {".safetensors", ".ckpt", ".pt"} and lyf.is_file()
+    ]
+    return valid_lycos
+
+
+# Attempt to use the build-in Lora.networks Lora/LyCORIS models lists.
+try:
+    import importlib
+    lora_networks = importlib.import_module("extensions-builtin.Lora.networks")
+
+    def _get_lora():
+        return [
+            Path(model.filename).absolute()
+            for model in lora_networks.available_networks.values()
+            if Path(model.filename).absolute().is_relative_to(LORA_PATH)
+        ]
+
+    def _get_lyco():
+        return [
+            Path(model.filename).absolute()
+            for model in lora_networks.available_networks.values()
+            if Path(model.filename).absolute().is_relative_to(LYCO_PATH)
+        ]
+
+except Exception as e:
+    pass
+    # no need to report
+    # print(f'Exception setting-up performant fetchers: {e}')
+
+
 def get_lora():
     """Write a list of all lora"""
-    global model_keyword_installed
-
-    # Get a list of all lora in the folder
-    lora_paths = [Path(l) for l in glob.glob(LORA_PATH.joinpath("**/*").as_posix(), recursive=True)]
     # Get hashes
-    valid_loras = [lf for lf in lora_paths if lf.suffix in {".safetensors", ".ckpt", ".pt"} and lf.is_file()]
+    valid_loras = _get_lora()
     loras_with_hash = []
     for l in valid_loras:
         name = l.relative_to(LORA_PATH).as_posix()
@@ -240,12 +303,8 @@ def get_lora():
 
 def get_lyco():
     """Write a list of all LyCORIS/LOHA from https://github.com/KohakuBlueleaf/a1111-sd-webui-lycoris"""
-
-    # Get a list of all LyCORIS in the folder
-    lyco_paths = [Path(ly) for ly in glob.glob(LYCO_PATH.joinpath("**/*").as_posix(), recursive=True)]
-
     # Get hashes
-    valid_lycos = [lyf for lyf in lyco_paths if lyf.suffix in {".safetensors", ".ckpt", ".pt"} and lyf.is_file()]
+    valid_lycos = _get_lyco()
     lycos_with_hash = []
     for ly in valid_lycos:
         name = ly.relative_to(LYCO_PATH).as_posix()
@@ -257,6 +316,7 @@ def get_lyco():
     # Sort
     return sort_models(lycos_with_hash)
 
+
 def write_tag_base_path():
     """Writes the tag base path to a fixed location temporary file"""
     with open(STATIC_TEMP_PATH.joinpath('tagAutocompletePath.txt'), 'w', encoding="utf-8") as f: