From e2fe29c104a3893372898281a4c355ef30fb00f0 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 4 Nov 2024 20:00:11 +0300 Subject: [PATCH] add safe get override_setting for processing (#2253) --- modules/images.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/images.py b/modules/images.py index 2c1711df..9de2753b 100644 --- a/modules/images.py +++ b/modules/images.py @@ -642,7 +642,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i Additional PNG info. `existing_info == {pngsectionname: info, ...}` no_prompt: TODO I don't know its meaning. - p (`StableDiffusionProcessing`) + p (`StableDiffusionProcessing` or `Processing`) forced_filename (`str`): If specified, `basename` and filename pattern will be ignored. save_to_dirs (bool): @@ -673,10 +673,13 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i if forced_filename is None: if short_filename or seed is None: file_decoration = "" - elif opts.save_to_dirs: - file_decoration = opts.samples_filename_pattern or p.override_settings.get("samples_filename_pattern") or "[seed]" + elif hasattr(p, 'override_settings'): + file_decoration = p.override_settings.get("samples_filename_pattern") else: - file_decoration = opts.samples_filename_pattern or p.override_settings.get("samples_filename_pattern") or "[seed]-[prompt_spaces]" + file_decoration = None + + if file_decoration is None: + file_decoration = opts.samples_filename_pattern or ("[seed]" if opts.save_to_dirs else "[seed]-[prompt_spaces]") file_decoration = namegen.apply(file_decoration) + suffix