Spaces:

3DTopia
/

3DGen-Arena

Running

App Files Files Community

ZhangYuhan commited on Apr 28, 2024

Commit

3e3ca46

1 Parent(s): 7bb496b

update serve

Browse files

Files changed (15) hide show

app.py +1 -1
constants.py +2 -4
model/model_config.py +67 -11
model/model_manager.py +1 -1
model/model_registry.py +16 -9
model/model_worker.py +17 -10
offline/utils.py +0 -73
serve/gradio_web_i2s.py +311 -167
serve/gradio_web_t2i_anony.py +0 -225
serve/gradio_web_t2i_named.py +0 -236
serve/gradio_web_t2i_single.py +0 -159
serve/gradio_web_t2s.py +246 -163
serve/inference.py +11 -20
serve/log_server.py +0 -1
serve/utils.py +5 -1

app.py CHANGED Viewed

@@ -81,4 +81,4 @@ if __name__ == "__main__":
     # elo_results_file, leaderboard_table_file = load_elo_results(elo_results_dir)
     elo_results_file, leaderboard_table_file = None, None
     demo = build_combine_demo(models, elo_results_file, leaderboard_table_file)
-    demo.queue(max_size=20).launch(server_port=server_port, root_path=ROOT_PATH)

     # elo_results_file, leaderboard_table_file = load_elo_results(elo_results_dir)
     elo_results_file, leaderboard_table_file = None, None
     demo = build_combine_demo(models, elo_results_file, leaderboard_table_file)
+    demo.queue(max_size=20).launch(server_port=server_port, root_path=ROOT_PATH, debug=True)

constants.py CHANGED Viewed

@@ -5,8 +5,6 @@ os.chdir(Path.cwd())
 LOGDIR = os.getenv("LOGDIR", "./3DGen-Arena-logs/vote_log")
 IMAGE_DIR = os.getenv("IMAGE_DIR", f"{LOGDIR}/images")
-OFFLINE_DIR = "./offline"
-OFFLINE_GIF_DIR = os.path.join(OFFLINE_DIR, "gifs")
 SERVER_PORT = os.getenv("SERVER_PORT", 7860)
 ROOT_PATH = os.getenv("ROOT_PATH", None)
@@ -22,8 +20,8 @@ SAVE_LOG = "save_log"
 NUM_SIDES = 2
 EVALUATE_DIMS = 5
-TEXT_PROMPT_PATH = "offline/prompts_110.json"
-IMAGE_PROMPT_PATH = "offline/image_urls.txt"
 MAX_ATTEMPTS = 5
 REPLICATE_API_TOKEN = os.getenv("REPLICATE_API_TOKEN", "yourKey")

 LOGDIR = os.getenv("LOGDIR", "./3DGen-Arena-logs/vote_log")
 IMAGE_DIR = os.getenv("IMAGE_DIR", f"{LOGDIR}/images")
 SERVER_PORT = os.getenv("SERVER_PORT", 7860)
 ROOT_PATH = os.getenv("ROOT_PATH", None)
 NUM_SIDES = 2
 EVALUATE_DIMS = 5
+PROMPT_NUM = 510
+TEXT_PROMPT_PATH = "offline/prompts.json"
 MAX_ATTEMPTS = 5
 REPLICATE_API_TOKEN = os.getenv("REPLICATE_API_TOKEN", "yourKey")

model/model_config.py CHANGED Viewed

@@ -20,14 +20,20 @@ register_model_config(
     online_model=False
 )
 register_model_config(
-    model_name="instant3d",
     i2s_model=False,
     online_model=False
 )
 register_model_config(
-    model_name="latent-nerf",
     i2s_model=False,
     online_model=False
 )
@@ -38,27 +44,77 @@ register_model_config(
     online_model=False
 )
 # register_model_config(
-#     model_name="mvdream",
 #     i2s_model=False,
 #     online_model=False
 # )
 # register_model_config(
-#     model_name="prolificdreamer",
-#     i2s_model=False,
 #     online_model=False
 # )
 register_model_config(
-    model_name="dreamgaussian",
     i2s_model=True,
     online_model=False
 )
 register_model_config(
-    model_name="sjc",
-    i2s_model=False,
     online_model=False
 )
@@ -75,19 +131,19 @@ register_model_config(
 )
 register_model_config(
-    model_name="lgm",
     i2s_model=True,
     online_model=False
 )
 register_model_config(
-    model_name="openlrm",
     i2s_model=True,
     online_model=False
 )
 register_model_config(
-    model_name="triplane-gaussian",
     i2s_model=True,
     online_model=False
 )

     online_model=False
 )
+# register_model_config(
+#     model_name="instant3d",
+#     i2s_model=False,
+#     online_model=False
+# )
 register_model_config(
+    model_name="latent-nerf",
     i2s_model=False,
     online_model=False
 )
 register_model_config(
+    model_name="lucid-dreamer",
     i2s_model=False,
     online_model=False
 )
     online_model=False
 )
+register_model_config(
+    model_name="mvdream",
+    i2s_model=False,
+    online_model=False
+)
+register_model_config(
+    model_name="point-e_t",
+    i2s_model=False,
+    online_model=False
+)
+register_model_config(
+    model_name="shap-e_t",
+    i2s_model=False,
+    online_model=False
+)
+register_model_config(
+    model_name="sjc",
+    i2s_model=False,
+    online_model=False
+)
 # register_model_config(
+#     model_name="prolificdreamer",
 #     i2s_model=False,
 #     online_model=False
 # )
 # register_model_config(
+#     model_name="dreamgaussian",
+#     i2s_model=True,
 #     online_model=False
 # )
 register_model_config(
+    model_name="escher-net",
     i2s_model=True,
     online_model=False
 )
 register_model_config(
+    model_name="free3d",
+    i2s_model=True,
+    online_model=False
+)
+register_model_config(
+    model_name="lgm",
+    i2s_model=True,
+    online_model=False
+)
+register_model_config(
+    model_name="openlrm",
+    i2s_model=True,
+    online_model=False
+)
+register_model_config(
+    model_name="point-e_i",
+    i2s_model=True,
+    online_model=False
+)
+register_model_config(
+    model_name="shap-e_i",
+    i2s_model=True,
     online_model=False
 )
 )
 register_model_config(
+    model_name="triplane-gaussian",
     i2s_model=True,
     online_model=False
 )
 register_model_config(
+    model_name="zero123-xl",
     i2s_model=True,
     online_model=False
 )
 register_model_config(
+    model_name="stable-zero123",
     i2s_model=True,
     online_model=False
 )

model/model_manager.py CHANGED Viewed

@@ -68,7 +68,7 @@ class ModelManager:
         worker = self.models_worker[model_name]
         if offline:
-            result = worker.load_offline(offline, offline_idx)
         if not offline or result == None:
             if worker.check_online():
                 result = worker.inference(prompt)

         worker = self.models_worker[model_name]
         if offline:
+            result = worker.load_offline(offline_idx)
         if not offline or result == None:
             if worker.check_online():
                 result = worker.inference(prompt)

model/model_registry.py CHANGED Viewed

@@ -103,14 +103,14 @@ register_model_info(
 )
 register_model_info(
-    ["point-e"],
     "Point·E",
     "https://github.com/openai/point-e",
     "A System for Generating 3D Point Clouds from Complex Prompts",
 )
 register_model_info(
-    ["shap-e"],
     "Shap-E",
     "https://github.com/openai/shap-e",
     "Generating Conditional 3D Implicit Functions",
@@ -123,13 +123,6 @@ register_model_info(
     "High-Fidelity and Diverse Text-to-3D Generation with Variational Score Distillation",
 )
-register_model_info(
-    ["syncdreamer"],
-    "SyncDreamer",
-    "https://github.com/liuyuan-pal/SyncDreamer",
-    "Generating Multiview-consistent Images from a Single-view Image",
-)
 register_model_info(
     ["sjc"],
     "Score Jacobian Chaining",
@@ -168,6 +161,13 @@ register_model_info(
     "Hierarchical 3d generation with bootstrapped diffusion prior",
 )
 register_model_info(
     ["zero123"],
     "Zero-1-to-3",
@@ -182,6 +182,13 @@ register_model_info(
     "Quality 3D Object Generation from Single Images",
 )
 register_model_info(
     ["magic123"],
     "Magic123",

 )
 register_model_info(
+    ["point-e_t", "point-e_i"],
     "Point·E",
     "https://github.com/openai/point-e",
     "A System for Generating 3D Point Clouds from Complex Prompts",
 )
 register_model_info(
+    ["shap-e_t", "shap-e_i"],
     "Shap-E",
     "https://github.com/openai/shap-e",
     "Generating Conditional 3D Implicit Functions",
     "High-Fidelity and Diverse Text-to-3D Generation with Variational Score Distillation",
 )
 register_model_info(
     ["sjc"],
     "Score Jacobian Chaining",
     "Hierarchical 3d generation with bootstrapped diffusion prior",
 )
+register_model_info(
+    ["syncdreamer"],
+    "SyncDreamer",
+    "https://github.com/liuyuan-pal/SyncDreamer",
+    "Generating Multiview-consistent Images from a Single-view Image",
+)
 register_model_info(
     ["zero123"],
     "Zero-1-to-3",
     "Quality 3D Object Generation from Single Images",
 )
+register_model_info(
+    ["zero123-xl"],
+    "Zero123-XL",
+    "https://stability.ai/news/stable-zero123-3d-generation",
+    "Quality 3D Object Generation from Single Images",
+)
 register_model_info(
     ["magic123"],
     "Magic123",

model/model_worker.py CHANGED Viewed

@@ -6,9 +6,10 @@ from typing import List
 import replicate
 import subprocess
 from gradio_client import Client
 # from .client import Gau2Mesh_client
-from constants import OFFLINE_GIF_DIR, REPLICATE_API_TOKEN
 # os.environ("REPLICATE_API_TOKEN", "yourKey")
 class BaseModelWorker:
@@ -24,10 +25,10 @@ class BaseModelWorker:
         self.model_api = model_api
         self.urls_json = None
-        urls_json_path = os.path.join(OFFLINE_GIF_DIR, f"{model_name}.json")
-        if os.path.exists(urls_json_path):
-            with open(urls_json_path, 'r') as f:
-                self.urls_json = json.load(f)
     def check_online(self) -> bool:
         if self.online_model and not self.model:
@@ -35,12 +36,18 @@ class BaseModelWorker:
         else:
             return False
-    def load_offline(self, offline: bool, offline_idx):
         ## offline
-        if offline and str(offline_idx) in self.urls_json.keys():
-            return self.urls_json[str(offline_idx)]
-        else:
-            return None
     def inference(self, prompt):
         pass

 import replicate
 import subprocess
+import requests
 from gradio_client import Client
 # from .client import Gau2Mesh_client
+from constants import REPLICATE_API_TOKEN, LOG_SERVER
 # os.environ("REPLICATE_API_TOKEN", "yourKey")
 class BaseModelWorker:
         self.model_api = model_api
         self.urls_json = None
+        # urls_json_path = os.path.join(OFFLINE_GIF_DIR, f"{model_name}.json")
+        # if os.path.exists(urls_json_path):
+        #     with open(urls_json_path, 'r') as f:
+        #         self.urls_json = json.load(f)
     def check_online(self) -> bool:
         if self.online_model and not self.model:
         else:
             return False
+    def load_offline(self, offline_idx):
         ## offline
+        # if offline and str(offline_idx) in self.urls_json.keys():
+        # #     return self.urls_json[str(offline_idx)]
+        # else:
+        #     return None
+        galley = "image2shape" if self.i2s_model else "text2shape"
+        rgb_name = f"{galley}_{self.model_name}_{offline_idx}_rgb"
+        normal_name = f"{galley}_{self.model_name}_{offline_idx}_normal"
+        rgb_url = f"{LOG_SERVER}/get_{rgb_name}"
+        normal_url = f"{LOG_SERVER}/get_{normal_name}"
+        return {'rgb': rgb_url, 'normal': normal_url}
     def inference(self, prompt):
         pass

offline/utils.py DELETED Viewed

@@ -1,73 +0,0 @@
-import os
-import json
-import base64
-import requests
-import numpy as np
-import matplotlib.pyplot as plt
-# MAX_LEN = 40
-# STEP = 2
-# x = np.arange(0, MAX_LEN, STEP)
-# token_counts = [0] * (MAX_LEN//STEP)
-# with open("prompts.json", 'r') as f:
-#     prompts = json.load(f)
-# for prompt in prompts:
-#     tokens = len(prompt.strip().split(' '))
-#     token_counts[min(tokens//STEP, MAX_LEN//STEP-1)] += 1
-# plt.xticks(x, x+1)
-# plt.xlabel("token counts")
-# plt.bar(x, token_counts, width=1.3)
-# # plt.show()
-# plt.savefig("token_counts.png")
-## Generate image prompts
-with open("prompts.json") as f:
-    text_prompts = json.load(f)
-engine_id = "stable-diffusion-v1-6"
-api_host = os.getenv('API_HOST', 'https://api.stability.ai')
-api_key = os.getenv("STABILITY_API_KEY", "sk-ZvoFiXEbln6yh0hvSlm1K60WYcWFY5rmyW8a9FgoVBrKKP9N")
-if api_key is None:
-    raise Exception("Missing Stability API key.")
-for idx, text in enumerate(text_prompts):
-    if idx<=20: continue
-    print(f"Start generate prompt[{idx}]: {text}")
-    response = requests.post(
-        f"{api_host}/v1/generation/{engine_id}/text-to-image",
-        headers={
-            "Content-Type": "application/json",
-            "Accept": "application/json",
-            "Authorization": f"Bearer {api_key}"
-        },
-        json={
-            "text_prompts": [
-                {
-                    "text": text.strip()
-                }
-            ],
-            "cfg_scale": 7,
-            "height": 1024,
-            "width": 1024,
-            "samples": 3,
-            "steps": 30,
-        },
-    )
-    if response.status_code != 200:
-        # raise Exception("Non-200 response: " + str(response.text))
-        print(f"{idx} Failed!!! {str(response.text)}")
-        continue
-    print("Finished!")
-    data = response.json()
-    for i, image in enumerate(data["artifacts"]):
-        img_path = f"./images/{idx}/v1_txt2img_{i}.png"
-        os.makedirs(os.path.dirname(img_path), exist_ok=True)
-        with open(img_path, "wb") as f:
-            f.write(base64.b64decode(image["base64"]))

serve/gradio_web_i2s.py CHANGED Viewed

@@ -57,7 +57,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
             gr.Markdown(model_description_md, elem_id="model_description_markdown")
         with gr.Row():
-            with gr.Column():
                 imagebox = gr.Image(
                     width=512,
                     show_label=False,
@@ -65,7 +65,74 @@ Find out who is the 🥇conditional image generation models! More models are goi
                     interactive=False,   ## only support offline
                     label = "Prompt",
                     elem_id="input_box",
-                )
                 sample_btn = gr.Button(value="🎲 Sample", variant="primary")
                 # send_btn = gr.Button(value="📤 Send", variant="primary")
                 # clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
@@ -83,7 +150,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
                     interactive=False, show_download_button=True,)
         with gr.Row():
-            with gr.Column():
                 gr.Markdown("", visible=False)
             with gr.Column():
                 model_selector_left =gr.Markdown("", visible=False)
@@ -92,76 +159,76 @@ Find out who is the 🥇conditional image generation models! More models are goi
         with gr.Row():
             slow_warning = gr.Markdown("", elem_id="notice_markdown")
-        with gr.Row(elem_id="Geometry Plausibility"):
-            plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
-            plausive_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            plausive_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            plausive_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry Quality"):
-            geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
-            geo_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            geo_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            geo_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Texture Quality"):
-            text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
-            text_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            text_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            text_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry-Texture Coherency"):
-            coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
-            coherence_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            coherence_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            coherence_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Visual Alignment"):
-            align_md = gr.Markdown("Visual Alignment: ", visible=False, elem_id="evaldim_markdown")
-            align_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            align_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            align_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
     with gr.Row():
         # sample_btn = gr.Button(value="🎲 Sample", variant="primary")
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
-        share_btn = gr.Button(value="📷  Share")
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
         send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
@@ -207,12 +274,16 @@ Find out who is the 🥇conditional image generation models! More models are goi
         states + model_selectors,
         states + [imagebox],
         api_name="sample_btn_anony"
     )
     imagebox.upload(
         reset_states_side_by_side_anony,
         states,
-        states + model_selectors + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
@@ -231,7 +302,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     send_btn.click(
         reset_states_side_by_side_anony,
         states,
-        states + model_selectors + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
@@ -265,7 +336,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     regenerate_btn.click(
         reset_states_side_by_side_anony,
         states,
-        states + model_selectors + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
@@ -318,6 +389,8 @@ Find out who is the 🥇conditional image generation models! More models are goi
             gr.Markdown(model_description_md, elem_id="model_description_markdown")
         with gr.Row():
             with gr.Column():
                 model_selector_left = gr.Dropdown(
                     choices=model_list,
@@ -336,6 +409,81 @@ Find out who is the 🥇conditional image generation models! More models are goi
                     )
         with gr.Row():
             with gr.Column():
                 normal_left = gr.Image(width=512, label = "Normal A", show_download_button=True)
@@ -344,87 +492,76 @@ Find out who is the 🥇conditional image generation models! More models are goi
                 normal_right = gr.Image(width=512, label = "Normal B", show_download_button=True,)
                 rgb_right = gr.Image(width=512, label = "RGB B", show_download_button=True,)
-        with gr.Row(elem_id="Geometry Plausibility"):
-            plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
-            plausive_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            plausive_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            plausive_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry Quality"):
-            geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
-            geo_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            geo_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            geo_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Texture Quality"):
-            text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
-            text_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            text_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            text_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry-Texture Coherency"):
-            coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
-            coherence_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            coherence_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            coherence_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Visual Alignment"):
-            align_md = gr.Markdown("Visual Alignment: ", visible=False, elem_id="evaldim_markdown")
-            align_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            align_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            align_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
     with gr.Row():
-        imagebox = gr.Image(
-            width=512,
-            show_label=False,
-            visible=True,
-            interactive=False,   ## only support offline
-            elem_id="input_box",
-        )
-        with gr.Column():
-            sample_btn = gr.Button(value="🎲 Sample", variant="primary")
-            send_btn = gr.Button(value="📤 Send", variant="primary")
-            clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
-            regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
-            share_btn = gr.Button(value="📷  Share")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
@@ -499,12 +636,16 @@ Find out who is the 🥇conditional image generation models! More models are goi
         states + model_selectors,
         states + [imagebox],
         api_name="sample_btn_named"
     )
     imagebox.upload(
         reset_states_side_by_side,
         states,
-        states + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
@@ -523,7 +664,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     send_btn.click(
         reset_states_side_by_side,
         states,
-        states + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
@@ -557,7 +698,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     regenerate_btn.click(
         reset_states_side_by_side,
         states,
-        states + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
@@ -607,6 +748,15 @@ def build_i2s_ui_single_model(models):
         )
     with gr.Row():
         normal = gr.Image(width=512, label = "Normal", show_download_button=True)
         rgb = gr.Image(width=512, label = "RGB", show_download_button=True,)
@@ -642,19 +792,9 @@ def build_i2s_ui_single_model(models):
     with gr.Row():
-        imagebox = gr.Image(
-            width=512,
-            show_label=False,
-            visible=True,
-            interactive=False,   ## only support offline
-            elem_id="input_box",
-        )
-        with gr.Column():
-            # with gr.Row():
-            sample_btn = gr.Button(value="🎲 Sample", variant="primary")
-            send_btn = gr.Button(value="📤 Send", variant="primary")
-            clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
-            regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
@@ -704,12 +844,16 @@ def build_i2s_ui_single_model(models):
         [state, model_selector],
         [state, imagebox],
         api_name="sample_btn_single"
     )
     imagebox.upload(
         reset_state,
         state,
-        [state] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, imagebox, model_selector],
@@ -725,7 +869,7 @@ def build_i2s_ui_single_model(models):
     send_btn.click(
         reset_state,
         state,
-        [state] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, imagebox, model_selector],
@@ -753,7 +897,7 @@ def build_i2s_ui_single_model(models):
     regenerate_btn.click(
         reset_state,
         state,
-        [state] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, imagebox, model_selector],

             gr.Markdown(model_description_md, elem_id="model_description_markdown")
         with gr.Row():
+            with gr.Column(scale=0.8):
                 imagebox = gr.Image(
                     width=512,
                     show_label=False,
                     interactive=False,   ## only support offline
                     label = "Prompt",
                     elem_id="input_box",
+                )
+                plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Plausibility"):
+                    plausive_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    plausive_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    plausive_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Details"):
+                    geo_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    geo_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    geo_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Texture Quality"):
+                    text_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    text_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    text_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry-Texture Coherency"):
+                    coherence_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    coherence_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    coherence_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                align_md = gr.Markdown("Visual Alignment: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Visual Alignment"):
+                    align_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    align_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    align_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
                 sample_btn = gr.Button(value="🎲 Sample", variant="primary")
                 # send_btn = gr.Button(value="📤 Send", variant="primary")
                 # clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
                     interactive=False, show_download_button=True,)
         with gr.Row():
+            with gr.Column(scale=0.8):
                 gr.Markdown("", visible=False)
             with gr.Column():
                 model_selector_left =gr.Markdown("", visible=False)
         with gr.Row():
             slow_warning = gr.Markdown("", elem_id="notice_markdown")
+        # with gr.Row(elem_id="Geometry Plausibility"):
+        #     plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
+        #     plausive_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     plausive_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     plausive_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Geometry Details"):
+        #     geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
+        #     geo_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     geo_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     geo_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Texture Quality"):
+        #     text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
+        #     text_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     text_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     text_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Geometry-Texture Coherency"):
+        #     coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
+        #     coherence_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     coherence_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     coherence_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Visual Alignment"):
+        #     align_md = gr.Markdown("Visual Alignment: ", visible=False, elem_id="evaldim_markdown")
+        #     align_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     align_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     align_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
     with gr.Row():
         # sample_btn = gr.Button(value="🎲 Sample", variant="primary")
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
+        share_btn = gr.Button(value="📷  Share")
         send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
         states + model_selectors,
         states + [imagebox],
         api_name="sample_btn_anony"
+    ).then(
+        reset_states_side_by_side_anony,
+        states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     )
     imagebox.upload(
         reset_states_side_by_side_anony,
         states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
     send_btn.click(
         reset_states_side_by_side_anony,
         states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
     regenerate_btn.click(
         reset_states_side_by_side_anony,
         states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
             gr.Markdown(model_description_md, elem_id="model_description_markdown")
         with gr.Row():
+            with gr.Column(scale=0.8):
+                gr.Markdown("Select Players:", elem_id="evaldim_markdown")
             with gr.Column():
                 model_selector_left = gr.Dropdown(
                     choices=model_list,
                     )
         with gr.Row():
+            with gr.Column(scale=0.8):
+                imagebox = gr.Image(
+                    width=512,
+                    show_label=False,
+                    visible=True,
+                    interactive=False,   ## only support offline
+                    elem_id="input_box",
+                )
+                plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Plausibility"):
+                    plausive_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    plausive_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    plausive_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Quality"):
+                    geo_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    geo_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    geo_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Texture Quality"):
+                    text_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    text_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    text_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry-Texture Coherency"):
+                    coherence_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    coherence_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    coherence_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                align_md = gr.Markdown("Visual Alignment: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Visual Alignment"):
+                    align_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    align_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    align_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                sample_btn = gr.Button(value="🎲 Sample", variant="primary")
             with gr.Column():
                 normal_left = gr.Image(width=512, label = "Normal A", show_download_button=True)
                 normal_right = gr.Image(width=512, label = "Normal B", show_download_button=True,)
                 rgb_right = gr.Image(width=512, label = "RGB B", show_download_button=True,)
+        # with gr.Row(elem_id="Geometry Plausibility"):
+        #     plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
+        #     plausive_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     plausive_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     plausive_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Geometry Quality"):
+        #     geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
+        #     geo_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     geo_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     geo_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Texture Quality"):
+        #     text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
+        #     text_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     text_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     text_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Geometry-Texture Coherency"):
+        #     coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
+        #     coherence_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     coherence_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     coherence_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Visual Alignment"):
+        #     align_md = gr.Markdown("Visual Alignment: ", visible=False, elem_id="evaldim_markdown")
+        #     align_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     align_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     align_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
     with gr.Row():
+        clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
+        regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
+        share_btn = gr.Button(value="📷  Share")
+        send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
         states + model_selectors,
         states + [imagebox],
         api_name="sample_btn_named"
+    ).then(
+        reset_states_side_by_side,
+        states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     )
     imagebox.upload(
         reset_states_side_by_side,
         states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
     send_btn.click(
         reset_states_side_by_side,
         states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
     regenerate_btn.click(
         reset_states_side_by_side,
         states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [imagebox] + model_selectors,
         )
     with gr.Row():
+        with gr.Column():
+            imagebox = gr.Image(
+                show_label=False,
+                visible=True,
+                interactive=False,   ## only support offline
+                elem_id="input_box",
+                label="Prompt",
+            )
+            sample_btn = gr.Button(value="🎲 Sample", variant="primary")
         normal = gr.Image(width=512, label = "Normal", show_download_button=True)
         rgb = gr.Image(width=512, label = "RGB", show_download_button=True,)
     with gr.Row():
+        clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
+        regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
+        send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
         [state, model_selector],
         [state, imagebox],
         api_name="sample_btn_single"
+    ).then(
+        reset_state,
+        state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     )
     imagebox.upload(
         reset_state,
         state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, imagebox, model_selector],
     send_btn.click(
         reset_state,
         state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, imagebox, model_selector],
     regenerate_btn.click(
         reset_state,
         state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, imagebox, model_selector],

serve/gradio_web_t2i_anony.py DELETED Viewed

@@ -1,225 +0,0 @@
-import json
-from functools import partial
-from .utils import *
-from .vote_utils import (
-    upvote_last_response_t2s as upvote_last_response,
-    downvote_last_response_t2s as downvote_last_response,
-    flag_last_response_t2s as flag_last_response,
-    leftvote_last_response_t2s_multi as leftvote_last_response,
-    rightvote_last_response_t2s_multi as rightvote_last_response,
-    tievote_last_response_t2s_multi as tievote_last_response,
-    bothbad_vote_last_response_t2s_multi as bothbad_vote_last_response,
-    share_click_t2s_multi as share_click,
-    share_js
-)
-from .inference import(
-    sample_model,
-    sample_prompt,
-    generate_t2s,
-    generate_t2s_multi,
-    generate_t2s_multi_annoy
-)
-from constants import TEXT_PROMPT_PATH
-with open(TEXT_PROMPT_PATH, 'r') as f:
-    prompt_list = json.load(f)
-def build_side_by_side_ui_anony(models):
-    notice_markdown = """
-# ⚔️  GenAI-Arena ⚔️ : Benchmarking Text-to-3D generative models
-## 📜 Rules
-- Input prompt to two anonymous models in same area and vote for the better one!
-- When the results are ready, click the button below to vote.
-- Vote won't be counted if model identity is revealed during conversation.
-- Click "Clear" to start a new round.
-## 🏆 Arena Elo
-Find out who is the 🥇conditional image generation models! More models are going to be supported.
-## 👇 Generating now!
-"""
-    model_list = models.get_t2s_models()
-    gen_func = partial(generate_t2s_multi_annoy, models.inference_parallel_anony, models.render_parallel)
-    state_0 = gr.State()
-    state_1 = gr.State()
-    gr.Markdown(notice_markdown, elem_id="notice_markdown")
-    with gr.Group(elem_id="share-region-anony"):
-        with gr.Accordion("🔍 Expand to see all Arena players", open=False):
-            model_description_md = get_model_description_md(model_list)
-            gr.Markdown(model_description_md, elem_id="model_description_markdown")
-        with gr.Row():
-            with gr.Column():
-                normal_left = gr.Image(width=512, label = "Model A", show_copy_button=True)
-                rgb_left = gr.Image(width=512, label = "Model A", show_copy_button=True)
-            with gr.Column():
-                normal_right = gr.Image(width=512, label = "Model B", show_copy_button=True,)
-                rgb_right = gr.Image(width=512, label = "Model B", show_copy_button=True,)
-        with gr.Row():
-            with gr.Column():
-                model_selector_left =gr.Markdown("", visible=False)
-            with gr.Column():
-                model_selector_right = gr.Markdown("", visible=False)
-        with gr.Row():
-            slow_warning = gr.Markdown("", elem_id="notice_markdown")
-        with gr.Row(elem_id="Geometry Quality"):
-            geo_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            geo_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            geo_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Texture Quality"):
-            text_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            text_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            text_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Alignment Quality"):
-            align_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            align_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            align_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-    with gr.Row():
-        textbox = gr.Textbox(
-            show_label=False,
-            placeholder="👉 Enter your prompt or Sample a random prompt, and press ENTER",
-            container=True,
-            elem_id="input_box",
-        )
-        sample_btn = gr.Button(value="🎲 Sample", variant="primary", scale=0)
-        send_btn = gr.Button(value="📤 Send", variant="primary", scale=0)
-    with gr.Row():
-        clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
-        regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
-        share_btn = gr.Button(value="📷  Share")
-    gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
-    geo_btn_list = [geo_leftvote_btn, geo_rightvote_btn, geo_tie_btn, geo_bothbad_btn]
-    text_btn_list = [text_leftvote_btn, text_rightvote_btn, text_tie_btn, text_bothbad_btn]
-    align_btn_list = [align_leftvote_btn, align_rightvote_btn, align_tie_btn, align_bothbad_btn]
-    states = [state_0, state_1]
-    model_selectors = [model_selector_left, model_selector_right]
-    results = [normal_left, rgb_left, normal_right, rgb_right]
-    for btn_list in [geo_btn_list, text_btn_list, align_btn_list]:
-        leftvote_btn, rightvote_btn, tie_btn, bothbad_btn = btn_list
-        leftvote_btn.click(
-            leftvote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-        rightvote_btn.click(
-            rightvote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-        tie_btn.click(
-            tievote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-        bothbad_btn.click(
-            bothbad_vote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-    sample_btn.click(
-        sample_prompt,
-        states + model_selectors + [prompt_list],
-        states + [textbox],
-        api_name="sample_btn_anony"
-    )
-    textbox.submit(
-        sample_model,
-        states + [model_list, False],
-        states + model_selectors
-    ).then(
-        gen_func,
-        states + [textbox] + model_selectors + [prompt_list],
-        states + results + model_selectors,
-        api_name="submit_btn_anony"
-    ).then(
-        enable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    send_btn.click(
-        sample_model,
-        states + [model_list, False],
-        states + model_selectors
-    ).then(
-        gen_func,
-        states + [textbox] + model_selectors + [prompt_list],
-        states + results + model_selectors,
-        api_name="send_btn_anony"
-    ).then(
-        enable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    clear_btn.click(
-        clear_history_side_by_side_anony,
-        None,
-        states + [textbox] + results + model_selectors,
-        api_name="clear_btn_anony"
-    ).then(
-        disable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    regenerate_btn.click(
-        sample_model,
-        states + [model_list, False],
-        states + model_selectors
-    ).then(
-        gen_func,
-        states + [textbox] + model_selectors + [prompt_list],
-        states + results + model_selectors,
-        api_name="regenerate_btn_anony"
-    ).then(
-        enable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    share_btn.click(
-        share_click,
-        states + model_selectors,
-        [],
-        js=share_js
-    )

serve/gradio_web_t2i_named.py DELETED Viewed

@@ -1,236 +0,0 @@
-import json
-from functools import partial
-from .utils import *
-from .vote_utils import (
-    upvote_last_response_t2s as upvote_last_response,
-    downvote_last_response_t2s as downvote_last_response,
-    flag_last_response_t2s as flag_last_response,
-    leftvote_last_response_t2s_multi as leftvote_last_response,
-    rightvote_last_response_t2s_multi as rightvote_last_response,
-    tievote_last_response_t2s_multi as tievote_last_response,
-    bothbad_vote_last_response_t2s_multi as bothbad_vote_last_response,
-    share_click_t2s_multi as share_click,
-    share_js
-)
-from .inference import(
-    sample_prompt,
-    generate_t2s_multi
-)
-from constants import TEXT_PROMPT_PATH
-with open(TEXT_PROMPT_PATH, 'r') as f:
-    prompt_list = json.load(f)
-def build_side_by_side_ui_named(models):
-    notice_markdown = """
-# ⚔️  GenAI-Arena ⚔️ : Benchmarking Text-to-3D generative models
-## 📜 Rules
-- Generate with any two selected models side-by-side and vote!
-- Sample or Input prompt you want to generate.
-- Click "Send" to submit the prompt.
-- Click "Clear" to start a new round.
-## 🏆 Arena Elo
-Find out who is the 🥇conditional image generation models! More models are going to be supported.
-## 👇 Generating now!
-"""
-    model_list = models.get_t2s_models()
-    gen_func = partial(generate_t2s_multi, models.inference_parallel, models.render_parallel)
-    state_0 = gr.State()
-    state_1 = gr.State()
-    gr.Markdown(notice_markdown, elem_id="notice_markdown")
-    with gr.Group(elem_id="share-region-named"):
-        with gr.Row():
-            with gr.Column():
-                model_selector_left = gr.Dropdown(
-                    choices=model_list,
-                    value=model_list[0] if len(model_list) > 0 else "",
-                    interactive=True,
-                    show_label=False,
-                    container=False,
-                    )
-            with gr.Column():
-                model_selector_right = gr.Dropdown(
-                    choices=model_list,
-                    value=model_list[1] if len(model_list) > 1 else "",
-                    interactive=True,
-                    show_label=False,
-                    container=False,
-                    )
-        with gr.Accordion("🔍 Expand to see all Arena players", open=False):
-            model_description_md = get_model_description_md(model_list)
-            gr.Markdown(model_description_md, elem_id="model_description_markdown")
-        with gr.Row():
-            with gr.Column():
-                normal_left = gr.Image(width=512, label = "Model A", show_copy_button=True)
-                rgb_left = gr.Image(width=512, label = "Model A", show_copy_button=True)
-            with gr.Column():
-                normal_right = gr.Image(width=512, label = "Model B", show_copy_button=True,)
-                rgb_right = gr.Image(width=512, label = "Model B", show_copy_button=True,)
-        with gr.Row():
-            slow_warning = gr.Markdown("", elem_id="notice_markdown")
-        with gr.Row(elem_id="Geometry Quality"):
-            geo_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            geo_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            geo_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Texture Quality"):
-            text_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            text_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            text_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Alignment Quality"):
-            align_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            align_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            align_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-    with gr.Row():
-        textbox = gr.Textbox(
-            show_label=False,
-            placeholder="👉 Enter your prompt or Sample a random prompt, and press ENTER",
-            container=True,
-            elem_id="input_box",
-        )
-        sample_btn = gr.Button(value="🎲 Sample", variant="primary", scale=0)
-        send_btn = gr.Button(value="📤 Send", variant="primary", scale=0)
-    with gr.Row():
-        clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
-        regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
-        share_btn = gr.Button(value="📷  Share")
-    gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
-    geo_btn_list = [geo_leftvote_btn, geo_rightvote_btn, geo_tie_btn, geo_bothbad_btn]
-    text_btn_list = [text_leftvote_btn, text_rightvote_btn, text_tie_btn, text_bothbad_btn]
-    align_btn_list = [align_leftvote_btn, align_rightvote_btn, align_tie_btn, align_bothbad_btn]
-    states = [state_0, state_1]
-    model_selectors = [model_selector_left, model_selector_right]
-    results = [normal_left, rgb_left, normal_right, rgb_right]
-    model_selector_left.change(
-        clear_history_side_by_side,
-        None,
-        states + [textbox] + results,
-        api_name="model_selector_left"
-    )
-    model_selector_right.change(
-        clear_history_side_by_side,
-        None,
-        states + [textbox] + results,
-        api_name="model_selector_right"
-    )
-    for btn_list in [geo_btn_list, text_btn_list, align_btn_list]:
-        leftvote_btn, rightvote_btn, tie_btn, bothbad_btn = btn_list
-        leftvote_btn.click(
-            leftvote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-        rightvote_btn.click(
-            rightvote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-        tie_btn.click(
-            tievote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-        bothbad_btn.click(
-            bothbad_vote_last_response,
-            states + model_selectors,
-            [textbox] + btn_list + model_selectors
-        )
-    sample_btn.click(
-        sample_prompt,
-        states + model_selectors + [prompt_list],
-        states + [textbox],
-        api_name="sample_btn_named"
-    )
-    textbox.then(
-        gen_func,
-        states + [textbox] + model_selectors + [prompt_list],
-        states + results + model_selectors,
-        api_name="submit_btn_named"
-    ).then(
-        enable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    send_btn.click(
-        gen_func,
-        states + [textbox] + model_selectors + [prompt_list],
-        states + results + model_selectors,
-        api_name="send_btn_named"
-    ).then(
-        enable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    clear_btn.click(
-        clear_history_side_by_side_anony,
-        None,
-        states + [textbox] + results + model_selectors,
-        api_name="clear_btn_named"
-    ).then(
-        disable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    regenerate_btn.click(
-        gen_func,
-        states + [textbox] + model_selectors + [prompt_list],
-        states + results + model_selectors,
-        api_name="regenerate_btn_named"
-    ).then(
-        enable_buttons_side_by_side,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    share_btn.click(
-        share_click,
-        states + model_selectors,
-        [],
-        js=share_js
-    )

serve/gradio_web_t2i_single.py DELETED Viewed

@@ -1,159 +0,0 @@
-import json
-from functools import partial
-from .utils import *
-from .vote_utils import (
-    upvote_last_response_t2s as upvote_last_response,
-    downvote_last_response_t2s as downvote_last_response,
-    flag_last_response_t2s as flag_last_response,
-)
-from .inference import(
-    sample_prompt,
-    generate_t2s
-)
-from constants import TEXT_PROMPT_PATH
-with open(TEXT_PROMPT_PATH, 'r') as f:
-    prompt_list = json.load(f)
-def build_single_model_ui(models):
-    notice_markdown = """
-# 🏔️ Play with Image Generation Models
-{promotion}
-## 🤖 Choose any model to generate
-"""
-    model_list = models.get_t2s_models()
-    gen_func = partial(generate_t2s, models.inference_parallel, models.render_parallel)
-    gr.Markdown(notice_markdown, elem_id="notice_markdown")
-    with gr.Row(elem_id="model_selector_row"):
-        model_selector = gr.Dropdown(
-            choices=model_list,
-            value=model_list[0] if len(model_list) > 0 else "",
-            interactive=True,
-            show_label=False
-        )
-    with gr.Row():
-        with gr.Accordion("🔍 Expand to see all Arena players", open=False):
-            model_description_md = get_model_description_md(model_list)
-            gr.Markdown(model_description_md, elem_id="model_description_markdown")
-    with gr.Row():
-        textbox = gr.Textbox(
-            show_label=False,
-            placeholder="👉 Enter your prompt or Sample a random prompt, and press ENTER",
-            container=True,
-            elem_id="input_box",
-        )
-        sample_btn = gr.Button(value="🎲 Sample", variant="primary", scale=0)
-        send_btn = gr.Button(value="📤 Send", variant="primary", scale=0)
-    with gr.Row():
-        normal = gr.Image(width=512, label = "Normal", show_copy_button=True)
-        rgb = gr.Image(width=512, label = "RGB", show_copy_button=True,)
-    with gr.Row():
-        clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
-        regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
-    with gr.Row(elem_id="Geometry Quality"):
-        geo_upvote_btn = gr.Button(value="👍  Upvote", interactive=False)
-        geo_downvote_btn = gr.Button(value="👎  Downvote", interactive=False)
-        geo_flag_btn = gr.Button(value="⚠️  Flag", interactive=False)
-    with gr.Row(elem_id="Texture Quality"):
-        text_upvote_btn = gr.Button(value="👍  Upvote", interactive=False)
-        text_downvote_btn = gr.Button(value="👎  Downvote", interactive=False)
-        text_flag_btn = gr.Button(value="⚠️  Flag", interactive=False)
-    with gr.Row(elem_id="Alignment Quality"):
-        align_upvote_btn = gr.Button(value="👍  Upvote", interactive=False)
-        align_downvote_btn = gr.Button(value="👎  Downvote", interactive=False)
-        align_flag_btn = gr.Button(value="⚠️  Flag", interactive=False)
-    gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
-    state = gr.State()
-    geo_btn_list = [geo_upvote_btn, geo_downvote_btn, geo_flag_btn]
-    text_btn_list = [text_upvote_btn, text_downvote_btn, text_flag_btn]
-    align_btn_list = [align_upvote_btn, align_downvote_btn, align_flag_btn]
-    for btn_list in [geo_btn_list, text_btn_list, align_btn_list]:
-        upvote_btn, downvote_btn, flag_btn = btn_list
-        upvote_btn.click(
-            upvote_last_response,
-            [state, model_selector],
-            [textbox] + btn_list
-        )
-        downvote_btn.click(
-            downvote_last_response,
-            [state, model_selector],
-            [textbox] + btn_list
-        )
-        flag_btn.click(
-            flag_last_response,
-            [state, model_selector],
-            [textbox] + btn_list
-        )
-    sample_btn.click(
-        sample_prompt,
-         [state, model_selector, prompt_list],
-        state + [textbox],
-        api_name="sample_btn_single"
-    )
-    textbox.submit(
-        gen_func,
-        [state, textbox, model_selector, prompt_list],
-        [state, normal, rgb],
-        api_name="submit_btn_single",
-        show_progress = "full"
-    ).then(
-        enable_buttons,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    send_btn.click(
-        gen_func,
-        [state, textbox, model_selector, prompt_list],
-        [state, normal, rgb],
-        api_name="send_btn_single",
-        show_progress = "full"
-    ).then(
-        enable_buttons,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    clear_btn.click(
-        clear_history,
-        None,
-        [state, textbox, normal, rgb],
-        api_name="clear_history_single",
-        show_progress="full"
-    ).then(
-        disable_buttons,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )
-    regenerate_btn.click(
-        gen_func,
-        [state, textbox, model_selector, prompt_list],
-        [state, normal, rgb],
-        api_name="regenerate_btn_single",
-        show_progress = "full"
-    ).then(
-        enable_buttons,
-        None,
-        geo_btn_list + text_btn_list + align_btn_list + [regenerate_btn, clear_btn]
-    )

serve/gradio_web_t2s.py CHANGED Viewed

@@ -60,13 +60,80 @@ Find out who is the 🥇conditional image generation models! More models are goi
             with gr.Column():
                 textbox = gr.Textbox(
                     show_label=False,
-                    placeholder="👉 Enter your prompt or Sample a random prompt, and press ENTER",
                     container=True,
                     elem_id="input_box",
-                    lines = 10,
                     interactive=False,      ## only support offline
                 )
                 sample_btn = gr.Button(value="🎲 Sample", variant="primary")
             with gr.Column():
                 normal_left = gr.Image(width=512, label = "Normal A", show_download_button=True)
                 rgb_left = gr.Image(width=512, label = "RGB A", show_download_button=True)
@@ -76,7 +143,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
         with gr.Row():
             with gr.Column():
-                gr.Markdown("", visible=True)
             with gr.Column():
                 model_selector_left =gr.Markdown("", visible=False)
             with gr.Column():
@@ -84,70 +151,70 @@ Find out who is the 🥇conditional image generation models! More models are goi
         with gr.Row():
             slow_warning = gr.Markdown("", elem_id="notice_markdown")
-        with gr.Row(elem_id="Geometry Plausibility"):
-            plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
-            plausive_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            plausive_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            plausive_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry Quality"):
-            geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
-            geo_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            geo_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            geo_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Texture Quality"):
-            text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
-            text_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            text_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            text_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry-Texture Coherency"):
-            coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
-            coherence_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            coherence_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            coherence_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Semantic Alignment"):
-            align_md = gr.Markdown("Semantic Alignment: ", visible=False, elem_id="evaldim_markdown")
-            align_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            align_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            align_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
     # with gr.Row():
     #     textbox = gr.Textbox(
@@ -162,8 +229,8 @@ Find out who is the 🥇conditional image generation models! More models are goi
     with gr.Row():
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
-        share_btn = gr.Button(value="📷  Share")
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
         send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
@@ -209,12 +276,16 @@ Find out who is the 🥇conditional image generation models! More models are goi
         states + model_selectors,
         states + [textbox],
         api_name="sample_btn_anony"
     )
     textbox.submit(
         reset_states_side_by_side_anony,
         states,
-        states + model_selectors + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
@@ -233,7 +304,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     send_btn.click(
         reset_states_side_by_side_anony,
         states,
-        states + model_selectors + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
@@ -267,7 +338,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     regenerate_btn.click(
         reset_states_side_by_side_anony,
         states,
-        states + model_selectors + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
@@ -320,6 +391,8 @@ Find out who is the 🥇conditional image generation models! More models are goi
             gr.Markdown(model_description_md, elem_id="model_description_markdown")
         with gr.Row():
             with gr.Column():
                 model_selector_left = gr.Dropdown(
                     choices=model_list,
@@ -338,6 +411,83 @@ Find out who is the 🥇conditional image generation models! More models are goi
                     )
         with gr.Row():
             with gr.Column():
                 normal_left = gr.Image(width=512, label = "Normal A", show_download_button=True)
                 rgb_left = gr.Image(width=512, label = "RGB A", show_download_button=True)
@@ -348,86 +498,11 @@ Find out who is the 🥇conditional image generation models! More models are goi
         with gr.Row():
             slow_warning = gr.Markdown("", elem_id="notice_markdown")
-        with gr.Row(elem_id="Geometry Plausibility"):
-            plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
-            plausive_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            plausive_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            plausive_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry Quality"):
-            geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
-            geo_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            geo_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            geo_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Texture Quality"):
-            text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
-            text_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            text_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            text_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Geometry-Texture Coherency"):
-            coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
-            coherence_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            coherence_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            coherence_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-        with gr.Row(elem_id="Semantic Alignment"):
-            align_md = gr.Markdown("Semantic Alignment: ", visible=False, elem_id="evaldim_markdown")
-            align_leftvote_btn = gr.Button(
-                value="👈  A is better", visible=False, interactive=False
-            )
-            align_rightvote_btn = gr.Button(
-                value="👉  B is better", visible=False, interactive=False
-            )
-            align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
-            align_bothbad_btn = gr.Button(
-                value="👎  Both are bad", visible=False, interactive=False
-            )
-    with gr.Row():
-        textbox = gr.Textbox(
-            show_label=False,
-            placeholder="👉 Enter your prompt or Sample a random prompt, and press ENTER",
-            container=True,
-            elem_id="input_box",
-            interactive=False,   ## only support offline
-        )
-        sample_btn = gr.Button(value="🎲 Sample", variant="primary", scale=0)
-        send_btn = gr.Button(value="📤 Send", variant="primary", scale=0)
     with gr.Row():
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
         share_btn = gr.Button(value="📷  Share")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
@@ -502,12 +577,16 @@ Find out who is the 🥇conditional image generation models! More models are goi
         states + model_selectors,
         states + [textbox],
         api_name="sample_btn_named"
     )
     textbox.submit(
         reset_states_side_by_side,
         states,
-        states + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
@@ -526,7 +605,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     send_btn.click(
         reset_states_side_by_side,
         states,
-        states + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
@@ -560,7 +639,7 @@ Find out who is the 🥇conditional image generation models! More models are goi
     regenerate_btn.click(
         reset_states_side_by_side,
         states,
-        states + vote_btn_list + [regenerate_btn, clear_btn, geo_md, text_md, align_md]
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
@@ -610,6 +689,16 @@ def build_t2s_ui_single_model(models):
         )
     with gr.Row():
         normal = gr.Image(width=512, label = "Normal", show_download_button=True)
         rgb = gr.Image(width=512, label = "RGB", show_download_button=True,)
@@ -643,20 +732,10 @@ def build_t2s_ui_single_model(models):
         align_downvote_btn = gr.Button(value="👎  Downvote", interactive=False)
         align_flag_btn = gr.Button(value="⚠️  Flag", interactive=False)
-    with gr.Row():
-        textbox = gr.Textbox(
-            show_label=False,
-            placeholder="👉 Enter your prompt or Sample a random prompt, and press ENTER",
-            container=True,
-            elem_id="input_box",
-            interactive=False,   ## only support offline
-        )
-        sample_btn = gr.Button(value="🎲 Sample", variant="primary", scale=0)
-        send_btn = gr.Button(value="📤 Send", variant="primary", scale=0)
     with gr.Row():
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
@@ -706,12 +785,16 @@ def build_t2s_ui_single_model(models):
         [state, model_selector],
         [state, textbox],
         api_name="sample_btn_single"
     )
     textbox.submit(
         reset_state,
         state,
-        [state] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, textbox, model_selector],
@@ -727,7 +810,7 @@ def build_t2s_ui_single_model(models):
     send_btn.click(
         reset_state,
         state,
-        [state] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, textbox, model_selector],
@@ -755,7 +838,7 @@ def build_t2s_ui_single_model(models):
     regenerate_btn.click(
         reset_state,
         state,
-        [state] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, textbox, model_selector],

             with gr.Column():
                 textbox = gr.Textbox(
                     show_label=False,
+                    placeholder="👉 Enter your prompt or Sample a random prompt, and press 'Send'",
                     container=True,
                     elem_id="input_box",
+                    lines = 15,
                     interactive=False,      ## only support offline
                 )
+                plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Plausibility"):
+                    plausive_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    plausive_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    plausive_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Quality"):
+                    geo_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    geo_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    geo_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Texture Quality"):
+                    text_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    text_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    text_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry-Texture Coherency"):
+                    coherence_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    coherence_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    coherence_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                align_md = gr.Markdown("Semantic Alignment: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Semantic Alignment"):
+                    align_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    align_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    align_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                        )
                 sample_btn = gr.Button(value="🎲 Sample", variant="primary")
             with gr.Column():
                 normal_left = gr.Image(width=512, label = "Normal A", show_download_button=True)
                 rgb_left = gr.Image(width=512, label = "RGB A", show_download_button=True)
         with gr.Row():
             with gr.Column():
+                gr.Markdown("", visible=False)
             with gr.Column():
                 model_selector_left =gr.Markdown("", visible=False)
             with gr.Column():
         with gr.Row():
             slow_warning = gr.Markdown("", elem_id="notice_markdown")
+        # with gr.Row(elem_id="Geometry Plausibility"):
+        #     plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
+        #     plausive_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     plausive_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     plausive_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Geometry Quality"):
+        #     geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
+        #     geo_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     geo_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     geo_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Texture Quality"):
+        #     text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
+        #     text_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     text_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     text_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Geometry-Texture Coherency"):
+        #     coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
+        #     coherence_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     coherence_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     coherence_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+        #     )
+        # with gr.Row(elem_id="Semantic Alignment"):
+        #     align_md = gr.Markdown("Semantic Alignment: ", visible=False, elem_id="evaldim_markdown")
+        #     align_leftvote_btn = gr.Button(
+        #         value="👈  A is better", visible=False, interactive=False
+        #     )
+        #     align_rightvote_btn = gr.Button(
+        #         value="👉  B is better", visible=False, interactive=False
+        #     )
+        #     align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+        #     align_bothbad_btn = gr.Button(
+        #         value="👎  Both are bad", visible=False, interactive=False
+            # )
     # with gr.Row():
     #     textbox = gr.Textbox(
     with gr.Row():
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
+        share_btn = gr.Button(value="📷  Share")
         send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
         states + model_selectors,
         states + [textbox],
         api_name="sample_btn_anony"
+    ).then(
+        reset_states_side_by_side_anony,
+        states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     )
     textbox.submit(
         reset_states_side_by_side_anony,
         states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
     send_btn.click(
         reset_states_side_by_side_anony,
         states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
     regenerate_btn.click(
         reset_states_side_by_side_anony,
         states,
+        states + model_selectors + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
             gr.Markdown(model_description_md, elem_id="model_description_markdown")
         with gr.Row():
+            with gr.Column():
+                gr.Markdown("Select Players:", elem_id="evaldim_markdown")
             with gr.Column():
                 model_selector_left = gr.Dropdown(
                     choices=model_list,
                     )
         with gr.Row():
+            with gr.Column():
+                textbox = gr.Textbox(
+                    show_label=False,
+                    placeholder="👉 Enter your prompt or Sample a random prompt, and press 'Send'",
+                    container=True,
+                    elem_id="input_box",
+                    lines=15,
+                    interactive=False,   ## only support offline
+                )
+                plausive_md = gr.Markdown("Geometry Plausibility: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Plausibility"):
+                    plausive_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    plausive_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    plausive_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    plausive_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                geo_md = gr.Markdown("Geometry Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry Quality"):
+                    geo_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    geo_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    geo_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    geo_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                text_md = gr.Markdown("Texture Quality: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Texture Quality"):
+                    text_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    text_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    text_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    text_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                coherence_md = gr.Markdown("Geometry-Texture Coherency: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Geometry-Texture Coherency"):
+                    coherence_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    coherence_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    coherence_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    coherence_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                align_md = gr.Markdown("Semantic Alignment: ", visible=False, elem_id="evaldim_markdown")
+                with gr.Row(elem_id="Semantic Alignment"):
+                    align_leftvote_btn = gr.Button(
+                        value="👈  A is better", visible=False, interactive=False
+                    )
+                    align_rightvote_btn = gr.Button(
+                        value="👉  B is better", visible=False, interactive=False
+                    )
+                    align_tie_btn = gr.Button(value="🤝  Tie", visible=False, interactive=False)
+                    align_bothbad_btn = gr.Button(
+                        value="👎  Both are bad", visible=False, interactive=False
+                    )
+                sample_btn = gr.Button(value="🎲 Sample", variant="primary")
             with gr.Column():
                 normal_left = gr.Image(width=512, label = "Normal A", show_download_button=True)
                 rgb_left = gr.Image(width=512, label = "RGB A", show_download_button=True)
         with gr.Row():
             slow_warning = gr.Markdown("", elem_id="notice_markdown")
     with gr.Row():
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
         share_btn = gr.Button(value="📷  Share")
+        send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
         states + model_selectors,
         states + [textbox],
         api_name="sample_btn_named"
+    ).then(
+        reset_states_side_by_side,
+        states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     )
     textbox.submit(
         reset_states_side_by_side,
         states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
     send_btn.click(
         reset_states_side_by_side,
         states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
     regenerate_btn.click(
         reset_states_side_by_side,
         states,
+        states + results + vote_btn_list + [regenerate_btn, clear_btn] + dim_md_list
     ).then(
         gen_func,
         states + [textbox] + model_selectors,
         )
     with gr.Row():
+        with gr.Column():
+            textbox = gr.Textbox(
+                show_label=False,
+                placeholder="👉 Enter your prompt or Sample a random prompt, and press 'Send'",
+                container=True,
+                elem_id="input_box",
+                lines=15,
+                interactive=False,   ## only support offline
+            )
+            sample_btn = gr.Button(value="🎲 Sample", variant="primary")
         normal = gr.Image(width=512, label = "Normal", show_download_button=True)
         rgb = gr.Image(width=512, label = "RGB", show_download_button=True,)
         align_downvote_btn = gr.Button(value="👎  Downvote", interactive=False)
         align_flag_btn = gr.Button(value="⚠️  Flag", interactive=False)
     with gr.Row():
         clear_btn = gr.Button(value="🗑️ Clear", interactive=False)
         regenerate_btn = gr.Button(value="🔄  Regenerate", interactive=False)
+        send_btn = gr.Button(value="📤 Send", variant="primary")
     gr.Markdown(acknowledgment_md, elem_id="ack_markdown")
         [state, model_selector],
         [state, textbox],
         api_name="sample_btn_single"
+    ).then(
+        reset_state,
+        state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     )
     textbox.submit(
         reset_state,
         state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, textbox, model_selector],
     send_btn.click(
         reset_state,
         state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, textbox, model_selector],
     regenerate_btn.click(
         reset_state,
         state,
+        [state, normal, rgb] + vote_btn_list + [regenerate_btn, clear_btn]
     ).then(
         gen_func,
         [state, textbox, model_selector],

serve/inference.py CHANGED Viewed

@@ -4,20 +4,12 @@ import time
 from .utils import *
 from .vote_utils import t2s_logger, t2s_multi_logger, i2s_logger, i2s_multi_logger
-from constants import IMAGE_DIR, OFFLINE_DIR, TEXT_PROMPT_PATH, IMAGE_PROMPT_PATH
 with open(TEXT_PROMPT_PATH, 'r') as f:
     prompt_list = json.load(f)
-with open(IMAGE_PROMPT_PATH, 'r') as f:
-    lines = f.readlines()
-image_list = {}
-for line in lines:
-    idx = line.split('.png')[0].split('_')[-1]
-    url = line.split(')')[0].split('(')[-1]
-    image_list[eval(idx)] = url
 class State:
     def __init__(self,
@@ -99,7 +91,7 @@ def sample_prompt(state, model_name):
     if state is None:
         state = State(model_name)
-    idx = random.randint(0, len(prompt_list)-1)
     prompt = prompt_list[idx]
     state.model_name = model_name
@@ -115,7 +107,7 @@ def sample_prompt_side_by_side(state_0, state_1, model_name_0, model_name_1):
     if state_1 is None:
         state_1 = State(model_name_1)
-    idx = random.randint(0, len(prompt_list)-1)
     prompt = prompt_list[idx]
     state_0.i2s_mode, state_1.i2s_mode = False, False
@@ -128,8 +120,8 @@ def sample_image(state, model_name):
     if state is None:
         state = State(model_name)
-    idx = random.sample(image_list.keys(), 1)[0]
-    img_url = image_list[idx]
     state.model_name = model_name
     state.image = img_url
@@ -144,9 +136,8 @@ def sample_image_side_by_side(state_0, state_1, model_name_0, model_name_1):
     if state_1 is None:
         state_1 = State(model_name_1)
-    idx = random.sample(image_list.keys(), 1)[0]
-    img_url = image_list[idx]
     state_0.i2s_mode, state_1.i2s_mode = True, True
     state_0.offline, state_1.offline = True, True
@@ -495,7 +486,7 @@ def generate_i2s(gen_func, render_func, state, image, model_name, request: gr.Re
         state = State(model_name, i2s_mode=True, offline=False)
     ip = get_ip(request)
-    t2s_logger.info(f"generate. ip: {ip}")
     state.model_name = model_name
     state.image = image
@@ -584,7 +575,7 @@ def generate_i2s_multi(gen_func, render_func,
         state_1 = State(model_name_1, i2s_mode=True, offline=False)
     ip = get_ip(request)
-    t2s_multi_logger.info(f"generate. ip: {ip}")
     state_0.model_name, state_1.model_name = model_name_0, model_name_1
     state_0.image, state_1.image = image, image
@@ -698,7 +689,7 @@ def generate_i2s_multi_annoy(gen_func, render_func,
         state_1 = State(model_name_1, i2s_mode=True, offline=False)
     ip = get_ip(request)
-    t2s_multi_logger.info(f"generate. ip: {ip}")
     state_0.model_name, state_1.model_name = model_name_0, model_name_1
     state_0.image, state_1.image = image, image

 from .utils import *
 from .vote_utils import t2s_logger, t2s_multi_logger, i2s_logger, i2s_multi_logger
+from constants import IMAGE_DIR, LOG_SERVER, TEXT_PROMPT_PATH, PROMPT_NUM
 with open(TEXT_PROMPT_PATH, 'r') as f:
     prompt_list = json.load(f)
+assert len(prompt_list) == PROMPT_NUM, f"Load {len(prompt_list)} text prompts, but expected {PROMPT_NUM}."
 class State:
     def __init__(self,
     if state is None:
         state = State(model_name)
+    idx = random.randint(0, PROMPT_NUM-1)
     prompt = prompt_list[idx]
     state.model_name = model_name
     if state_1 is None:
         state_1 = State(model_name_1)
+    idx = random.randint(0, PROMPT_NUM-1)
     prompt = prompt_list[idx]
     state_0.i2s_mode, state_1.i2s_mode = False, False
     if state is None:
         state = State(model_name)
+    idx = random.randint(0, PROMPT_NUM-1)
+    img_url = f"{LOG_SERVER}/get_rgba_{idx}"
     state.model_name = model_name
     state.image = img_url
     if state_1 is None:
         state_1 = State(model_name_1)
+    idx = random.randint(0, PROMPT_NUM-1)
+    img_url = f"{LOG_SERVER}/get_rgba_{idx}"
     state_0.i2s_mode, state_1.i2s_mode = True, True
     state_0.offline, state_1.offline = True, True
         state = State(model_name, i2s_mode=True, offline=False)
     ip = get_ip(request)
+    i2s_logger.info(f"generate. ip: {ip}")
     state.model_name = model_name
     state.image = image
         state_1 = State(model_name_1, i2s_mode=True, offline=False)
     ip = get_ip(request)
+    i2s_multi_logger.info(f"generate. ip: {ip}")
     state_0.model_name, state_1.model_name = model_name_0, model_name_1
     state_0.image, state_1.image = image, image
         state_1 = State(model_name_1, i2s_mode=True, offline=False)
     ip = get_ip(request)
+    i2s_multi_logger.info(f"generate. ip: {ip}")
     state_0.model_name, state_1.model_name = model_name_0, model_name_1
     state_0.image, state_1.image = image, image

serve/log_server.py CHANGED Viewed

@@ -63,7 +63,6 @@ async def save_log(message: str = Form(...), log_path: str = Form(...)):
     logger.info(f"Romote log message saved to {log_path}")
     return {"message": f"Log message saved successfully to {log_path}"}
 app.include_router(router)
 if __name__ == "__main__":

     logger.info(f"Romote log message saved to {log_path}")
     return {"message": f"Log message saved successfully to {log_path}"}
 app.include_router(router)
 if __name__ == "__main__":

serve/utils.py CHANGED Viewed

@@ -78,6 +78,8 @@ block_css = """
     background-color: white;
 }
 #input_box textarea {
 }
 footer {
     display:none !important
@@ -118,13 +120,14 @@ def disable_buttons():
 def reset_state(state):
     state.normal_video, state.rgb_video = None, None
     state.evaluted_dims = 0
-    return (state,) + tuple(gr.update(interactive=False) for _ in range(EVALUATE_DIMS*3 + 2))
 def reset_states_side_by_side(state_0, state_1):
     state_0.normal_video, state_0.rgb_video = None, None
     state_1.normal_video, state_1.rgb_video = None, None
     state_0.evaluted_dims, state_1.evaluted_dims = 0, 0
     return (state_0, state_1) \
         + tuple(gr.update(visible=(i>=EVALUATE_DIMS*4), interactive=False) for i in range(EVALUATE_DIMS*4 + 2)) \
         + tuple(gr.update(visible=False) for _ in range(EVALUATE_DIMS))
@@ -135,6 +138,7 @@ def reset_states_side_by_side_anony(state_0, state_1):
     state_0.evaluted_dims, state_1.evaluted_dims = 0, 0
     return (state_0, state_1) \
         + (gr.Markdown("", visible=False), gr.Markdown("", visible=False))\
         + tuple(gr.update(visible=(i>=EVALUATE_DIMS*4), interactive=False) for i in range(EVALUATE_DIMS*4 + 2)) \
         + tuple(gr.update(visible=False) for _ in range(EVALUATE_DIMS))

     background-color: white;
 }
 #input_box textarea {
+    font-weight: bold;
+    font-size: 125%;
 }
 footer {
     display:none !important
 def reset_state(state):
     state.normal_video, state.rgb_video = None, None
     state.evaluted_dims = 0
+    return (state, None, None) + tuple(gr.update(interactive=False) for _ in range(EVALUATE_DIMS*3 + 2))
 def reset_states_side_by_side(state_0, state_1):
     state_0.normal_video, state_0.rgb_video = None, None
     state_1.normal_video, state_1.rgb_video = None, None
     state_0.evaluted_dims, state_1.evaluted_dims = 0, 0
     return (state_0, state_1) \
+        + (None,) * 4\
         + tuple(gr.update(visible=(i>=EVALUATE_DIMS*4), interactive=False) for i in range(EVALUATE_DIMS*4 + 2)) \
         + tuple(gr.update(visible=False) for _ in range(EVALUATE_DIMS))
     state_0.evaluted_dims, state_1.evaluted_dims = 0, 0
     return (state_0, state_1) \
         + (gr.Markdown("", visible=False), gr.Markdown("", visible=False))\
+        + (None,) * 4 \
         + tuple(gr.update(visible=(i>=EVALUATE_DIMS*4), interactive=False) for i in range(EVALUATE_DIMS*4 + 2)) \
         + tuple(gr.update(visible=False) for _ in range(EVALUATE_DIMS))