Merge branch 'dev' into refactor/logging

src/control_backend/agents/ri_command_agent.py

@@ -2,10 +2,10 @@ import json
 
 import zmq
 from spade.behaviour import CyclicBehaviour
+from zmq.asyncio import Context
 
 from control_backend.agents import BaseAgent
 from control_backend.core.config import settings
-from control_backend.core.zmq_context import context
 from control_backend.schemas.ri_message import SpeechCommand
 
 
@@ -53,6 +53,8 @@ class RICommandAgent(BaseAgent):
         """
         self.logger.info("Setting up %s", self.jid)
 
+        context = Context.instance()
+
         # To the robot
         self.pubsocket = context.socket(zmq.PUB)
         if self.bind:
@@ -62,7 +64,7 @@ class RICommandAgent(BaseAgent):
 
         # Receive internal topics regarding commands
         self.subsocket = context.socket(zmq.SUB)
-        self.subsocket.connect(settings.zmq_settings.internal_comm_address)
+        self.subsocket.connect(settings.zmq_settings.internal_sub_address)
         self.subsocket.setsockopt(zmq.SUBSCRIBE, b"command")
 
         # Add behaviour to our agent

src/control_backend/agents/ri_communication_agent.py

@@ -2,10 +2,10 @@ import asyncio
 
 import zmq
 from spade.behaviour import CyclicBehaviour
+from zmq.asyncio import Context
 
 from control_backend.agents import BaseAgent
 from control_backend.core.config import settings
-from control_backend.core.zmq_context import context
 
 from .ri_command_agent import RICommandAgent
 
@@ -72,7 +72,7 @@ class RICommunicationAgent(BaseAgent):
         # Let's try a certain amount of times before failing connection
         while retries < max_retries:
             # Bind request socket
-            self.req_socket = context.socket(zmq.REQ)
+            self.req_socket = Context.instance().socket(zmq.REQ)
             if self._bind:
                 self.req_socket.bind(self._address)
             else:

src/control_backend/agents/transcription/transcription_agent.py

@@ -8,7 +8,6 @@ from spade.message import Message
 
 from control_backend.agents import BaseAgent
 from control_backend.core.config import settings
-from control_backend.core.zmq_context import context as zmq_context
 
 from .speech_recognizer import SpeechRecognizer
 
@@ -67,7 +66,7 @@ class TranscriptionAgent(BaseAgent):
         return await super().stop()
 
     def _connect_audio_in_socket(self):
-        self.audio_in_socket = zmq_context.socket(zmq.SUB)
+        self.audio_in_socket = azmq.Context.instance().socket(zmq.SUB)
         self.audio_in_socket.setsockopt_string(zmq.SUBSCRIBE, "")
         self.audio_in_socket.connect(self.audio_in_address)
 

src/control_backend/agents/vad_agent.py

@@ -6,7 +6,6 @@ from spade.behaviour import CyclicBehaviour
 
 from control_backend.agents import BaseAgent
 from control_backend.core.config import settings
-from control_backend.core.zmq_context import context as zmq_context
 
 from .transcription.transcription_agent import TranscriptionAgent
 
@@ -120,7 +119,7 @@ class VADAgent(BaseAgent):
         return await super().stop()
 
     def _connect_audio_in_socket(self):
-        self.audio_in_socket = zmq_context.socket(zmq.SUB)
+        self.audio_in_socket = azmq.Context.instance().socket(zmq.SUB)
         self.audio_in_socket.setsockopt_string(zmq.SUBSCRIBE, "")
         if self.audio_in_bind:
             self.audio_in_socket.bind(self.audio_in_address)
@@ -131,7 +130,7 @@ class VADAgent(BaseAgent):
     def _connect_audio_out_socket(self) -> int | None:
         """Returns the port bound, or None if binding failed."""
         try:
-            self.audio_out_socket = zmq_context.socket(zmq.PUB)
+            self.audio_out_socket = azmq.Context.instance().socket(zmq.PUB)
             return self.audio_out_socket.bind_to_random_port("tcp://*", max_tries=100)
         except zmq.ZMQBindError:
             self.logger.error("Failed to bind an audio output socket after 100 tries.")