diff --git a/cli/civitai-search.py b/cli/civitai-search.py index e7600fd06..53c524338 100644 --- a/cli/civitai-search.py +++ b/cli/civitai-search.py @@ -147,7 +147,7 @@ def search_civitai( model_names = [model.name.lower()] version_names = [v.name.lower() for v in model.versions] file_names = [f.name.lower() for v in model.versions for f in v.files] - if any([query.lower() in name for name in model_names + version_names + file_names]): + if any([query.lower() in name for name in model_names + version_names + file_names]): # noqa: C419 exact_models.append(model) t1 = time.time() diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 9052df510..95b8f72f0 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 9052df510e9704ef952f1c4ebfa1fba28dc984a3 +Subproject commit 95b8f72f0683a08c98f0c24ae418138b964751b5 diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py index cb8789aea..57587e3b5 100644 --- a/modules/prompt_parser.py +++ b/modules/prompt_parser.py @@ -14,7 +14,8 @@ from typing import List import lark import torch from compel import Compel -from modules.shared import opts, log, native +from modules.shared import opts, log + # a prompt like this: "fantasy landscape with a [mountain:lake:0.25] and [an oak:a christmas tree:0.75][ in foreground::0.6][ in background:0.25] [shoddy:masterful:0.5]" # will be represented with prompt_schedule like this (assuming steps=100): @@ -24,6 +25,7 @@ from modules.shared import opts, log, native # [75, 'fantasy landscape with a lake and an oak in background masterful'] # [100, 'fantasy landscape with a lake and a christmas tree in background masterful'] + round_bracket_multiplier = 1.1 square_bracket_multiplier = 1.0 / 1.1 re_AND = re.compile(r"\bAND\b") diff --git a/modules/ui_models.py b/modules/ui_models.py index d8c3ce4f5..da5495c2f 100644 --- a/modules/ui_models.py +++ b/modules/ui_models.py @@ -98,7 +98,7 @@ def create_ui(): stat = os.stat(row.filename) if os.path.isfile(f): typ = os.path.splitext(f)[1][1:] - size = f'{str(round(stat.st_size / 1024 / 1024 / 1024, 3)) + ' mb'}' + size = f"{round(stat.st_size / 1024 / 1024 / 1024, 3)} gb" elif os.path.isdir(f): typ = 'diffusers' size = 'folder' diff --git a/wiki b/wiki index 79b18f2c5..a6e3a70d1 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 79b18f2c5e3438f3f564fd264fdb27bed76b0f72 +Subproject commit a6e3a70d176e8b2af89eedb2ab9c25069146e30f