update vg vote utils

serve/vote_utils.py

@@ -810,7 +810,7 @@ def generate_vg(gen_func, state, text, model_name, request: gr.Request):
     state.output = generated_video
     state.model_name = model_name
 
-    # yield state, generated_video
+    yield state, generated_video
 
     finish_tstamp = time.time()
 
@@ -840,7 +840,7 @@ def generate_vg(gen_func, state, text, model_name, request: gr.Request):
         imageio.mimwrite(output_file, state.output, fps=8, quality=9)
 
     save_video_file_on_log_server(output_file)
-    yield state, output_file
+    # yield state, output_file
 
 def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, request: gr.Request):
     if not text:
@@ -866,6 +866,8 @@ def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, reque
     state1.output = generated_video1
     state0.model_name = model_name0
     state1.model_name = model_name1
+
+    yield state0, state1, generated_video0, generated_video1
     print("====== model name =========")
     print(state0.model_name)
     print(state1.model_name)
@@ -915,7 +917,7 @@ def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, reque
             print(state.output.shape)
             imageio.mimwrite(output_file, state.output, fps=8, quality=9)
         save_video_file_on_log_server(output_file)
-    yield state0, state1, f'{VIDEO_DIR}/generation/{state0.conv_id}.mp4', f'{VIDEO_DIR}/generation/{state1.conv_id}.mp4'
+    # yield state0, state1, f'{VIDEO_DIR}/generation/{state0.conv_id}.mp4', f'{VIDEO_DIR}/generation/{state1.conv_id}.mp4'
 
 
 def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1, request: gr.Request):
@@ -937,9 +939,9 @@ def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
     state1.output = generated_video1
     state0.model_name = model_name0
     state1.model_name = model_name1
-
-    # yield state0, state1, generated_video0, generated_video1, \
-    #     gr.Markdown(f"### Model A: {model_name0}"), gr.Markdown(f"### Model B: {model_name1}")
+    
+    yield state0, state1, generated_video0, generated_video1, \
+        gr.Markdown(f"### Model A: {model_name0}"), gr.Markdown(f"### Model B: {model_name1}")
 
     finish_tstamp = time.time()
     # logger.info(f"===output===: {output}")
@@ -983,5 +985,5 @@ def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
             imageio.mimwrite(output_file, state.output, fps=8, quality=9)
         save_video_file_on_log_server(output_file)
 
-    yield state0, state1, f'{VIDEO_DIR}/generation/{state0.conv_id}.mp4', f'{VIDEO_DIR}/generation/{state1.conv_id}.mp4', \
-        gr.Markdown(f"### Model A: {model_name0}"), gr.Markdown(f"### Model B: {model_name1}")
+    # yield state0, state1, f'{VIDEO_DIR}/generation/{state0.conv_id}.mp4', f'{VIDEO_DIR}/generation/{state1.conv_id}.mp4', \
+    #     gr.Markdown(f"### Model A: {model_name0}"), gr.Markdown(f"### Model B: {model_name1}")