Update game build from GitLab CI

server/ActionProcessor.py

@@ -1,15 +1,32 @@
 from threading import Thread
-from queue import Queue
+from multiprocessing import Queue
 from typing import Dict, Any
 import json
 import re
+import logging
+import sys
+
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+    handlers=[logging.StreamHandler(sys.stdout)],
+)
+
+logger = logging.getLogger(__name__)
 
 
 class ActionProcessor(Thread):
-    def __init__(self, text_queue: "Queue[str]", action_queue: "Queue[str]"):
+    def __init__(
+        self,
+        text_queue: "Queue[str]",
+        action_queue: "Queue[str]",
+        mistral_api_key: str,
+    ):
         super().__init__()
         self.text_queue = text_queue
         self.action_queue = action_queue
+        self.mistral_api_key = mistral_api_key
         self.daemon = True  # Thread will exit when main program exits
 
     def process_text(self, text: str) -> Dict[str, Any] | None:
@@ -48,9 +65,6 @@ class ActionProcessor(Thread):
                 if action:
                     self.action_queue.put(json.dumps(action))
 
-                # Mark the text as processed
-                self.text_queue.task_done()
-
             except Exception as e:
-                print(f"Error processing text: {str(e)}")
+                logger.error(f"Error processing text: {str(e)}")
                 continue

server/AudioTranscriber.py

@@ -45,8 +45,7 @@ class AudioTranscriber(threading.Thread):
                     self.action_queue.put(segment.text)
                     # Still print for debugging
                     logger.info(
-                        f"[%.2fs -> %.2fs] %s"
-                        % (segment.start, segment.end, segment.text)
+                        f"[{segment.start:.2f}s -> {segment.end:.2f}s] {segment.text}"
                     )
 
             except Empty:

server/StandaloneApplication.py

@@ -0,0 +1,19 @@
+import gunicorn.app.base
+from flask import Flask
+
+
+from typing import Any, Dict
+
+
+class StandaloneApplication(gunicorn.app.base.BaseApplication):
+    def __init__(self, app: Flask, options: Optional[Dict[str, Any]] = None):
+        self.options = options or {}
+        self.application = app
+        super().__init__()
+
+    def load_config(self):
+        for key, value in self.options.items():
+            self.cfg.set(key.lower(), value)
+
+    def load(self):
+        return self.application

server/__main__.py

@@ -1,18 +1,17 @@
 import io
-import json
-from flask import Flask, send_from_directory, jsonify, request, abort
+from flask import Flask, Response, send_from_directory, jsonify, request, abort
 import os
-import gunicorn.app.base
 from flask_cors import CORS
 from multiprocessing import Queue
 import base64
-from typing import Any, Optional, List, Dict, Tuple
-from queue import Queue
+from typing import Any, List, Dict, Tuple
+from multiprocessing import Queue
 import logging
 import sys
 
 from server.AudioTranscriber import AudioTranscriber
 from server.ActionProcessor import ActionProcessor
+from server.StandaloneApplication import StandaloneApplication
 
 # Configure logging
 logging.basicConfig(
@@ -42,7 +41,7 @@ _ = CORS(
 
 
 @app.after_request
-def add_header(response):
+def add_header(response: Response):
     # Add permissive CORS headers
     response.headers["Access-Control-Allow-Origin"] = "*"
     response.headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, DELETE, OPTIONS"
@@ -90,7 +89,6 @@ def get_data():
 
 @app.route("/api/process", methods=["POST"])
 def process_data():
-    logger.info("Processing data")
     try:
         # Check content type
         content_type = request.headers.get("Content-Type", "")
@@ -145,7 +143,7 @@ def process_data():
 
 
 @app.route("/api/actions", methods=["GET"])
-def get_actions() -> Tuple[Dict[str, Any], int]:
+def get_actions() -> Tuple[Response, int]:
     """Retrieve and clear all pending actions from the queue"""
     actions: List[Dict[str, Any]] = []
 
@@ -156,7 +154,7 @@ def get_actions() -> Tuple[Dict[str, Any], int]:
         except Exception:
             break
 
-    return jsonify({"actions": json.dumps(actions), "status": "success"}), 200
+    return jsonify({"actions": actions, "status": "success"}), 200
 
 
 @app.route("/<path:path>")
@@ -167,23 +165,7 @@ def serve_static(path: str):
         abort(404, description=f"File {path} not found in static folder")
 
 
-class StandaloneApplication(gunicorn.app.base.BaseApplication):
-    def __init__(self, app: Flask, options: Optional[Dict[str, Any]] = None):
-        self.options = options or {}
-        self.application = app
-        super().__init__()
-
-    def load_config(self):
-        for key, value in self.options.items():
-            self.cfg.set(key.lower(), value)
-
-    def load(self):
-        return self.application
-
-
 if __name__ == "__main__":
-    logger.info(f"Static folder path: {app.static_folder}")
-    logger.info(f"Static folder exists: {os.path.exists(app.static_folder)}")
     if os.path.exists(app.static_folder):
         logger.info(f"Static folder contents: {os.listdir(app.static_folder)}")
 
@@ -194,7 +176,11 @@ if __name__ == "__main__":
     transcriber.start()
 
     # Start the action processor thread
-    action_processor = ActionProcessor(text_queue, action_queue)
+    MISTRAL_API_KEY = os.getenv("MISTRAL_API_KEY")
+    if not MISTRAL_API_KEY:
+        raise ValueError("MISTRAL_API_KEY is not set")
+
+    action_processor = ActionProcessor(text_queue, action_queue, MISTRAL_API_KEY)
     action_processor.start()
 
     options: Any = {