aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAUTOMATIC <16777216c@gmail.com>2023-03-11 15:27:42 +0300
committerAUTOMATIC <16777216c@gmail.com>2023-03-11 15:27:42 +0300
commitce68ab8d0dfdd25e820c58dbc9d3b0148a2022a4 (patch)
treec56a08c3a94499a0f2d5789f1f740fa18a43b34f
parentc239b3d7a86452bd7cf6b081bd0e02b0fa12dcaf (diff)
remove underscores from function names in #8366
remove LRU from #8366 because I don't know why it's there
-rw-r--r--extensions-builtin/Lora/ui_extra_networks_lora.py4
-rw-r--r--modules/ui_extra_networks.py8
-rw-r--r--modules/ui_extra_networks_checkpoints.py4
-rw-r--r--modules/ui_extra_networks_hypernets.py4
-rw-r--r--modules/ui_extra_networks_textual_inversion.py4
5 files changed, 11 insertions, 13 deletions
diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index 9da13a09..6815f6ef 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -18,8 +18,8 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
yield {
"name": name,
"filename": path,
- "preview": self._find_preview(path),
- "description": self._find_description(path),
+ "preview": self.find_preview(path),
+ "description": self.find_description(path),
"search_term": self.search_terms_from_path(lora_on_disk.filename),
"prompt": json.dumps(f"<lora:{name}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),
"local_preview": path + ".png",
diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index cd61a569..21c52287 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -1,9 +1,7 @@
import glob
import os.path
import urllib.parse
-from functools import lru_cache
from pathlib import Path
-from typing import Optional
from modules import shared
import gradio as gr
@@ -140,17 +138,17 @@ class ExtraNetworksPage:
return self.card_page.format(**args)
- def _find_preview(self, path: str) -> Optional[str]:
+ def find_preview(self, path):
"""
Find a preview PNG for a given path (without extension) and call link_preview on it.
"""
for file in [path + ".png", path + ".preview.png"]:
if os.path.isfile(file):
return self.link_preview(file)
+
return None
- @lru_cache(maxsize=512)
- def _find_description(self, path: str) -> Optional[str]:
+ def find_description(self, path):
"""
Find and read a description file for a given path (without extension).
"""
diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
index 1deb785a..7d1aa203 100644
--- a/modules/ui_extra_networks_checkpoints.py
+++ b/modules/ui_extra_networks_checkpoints.py
@@ -19,8 +19,8 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
yield {
"name": checkpoint.name_for_extra,
"filename": path,
- "preview": self._find_preview(path),
- "description": self._find_description(path),
+ "preview": self.find_preview(path),
+ "description": self.find_description(path),
"search_term": self.search_terms_from_path(checkpoint.filename) + " " + (checkpoint.sha256 or ""),
"onclick": '"' + html.escape(f"""return selectCheckpoint({json.dumps(name)})""") + '"',
"local_preview": path + ".png",
diff --git a/modules/ui_extra_networks_hypernets.py b/modules/ui_extra_networks_hypernets.py
index 80cc2a24..8e49e93b 100644
--- a/modules/ui_extra_networks_hypernets.py
+++ b/modules/ui_extra_networks_hypernets.py
@@ -18,8 +18,8 @@ class ExtraNetworksPageHypernetworks(ui_extra_networks.ExtraNetworksPage):
yield {
"name": name,
"filename": path,
- "preview": self._find_preview(path),
- "description": self._find_description(path),
+ "preview": self.find_preview(path),
+ "description": self.find_description(path),
"search_term": self.search_terms_from_path(path),
"prompt": json.dumps(f"<hypernet:{name}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),
"local_preview": path + ".png",
diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py
index f3bae666..1ad806eb 100644
--- a/modules/ui_extra_networks_textual_inversion.py
+++ b/modules/ui_extra_networks_textual_inversion.py
@@ -18,8 +18,8 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage):
yield {
"name": embedding.name,
"filename": embedding.filename,
- "preview": self._find_preview(path),
- "description": self._find_description(path),
+ "preview": self.find_preview(path),
+ "description": self.find_description(path),
"search_term": self.search_terms_from_path(embedding.filename),
"prompt": json.dumps(embedding.name),
"local_preview": path + ".preview.png",