refactor: restructure to make sure the Bel agents are also part of BDI.

ref: N25B-257

src/control_backend/agents/bdi_agents/__init__.py

@@ -1 +1,5 @@
-from .bdi_core_agent import BDICoreAgent as BDICoreAgent
+from .bdi_belief_collector_agent.bel_collector_agent import (
+    BDIBeliefCollectorAgent as BDIBeliefCollectorAgent,
+)
+from .bdi_core_agent.bdi_core_agent import BDICoreAgent as BDICoreAgent
+from .bdi_text_belief_agent.bdi_text_belief_agent import BDITextBeliefAgent as BDITextBeliefAgent

src/control_backend/agents/bdi_agents/bdi_belief_collector_agent/bel_collector_agent.py

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

src/control_backend/agents/bdi_agents/bdi_core_agent/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.bel_collector_agent_name:
+            case settings.agent_settings.bdi_belief_collector_agent_name:
                 self.agent.logger.debug(
                     "Message is from the belief collector agent. Processing as belief message."
                 )

src/control_backend/agents/bdi_agents/bdi_text_belief_agent/bdi_text_belief_agent.py

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

src/control_backend/agents/bdi_agents/bdi_text_belief_agent/behaviours/text_belief_extractor.py

@@ -71,7 +71,7 @@ class BeliefFromText(CyclicBehaviour):
             belief_message = Message()
 
             belief_message.to = (
-                settings.agent_settings.bel_collector_agent_name
+                settings.agent_settings.bdi_belief_collector_agent_name
                 + "@"
                 + settings.agent_settings.host
             )
@@ -95,7 +95,9 @@ class BeliefFromText(CyclicBehaviour):
         belief_msg = Message()
 
         belief_msg.to = (
-            settings.agent_settings.bel_collector_agent_name + "@" + settings.agent_settings.host
+            settings.agent_settings.bdi_belief_collector_agent_name
+            + "@"
+            + settings.agent_settings.host
         )
         belief_msg.body = payload
         belief_msg.thread = "beliefs"

src/control_backend/agents/bel_agents/__init__.py

@@ -1,4 +0,0 @@
-from .bel_collector_agent.bel_collector_agent import BelCollectorAgent as BelCollectorAgent
-from .bel_text_extract_agent.bel_text_extract_agent import (
-    BelTextExtractAgent as BelTextExtractAgent,
-)

src/control_backend/agents/mock_agents/bel_text_agent.py

@@ -11,7 +11,7 @@ class BelTextAgent(Agent):
     class SendOnceBehaviourBlfText(OneShotBehaviour):
         async def run(self):
             to_jid = (
-                settings.agent_settings.bel_collector_agent_name
+                settings.agent_settings.bdi_belief_collector_agent_name
                 + "@"
                 + settings.agent_settings.host
             )

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

@@ -47,7 +47,7 @@ class PerTranscriptionAgent(BaseAgent):
         async def _share_transcription(self, transcription: str):
             """Share a transcription to the other agents that depend on it."""
             receiver_jids = [
-                settings.agent_settings.texbel_text_extractor_agent_name
+                settings.agent_settings.texbdi_text_belief_agent_name
                 + "@"
                 + settings.agent_settings.host,
             ]  # Set message receivers here

src/control_backend/core/config.py

@@ -10,8 +10,8 @@ class ZMQSettings(BaseModel):
 class AgentSettings(BaseModel):
     host: str = "localhost"
     bdi_core_agent_agent_name: str = "bdi_core_agent"
-    bel_collector_agent_name: str = "bel_collector_agent"
-    bel_text_extractor_agent_name: str = "bel_text_extractor_agent"
+    bdi_belief_collector_agent_name: str = "bdi_belief_collector_agent"
+    bdi_text_belief_agent_name: str = "bdi_text_belief_agent"
     per_vad_agent_name: str = "per_vad_agent"
     llm_agent_name: str = "llm_agent"
     test_agent_name: str = "test_agent"

src/control_backend/main.py

@@ -9,10 +9,11 @@ from zmq.asyncio import Context
 
 # Act agents
 # BDI agents
-from control_backend.agents.bdi_agents import BDICoreAgent
-
-# Believe Agents
-from control_backend.agents.bel_agents import BelCollectorAgent, BelTextExtractAgent
+from control_backend.agents.bdi_agents import (
+    BDIBeliefCollectorAgent,
+    BDICoreAgent,
+    BDITextBeliefAgent,
+)
 
 # Communication agents
 from control_backend.agents.com_agents import ComRIAgent
@@ -104,22 +105,22 @@ async def lifespan(app: FastAPI):
                 "asl": "src/control_backend/agents/bdi/rules.asl",
             },
         ),
-        "BelCollectorAgent": (
-            BelCollectorAgent,
+        "BDIBeliefCollectorAgent": (
+            BDIBeliefCollectorAgent,
             {
-                "name": settings.agent_settings.bel_collector_agent_name,
-                "jid": f"{settings.agent_settings.bel_collector_agent_name}@"
+                "name": settings.agent_settings.bdi_belief_collector_agent_name,
+                "jid": f"{settings.agent_settings.bdi_belief_collector_agent_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.bel_collector_agent_name,
+                "password": settings.agent_settings.bdi_belief_collector_agent_name,
             },
         ),
         "TBeliefExtractor": (
-            BelTextExtractAgent,
+            BDITextBeliefAgent,
             {
-                "name": settings.agent_settings.bel_text_extractor_agent_name,
-                "jid": f"{settings.agent_settings.bel_text_extractor_agent_name}@"
+                "name": settings.agent_settings.bdi_text_belief_agent_name,
+                "jid": f"{settings.agent_settings.bdi_text_belief_agent_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.bel_text_extractor_agent_name,
+                "password": settings.agent_settings.bdi_text_belief_agent_name,
             },
         ),
         "PerVADAgent": (