Merge remote-tracking branch 'origin/dev' into refactor/config-file

# Conflicts:
#	src/control_backend/agents/ri_communication_agent.py
#	src/control_backend/core/config.py
#	src/control_backend/main.py

src/control_backend/main.py

@@ -7,13 +7,25 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from zmq.asyncio import Context
 
-from control_backend.agents import (
-    BeliefCollectorAgent,
-    LLMAgent,
-    RICommunicationAgent,
-    VADAgent,
+# Act agents
+# BDI agents
+from control_backend.agents.bdi import (
+    BDIBeliefCollectorAgent,
+    BDICoreAgent,
+    TextBeliefExtractorAgent,
 )
-from control_backend.agents.bdi import BDICoreAgent, TBeliefExtractorAgent
+
+# Communication agents
+from control_backend.agents.communication import RICommunicationAgent
+
+# Emotional Agents
+# LLM Agents
+from control_backend.agents.llm import LLMAgent
+
+# Perceive agents
+from control_backend.agents.perception import VADAgent
+
+# Other backend imports
 from control_backend.api.v1.router import api_router
 from control_backend.core.config import settings
 from control_backend.logging import setup_logging
@@ -67,10 +79,10 @@ async def lifespan(app: FastAPI):
         "RICommunicationAgent": (
             RICommunicationAgent,
             {
-                "name": settings.agent_settings.ri_communication_agent_name,
-                "jid": f"{settings.agent_settings.ri_communication_agent_name}"
+                "name": settings.agent_settings.ri_communication_name,
+                "jid": f"{settings.agent_settings.ri_communication_name}"
                 f"@{settings.agent_settings.host}",
-                "password": settings.agent_settings.ri_communication_agent_name,
+                "password": settings.agent_settings.ri_communication_name,
                 "address": settings.zmq_settings.ri_communication_address,
                 "bind": True,
             },
@@ -78,37 +90,36 @@ async def lifespan(app: FastAPI):
         "LLMAgent": (
             LLMAgent,
             {
-                "name": settings.agent_settings.llm_agent_name,
-                "jid": f"{settings.agent_settings.llm_agent_name}@{settings.agent_settings.host}",
-                "password": settings.agent_settings.llm_agent_name,
+                "name": settings.agent_settings.llm_name,
+                "jid": f"{settings.agent_settings.llm_name}@{settings.agent_settings.host}",
+                "password": settings.agent_settings.llm_name,
             },
         ),
         "BDICoreAgent": (
             BDICoreAgent,
             {
-                "name": settings.agent_settings.bdi_core_agent_name,
-                "jid": f"{settings.agent_settings.bdi_core_agent_name}@"
-                f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.bdi_core_agent_name,
-                "asl": "src/control_backend/agents/bdi/rules.asl",
+                "name": settings.agent_settings.bdi_core_name,
+                "jid": f"{settings.agent_settings.bdi_core_name}@{settings.agent_settings.host}",
+                "password": settings.agent_settings.bdi_core_name,
+                "asl": "src/control_backend/agents/bdi/bdi_core_agent/rules.asl",
             },
         ),
         "BeliefCollectorAgent": (
-            BeliefCollectorAgent,
+            BDIBeliefCollectorAgent,
             {
-                "name": settings.agent_settings.belief_collector_agent_name,
-                "jid": f"{settings.agent_settings.belief_collector_agent_name}@"
+                "name": settings.agent_settings.bdi_belief_collector_name,
+                "jid": f"{settings.agent_settings.bdi_belief_collector_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.belief_collector_agent_name,
+                "password": settings.agent_settings.bdi_belief_collector_name,
             },
         ),
-        "TBeliefExtractor": (
-            TBeliefExtractorAgent,
+        "TextBeliefExtractorAgent": (
+            TextBeliefExtractorAgent,
             {
-                "name": settings.agent_settings.text_belief_extractor_agent_name,
-                "jid": f"{settings.agent_settings.text_belief_extractor_agent_name}@"
+                "name": settings.agent_settings.text_belief_extractor_name,
+                "jid": f"{settings.agent_settings.text_belief_extractor_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.text_belief_extractor_agent_name,
+                "password": settings.agent_settings.text_belief_extractor_name,
             },
         ),
         "VADAgent": (
@@ -117,17 +128,23 @@ async def lifespan(app: FastAPI):
         ),
     }
 
+    vad_agent = None
+
     for name, (agent_class, kwargs) in agents_to_start.items():
         try:
             logger.debug("Starting agent: %s", name)
             agent_instance = agent_class(**{k: v for k, v in kwargs.items() if k != "name"})
             await agent_instance.start()
+            if isinstance(agent_instance, VADAgent):
+                vad_agent = agent_instance
             logger.info("Agent '%s' started successfully.", name)
         except Exception as e:
             logger.error("Failed to start agent '%s': %s", name, e, exc_info=True)
             # Consider if the application should continue if an agent fails to start.
             raise
 
+    await vad_agent.streaming_behaviour.reset()
+
     logger.info("Application startup complete.")
 
     yield