fix bugs that operations in a single session having the same conv_id, which causes the saved data overlapped

serve/vote_utils.py

@@ -503,8 +503,7 @@ def generate_ig(gen_func, state, text, model_name, request: gr.Request):
         raise gr.Warning("Prompt cannot be empty.")
     if not model_name:
         raise gr.Warning("Model name cannot be empty.")
-    if state is None:
-        state = ImageStateIG(model_name)
+    state = ImageStateIG(model_name)
     ip = get_ip(request)
     ig_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -541,8 +540,7 @@ def generate_ig(gen_func, state, text, model_name, request: gr.Request):
 def generate_ig_museum(gen_func, state, model_name, request: gr.Request):
     if not model_name:
         raise gr.Warning("Model name cannot be empty.")
-    if state is None:
-        state = ImageStateIG(model_name)
+    state = ImageStateIG(model_name)
     ip = get_ip(request)
     ig_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -583,10 +581,8 @@ def generate_igm(gen_func, state0, state1, text, model_name0, model_name1, reque
         raise gr.Warning("Model name A cannot be empty.")
     if not model_name1:
         raise gr.Warning("Model name B cannot be empty.")
-    if state0 is None:
-        state0 = ImageStateIG(model_name0)
-    if state1 is None:
-        state1 = ImageStateIG(model_name1)
+    state0 = ImageStateIG(model_name0)
+    state1 = ImageStateIG(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -644,10 +640,8 @@ def generate_igm_museum(gen_func, state0, state1, model_name0, model_name1, requ
         raise gr.Warning("Model name A cannot be empty.")
     if not model_name1:
         raise gr.Warning("Model name B cannot be empty.")
-    if state0 is None:
-        state0 = ImageStateIG(model_name0)
-    if state1 is None:
-        state1 = ImageStateIG(model_name1)
+    state0 = ImageStateIG(model_name0)
+    state1 = ImageStateIG(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -704,10 +698,8 @@ def generate_igm_museum(gen_func, state0, state1, model_name0, model_name1, requ
 def generate_igm_annoy(gen_func, state0, state1, text, model_name0, model_name1, request: gr.Request):
     if not text:
         raise gr.Warning("Prompt cannot be empty.")
-    if state0 is None:
-        state0 = ImageStateIG(model_name0)
-    if state1 is None:
-        state1 = ImageStateIG(model_name1)
+    state0 = ImageStateIG(model_name0)
+    state1 = ImageStateIG(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -761,10 +753,8 @@ def generate_igm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
         save_image_file_on_log_server(output_file)
             
 def generate_igm_annoy_museum(gen_func, state0, state1, model_name0, model_name1, request: gr.Request):
-    if state0 is None:
-        state0 = ImageStateIG(model_name0)
-    if state1 is None:
-        state1 = ImageStateIG(model_name1)
+    state0 = ImageStateIG(model_name0)
+    state1 = ImageStateIG(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -828,8 +818,7 @@ def generate_ie(gen_func, state, source_text, target_text, instruct_text, source
         raise gr.Warning("Source image cannot be empty.")
     if not model_name:
         raise gr.Warning("Model name cannot be empty.")
-    if state is None:
-        state = ImageStateIE(model_name)
+    state = ImageStateIE(model_name)
     ip = get_ip(request)
     ig_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -873,8 +862,7 @@ def generate_ie(gen_func, state, source_text, target_text, instruct_text, source
 def generate_ie_museum(gen_func, state, model_name, request: gr.Request):
     if not model_name:
         raise gr.Warning("Model name cannot be empty.")
-    if state is None:
-        state = ImageStateIE(model_name)
+    state = ImageStateIE(model_name)
     ip = get_ip(request)
     ig_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -929,10 +917,8 @@ def generate_iem(gen_func, state0, state1, source_text, target_text, instruct_te
         raise gr.Warning("Model name A cannot be empty.")
     if not model_name1:
         raise gr.Warning("Model name B cannot be empty.")
-    if state0 is None:
-        state0 = ImageStateIE(model_name0)
-    if state1 is None:
-        state1 = ImageStateIE(model_name1)
+    state0 = ImageStateIE(model_name0)
+    state1 = ImageStateIE(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -999,10 +985,8 @@ def generate_iem_museum(gen_func, state0, state1, model_name0, model_name1, requ
         raise gr.Warning("Model name A cannot be empty.")
     if not model_name1:
         raise gr.Warning("Model name B cannot be empty.")
-    if state0 is None:
-        state0 = ImageStateIE(model_name0)
-    if state1 is None:
-        state1 = ImageStateIE(model_name1)
+    state0 = ImageStateIE(model_name0)
+    state1 = ImageStateIE(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1074,10 +1058,8 @@ def generate_iem_annoy(gen_func, state0, state1, source_text, target_text, instr
         raise gr.Warning("Instruction prompt cannot be empty.")
     if not source_image:
         raise gr.Warning("Source image cannot be empty.")
-    if state0 is None:
-        state0 = ImageStateIE(model_name0)
-    if state1 is None:
-        state1 = ImageStateIE(model_name1)
+    state0 = ImageStateIE(model_name0)
+    state1 = ImageStateIE(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1141,10 +1123,8 @@ def generate_iem_annoy(gen_func, state0, state1, source_text, target_text, instr
         save_image_file_on_log_server(output_file)
 
 def generate_iem_annoy_museum(gen_func, state0, state1, model_name0, model_name1, request: gr.Request):
-    if state0 is None:
-        state0 = ImageStateIE(model_name0)
-    if state1 is None:
-        state1 = ImageStateIE(model_name1)
+    state0 = ImageStateIE(model_name0)
+    state1 = ImageStateIE(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1212,8 +1192,7 @@ def generate_vg(gen_func, state, text, model_name, request: gr.Request):
         raise gr.Warning("Prompt cannot be empty.")
     if not model_name:
         raise gr.Warning("Model name cannot be empty.")
-    if state is None:
-        state = VideoStateVG(model_name)
+    state = VideoStateVG(model_name)
     ip = get_ip(request)
     vg_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1255,8 +1234,7 @@ def generate_vg(gen_func, state, text, model_name, request: gr.Request):
     yield state, output_file
 
 def generate_vg_museum(gen_func, state, model_name, request: gr.Request):
-    if state is None:
-        state = VideoStateVG(model_name)
+    state = VideoStateVG(model_name)
     ip = get_ip(request)
     vg_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1301,10 +1279,8 @@ def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, reque
         raise gr.Warning("Model name A cannot be empty.")
     if not model_name1:
         raise gr.Warning("Model name B cannot be empty.")
-    if state0 is None:
-        state0 = VideoStateVG(model_name0)
-    if state1 is None:
-        state1 = VideoStateVG(model_name1)
+    state0 = VideoStateVG(model_name0)
+    state1 = VideoStateVG(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1372,10 +1348,8 @@ def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, reque
     yield state0, state1, f'{VIDEO_DIR}/generation/{state0.conv_id}.mp4', f'{VIDEO_DIR}/generation/{state1.conv_id}.mp4'
 
 def generate_vgm_museum(gen_func, state0, state1, model_name0, model_name1, request: gr.Request):
-    if state0 is None:
-        state0 = VideoStateVG(model_name0)
-    if state1 is None:
-        state1 = VideoStateVG(model_name1)
+    state0 = VideoStateVG(model_name0)
+    state1 = VideoStateVG(model_name1)
     ip = get_ip(request)
     igm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1441,10 +1415,8 @@ def generate_vgm_museum(gen_func, state0, state1, model_name0, model_name1, requ
 def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1, request: gr.Request):
     if not text:
         raise gr.Warning("Prompt cannot be empty.")
-    if state0 is None:
-        state0 = VideoStateVG(model_name0)
-    if state1 is None:
-        state1 = VideoStateVG(model_name1)
+    state0 = VideoStateVG(model_name0)
+    state1 = VideoStateVG(model_name1)
     ip = get_ip(request)
     vgm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()
@@ -1507,10 +1479,8 @@ def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
         gr.Markdown(f"### Model A: {model_name0}", visible=False), gr.Markdown(f"### Model B: {model_name1}", visible=False)
 
 def generate_vgm_annoy_museum(gen_func, state0, state1, model_name0, model_name1, request: gr.Request):
-    if state0 is None:
-        state0 = VideoStateVG(model_name0)
-    if state1 is None:
-        state1 = VideoStateVG(model_name1)
+    state0 = VideoStateVG(model_name0)
+    state1 = VideoStateVG(model_name1)
     ip = get_ip(request)
     vgm_logger.info(f"generate. ip: {ip}")
     start_tstamp = time.time()