chore: merge current dev into refactor/config-file

ref: N25B-236

src/control_backend/main.py

@@ -1,6 +1,3 @@
-# Standard library imports
-
-# External imports
 import contextlib
 import logging
 import threading
@@ -10,17 +7,18 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from zmq.asyncio import Context
 
-from control_backend.agents.bdi.bdi_core import BDICoreAgent
-from control_backend.agents.bdi.text_extractor import TBeliefExtractor
-from control_backend.agents.belief_collector.belief_collector import BeliefCollectorAgent
-from control_backend.agents.llm.llm import LLMAgent
-from control_backend.agents.ri_communication_agent import RICommunicationAgent
-from control_backend.agents.vad_agent import VADAgent
+from control_backend.agents import (
+    BeliefCollectorAgent,
+    LLMAgent,
+    RICommunicationAgent,
+    VADAgent,
+)
+from control_backend.agents.bdi import BDICoreAgent, TBeliefExtractorAgent
 from control_backend.api.v1.router import api_router
 from control_backend.core.config import settings
+from control_backend.logging import setup_logging
 
 logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
 
 
 def setup_sockets():
@@ -44,7 +42,13 @@ def setup_sockets():
 
 @contextlib.asynccontextmanager
 async def lifespan(app: FastAPI):
-    logger.info("%s starting up.", app.title)
+    """
+    Application lifespan context manager to handle startup and shutdown events.
+    """
+    # --- APPLICATION STARTUP ---
+    setup_logging()
+    logger.info("%s is starting up.", app.title)
+    logger.warning("testing extra", extra={"extra1": "one", "extra2": "two"})
 
     # Initiate sockets
     proxy_thread = threading.Thread(target=setup_sockets)
@@ -57,50 +61,83 @@ async def lifespan(app: FastAPI):
     endpoints_pub_socket.connect(settings.zmq_settings.internal_pub_address)
     app.state.endpoints_pub_socket = endpoints_pub_socket
 
-    # Initiate agents
-    ri_communication_agent = RICommunicationAgent(
-        settings.agent_settings.ri_communication_agent_name + "@" + settings.agent_settings.host,
-        settings.agent_settings.ri_communication_agent_name,
-        address=settings.zmq_settings.ri_communication_address,
-        bind=True,
-    )
-    await ri_communication_agent.start()
+    # --- Initialize Agents ---
+    logger.info("Initializing and starting agents.")
+    agents_to_start = {
+        "RICommunicationAgent": (
+            RICommunicationAgent,
+            {
+                "name": settings.agent_settings.ri_communication_agent_name,
+                "jid": f"{settings.agent_settings.ri_communication_agent_name}"
+                f"@{settings.agent_settings.host}",
+                "password": settings.agent_settings.ri_communication_agent_name,
+                "address": settings.zmq_settings.ri_communication_address,
+                "bind": True,
+            },
+        ),
+        "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,
+            },
+        ),
+        "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",
+            },
+        ),
+        "BeliefCollectorAgent": (
+            BeliefCollectorAgent,
+            {
+                "name": settings.agent_settings.belief_collector_agent_name,
+                "jid": f"{settings.agent_settings.belief_collector_agent_name}@"
+                f"{settings.agent_settings.host}",
+                "password": settings.agent_settings.belief_collector_agent_name,
+            },
+        ),
+        "TBeliefExtractor": (
+            TBeliefExtractorAgent,
+            {
+                "name": settings.agent_settings.text_belief_extractor_agent_name,
+                "jid": f"{settings.agent_settings.text_belief_extractor_agent_name}@"
+                f"{settings.agent_settings.host}",
+                "password": settings.agent_settings.text_belief_extractor_agent_name,
+            },
+        ),
+        "VADAgent": (
+            VADAgent,
+            {"audio_in_address": settings.zmq_settings.vad_agent_address, "audio_in_bind": False},
+        ),
+    }
 
-    llm_agent = LLMAgent(
-        settings.agent_settings.llm_agent_name + "@" + settings.agent_settings.host,
-        settings.agent_settings.llm_agent_name,
-    )
-    await llm_agent.start()
+    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()
+            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
 
-    bdi_core = BDICoreAgent(
-        settings.agent_settings.bdi_core_agent_name + "@" + settings.agent_settings.host,
-        settings.agent_settings.bdi_core_agent_name,
-        "src/control_backend/agents/bdi/rules.asl",
-    )
-    await bdi_core.start()
-
-    belief_collector = BeliefCollectorAgent(
-        settings.agent_settings.belief_collector_agent_name + "@" + settings.agent_settings.host,
-        settings.agent_settings.belief_collector_agent_name,
-    )
-    await belief_collector.start()
-
-    text_belief_extractor = TBeliefExtractor(
-        settings.agent_settings.text_belief_extractor_agent_name
-        + "@"
-        + settings.agent_settings.host,
-        settings.agent_settings.text_belief_extractor_agent_name,
-    )
-    await text_belief_extractor.start()
-
-    _temp_vad_agent = VADAgent(settings.zmq_settings.vad_agent_address, False)
-    await _temp_vad_agent.start()
-    logger.info("VAD agent started, now making ready...")
-    await _temp_vad_agent.streaming_behaviour.reset()
+    logger.info("Application startup complete.")
 
     yield
 
-    logger.info("%s shutting down.", app.title)
+    # --- APPLICATION SHUTDOWN ---
+    logger.info("%s is shutting down.", app.title)
+
+    # Potential shutdown logic goes here
+
+    logger.info("Application shutdown complete.")
 
 
 # if __name__ == "__main__":