update serve

constants.py

@@ -18,6 +18,9 @@ APPEND_JSON = "append_json"
 SAVE_IMAGE = "save_image"
 SAVE_LOG = "save_log"
 
+GIF_SERVER =  os.getenv("GIF_SERVER", f"{LOG_SERVER}/get_gif")
+RGBA_SERVER = os.getenv("RGBA_SERVER", f"{LOG_SERVER}/get_rgba")
+
 NUM_SIDES = 2
 EVALUATE_DIMS = 5
 PROMPT_NUM = 510

model/model_worker.py

@@ -9,7 +9,7 @@ import subprocess
 import requests
 from gradio_client import Client
 # from .client import Gau2Mesh_client
-from constants import REPLICATE_API_TOKEN, LOG_SERVER
+from constants import REPLICATE_API_TOKEN, LOG_SERVER, GIF_SERVER
 # os.environ("REPLICATE_API_TOKEN", "yourKey")
 
 class BaseModelWorker:
@@ -43,10 +43,10 @@ class BaseModelWorker:
         # 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}"
+        rgb_name = f"{galley}_{self.model_name}_{offline_idx}_rgb.gif"
+        normal_name = f"{galley}_{self.model_name}_{offline_idx}_normal.gif"
+        rgb_url = f"{GIF_SERVER}/{rgb_name}"
+        normal_url = f"{GIF_SERVER}/{normal_name}"
         return {'rgb': rgb_url, 'normal': normal_url}
 
     def inference(self, prompt):

serve/gradio_web_t2s.py

@@ -80,8 +80,8 @@ Find out who is the 🥇conditional image generation models! More models are goi
                         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_md = gr.Markdown("Geometry Details: ", 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
                     )
@@ -164,8 +164,8 @@ Find out who is the 🥇conditional image generation models! More models are goi
         #         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")
+        # with gr.Row(elem_id="Geometry Details"):
+        #     geo_md = gr.Markdown("Geometry Details: ", visible=False, elem_id="evaldim_markdown")
         #     geo_leftvote_btn = gr.Button(
         #         value="👈  A is better", visible=False, interactive=False
         #     )
@@ -434,8 +434,8 @@ Find out who is the 🥇conditional image generation models! More models are goi
                         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_md = gr.Markdown("Geometry Details: ", 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
                     )
@@ -708,8 +708,8 @@ def build_t2s_ui_single_model(models):
         plausive_downvote_btn = gr.Button(value="👎  Downvote", interactive=False)
         plausive_flag_btn = gr.Button(value="⚠️  Flag", interactive=False)
         
-    with gr.Row(elem_id="Geometry Quality"):
-        geo_md = gr.Markdown("Geometry Quality: ", elem_id="evaldim_markdown")
+    with gr.Row(elem_id="Geometry Details"):
+        geo_md = gr.Markdown("Geometry Details: ", elem_id="evaldim_markdown")
         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)

serve/inference.py

@@ -4,7 +4,7 @@ import time
 
 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
+from constants import RGBA_SERVER, LOG_SERVER, TEXT_PROMPT_PATH, PROMPT_NUM
 
 with open(TEXT_PROMPT_PATH, 'r') as f:
     prompt_list = json.load(f)
@@ -121,7 +121,7 @@ def sample_image(state, model_name):
         state = State(model_name)
 
     idx = random.randint(0, PROMPT_NUM-1)
-    img_url = f"{LOG_SERVER}/get_rgba_{idx}"
+    img_url = f"{RGBA_SERVER}/{idx}.png"
 
     state.model_name = model_name
     state.image = img_url
@@ -137,7 +137,7 @@ def sample_image_side_by_side(state_0, state_1, model_name_0, model_name_1):
         state_1 = State(model_name_1)
 
     idx = random.randint(0, PROMPT_NUM-1)
-    img_url = f"{LOG_SERVER}/get_rgba_{idx}"
+    img_url = f"{RGBA_SERVER}/{idx}.png"
 
     state_0.i2s_mode, state_1.i2s_mode = True, True
     state_0.offline, state_1.offline = True, True