tweaks

Signed-off-by: Vladimir Mandic <mandic00@live.com>

modules/gr_hijack.py

@@ -208,13 +208,13 @@ def patch_gradio():
                 return {"is_generating": False, "data": [], "error": "empty response"}
             return response
         except GeneratorExit as e:
-            log.error(f"Gradio queue: events={len(events)} batch={batch} error: {e}")
+            log.error(f"Gradio queue: events={len(events)} batch={batch} reason=GeneratorExit {e}")
             return {"is_generating": False, "data": [None, None, None, None, "cancelled", ""], "error": None}
         except Exception as e:
-            log.error(f"Gradio queue: events={len(events)} batch={batch} error: {e}")
+            log.error(f"Gradio queue: events={len(events)} batch={batch} reason=Exception {e}")
             raise
         except BaseException as e:
-            log.error(f"Gradio queue: events={len(events)} batch={batch} error: {e}")
+            log.error(f"Gradio queue: events={len(events)} batch={batch} reason=BaseException {e}")
             raise
 
     def wrap_blocks_preprocess_data(self, fn_index: int, inputs: list, state: dict):

modules/minimax/minimax_ui.py

@@ -57,11 +57,11 @@ def create_ui(prompt, _negative, styles, overrides, script_inputs, mp4_fps, mp4_
         model_info = next((m for m in models['MiniMax'] if m.name == model_name), None)
         if model_info is None or model_info.name is None or model_info.name == '' or model_info.name == 'None':
             return gr.update(value='none'), gr.update(visible=False), gr.update(visible=False)
-        log.debug(f'Selected: name="{model_info.name}" repo="{model_info.repo}" cls={model_info.repo_cls}')
         if model_info.workflow == 'fl2va':
             workflow = 'fl2va' if init_image is not None else 't2va'
         else:
             workflow = model_info.workflow
+        log.debug(f'Video: workflow={workflow} name="{model_info.name}" repo="{model_info.repo}" cls={model_info.repo_cls} image={init_image} selected')
         return gr.update(value=f'Workflow: {workflow}'), gr.update(visible=workflow != 'ref2va'), gr.update(visible=workflow == 'ref2va')
 
     def on_load(model_name: str):

modules/shared.py

@@ -211,7 +211,7 @@ def restart_server(restart=True):
             demo.server.should_exit = True
             demo.server.force_exit = True
             demo.close(verbose=False)
-            demo.server.close()
+            # demo.server.close()
             demo.fns = []
         time.sleep(1)
         sys.tracebacklimit = 100

scripts/dlss_ext.py

@@ -281,12 +281,18 @@ def dlss(p: processing.StableDiffusionProcessing | None, pp: processing.Processe
     ss_scale_factor = float(getattr(p, 'ss_scale_factor', ss_scale_factor))
     fg_source_fps = str(getattr(p, 'fg_source_fps', fg_source_fps))
     fg_target_fps = str(getattr(p, 'fg_target_fps', fg_target_fps))
+    if (p is not None) and ('video' in p.ops): # should not add video frames
+        nr_append = False
+        ss_append = False
 
     images = []
     originals = []
     current_images = inputs
     t = timer.Timer()
 
+    jobid = shared.state.begin('DLSS')
+    t_start = time.time()
+
     if ss_enabled:
         t0 = time.time()
         if p:
@@ -332,6 +338,9 @@ def dlss(p: processing.StableDiffusionProcessing | None, pp: processing.Processe
             current_images = output
         t.ts('framegen', t0)
 
+    shared.state.end(jobid)
+    timer.process.ts('dlss', t_start)
+
     log.debug(f'DLSS: frames={len(images)} {t.summary(min_time=0)}')
     if update == 'images':
         pp.images = images