From 44895d5e1f56effbb53074acfb94a2cc7adb269f Mon Sep 17 00:00:00 2001 From: GeorgLegato Date: Sat, 15 Apr 2023 15:42:32 +0200 Subject: [PATCH 1/3] fix issue #11, settings, select size, output folder. --- .gitignore | 3 +++ scripts/inifnite-zoom.py | 26 ++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 876e20e..a097554 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,6 @@ dmypy.json .pyre/ .vscode/settings.json .DS_Store + +# old code using hard coded out dir +out/* diff --git a/scripts/inifnite-zoom.py b/scripts/inifnite-zoom.py index 17b7b02..fe3053e 100644 --- a/scripts/inifnite-zoom.py +++ b/scripts/inifnite-zoom.py @@ -20,7 +20,6 @@ from modules.processing import ( from modules.ui import create_output_panel, plaintext_to_html -output_path = basedir + "/extensions/infinite-zoom-automatic1111-webui/out" default_prompt = "A psychedelic jungle with trees that have glowing, fractal-like patterns, Simon stalenhag poster 1920s style, street level view, hyper futuristic, 8k resolution, hyper realistic" default_negative_prompt = "frames, borderline, text, character, duplicate, error, out of frame, watermark, low quality, ugly, deformed, blur" @@ -106,6 +105,7 @@ def create_zoom( inpainting_full_res, inpainting_padding, zoom_speed, + outputsize ): prompts = {} for x in prompts_array: @@ -117,8 +117,9 @@ def create_zoom( pass assert len(prompts_array) > 0, "prompts is empty" - width = 512 - height = 512 + width = outputsize + height = outputsize + current_image = Image.new(mode="RGBA", size=(height, width)) mask_image = np.array(current_image)[:, :, 3] mask_image = Image.fromarray(255 - mask_image).convert("RGB") @@ -216,7 +217,8 @@ def create_zoom( all_frames.append(current_image) video_file_name = "infinite_zoom_" + str(int(time.time())) + ".mp4" - save_path = os.path.join(output_path, "videos") + output_path = shared.opts.data.get("infzoom_outpath",shared.opts.data.get("outdir_img2img_samples")) + save_path = os.path.join(output_path, shared.opts.data.get("infzoom_outSUBpath","infinite-zooms")) if not os.path.exists(save_path): os.makedirs(save_path) out = os.path.join(save_path, video_file_name) @@ -250,7 +252,9 @@ def on_ui_tabs(): generate_btn = gr.Button(value="Generate video", variant="primary") with gr.Row(): with gr.Column(scale=1, variant="panel"): + with gr.Tab("Main"): + outsize_slider = gr.Slider(minimum=512, maximum=2048,value=shared.opts.data.get("infzoom_outsize",512),step=8,label="Output size (square)") outpaint_prompts = gr.Dataframe( type="array", headers=["outpaint steps", "prompt"], @@ -373,11 +377,25 @@ def on_ui_tabs(): inpainting_full_res, inpainting_padding, zoom_speed_slider, + outsize_slider ], outputs=[output_video, out_image, generation_info, html_info, html_log], ) return [(infinite_zoom_interface, "Infinite Zoom", "iz_interface")] +def on_ui_settings(): + section = ('infinite-zoom', "Infinite Zoom") + + shared.opts.add_option("infzoom_outpath", shared.OptionInfo( + "", "Path where to store your infinite video. Let empty to use img2img-output", gr.Textbox, {"interactive": True}, section=section)) + + shared.opts.add_option("infzoom_outSUBpath", shared.OptionInfo( + "infinite-zooms", "Which subfolder name to be created in the outpath. Default is 'infinite-zooms'", gr.Textbox, {"interactive": True}, section=section)) + + shared.opts.add_option("infzoom_outsize", shared.OptionInfo( + 512, "Default size for X and Y of your video", gr.Slider, {"minimum": 512, "maximum": 2048, "step": 8}, section=section)) + script_callbacks.on_ui_tabs(on_ui_tabs) +script_callbacks.on_ui_settings(on_ui_settings) \ No newline at end of file From d419952544a51ec1587869d2c4965cb2770479e0 Mon Sep 17 00:00:00 2001 From: GeorgLegato Date: Sat, 15 Apr 2023 20:38:57 +0200 Subject: [PATCH 2/3] fixed MASK_WIDTH being 1/4 of output size Signed-off-by: GeorgLegato --- scripts/inifnite-zoom.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/inifnite-zoom.py b/scripts/inifnite-zoom.py index fe3053e..e678ed1 100644 --- a/scripts/inifnite-zoom.py +++ b/scripts/inifnite-zoom.py @@ -7,6 +7,7 @@ sys.path.extend(basedir + "/extensions/infinite-zoom-automatic1111-webui/") import numpy as np import gradio as gr from PIL import Image +import math from iz_helpers import shrink_and_paste_on_blank, write_video from webui import wrap_gradio_gpu_call @@ -140,7 +141,8 @@ def create_zoom( height, ) current_image = processed.images[0] - mask_width = 128 + + mask_width = math.trunc(width/4) # was initially 512px => 128px num_interpol_frames = round(video_frame_rate * zoom_speed) all_frames = [] @@ -250,6 +252,7 @@ def on_ui_tabs(): """ ) generate_btn = gr.Button(value="Generate video", variant="primary") + interrupt = gr.Button(value="Interrupt", elem_id="interrupt_training") with gr.Row(): with gr.Column(scale=1, variant="panel"): @@ -381,7 +384,11 @@ def on_ui_tabs(): ], outputs=[output_video, out_image, generation_info, html_info, html_log], ) - + interrupt.click( + fn=lambda: shared.state.interrupt(), + inputs=[], + outputs=[] + ) return [(infinite_zoom_interface, "Infinite Zoom", "iz_interface")] def on_ui_settings(): @@ -398,4 +405,4 @@ def on_ui_settings(): script_callbacks.on_ui_tabs(on_ui_tabs) -script_callbacks.on_ui_settings(on_ui_settings) \ No newline at end of file +script_callbacks.on_ui_settings(on_ui_settings) From 97eb67443058d3bcdb82d113a445548c2d34824d Mon Sep 17 00:00:00 2001 From: GeorgLegato Date: Sat, 15 Apr 2023 20:44:21 +0200 Subject: [PATCH 3/3] Update .gitignore Signed-off-by: GeorgLegato --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index a097554..876e20e 100644 --- a/.gitignore +++ b/.gitignore @@ -129,6 +129,3 @@ dmypy.json .pyre/ .vscode/settings.json .DS_Store - -# old code using hard coded out dir -out/*