diff --git a/.gitignore b/.gitignore index 9bc6d5a24..3bb999538 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ tunableop_results*.csv /*.txt /*.mp3 /*.lnk +/*.swp !webui.bat !webui.sh !package.json diff --git a/CHANGELOG.md b/CHANGELOG.md index c60c6f3da..ae551af28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - fix `wan-2.2-a14b` stage selection - fix `wan-2.2-5b` vae decode - disabling live preview should not disable progress updates + - video tab create `params.txt` with metadata ## Update for 2025-10-18 diff --git a/modules/framepack/framepack_worker.py b/modules/framepack/framepack_worker.py index cda5677f8..6558c0765 100644 --- a/modules/framepack/framepack_worker.py +++ b/modules/framepack/framepack_worker.py @@ -308,12 +308,26 @@ def worker( if is_last_section: break - total_generated_frames, _video_filename = save_video(history_pixels, mp4_fps, mp4_codec, mp4_opt, mp4_ext, mp4_sf, mp4_video, mp4_frames, mp4_interpolate, pbar=pbar, stream=stream, metadata=metadata) + total_generated_frames, _video_filename = save_video( + None, + history_pixels, + mp4_fps, + mp4_codec, + mp4_opt, + mp4_ext, + mp4_sf, + mp4_video, + mp4_frames, + mp4_interpolate, + pbar=pbar, + stream=stream, + metadata=metadata, + ) except AssertionError: shared.log.info('FramePack: interrupted') if shared.opts.keep_incomplete: - save_video(history_pixels, mp4_fps, mp4_codec, mp4_opt, mp4_ext, mp4_sf, mp4_video, mp4_frames, mp4_interpolate=0, stream=stream, metadata=metadata) + save_video(None, history_pixels, mp4_fps, mp4_codec, mp4_opt, mp4_ext, mp4_sf, mp4_video, mp4_frames, mp4_interpolate=0, stream=stream, metadata=metadata) except Exception as e: shared.log.error(f'FramePack: {e}') errors.display(e, 'FramePack') diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py index 1427e53cc..df0ea1643 100644 --- a/modules/generation_parameters_copypaste.py +++ b/modules/generation_parameters_copypaste.py @@ -3,7 +3,6 @@ import io import os from PIL import Image import gradio as gr -from modules.paths import params_path from modules import shared, gr_tempdir, script_callbacks, images from modules.infotext import parse, mapping, quote, unquote # pylint: disable=unused-import @@ -204,6 +203,7 @@ def create_override_settings_dict(text_pairs): def connect_paste(button, local_paste_fields, input_comp, override_settings_component, tabname): def paste_func(prompt): + from modules.paths import params_path if prompt is None or len(prompt.strip()) == 0: if os.path.exists(params_path): with open(params_path, "r", encoding="utf8") as file: diff --git a/modules/images_namegen.py b/modules/images_namegen.py index 849450d5b..f81a6447d 100644 --- a/modules/images_namegen.py +++ b/modules/images_namegen.py @@ -23,8 +23,8 @@ NOTHING = object() class FilenameGenerator: replacements = { - 'width': lambda self: self.image.width, - 'height': lambda self: self.image.height, + 'width': lambda self: self.width, + 'height': lambda self: self.height, 'batch_number': lambda self: self.batch_number, 'iter_number': lambda self: self.iter_number, 'num': lambda self: NOTHING if self.p.n_iter == 1 and self.p.batch_size == 1 else self.p.iteration * self.p.batch_size + self.p.batch_index + 1, @@ -32,8 +32,8 @@ class FilenameGenerator: 'date': lambda self: datetime.datetime.now().strftime('%Y-%m-%d'), 'datetime': lambda self, *args: self.datetime(*args), # accepts formats: [datetime], [datetime], [datetime