Update app.py

app.py

@@ -15,8 +15,7 @@ dashscope.api_key = DASHSCOPE_API_KEY
 KEEP_SUCCESS_TASK = 3600 * 10
 KEEP_RUNING_TASK = 3600 * 1
 # the total running task number in 1800 seconds
-LIMIT_RUNING_TASK = 2
-LIMIT_HISTORY_RUNING_TASK = 4
+LIMIT_RUNING_TASK = 4
 
 task_status = {}
 
@@ -33,7 +32,7 @@ def get_submit_code():
     submit_code = random.randint(0, 2147483647)
     #
     for sub_c, sub_info in copy.deepcopy(total_task_info["latest_1h_submit_status"]).items():
-        if time.time() - sub_info > 3600:
+        if time.time() - sub_info["time"] > 3600:
             total_task_info["latest_1h_submit_status"].pop(sub_c)
     return submit_code
 def t2v_generation(prompt, resolution, watermark_wan, seed=-1):
@@ -41,7 +40,7 @@ def t2v_generation(prompt, resolution, watermark_wan, seed=-1):
     total_task_info["latest_1h_submit_status"][get_submit_code()] = time.time()
     total_task_info["total_submit"] += 1
     if not allow_task_num():
-        gr.Info(f"Warning: The number of running tasks is too large, the estimate waiting time is {get_waiting_time('-1')} s.")
+        gr.Info(f"Warning: The number of running tasks is too large, please wait for a while.")
         return None, gr.Button(visible=True)
     try:
         rsp = VideoSynthesis.call(model="wanx2.1-t2v-plus", prompt=prompt, seed=seed,
@@ -56,12 +55,11 @@ def t2v_generation(prompt, resolution, watermark_wan, seed=-1):
 def t2v_generation_async(prompt, size, watermark_wan, seed=-1):
     print(seed)
     seed = seed if seed >= 0 else random.randint(0, 2147483647)
-    total_task_info["latest_1h_submit_status"][get_submit_code()] = time.time()
     total_task_info["total_submit"] += 1
     print(seed)
     if not allow_task_num():
-        gr.Info(f"Warning: The number of running tasks is too large, the estimate waiting time is {get_waiting_time('-1')} s.")
-        return None, False, gr.Button(visible=True), gr.Button(visible=False), gr.Slider(), gr.Slider()
+        gr.Info(f"Warning: The number of running tasks is too large, the estimate waiting time is {waiting_time('-1')} s.")
+        return None, False, gr.Button(visible=True), gr.Button(visible=False)
     try:
         rsp = VideoSynthesis.async_call(model="wanx2.1-t2v-plus",
                                         prompt=prompt,
@@ -70,10 +68,10 @@ def t2v_generation_async(prompt, size, watermark_wan, seed=-1):
                                         watermark_wanx=watermark_wan)
         task_id = rsp.output.task_id
         status = False
-        return task_id, status, gr.Button(visible=False), gr.Button(visible=True), get_cost_time(task_id), get_waiting_time(task_id)
+        return task_id, status, gr.Button(visible=False), gr.Button(visible=True)
     except Exception as e:
         gr.Warning(f"Warning: {e}")
-        return None, True, gr.Button(), gr.Button(), gr.Slider(), gr.Slider()
+        return None, True, gr.Button(), gr.Button()
 
 
 def i2v_generation(prompt, image, watermark_wan, seed=-1):
@@ -92,21 +90,21 @@ def i2v_generation(prompt, image, watermark_wan, seed=-1):
 
 def i2v_generation_async(prompt, image, watermark_wan, seed=-1):
     seed = seed if seed >= 0 else random.randint(0, 2147483647)
-    total_task_info["latest_1h_submit_status"][get_submit_code()] = time.time()
     total_task_info["total_submit"] += 1
     if not allow_task_num():
-        gr.Info(f"Warning: The number of running tasks is too large, the estimate waiting time is {get_waiting_time('-1')} s.")
-        return "", None, gr.Button(visible=True), gr.Button(visible=False), gr.Slider(), gr.Slider()
+        gr.Info(f"Warning: The number of running tasks is too large, the estimate waiting time is {waiting_time('-1')} s.")
+        return "", None, gr.Button(visible=True), gr.Button(visible=False)
     try:
         rsp = VideoSynthesis.async_call(model="wanx2.1-i2v-plus", prompt=prompt, seed=seed,
                                         img_url=image, watermark_wanx=watermark_wan)
         print(rsp)
         task_id = rsp.output.task_id
         status = False
-        return task_id, status, gr.Button(visible=False), gr.Button(visible=True), gr.Button(visible=True), get_cost_time(task_id), get_waiting_time(task_id)
+        return task_id, status, gr.Button(visible=False), gr.Button(visible=True)
     except Exception as e:
         gr.Warning(f"Warning: {e}")
-        return "", None, gr.Button(), gr.Button(), gr.Slider(), gr.Slider()
+        return "", None, gr.Button(), gr.Button()
+
 
 def get_result_with_task_id(task_id):
     if task_id == "": return True, None
@@ -124,7 +122,7 @@ def get_result_with_task_id(task_id):
         if status:
             total_task_info["total_complete_task"] += 1
             total_task_info["total_process_cost"] += time.time() - task_status[task_id]["time"]
-            print(total_task_info["total_complete_task"], total_task_info["total_process_cost"])
+            print(total_task_info)
     except:
         video_url = None
         status = False
@@ -141,7 +139,7 @@ def allow_task_num():
             num += 1
         if not task_status[task_id]["status"]:
             total_num += 1
-    return num < LIMIT_RUNING_TASK or total_num < LIMIT_HISTORY_RUNING_TASK
+    return num < LIMIT_RUNING_TASK or num < 10
 
 def get_waiting_time(task_id):
     # if the num of running task < Limit
@@ -156,9 +154,9 @@ def get_waiting_time(task_id):
     latest_submit_tasks = len(total_task_info["latest_1h_submit_status"])
     print("latest submit tasks", latest_submit_tasks)
     if task_id in task_status:
-        return int(640 - (time.time() - task_status[task_id]["time"]))
+        return int(num * 480 - (time.time() - task_status[task_id]["time"]))
     else:
-        return int(latest_submit_tasks * (total_task_info["total_process_cost"]/(total_task_info["total_complete_task"]+1)))
+        return int(latest_submit_tasks * (total_task_info["total_process_cost"]/total_task_info["total_complete_task"]))
 
 def clean_task_status():
     # clean the task over 1800 seconds
@@ -176,7 +174,7 @@ def clean_task_status():
 
 def get_cost_time(task_id):
     if task_id in task_status and not task_status[task_id]["status"]:
-        et = int(time.time() - task_status[task_id]["time"])
+        et = time.time() - task_status[task_id]["time"]
         return f"{et:.2f}"
     else:
         return gr.Textbox()
@@ -202,7 +200,7 @@ def get_process_bar(task_id, status):
     if task_status[task_id]["status"]:
         task_status[task_id]["value"] = 100
     else:
-        task_status[task_id]["value"] += 5
+        task_status[task_id]["value"] += 1
     if task_status[task_id]["value"] >= 100 and not task_status[task_id]["status"]:
         task_status[task_id]["value"] = 95
     # print(task_id, task_status[task_id], task_status)
@@ -332,19 +330,11 @@ with gr.Blocks() as demo:
     )
 
     def status_refresh(task_id, task, status):
-        if task_id in task_status and not task_status[task_id]["status"]:
-            cost_time = int(time.time() - task_status[task_id]["time"])
-        else:
-            cost_time = 0
-        status, video_url = get_result_with_task_id(task_id)
-        task_status[task_id]["status"] = status
-        task_status[task_id]["url"] = video_url
+        cost_time = get_cost_time(task_id)
         waiting_time = get_waiting_time(task_id)
-        value = task_status.get(task_id, {"value": 100})["value"]
-        value = min(value, int(cost_time*100/waiting_time))
-        process_bar = gr.Slider(label=f"({value}%)Generating" if value % 2 == 1 else f"({value}%)Generating.....", value=value)
+        process_bar = get_process_bar(task_id, status)
         process_change_ret = process_change(task_id, task)
-        return *process_change_ret, cost_time, waiting_time, process_bar
+        return process_change_ret + [cost_time, waiting_time, process_bar]
 
 
     t2v_refresh_status.click(