1580158
/
SD-CN-Animation
mirror of https://github.com/volotat/SD-CN-Animation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #212 from doctorjei/main 

This commit removes deprecated elements that break in some WebUI variants while maintaining compatibility.
main
Alexey Borsky 2026-01-12 00:56:22 +03:00 committed by GitHub
parent 4f07b5e6d2 052fdec082
commit 2e5e09f3c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/base_ui.py
View File

@ -13,7 +13,6 @@ from modules.ui import create_override_settings_dropdown
import modules.scripts as scripts import modules.scripts as scripts
from modules.sd_samplers import samplers_for_img2img from modules.sd_samplers import samplers_for_img2img
from modules.ui import setup_progressbar, create_sampler_and_steps_selection, ordered_ui_categories, create_output_panel
from scripts.core import vid2vid, txt2vid, utils from scripts.core import vid2vid, txt2vid, utils
import traceback import traceback
@ -169,7 +168,7 @@ def on_ui_tabs():
components = {} components = {}
#dv = SimpleNamespace(**T2VOutputArgs()) #dv = SimpleNamespace(**T2VOutputArgs())
with gr.Row(elem_id='sdcn-core').style(equal_height=False, variant='compact'): with gr.Row(elem_id='sdcn-core', equal_height=False, variant='compact'):
with gr.Column(scale=1, variant='panel'): with gr.Column(scale=1, variant='panel'):
#with gr.Tabs(): #with gr.Tabs():
components = inputs_ui() components = inputs_ui()
@ -191,11 +190,11 @@ def on_ui_tabs():
sp_progress = gr.HTML(elem_id="sp_progress", value="") sp_progress = gr.HTML(elem_id="sp_progress", value="")
with gr.Row(variant='compact'): with gr.Row(variant='compact'):
img_preview_curr_frame = gr.Image(label='Current frame', elem_id=f"img_preview_curr_frame", type='pil').style(height=240) img_preview_curr_frame = gr.Image(label='Current frame', elem_id=f"img_preview_curr_frame", type='pil', height=240)
img_preview_curr_occl = gr.Image(label='Current occlusion', elem_id=f"img_preview_curr_occl", type='pil').style(height=240) img_preview_curr_occl = gr.Image(label='Current occlusion', elem_id=f"img_preview_curr_occl", type='pil', height=240)
with gr.Row(variant='compact'): with gr.Row(variant='compact'):
img_preview_prev_warp = gr.Image(label='Previous frame warped', elem_id=f"img_preview_curr_frame", type='pil').style(height=240) img_preview_prev_warp = gr.Image(label='Previous frame warped', elem_id=f"img_preview_curr_frame", type='pil', height=240)
img_preview_processed = gr.Image(label='Processed', elem_id=f"img_preview_processed", type='pil').style(height=240) img_preview_processed = gr.Image(label='Processed', elem_id=f"img_preview_processed", type='pil', height=240)
video_preview = gr.Video(interactive=False) video_preview = gr.Video(interactive=False)
@ -245,7 +244,8 @@ def on_ui_tabs():
modules.scripts.scripts_current = None modules.scripts.scripts_current = None
# define queue - required for generators # define queue - required for generators
sdcnanim_interface.queue(concurrency_count=1) sdcnanim_interface.queue()
return [(sdcnanim_interface, "SD-CN-Animation", "sd_cn_animation_interface")] return [(sdcnanim_interface, "SD-CN-Animation", "sd_cn_animation_interface")]

2
scripts/core/utils.py
View File

@ -149,7 +149,7 @@ import modules.images as images
import modules.scripts import modules.scripts
from modules.shared import opts, state from modules.shared import opts, state
from modules import devices, sd_samplers, img2img from modules import devices, sd_samplers, img2img
from modules import shared, sd_hijack, lowvram from modules import shared, sd_hijack
# TODO: Refactor all the code below # TODO: Refactor all the code below

8
scripts/core/vid2vid.py
View File

@ -9,7 +9,12 @@ import numpy as np
from PIL import Image from PIL import Image
from modules import devices, sd_samplers from modules import devices, sd_samplers
from modules import shared, sd_hijack, lowvram from modules import shared, sd_hijack
try:
from modules import lowvram
except ImportError:
lowvram = None
import modules.shared as shared import modules.shared as shared
@ -60,6 +65,7 @@ def get_cur_stat():
def clear_memory_from_sd(): def clear_memory_from_sd():
if shared.sd_model is not None: if shared.sd_model is not None:
sd_hijack.model_hijack.undo_hijack(shared.sd_model) sd_hijack.model_hijack.undo_hijack(shared.sd_model)
if lowvram:
try: try:
lowvram.send_everything_to_cpu() lowvram.send_everything_to_cpu()
except Exception as e: except Exception as e: