Update app.py

app.py

@@ -23,17 +23,7 @@ def restart_script_periodically():
 restart_thread = Thread(target=restart_script_periodically, daemon=True)
 restart_thread.start()
 
-
-def reset_queue_periodically():
-    start_time = time.time()
-    while True:
-        if time.time() - start_time >= 300: # 5 minutes
-            queue.queue.clear()
-            start_time = time.time()
-
-reset_queue_thread = Thread(target=reset_queue_periodically, daemon=True)
-reset_queue_thread.start()
-
+queue_length_counter = 0
 
 def add_random_noise(prompt, noise_level=0.07):
     # Get the percentage of characters to add as noise
@@ -51,75 +41,112 @@ def add_random_noise(prompt, noise_level=0.07):
 
 
 def send_it1(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output1 = proc1(queue.get())
+    queue_length_counter += 1
+    output1 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output1
 
 def send_it2(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output2 = proc1(queue.get())
+    queue_length_counter += 1
+    output2 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output2
 
 def send_it3(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output3 = proc1(queue.get())
+    queue_length_counter += 1
+    output3 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output3
 
 def send_it4(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output4 = proc1(queue.get())
+    queue_length_counter += 1
+    output4 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output4
 
 def send_it5(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output5 = proc1(queue.get())
+    queue_length_counter += 1
+    output5 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output5
 
 def send_it6(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output6 = proc1(queue.get())
+    queue_length_counter += 1
+    output6 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output6
 
 def send_it7(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output7 = proc1(queue.get())
+    queue_length_counter += 1
+    output7 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output7
 
 def send_it8(inputs, noise_level, proc1=proc1):
+    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_with_noise)
-    output8 = proc1(queue.get())
+    queue_length_counter += 1
+    output8 = proc1(prompt_with_noise)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output8
 
 
+
 def get_prompts(prompt_text):
-    while queue.qsize() >= queue_threshold:
-        time.sleep(1)
-    queue.put(prompt_text)
-    output = text_gen(queue.get())
+    global queue_length_counter
+    queue_length_counter += 1
+    output = text_gen(prompt_text)
+    queue_length_counter -= 1
+    if queue_length_counter > 25:
+        queue.queue.clear()
+        queue_length_counter = 0
+    time.sleep(1)
     return output
 
 
@@ -160,6 +187,5 @@ with gr.Blocks() as myface:
     run.click(send_it8, inputs=[prompt, noise_level], outputs=[output8])
     see_prompts.click(get_prompts, inputs=[input_text], outputs=[prompt])
 
-myface.queue(concurrency_count=8)
-myface.launch(enable_queue=True, inline=True)
-reset_queue_thread.join()
+    myface.queue(concurrency_count=8)
+    myface.launch(enable_queue=True, inline=True)