feat: apply new agent naming standards
Expanding abbreviations to remove ambiguity, simplifying agent names to reduce repetition. ref: N25B-257
This commit is contained in:
@@ -9,21 +9,21 @@ from zmq.asyncio import Context
|
||||
|
||||
# Act agents
|
||||
# BDI agents
|
||||
from control_backend.agents.bdi_agents import (
|
||||
from control_backend.agents.bdi import (
|
||||
BDIBeliefCollectorAgent,
|
||||
BDICoreAgent,
|
||||
BDITextBeliefAgent,
|
||||
TextBeliefExtractorAgent,
|
||||
)
|
||||
|
||||
# Communication agents
|
||||
from control_backend.agents.com_agents import ComRIAgent
|
||||
from control_backend.agents.communication import RICommunicationAgent
|
||||
|
||||
# Emotional Agents
|
||||
# LLM Agents
|
||||
from control_backend.agents.llm_agents import LLMAgent
|
||||
from control_backend.agents.llm import LLMAgent
|
||||
|
||||
# Perceive agents
|
||||
from control_backend.agents.per_agents import PerVADAgent
|
||||
from control_backend.agents.perception import VADAgent
|
||||
|
||||
# Other backend imports
|
||||
from control_backend.api.v1.router import api_router
|
||||
@@ -77,12 +77,12 @@ async def lifespan(app: FastAPI):
|
||||
logger.info("Initializing and starting agents.")
|
||||
agents_to_start = {
|
||||
"ComRIAgent": (
|
||||
ComRIAgent,
|
||||
RICommunicationAgent,
|
||||
{
|
||||
"name": settings.agent_settings.com_ri_agent_name,
|
||||
"jid": f"{settings.agent_settings.com_ri_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.com_ri_agent_name,
|
||||
"password": settings.agent_settings.ri_communication_name,
|
||||
"address": "tcp://*:5555",
|
||||
"bind": True,
|
||||
},
|
||||
@@ -90,56 +90,61 @@ 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_agent_name,
|
||||
"jid": f"{settings.agent_settings.bdi_core_agent_agent_name}@"
|
||||
f"{settings.agent_settings.host}",
|
||||
"password": settings.agent_settings.bdi_core_agent_agent_name,
|
||||
"asl": "src/control_backend/agents/bdi_agents/bdi_core_agent/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",
|
||||
},
|
||||
),
|
||||
"BDIBeliefCollectorAgent": (
|
||||
BDIBeliefCollectorAgent,
|
||||
{
|
||||
"name": settings.agent_settings.bdi_belief_collector_agent_name,
|
||||
"jid": f"{settings.agent_settings.bdi_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.bdi_belief_collector_agent_name,
|
||||
"password": settings.agent_settings.bdi_belief_collector_name,
|
||||
},
|
||||
),
|
||||
"BDITextBeliefAgent": (
|
||||
BDITextBeliefAgent,
|
||||
TextBeliefExtractorAgent,
|
||||
{
|
||||
"name": settings.agent_settings.bdi_text_belief_agent_name,
|
||||
"jid": f"{settings.agent_settings.bdi_text_belief_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.bdi_text_belief_agent_name,
|
||||
"password": settings.agent_settings.text_belief_extractor_name,
|
||||
},
|
||||
),
|
||||
"PerVADAgent": (
|
||||
PerVADAgent,
|
||||
VADAgent,
|
||||
{"audio_in_address": "tcp://localhost:5558", "audio_in_bind": False},
|
||||
),
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user