wakaq

app.py

@@ -12,8 +12,8 @@ import os
 import requests
 from modules.audio import convert, get_audio_duration
 from modules.r2 import upload_to_s3
+from wakaq import Queue, Worker
 import threading
-import queue
 
 vpv_webhook = os.environ.get("VPV_WEBHOOK")
 
@@ -73,43 +73,35 @@ class ProcessRequest(BaseModel):
     crossfade: float = 0.1
 
 
-q = queue.Queue()
-
-def process_queue(q):
-    while True:
-        try:
-            key, censor, offset, text, format, speed, crossfade, id, receiver, webhook = q.get(timeout=5)
-            
-            # Processamento do item
-            audio = generate_audio(key, text, censor, offset, speed=speed, crossfade=crossfade)
-            convertedAudioPath = convert(audio, format)
-            duration = get_audio_duration(convertedAudioPath)
-            audioUrl = upload_to_s3(convertedAudioPath, f"{id}", format)
+def process_queue(item):
+    key, censor, offset, text, format, speed, crossfade, id, receiver, webhook = item
             
-            os.remove(audio)
-            os.remove(convertedAudioPath)
+    audio = generate_audio(key, text, censor, offset, speed=speed, crossfade=crossfade)
+    convertedAudioPath = convert(audio, format)
+    duration = get_audio_duration(convertedAudioPath)
+    audioUrl = upload_to_s3(convertedAudioPath, f"{id}", format)
             
-            payload = {
-                "id": id,
-                "duration": duration,
-                "receiver": receiver,
-                "url": audioUrl
-            }
+    os.remove(audio)
+    os.remove(convertedAudioPath)
             
-            requests.post(webhook, json=payload)
+    payload = {
+        "id": id,
+        "duration": duration,
+        "receiver": receiver,
+        "url": audioUrl
+    }
             
-        except queue.Empty:
-            print("Queue timeout: no items to process.")
-            break
-        except Exception as e:
-            print(f"Error processing item: {e}")
-        else:
-            # Confirma que a tarefa foi concluída com sucesso
-            q.task_done()
-        
-worker_thread = threading.Thread(target=process_queue, args=(q,))
-worker_thread.start()
-        
+    requests.post(webhook, json=payload)
+
+queue = Queue()
+worker = Worker(queue, process_queue, concurrency=8)
+def start_worker():
+    worker.run()
+    
+thread = threading.Thread(target=start_worker)
+thread.daemon = True 
+thread.start()
+
 @app.post("/process")
 def process_audio(payload: ProcessRequest):
     key = payload.key

requirements.txt

@@ -15,4 +15,5 @@ peft
 spaces
 torch
 transformers
-xformers
+xformers
+wakaq