Update app.py

app.py

@@ -20,7 +20,7 @@ restart_thread = Thread(target=restart_script_periodically, daemon=True)
 restart_thread.start()
 
 queue = Queue()
-queue_threshold = 25
+queue_threshold = 15
 
 queue_length_counter = 0
 
@@ -40,103 +40,70 @@ 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)
-    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(2)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output1 = proc1(queue.get())
     return output1
 
 def send_it2(inputs, noise_level, proc1=proc1):
-    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    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(2)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output2 = proc1(queue.get())
     return output2
 
 def send_it3(inputs, noise_level, proc1=proc1):
-    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    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(2)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output3 = proc1(queue.get())
     return output3
 
 def send_it4(inputs, noise_level, proc1=proc1):
-    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    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(2)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output4 = proc1(queue.get())
     return output4
 
 def send_it5(inputs, noise_level, proc1=proc1):
-    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    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(2)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output5 = proc1(queue.get())
     return output5
 
 def send_it6(inputs, noise_level, proc1=proc1):
-    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    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(2)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output6 = proc1(queue.get())
     return output6
 
 def send_it7(inputs, noise_level, proc1=proc1):
-    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    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(2)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output7 = proc1(queue.get())
     return output7
 
 def send_it8(inputs, noise_level, proc1=proc1):
-    global queue_length_counter
     prompt_with_noise = add_random_noise(inputs, noise_level)
-    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)
+    while queue.qsize() >= queue_threshold:
+        time.sleep(1)
+    queue.put(prompt_with_noise)
+    output8 = proc1(queue.get())
     return output8
 
 
-
 def get_prompts(prompt_text):
     global queue_length_counter
     queue_length_counter += 1
@@ -186,5 +153,6 @@ 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=15)
-    myface.launch(enable_queue=True, inline=True)
+myface.launch(enable_queue=True, inline=True)
+block.queue(concurrency_count=15, max_size=30).launch(max_threads=20)
+reset_queue_thread.join()