fix bugs

serve/gradio_web.py

@@ -36,7 +36,6 @@ Find out who is the 🥇conditional image generation models! More models are goi
 
     state0 = gr.State()
     state1 = gr.State()
-    anony = True
     gen_func = partial(generate_igm_annoy, models.generate_image_ig_parallel_anony)
     
     gr.Markdown(notice_markdown, elem_id="notice_markdown")
@@ -53,7 +52,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
 
         with gr.Row():
             with gr.Column():
-                model_selector_left =gr.Markdown("", visible=False)
+                model_selector_left = gr.Markdown("", visible=False)
             with gr.Column():
                 model_selector_right = gr.Markdown("", visible=False)
         with gr.Row():

serve/vote_utils.py

@@ -172,7 +172,7 @@ def leftvote_last_response_igm(
     vote_last_response_igm(
         [state0, state1], "leftvote", [model_selector0, model_selector1], request
     )
-    if model_selector0 == gr.State(""):
+    if model_selector0 == "":
         return ("",) + (disable_btn,) * 4 + (
         gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
         gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
@@ -186,9 +186,11 @@ def rightvote_last_response_igm(
     vote_last_response_igm(
         [state0, state1], "rightvote", [model_selector0, model_selector1], request
     )
-    if model_selector0 == gr.State(""):
+    print(model_selector0)
+    if model_selector0 == "":
         return ("",) + (disable_btn,) * 4 + (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
     else:
+        print("no")
         return ("",) + (disable_btn,) * 4 + (gr.Markdown('', visible=True), gr.Markdown('', visible=True))
 
 
@@ -199,7 +201,7 @@ def tievote_last_response_igm(
     vote_last_response_igm(
         [state0, state1], "tievote", [model_selector0, model_selector1], request
     )
-    if model_selector0 == gr.State(""):
+    if model_selector0 == "":
         return ("",) + (disable_btn,) * 4 + (
         gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
         gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
@@ -214,7 +216,7 @@ def bothbad_vote_last_response_igm(
     vote_last_response_igm(
         [state0, state1], "bothbad_vote", [model_selector0, model_selector1], request
     )
-    if model_selector0 == gr.State(""):
+    if model_selector0 == "":
         return ("",) + (disable_btn,) * 4 + (
             gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
             gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
@@ -254,7 +256,10 @@ def leftvote_last_response_iem(
     #     "### Model B: " + state1.model_name,
     # )
     # names = (state0.model_name, state1.model_name)
-    names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    if model_selector0 == "":
+        names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        names = (gr.Markdown('', visible=False), gr.Markdown('', visible=False))
     return names + ("", "", gr.Image(height=512, width=512, type="pil"), "") + (disable_btn,) * 4
         
 def rightvote_last_response_iem(
@@ -268,7 +273,11 @@ def rightvote_last_response_iem(
     #     "### Model A: " + state0.model_name,
     #     "### Model B: " + state1.model_name,
     # )
-    names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    if model_selector0 == "":
+        names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
+                 gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        names = (gr.Markdown('', visible=False), gr.Markdown('', visible=False))
     return names + ("", "", gr.Image(height=512, width=512, type="pil"), "") + (disable_btn,) * 4
 
 def tievote_last_response_iem(
@@ -278,7 +287,11 @@ def tievote_last_response_iem(
     vote_last_response_iem(
         [state0, state1], "tievote", [model_selector0, model_selector1], request
     )
-    names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    if model_selector0 == "":
+        names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
+                 gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        names = (gr.Markdown('', visible=False), gr.Markdown('', visible=False))
     return names + ("", "", gr.Image(height=512, width=512, type="pil"), "") + (disable_btn,) * 4
 
 def bothbad_vote_last_response_iem(
@@ -288,7 +301,11 @@ def bothbad_vote_last_response_iem(
     vote_last_response_iem(
         [state0, state1], "bothbad_vote", [model_selector0, model_selector1], request
     )
-    names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    if model_selector0 == "":
+        names = (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
+                 gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        names = (gr.Markdown('', visible=False), gr.Markdown('', visible=False))
     return names + ("", "", gr.Image(height=512, width=512, type="pil"), "") + (disable_btn,) * 4
 
 
@@ -321,7 +338,12 @@ def leftvote_last_response_vgm(
     vote_last_response_vgm(
         [state0, state1], "leftvote", [model_selector0, model_selector1], request
     )
-    return ("",) + (disable_btn,) * 4 + (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    if model_selector0 == "":
+        return ("",) + (disable_btn,) * 4 + (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        return ("",) + (disable_btn,) * 4 + (
+        gr.Markdown("", visible=False),
+        gr.Markdown("", visible=False))
 
 
 def rightvote_last_response_vgm(
@@ -331,8 +353,14 @@ def rightvote_last_response_vgm(
     vote_last_response_vgm(
         [state0, state1], "rightvote", [model_selector0, model_selector1], request
     )
-    return ("",) + (disable_btn,) * 4 + (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
-
+    if model_selector0 == "":
+        return ("",) + (disable_btn,) * 4 + (
+        gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
+        gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        return ("",) + (disable_btn,) * 4 + (
+            gr.Markdown("", visible=False),
+            gr.Markdown("", visible=False))
 
 def tievote_last_response_vgm(
     state0, state1, model_selector0, model_selector1, request: gr.Request
@@ -341,7 +369,14 @@ def tievote_last_response_vgm(
     vote_last_response_vgm(
         [state0, state1], "tievote", [model_selector0, model_selector1], request
     )
-    return ("",) + (disable_btn,) * 4 + (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    if model_selector0 == "":
+        return ("",) + (disable_btn,) * 4 + (
+        gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
+        gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        return ("",) + (disable_btn,) * 4 + (
+            gr.Markdown("", visible=False),
+            gr.Markdown("", visible=False))
 
 
 def bothbad_vote_last_response_vgm(
@@ -351,7 +386,14 @@ def bothbad_vote_last_response_vgm(
     vote_last_response_vgm(
         [state0, state1], "bothbad_vote", [model_selector0, model_selector1], request
     )
-    return ("",) + (disable_btn,) * 4 + (gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True), gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    if model_selector0 == "":
+        return ("",) + (disable_btn,) * 4 + (
+        gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
+        gr.Markdown(f"### Model B: {state1.model_name.split('_')[1]}", visible=True))
+    else:
+        return ("",) + (disable_btn,) * 4 + (
+            gr.Markdown("", visible=False),
+            gr.Markdown("", visible=False))
 
 share_js = """
 function (a, b, c, d) {
@@ -827,7 +869,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()
 
@@ -857,7 +899,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: