Update game build from GitLab CI

server/ActionProcessor.py

@@ -1,9 +1,8 @@
 import datetime
+import json
 from threading import Thread
 from multiprocessing import Queue
 from typing import Dict, Any, List
-import json
-import re
 import logging
 import sys
 from mistralai import Mistral
@@ -34,7 +33,7 @@ class ActionProcessor(Thread):
     def __init__(
         self,
         text_queue: "Queue[str]",
-        action_queue: "Queue[str]",
+        action_queue: "Queue[Dict[str, Any]]",
         mistral_api_key: str,
     ):
         super().__init__()
@@ -50,22 +49,19 @@ class ActionProcessor(Thread):
             {
                 "role": "system",
                 "content": """
-You are an AI Agent in a video game. You're listening to a parent giving their baby instructions, translate them into game functions. The following game functions are:
-
-- DropBleach: Ask the baby to drop the bleach (or 'Javel').
-- DropSyringe: Ask the baby to drop the syringe.
-- DropFork: Ask the baby to drop the fork.
-- GoToLivingRoom: Ask the baby to go to the living room.
-- GoToKitchen: Ask the baby to go to the kitchen.
-- GoToBedroom: Ask the baby to go to the bedroom.
-- StopCrying: Ask the baby to stop crying.
-- Come: Ask the baby to come towards the camera, or follow the sound of the voice.
-- None: The baby does not need to take any action.
-
-You must also determine whether the parenting sentiment behind the command is positive or negative, based on the following criteria:
-- If the statement includes the baby’s name ("Harold"), it is considered positive parenting.
-- If the statement consists only of direct commands without affectionate or encouraging words (e.g., "good boy," "better"), it is considered negative parenting.
-Your response should strictly follow this JSON format as an array of strings:
+You are a transcription expert. You're listening to a parent speaking to a baby. Your goal
+is to determine what the baby is asked to do and what the parent's sentiment is.
+
+The following interpretations are possible:
+- DropBleach: The parent asks to drop the bleach (or 'Javel').
+- DropSyringe: The parent asks to drop the syringe.
+- DropFork: The parent asks to drop the fork.
+- GoToLivingRoom: The parent asks to go to the living room.
+- GoToKitchen: The parent asks to go to the kitchen.
+- GoToBedroom: The parent asks to go to the bedroom.
+- StopCrying: The parent asks to stop crying.
+- Come: The parent asks to come.
+- None: Others instructions are not relevant.
 
 ```json
 [action,sentiment]
@@ -77,7 +73,10 @@ Output: ["DropFork", "negative"]
 
 Input: "Harold, please don't drink the bleach!"
 Output: ["DropBleach", "positive"]
-            """,
+
+Input: "I'm so tired of this."
+Output: ["None", "negative"]
+""",
             },
             {
                 "role": "user",
@@ -91,7 +90,7 @@ Output: ["DropBleach", "positive"]
             + [
                 {
                     "role": "assistant",
-                    "content": "[",
+                    "content": '["',
                     "prefix": True,
                 }
             ],
@@ -117,8 +116,14 @@ Output: ["DropBleach", "positive"]
         candidate = self.text_buffers[1]
 
         if len(self.text_buffers[0]) < len(candidate) >= len(self.text_buffers[2]):
-            action_and_sentiment = self.get_action_and_sentiment(candidate)
-            action, sentiment = action_and_sentiment.split(",")
+            action_and_sentiment = json.loads(self.get_action_and_sentiment(candidate))
+            if (
+                not isinstance(action_and_sentiment, list)
+                or len(action_and_sentiment) != 2
+            ):
+                return None
+
+            action, sentiment = action_and_sentiment
 
             if action not in self.valid_action:
                 action = "None"
@@ -143,7 +148,7 @@ Output: ["DropBleach", "positive"]
 
                 # If we got a valid action, add it to the action queue
                 if action:
-                    self.action_queue.put(json.dumps(action))
+                    self.action_queue.put(action)
 
             except Exception as e:
                 logger.error(f"Error processing text: {str(e)}")

server/__main__.py

@@ -32,7 +32,7 @@ STATIC_DIR = (
 
 audio_queue: "Queue[io.BytesIO]" = Queue()
 text_queue: "Queue[str]" = Queue()
-action_queue: "Queue[str]" = Queue()
+action_queue: "Queue[Dict[str, Any]]" = Queue()
 
 app = Flask(__name__, static_folder=STATIC_DIR)
 

server/static/godot/index.html

@@ -97,7 +97,7 @@ body {
 
 		<script src="index.js"></script>
 		<script>
-const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"ensureCrossOriginIsolationHeaders":false,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":870464,"index.wasm":35376909},"focusCanvas":true,"gdextensionLibs":[]};
+const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"ensureCrossOriginIsolationHeaders":false,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":870496,"index.wasm":35376909},"focusCanvas":true,"gdextensionLibs":[]};
 const GODOT_THREADS_ENABLED = false;
 const engine = new Engine(GODOT_CONFIG);