refactor: rename all agents and improve structure pt1

ref: N25B-257

src/control_backend/agents/__init__.py

@@ -1,7 +1 @@
 from .base import BaseAgent as BaseAgent
-from .belief_collector.belief_collector import BeliefCollectorAgent as BeliefCollectorAgent
-from .llm.llm import LLMAgent as LLMAgent
-from .ri_command_agent import RICommandAgent as RICommandAgent
-from .ri_communication_agent import RICommunicationAgent as RICommunicationAgent
-from .transcription.transcription_agent import TranscriptionAgent as TranscriptionAgent
-from .vad_agent import VADAgent as VADAgent

src/control_backend/agents/act_agents/__init__.py

@@ -0,0 +1 @@
+from .act_speech_agent import ActSpeechAgent as ActSpeechAgent

src/control_backend/agents/act_agents/act_speech_agent.py

@@ -10,7 +10,7 @@ from control_backend.core.config import settings
 from control_backend.schemas.ri_message import SpeechCommand
 
 
-class RICommandAgent(BaseAgent):
+class ActSpeechAgent(BaseAgent):
     subsocket: zmq.Socket
     pubsocket: zmq.Socket
     address = ""

src/control_backend/agents/bdi/__init__.py

@@ -1,2 +0,0 @@
-from .bdi_core import BDICoreAgent as BDICoreAgent
-from .text_extractor import TBeliefExtractorAgent as TBeliefExtractorAgent

src/control_backend/agents/bdi_agents/__init__.py

@@ -0,0 +1 @@
+from .bdi_core_agent import BDICoreAgent as BDICoreAgent

src/control_backend/agents/bdi_agents/behaviours/belief_setter.py

@@ -32,7 +32,7 @@ class BeliefSetterBehaviour(CyclicBehaviour):
         self.agent.logger.debug("Processing message from sender: %s", sender)
 
         match sender:
-            case settings.agent_settings.belief_collector_agent_name:
+            case settings.agent_settings.bel_collector_agent_name:
                 self.agent.logger.debug(
                     "Message is from the belief collector agent. Processing as belief message."
                 )

src/control_backend/agents/bdi_agents/behaviours/receive_llm_resp_behaviour.py

@@ -22,7 +22,7 @@ class ReceiveLLMResponseBehaviour(CyclicBehaviour):
                 speech_command = SpeechCommand(data=content)
 
                 message = Message(
-                    to=settings.agent_settings.ri_command_agent_name
+                    to=settings.agent_settings.act_speech_agent_name
                     + "@"
                     + settings.agent_settings.host,
                     sender=self.agent.jid,

src/control_backend/agents/bel_agents/bel_collector_agent/__init__.py

@@ -0,0 +1 @@
+from .bel_collector_agent import BelCollectorAgent as BelCollectorAgent

src/control_backend/agents/bel_agents/bel_collector_agent/behaviours/continuous_collect.py

@@ -35,7 +35,7 @@ class ContinuousBeliefCollector(CyclicBehaviour):
         msg_type = payload.get("type")
 
         # Prefer explicit 'type' field
-        if msg_type == "belief_extraction_text" or sender_node == "belief_text_agent_mock":
+        if msg_type == "belief_extraction_text" or sender_node == "bel_text_agent_mock":
             self.agent.logger.debug(
                 "Message routed to _handle_belief_text (sender=%s)", sender_node
             )
@@ -83,7 +83,9 @@ class ContinuousBeliefCollector(CyclicBehaviour):
         if not beliefs:
             return
 
-        to_jid = f"{settings.agent_settings.bdi_core_agent_name}@{settings.agent_settings.host}"
+        to_jid = (
+            f"{settings.agent_settings.bdi_core_agent_agent_name}@{settings.agent_settings.host}"
+        )
 
         msg = Message(to=to_jid, sender=self.agent.jid, thread="beliefs")
         msg.body = json.dumps(beliefs)

src/control_backend/agents/bel_agents/bel_collector_agent/bel_collector_agent.py

@@ -3,9 +3,9 @@ from control_backend.agents.base import BaseAgent
 from .behaviours.continuous_collect import ContinuousBeliefCollector
 
 
-class BeliefCollectorAgent(BaseAgent):
+class BelCollectorAgent(BaseAgent):
     async def setup(self):
-        self.logger.info("BeliefCollectorAgent starting (%s)", self.jid)
+        self.logger.info("BelCollectorAgent starting (%s)", self.jid)
         # Attach the continuous collector behaviour (listens and forwards to BDI)
         self.add_behaviour(ContinuousBeliefCollector())
-        self.logger.info("BeliefCollectorAgent ready.")
+        self.logger.info("BelCollectorAgent ready.")

src/control_backend/agents/bel_agents/bel_text_extract_agent/behaviours/text_belief_extractor.py

@@ -44,7 +44,7 @@ class BeliefFromText(CyclicBehaviour):
 
         sender = msg.sender.node
         match sender:
-            case settings.agent_settings.transcription_agent_name:
+            case settings.agent_settings.per_transcription_agent_name:
                 self.logger.debug("Received text from transcriber: %s", msg.body)
                 await self._process_transcription_demo(msg.body)
             case _:
@@ -71,7 +71,7 @@ class BeliefFromText(CyclicBehaviour):
             belief_message = Message()
 
             belief_message.to = (
-                settings.agent_settings.belief_collector_agent_name
+                settings.agent_settings.bel_collector_agent_name
                 + "@"
                 + settings.agent_settings.host
             )
@@ -95,7 +95,7 @@ class BeliefFromText(CyclicBehaviour):
         belief_msg = Message()
 
         belief_msg.to = (
-            settings.agent_settings.belief_collector_agent_name + "@" + settings.agent_settings.host
+            settings.agent_settings.bel_collector_agent_name + "@" + settings.agent_settings.host
         )
         belief_msg.body = payload
         belief_msg.thread = "beliefs"

src/control_backend/agents/bel_agents/bel_text_extract_agent/bel_text_extract_agent.py

@@ -3,6 +3,6 @@ from control_backend.agents.base import BaseAgent
 from .behaviours.text_belief_extractor import BeliefFromText
 
 
-class TBeliefExtractorAgent(BaseAgent):
+class BelTextExtractAgent(BaseAgent):
     async def setup(self):
         self.add_behaviour(BeliefFromText())

src/control_backend/agents/com_agents/__init__.py

@@ -0,0 +1 @@
+from .com_ri_agent import ComRIAgent as ComRIAgent

src/control_backend/agents/com_agents/com_ri_agent.py

@@ -7,10 +7,10 @@ from zmq.asyncio import Context
 from control_backend.agents import BaseAgent
 from control_backend.core.config import settings
 
-from .ri_command_agent import RICommandAgent
+from ..act_agents.act_speech_agent import ActSpeechAgent
 
 
-class RICommunicationAgent(BaseAgent):
+class ComRIAgent(BaseAgent):
     req_socket: zmq.Socket
     _address = ""
     _bind = True
@@ -132,11 +132,11 @@ class RICommunicationAgent(BaseAgent):
                                 else:
                                     self.req_socket.bind(addr)
                         case "actuation":
-                            ri_commands_agent = RICommandAgent(
-                                settings.agent_settings.ri_command_agent_name
+                            ri_commands_agent = ActSpeechAgent(
+                                settings.agent_settings.act_speech_agent_name
                                 + "@"
                                 + settings.agent_settings.host,
-                                settings.agent_settings.ri_command_agent_name,
+                                settings.agent_settings.act_speech_agent_name,
                                 address=addr,
                                 bind=bind,
                             )
@@ -153,7 +153,7 @@ class RICommunicationAgent(BaseAgent):
             break
 
         else:
-            self.logger.error("Failed to set up RICommunicationAgent after %d retries", max_retries)
+            self.logger.error("Failed to set up ComRIAgent after %d retries", max_retries)
             return
 
         # Set up ping behaviour

src/control_backend/agents/llm_agents/__init__.py

@@ -0,0 +1 @@
+from .llm_agent import LLMAgent as LLMAgent

src/control_backend/agents/llm_agents/llm_agent.py

@@ -39,7 +39,7 @@ class LLMAgent(BaseAgent):
                 sender,
             )
 
-            if sender == settings.agent_settings.bdi_core_agent_name:
+            if sender == settings.agent_settings.bdi_core_agent_agent_name:
                 self.agent.logger.debug("Processing message from BDI Core Agent")
                 await self._process_bdi_message(msg)
             else:
@@ -63,7 +63,9 @@ class LLMAgent(BaseAgent):
             Sends a response message back to the BDI Core Agent.
             """
             reply = Message(
-                to=settings.agent_settings.bdi_core_agent_name + "@" + settings.agent_settings.host,
+                to=settings.agent_settings.bdi_core_agent_agent_name
+                + "@"
+                + settings.agent_settings.host,
                 body=msg,
             )
             await self.send(reply)

src/control_backend/agents/mock_agents/bel_text_agent.py

@@ -7,11 +7,11 @@ from spade.message import Message
 from control_backend.core.config import settings
 
 
-class BeliefTextAgent(Agent):
+class BelTextAgent(Agent):
     class SendOnceBehaviourBlfText(OneShotBehaviour):
         async def run(self):
             to_jid = (
-                settings.agent_settings.belief_collector_agent_name
+                settings.agent_settings.bel_collector_agent_name
                 + "@"
                 + settings.agent_settings.host
             )
@@ -39,6 +39,6 @@ class BeliefTextAgent(Agent):
             await self.agent.stop()
 
     async def setup(self):
-        print("BeliefTextAgent started")
+        print("BelTextAgent started")
         self.b = self.SendOnceBehaviourBlfText()
         self.add_behaviour(self.b)

src/control_backend/agents/per_agents/__init__.py

@@ -0,0 +1,4 @@
+from .per_transcription_agent.per_transcription_agent import (
+    PerTranscriptionAgent as PerTranscriptionAgent,
+)
+from .per_vad_agent import PerVADAgent as PerVADAgent

src/control_backend/agents/per_agents/per_transcription_agent/per_transcription_agent.py

@@ -12,15 +12,19 @@ from control_backend.core.config import settings
 from .speech_recognizer import SpeechRecognizer
 
 
-class TranscriptionAgent(BaseAgent):
+class PerTranscriptionAgent(BaseAgent):
     """
     An agent which listens to audio fragments with voice, transcribes them, and sends the
     transcription to other agents.
     """
 
     def __init__(self, audio_in_address: str):
-        jid = settings.agent_settings.transcription_agent_name + "@" + settings.agent_settings.host
-        super().__init__(jid, settings.agent_settings.transcription_agent_name)
+        jid = (
+            settings.agent_settings.per_transcription_agent_name
+            + "@"
+            + settings.agent_settings.host
+        )
+        super().__init__(jid, settings.agent_settings.per_transcription_agent_name)
 
         self.audio_in_address = audio_in_address
         self.audio_in_socket: azmq.Socket | None = None
@@ -43,7 +47,7 @@ class TranscriptionAgent(BaseAgent):
         async def _share_transcription(self, transcription: str):
             """Share a transcription to the other agents that depend on it."""
             receiver_jids = [
-                settings.agent_settings.text_belief_extractor_agent_name
+                settings.agent_settings.texbel_text_extractor_agent_name
                 + "@"
                 + settings.agent_settings.host,
             ]  # Set message receivers here

src/control_backend/agents/per_agents/per_vad_agent.py

@@ -7,7 +7,7 @@ from spade.behaviour import CyclicBehaviour
 from control_backend.agents import BaseAgent
 from control_backend.core.config import settings
 
-from .transcription.transcription_agent import TranscriptionAgent
+from .per_transcription_agent.per_transcription_agent import PerTranscriptionAgent
 
 
 class SocketPoller[T]:
@@ -102,15 +102,15 @@ class Streaming(CyclicBehaviour):
         self.audio_buffer = chunk
 
 
-class VADAgent(BaseAgent):
+class PerVADAgent(BaseAgent):
     """
     An agent which listens to an audio stream, does Voice Activity Detection (VAD), and sends
     fragments with detected speech to other agents over ZeroMQ.
     """
 
     def __init__(self, audio_in_address: str, audio_in_bind: bool):
-        jid = settings.agent_settings.vad_agent_name + "@" + settings.agent_settings.host
-        super().__init__(jid, settings.agent_settings.vad_agent_name)
+        jid = settings.agent_settings.per_vad_agent_name + "@" + settings.agent_settings.host
+        super().__init__(jid, settings.agent_settings.per_vad_agent_name)
 
         self.audio_in_address = audio_in_address
         self.audio_in_bind = audio_in_bind
@@ -166,7 +166,7 @@ class VADAgent(BaseAgent):
         self.add_behaviour(self.streaming_behaviour)
 
         # Start agents dependent on the output audio fragments here
-        transcriber = TranscriptionAgent(audio_out_address)
+        transcriber = PerTranscriptionAgent(audio_out_address)
         await transcriber.start()
 
         self.logger.info("Finished setting up %s", self.jid)

src/control_backend/core/config.py

@@ -9,16 +9,16 @@ class ZMQSettings(BaseModel):
 
 class AgentSettings(BaseModel):
     host: str = "localhost"
-    bdi_core_agent_name: str = "bdi_core"
-    belief_collector_agent_name: str = "belief_collector"
-    text_belief_extractor_agent_name: str = "text_belief_extractor"
-    vad_agent_name: str = "vad_agent"
+    bdi_core_agent_agent_name: str = "bdi_core_agent"
+    bel_collector_agent_name: str = "bel_collector_agent"
+    texbel_text_extractor_agent_name: str = "text_belief_extractor"
+    per_vad_agent_name: str = "per_vad_agent"
     llm_agent_name: str = "llm_agent"
     test_agent_name: str = "test_agent"
-    transcription_agent_name: str = "transcription_agent"
+    per_transcription_agent_name: str = "per_transcription_agent"
 
-    ri_communication_agent_name: str = "ri_communication_agent"
-    ri_command_agent_name: str = "ri_command_agent"
+    com_ri_agent_name: str = "com_ri_agent"
+    act_speech_agent_name: str = "act_speech_agent"
 
 
 class LLMSettings(BaseModel):

src/control_backend/main.py

@@ -8,12 +8,12 @@ from fastapi.middleware.cors import CORSMiddleware
 from zmq.asyncio import Context
 
 from control_backend.agents import (
-    BeliefCollectorAgent,
+    BelCollectorAgent,
+    ComRIAgent,
     LLMAgent,
-    RICommunicationAgent,
-    VADAgent,
+    PerVADAgent,
 )
-from control_backend.agents.bdi import BDICoreAgent, TBeliefExtractorAgent
+from control_backend.agents.bdi_agents import BDICoreAgent, BelTextExtractAgent
 from control_backend.api.v1.router import api_router
 from control_backend.core.config import settings
 from control_backend.logging import setup_logging
@@ -64,13 +64,13 @@ async def lifespan(app: FastAPI):
     # --- Initialize Agents ---
     logger.info("Initializing and starting agents.")
     agents_to_start = {
-        "RICommunicationAgent": (
-            RICommunicationAgent,
+        "ComRIAgent": (
+            ComRIAgent,
             {
-                "name": settings.agent_settings.ri_communication_agent_name,
-                "jid": f"{settings.agent_settings.ri_communication_agent_name}"
+                "name": settings.agent_settings.com_ri_agent_name,
+                "jid": f"{settings.agent_settings.com_ri_agent_name}"
                 f"@{settings.agent_settings.host}",
-                "password": settings.agent_settings.ri_communication_agent_name,
+                "password": settings.agent_settings.com_ri_agent_name,
                 "address": "tcp://*:5555",
                 "bind": True,
             },
@@ -86,33 +86,33 @@ async def lifespan(app: FastAPI):
         "BDICoreAgent": (
             BDICoreAgent,
             {
-                "name": settings.agent_settings.bdi_core_agent_name,
-                "jid": f"{settings.agent_settings.bdi_core_agent_name}@"
+                "name": settings.agent_settings.bdi_core_agent_agent_name,
+                "jid": f"{settings.agent_settings.bdi_core_agent_agent_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.bdi_core_agent_name,
+                "password": settings.agent_settings.bdi_core_agent_agent_name,
                 "asl": "src/control_backend/agents/bdi/rules.asl",
             },
         ),
-        "BeliefCollectorAgent": (
-            BeliefCollectorAgent,
+        "BelCollectorAgent": (
+            BelCollectorAgent,
             {
-                "name": settings.agent_settings.belief_collector_agent_name,
-                "jid": f"{settings.agent_settings.belief_collector_agent_name}@"
+                "name": settings.agent_settings.bel_collector_agent_name,
+                "jid": f"{settings.agent_settings.bel_collector_agent_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.belief_collector_agent_name,
+                "password": settings.agent_settings.bel_collector_agent_name,
             },
         ),
         "TBeliefExtractor": (
-            TBeliefExtractorAgent,
+            BelTextExtractAgent,
             {
-                "name": settings.agent_settings.text_belief_extractor_agent_name,
-                "jid": f"{settings.agent_settings.text_belief_extractor_agent_name}@"
+                "name": settings.agent_settings.texbel_text_extractor_agent_name,
+                "jid": f"{settings.agent_settings.texbel_text_extractor_agent_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.text_belief_extractor_agent_name,
+                "password": settings.agent_settings.texbel_text_extractor_agent_name,
             },
         ),
-        "VADAgent": (
-            VADAgent,
+        "PerVADAgent": (
+            PerVADAgent,
             {"audio_in_address": "tcp://localhost:5558", "audio_in_bind": False},
         ),
     }