Merge pull request #191 from alexbofa/main

Update utils.py & txt2vid.py & vid2vid.py

scripts/base_ui.py

@@ -6,7 +6,7 @@ from types import SimpleNamespace
 
 from modules import script_callbacks, shared
 from modules.shared import cmd_opts, opts
-from webui import wrap_gradio_gpu_call
+from modules.call_queue import wrap_gradio_gpu_call
 
 from modules.ui_components import ToolButton, FormRow, FormGroup
 from modules.ui import create_override_settings_dropdown

scripts/core/txt2vid.py

@@ -6,7 +6,7 @@ import numpy as np
 from PIL import Image
 
 import modules.paths as ph
-from modules.shared import devices
+from modules import devices
 
 from scripts.core import utils, flow_utils
 from FloweR.model import FloweR
@@ -237,4 +237,4 @@ def start_process(*args):
 
     # print('TOTAL TIME:', int(time.time() - processing_start_time))
 
-    yield 'done', curr_frame, occlusion_mask, warped_styled_frame_, processed_frame, output_video_name, gr.Button.update(interactive=True), gr.Button.update(interactive=False)
+    yield 'done', curr_frame, occlusion_mask, warped_styled_frame_, processed_frame, output_video_name, gr.Button.update(interactive=True), gr.Button.update(interactive=False)

scripts/core/utils.py

@@ -147,7 +147,7 @@ import modules.processing as processing
 from modules.ui import plaintext_to_html
 import modules.images as images
 import modules.scripts
-from modules.shared import opts, devices, state
+from modules.shared import opts, state
 from modules import devices, sd_samplers, img2img
 from modules import shared, sd_hijack, lowvram
 
@@ -429,4 +429,4 @@ def export_settings(*args):
   for key in remove_list:
     if key in args_dict: del args_dict[key]
 
-  return json.dumps(args_dict, indent=2, default=lambda o: getattr(o, '__dict__', str(o)))
+  return json.dumps(args_dict, indent=2, default=lambda o: getattr(o, '__dict__', str(o)))

scripts/core/vid2vid.py

@@ -11,7 +11,6 @@ from PIL import Image
 from modules import devices, sd_samplers
 from modules import shared, sd_hijack, lowvram
 
-from modules.shared import devices
 import modules.shared as shared
 
 import gc
@@ -267,4 +266,4 @@ def start_process(*args):
   warped_styled_frame_ = gr.Image.update() 
   processed_frame = gr.Image.update()
 
-  yield get_cur_stat(), curr_frame, occlusion_mask, warped_styled_frame_, processed_frame, output_video_name, gr.Button.update(interactive=True), gr.Button.update(interactive=False)
+  yield get_cur_stat(), curr_frame, occlusion_mask, warped_styled_frame_, processed_frame, output_video_name, gr.Button.update(interactive=True), gr.Button.update(interactive=False)