From a12f8cbc8d6e2abefeeaf4be07fd20e6ea920c58 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 6 Jul 2025 17:31:21 -0400 Subject: [PATCH] improve infotext param parsing Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 3 ++- modules/infotext.py | 6 +++--- modules/upscaler_simple.py | 7 +++++-- wiki | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca8c98d49..aa2f72975 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,7 +40,8 @@ - fix ansi controle output from scripts/extensions - fix diffusers models non-unique hash - fix loading of manually downloaded diffuser models - - fix api `/sdapi/v1/embeddings` endpoint + - fix api `/sdapi/v1/embeddings` endpoint + - improve infotext param parsing - improve extensions ui search - improve model type autodetection - improve model auth check for hf repos diff --git a/modules/infotext.py b/modules/infotext.py index 6eef31897..4a348a776 100644 --- a/modules/infotext.py +++ b/modules/infotext.py @@ -34,9 +34,9 @@ def parse(infotext): debug(f'Raw: {infotext}') remaining = infotext.replace('\nSteps:', ' Steps:') - params = [' steps:', ' seed:', ' width:', ' height:', ' sampler:', ' size:', ' cfg scale:'] # first param is one of those - params += ['\nsteps:', '\nseed:', '\nwidth:', '\nheight:', '\nsampler:', '\nsize:', '\ncfg scale:'] - params += ['.steps:', '.seed:', '.width:', '.height:', '.sampler:', '.size:', '.cfg scale:'] + params = [' steps:', ' seed:', ' width:', ' height:', ' sampler:', ' size:', ' cfg scale:', ' pipeline:'] # first param is one of those + params += ['\nsteps:', '\nseed:', '\nwidth:', '\nheight:', '\nsampler:', '\nsize:', '\ncfg scale:', '\npipeline:'] + params += ['.steps:', '.seed:', '.width:', '.height:', '.sampler:', '.size:', '.cfg scale:', '.pipeline:'] prompt_end = [remaining.lower().find(p) for p in params if p in remaining.lower()] prompt_end += [remaining.lower().find('negative prompt:')] diff --git a/modules/upscaler_simple.py b/modules/upscaler_simple.py index bb342d5c8..5dd3fae13 100644 --- a/modules/upscaler_simple.py +++ b/modules/upscaler_simple.py @@ -1,5 +1,6 @@ from PIL import Image from modules.upscaler import Upscaler, UpscalerData +from modules.shared import log class UpscalerNone(Upscaler): @@ -71,7 +72,8 @@ class UpscalerLatent(Upscaler): if isinstance(img, torch.Tensor) and (len(img.shape) == 4): _batch, _channel, h, w = img.shape else: - raise ValueError(f"Latent upscale: image={img.shape if isinstance(img, torch.Tensor) else img} type={type(img)} if not supported") + log.error(f"Upscale: type=latent image={img.shape if isinstance(img, torch.Tensor) else img} type={type(img)} if not supported") + return img h, w = int((8 * h * self.scale) // 8), int((8 * w * self.scale) // 8) mode, antialias = '', '' if selected_model == "Latent Nearest": @@ -89,7 +91,8 @@ class UpscalerLatent(Upscaler): elif selected_model == "Latent Bicubic antialias": mode, antialias = 'bicubic', True else: - raise ValueError(f"Latent upscale: model={selected_model} unknown") + raise log.error(f"Upscale: type=latent model={selected_model} unknown") + return img return F.interpolate(img, size=(h, w), mode=mode, antialias=antialias) diff --git a/wiki b/wiki index a8d925f54..396dcad6c 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit a8d925f54c30d826913451b6eea52694657cb0ea +Subproject commit 396dcad6c41eb05b37afa9e8537d3e86184787ac