@@ -26,9 +26,9 @@ def load_args(args_dict,anim_args_dict, custom_settings_file, root):
26
26
import gradio as gr
27
27
28
28
# In gradio gui settings save/load
29
- def save_settings (settings_path , override_settings_with_file , custom_settings_file , animation_mode , max_frames , border , angle , zoom , translation_x , translation_y , translation_z , rotation_3d_x , rotation_3d_y , rotation_3d_z , flip_2d_perspective , perspective_flip_theta , perspective_flip_phi , perspective_flip_gamma , perspective_flip_fv , noise_schedule , strength_schedule , contrast_schedule , cfg_scale_schedule , fov_schedule , near_schedule , far_schedule , seed_schedule , kernel_schedule , sigma_schedule , amount_schedule , threshold_schedule , force_color_with_webui , reroll_blank_frames , inpaint_zeros , zeros_fill_mode , color_coherence , diffusion_cadence , use_depth_warping , midas_weight , near_plane , far_plane , fov , padding_mode , sampling_mode , save_depth_maps , video_init_path , extract_nth_frame , overwrite_extracted_frames , use_mask_video , video_mask_path , interpolate_key_frames , interpolate_x_frames , resume_from_timestring , resume_timestring , prompts , animation_prompts , W , H , restore_faces , tiling , enable_hr , firstphase_width , firstphase_height , seed , sampler , seed_enable_extras , subseed , subseed_strength , seed_resize_from_w , seed_resize_from_h , steps , ddim_eta , n_batch , make_grid , grid_rows , save_settings , save_samples , display_samples , save_sample_per_step , show_sample_per_step , override_these_with_webui , batch_name , filename_format , seed_behavior , use_init , from_img2img_instead_of_link , strength_0_no_init , strength , init_image , use_mask , use_alpha_as_mask , invert_mask , overlay_mask , mask_file , mask_contrast_adjust , mask_brightness_adjust , mask_overlay_blur , fill , full_res_mask , full_res_mask_padding ):
29
+ def save_settings (settings_path , override_settings_with_file , custom_settings_file , animation_mode , max_frames , border , angle , zoom , translation_x , translation_y , translation_z , rotation_3d_x , rotation_3d_y , rotation_3d_z , flip_2d_perspective , perspective_flip_theta , perspective_flip_phi , perspective_flip_gamma , perspective_flip_fv , noise_schedule , strength_schedule , contrast_schedule , cfg_scale_schedule , fov_schedule , near_schedule , far_schedule , seed_schedule , kernel_schedule , sigma_schedule , amount_schedule , threshold_schedule , color_coherence , diffusion_cadence , use_depth_warping , midas_weight , near_plane , far_plane , fov , padding_mode , sampling_mode , save_depth_maps , video_init_path , extract_nth_frame , overwrite_extracted_frames , use_mask_video , video_mask_path , interpolate_key_frames , interpolate_x_frames , resume_from_timestring , resume_timestring , prompts , animation_prompts , W , H , restore_faces , tiling , enable_hr , firstphase_width , firstphase_height , seed , sampler , seed_enable_extras , subseed , subseed_strength , seed_resize_from_w , seed_resize_from_h , steps , ddim_eta , n_batch , make_grid , grid_rows , save_settings , save_samples , display_samples , save_sample_per_step , show_sample_per_step , override_these_with_webui , batch_name , filename_format , seed_behavior , use_init , from_img2img_instead_of_link , strength_0_no_init , strength , init_image , use_mask , use_alpha_as_mask , invert_mask , overlay_mask , mask_file , mask_contrast_adjust , mask_brightness_adjust , mask_overlay_blur , fill , full_res_mask , full_res_mask_padding , force_color_with_webui , reroll_blank_frames , inpaint_zeros , zeros_fill_mode ):
30
30
from scripts .deforum .args import pack_args , pack_anim_args
31
- args_dict = pack_args (W , H , restore_faces , tiling , enable_hr , firstphase_width , firstphase_height , seed , sampler , seed_enable_extras , subseed , subseed_strength , seed_resize_from_w , seed_resize_from_h , steps , ddim_eta , n_batch , make_grid , grid_rows , save_settings , save_samples , display_samples , save_sample_per_step , show_sample_per_step , override_these_with_webui , batch_name , filename_format , seed_behavior , use_init , from_img2img_instead_of_link , strength_0_no_init , strength , init_image , use_mask , use_alpha_as_mask , invert_mask , overlay_mask , mask_file , mask_contrast_adjust , mask_brightness_adjust , mask_overlay_blur , fill , full_res_mask , full_res_mask_padding )
31
+ args_dict = pack_args (W , H , restore_faces , tiling , enable_hr , firstphase_width , firstphase_height , seed , sampler , seed_enable_extras , subseed , subseed_strength , seed_resize_from_w , seed_resize_from_h , steps , ddim_eta , n_batch , make_grid , grid_rows , save_settings , save_samples , display_samples , save_sample_per_step , show_sample_per_step , override_these_with_webui , batch_name , filename_format , seed_behavior , use_init , from_img2img_instead_of_link , strength_0_no_init , strength , init_image , use_mask , use_alpha_as_mask , invert_mask , overlay_mask , mask_file , mask_contrast_adjust , mask_brightness_adjust , mask_overlay_blur , fill , full_res_mask , full_res_mask_padding , force_color_with_webui , reroll_blank_frames , inpaint_zeros , zeros_fill_mode )
32
32
anim_args_dict = pack_anim_args (animation_mode , max_frames , border , angle , zoom , translation_x , translation_y , translation_z , rotation_3d_x , rotation_3d_y , rotation_3d_z , flip_2d_perspective , perspective_flip_theta , perspective_flip_phi , perspective_flip_gamma , perspective_flip_fv , noise_schedule , strength_schedule , contrast_schedule , cfg_scale_schedule , fov_schedule , near_schedule , far_schedule , seed_schedule , kernel_schedule , sigma_schedule , amount_schedule , threshold_schedule , force_color_with_webui , reroll_blank_frames , inpaint_zeros , zeros_fill_mode , color_coherence , diffusion_cadence , use_depth_warping , midas_weight , near_plane , far_plane , fov , padding_mode , sampling_mode , save_depth_maps , video_init_path , extract_nth_frame , overwrite_extracted_frames , use_mask_video , video_mask_path , interpolate_key_frames , interpolate_x_frames , resume_from_timestring , resume_timestring )
33
33
#print(f"{animation_prompts}")
34
34
args_dict ["prompts" ] = json .loads (animation_prompts )
@@ -46,7 +46,7 @@ def save_video_settings(video_settings_path, skip_video_for_run_all, fps, output
46
46
f .write (json .dumps (video_args_dict , ensure_ascii = False , indent = 4 ))
47
47
return ["" ]
48
48
49
- def load_settings (settings_path , override_settings_with_file , custom_settings_file , animation_mode , max_frames , border , angle , zoom , translation_x , translation_y , translation_z , rotation_3d_x , rotation_3d_y , rotation_3d_z , flip_2d_perspective , perspective_flip_theta , perspective_flip_phi , perspective_flip_gamma , perspective_flip_fv , noise_schedule , strength_schedule , contrast_schedule , cfg_scale_schedule , fov_schedule , near_schedule , far_schedule , seed_schedule , kernel_schedule , sigma_schedule , amount_schedule , threshold_schedule , force_color_with_webui , reroll_blank_frames , inpaint_zeros , zeros_fill_mode , color_coherence , diffusion_cadence , use_depth_warping , midas_weight , near_plane , far_plane , fov , padding_mode , sampling_mode , save_depth_maps , video_init_path , extract_nth_frame , overwrite_extracted_frames , use_mask_video , video_mask_path , interpolate_key_frames , interpolate_x_frames , resume_from_timestring , resume_timestring , prompts , animation_prompts , W , H , restore_faces , tiling , enable_hr , firstphase_width , firstphase_height , seed , sampler , seed_enable_extras , subseed , subseed_strength , seed_resize_from_w , seed_resize_from_h , steps , ddim_eta , n_batch , make_grid , grid_rows , save_settings , save_samples , display_samples , save_sample_per_step , show_sample_per_step , override_these_with_webui , batch_name , filename_format , seed_behavior , use_init , from_img2img_instead_of_link , strength_0_no_init , strength , init_image , use_mask , use_alpha_as_mask , invert_mask , overlay_mask , mask_file , mask_contrast_adjust , mask_brightness_adjust , mask_overlay_blur , fill , full_res_mask , full_res_mask_padding ):
49
+ def load_settings (settings_path , override_settings_with_file , custom_settings_file , animation_mode , max_frames , border , angle , zoom , translation_x , translation_y , translation_z , rotation_3d_x , rotation_3d_y , rotation_3d_z , flip_2d_perspective , perspective_flip_theta , perspective_flip_phi , perspective_flip_gamma , perspective_flip_fv , noise_schedule , strength_schedule , contrast_schedule , cfg_scale_schedule , fov_schedule , near_schedule , far_schedule , seed_schedule , kernel_schedule , sigma_schedule , amount_schedule , threshold_schedule , color_coherence , diffusion_cadence , use_depth_warping , midas_weight , near_plane , far_plane , fov , padding_mode , sampling_mode , save_depth_maps , video_init_path , extract_nth_frame , overwrite_extracted_frames , use_mask_video , video_mask_path , interpolate_key_frames , interpolate_x_frames , resume_from_timestring , resume_timestring , prompts , animation_prompts , W , H , restore_faces , tiling , enable_hr , firstphase_width , firstphase_height , seed , sampler , seed_enable_extras , subseed , subseed_strength , seed_resize_from_w , seed_resize_from_h , steps , ddim_eta , n_batch , make_grid , grid_rows , save_settings , save_samples , display_samples , save_sample_per_step , show_sample_per_step , override_these_with_webui , batch_name , filename_format , seed_behavior , use_init , from_img2img_instead_of_link , strength_0_no_init , strength , init_image , use_mask , use_alpha_as_mask , invert_mask , overlay_mask , mask_file , mask_contrast_adjust , mask_brightness_adjust , mask_overlay_blur , fill , full_res_mask , full_res_mask_padding , force_color_with_webui , reroll_blank_frames , inpaint_zeros , zeros_fill_mode ):
50
50
print (f"reading custom settings from { settings_path } " )
51
51
data = locals ()
52
52
data .pop ("settings_path" )
@@ -71,24 +71,18 @@ def load_settings(settings_path, override_settings_with_file, custom_settings_fi
71
71
else :
72
72
ret .append (sampler_val )
73
73
74
- elif key == 'fill' :
74
+ elif key == 'fill' and key in jdata :
75
75
from .args import mask_fill_choices
76
- if key in jdata :
77
- fill_val = jdata [key ]
78
- else :
79
- fill_val = mask_fill_choices [0 ]
76
+ fill_val = jdata [key ]
80
77
if type (fill_val ) == int :
81
78
from .args import mask_fill_choices
82
79
ret .append (mask_fill_choices [fill_val ])
83
80
else :
84
81
ret .append (fill_val )
85
82
86
- elif key == 'zeros_fill_mode' :
83
+ elif key == 'zeros_fill_mode' and key in jdata :
87
84
from .args import mask_fill_choices
88
- if key in jdata :
89
- fill_val = jdata [key ]
90
- else :
91
- fill_val = mask_fill_choices [0 ]
85
+ fill_val = jdata [key ]
92
86
if type (fill_val ) == int :
93
87
ret .append (mask_fill_choices [fill_val ])
94
88
else :
0 commit comments