update serve

serve/gradio_web_i2s.py

@@ -437,12 +437,29 @@ Find out who is the 🥇conditional image generation models! More models are goi
         None, 
         states + [imagebox] + results, 
         api_name="model_selector_left"
+    ).then(
+        disable_mds,
+        None,
+        dim_md_list
+    ).then(
+        disable_buttons_side_by_side,
+        None,
+        vote_btn_list + [regenerate_btn, clear_btn]
     )
+
     model_selector_right.change(
         clear_i2s_history_side_by_side, 
         None, 
         states + [imagebox] + results, 
         api_name="model_selector_right"
+    ).then(
+        disable_mds,
+        None,
+        dim_md_list
+    ).then(
+        disable_buttons_side_by_side,
+        None,
+        vote_btn_list + [regenerate_btn, clear_btn]
     )
 
     for  dim_md, btn_list in zip(dim_md_list, [geo_btn_list, text_btn_list, align_btn_list, plausive_btn_list, coherence_btn_list]):
@@ -662,6 +679,18 @@ def build_i2s_ui_single_model(models):
             [state] + btn_list
         )
 
+    model_selector.change(
+        clear_i2s_history, 
+        None, 
+        [state, imagebox, normal, rgb], 
+        api_name="clear_history_single",
+        show_progress="full"
+    ).then(
+        disable_buttons, 
+        None,  
+        vote_btn_list + [regenerate_btn, clear_btn]
+    )
+
     sample_btn.click(
         sample_image,
         [state, model_selector],

serve/gradio_web_t2s.py

@@ -435,12 +435,29 @@ Find out who is the 🥇conditional image generation models! More models are goi
         None, 
         states + [textbox] + results, 
         api_name="model_selector_left"
+    ).then(
+        disable_mds,
+        None,
+        dim_md_list
+    ).then(
+        disable_buttons_side_by_side,
+        None,
+        vote_btn_list + [regenerate_btn, clear_btn]
     )
+
     model_selector_right.change(
         clear_t2s_history_side_by_side, 
         None, 
         states + [textbox] + results, 
         api_name="model_selector_right"
+    ).then(
+        disable_mds,
+        None,
+        dim_md_list
+    ).then(
+        disable_buttons_side_by_side,
+        None,
+        vote_btn_list + [regenerate_btn, clear_btn]
     )
 
     for dim_md, btn_list in zip(dim_md_list, [geo_btn_list, text_btn_list, align_btn_list, plausive_btn_list, coherence_btn_list]):
@@ -659,6 +676,18 @@ def build_t2s_ui_single_model(models):
             [state] + btn_list
         )
 
+    model_selector.change(
+        clear_t2s_history, 
+        None, 
+        [state, textbox, normal, rgb], 
+        api_name="clear_history_single",
+        show_progress="full"
+    ).then(
+        disable_buttons, 
+        None,  
+        vote_btn_list + [regenerate_btn, clear_btn]
+    )
+
     sample_btn.click(
         sample_prompt,
         [state, model_selector],

serve/inference.py

@@ -104,6 +104,7 @@ def sample_prompt(state, model_name):
 
     state.model_name = model_name
     state.prompt = prompt
+    state.i2s_mode = False
     state.offline = True, 
     state.offline_idx = idx
     return state, prompt
@@ -117,6 +118,7 @@ def sample_prompt_side_by_side(state_0, state_1, model_name_0, 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
     state_0.offline, state_1.offline = True, True
     state_0.offline_idx, state_1.offline_idx = idx, idx
     state_0.prompt, state_1.prompt = prompt, prompt
@@ -131,6 +133,7 @@ def sample_image(state, model_name):
 
     state.model_name = model_name
     state.image = img_url
+    state.i2s_mode = True
     state.offline = True, 
     state.offline_idx = idx
     return state, img_url
@@ -145,6 +148,7 @@ def sample_image_side_by_side(state_0, state_1, model_name_0, 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
     state_0.offline_idx, state_1.offline_idx = idx, idx
     state_0.image, state_1.image = img_url, img_url
@@ -192,13 +196,13 @@ def generate_t2s(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name,
             "type": "offline",
             "gen_params": {},
             "state": state.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
     else:
         start_time = time.time()
@@ -217,7 +221,6 @@ def generate_t2s(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name,
             "type": "online",
             "gen_params": {},
@@ -227,6 +230,7 @@ def generate_t2s(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
 
     with open(get_conv_log_filename(), "a") as fout:
@@ -287,23 +291,23 @@ def generate_t2s_multi(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "offline",
             "gen_params": {},
             "state": state_0.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "offline",
             "gen_params": {},
             "state": state_1.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
     else:
         start_time = time.time()
@@ -322,7 +326,6 @@ def generate_t2s_multi(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "online",
             "gen_params": {},
@@ -332,10 +335,10 @@ def generate_t2s_multi(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "online",
             "gen_params": {},
@@ -345,6 +348,7 @@ def generate_t2s_multi(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
     
     with open(get_conv_log_filename(), "a") as fout:
@@ -406,23 +410,23 @@ def generate_t2s_multi_annoy(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "offline",
             "gen_params": {},
             "state": state_0.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "offline",
             "gen_params": {},
             "state": state_1.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
     else:
         start_time = time.time()
@@ -443,7 +447,6 @@ def generate_t2s_multi_annoy(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "online",
             "gen_params": {},
@@ -453,10 +456,10 @@ def generate_t2s_multi_annoy(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "online",
             "gen_params": {},
@@ -466,6 +469,7 @@ def generate_t2s_multi_annoy(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
     
     with open(get_conv_log_filename(), "a") as fout:
@@ -511,13 +515,13 @@ def generate_i2s(gen_func, render_func, state, image, model_name, request: gr.Re
         # logger.info(f"===output===: {output}")
         data = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name,
             "type": "offline",
             "gen_params": {},
             "state": state.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
     else:
         start_time = time.time()
@@ -536,7 +540,6 @@ def generate_i2s(gen_func, render_func, state, image, model_name, request: gr.Re
         # logger.info(f"===output===: {output}")
         data = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name,
             "type": "online",
             "gen_params": {},
@@ -546,6 +549,7 @@ def generate_i2s(gen_func, render_func, state, image, model_name, request: gr.Re
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
 
     with open(get_conv_log_filename(), "a") as fout:
@@ -603,23 +607,23 @@ def generate_i2s_multi(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "offline",
             "gen_params": {},
             "state": state_0.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "offline",
             "gen_params": {},
             "state": state_1.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
     else:
         start_time = time.time()
@@ -638,7 +642,6 @@ def generate_i2s_multi(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "online",
             "gen_params": {},
@@ -648,10 +651,10 @@ def generate_i2s_multi(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "online",
             "gen_params": {},
@@ -661,6 +664,7 @@ def generate_i2s_multi(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
     
     with open(get_conv_log_filename(), "a") as fout:
@@ -718,23 +722,23 @@ def generate_i2s_multi_annoy(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "offline",
             "gen_params": {},
             "state": state_0.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "offline",
             "gen_params": {},
             "state": state_1.dict(),
             "start": round(start_time, 4),
             "finish": round(finish_tstamp, 4),
+            "ip": get_ip(request),
         }
     else:
         start_time = time.time()
@@ -754,7 +758,6 @@ def generate_i2s_multi_annoy(gen_func, render_func,
         # logger.info(f"===output===: {output}")
         data_0 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_0,
             "type": "online",
             "gen_params": {},
@@ -764,10 +767,10 @@ def generate_i2s_multi_annoy(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
         data_1 = {
             "tstamp": round(finish_tstamp, 4),
-            "ip": get_ip(request),
             "model": model_name_1,
             "type": "online",
             "gen_params": {},
@@ -777,6 +780,7 @@ def generate_i2s_multi_annoy(gen_func, render_func,
             "time": round(finish_time - start_time, 4),
             "generate_time": round(generate_time, 4),
             "render_time": round(render_time, 4),
+            "ip": get_ip(request),
         }
     
     with open(get_conv_log_filename(), "a") as fout: