Merge remote-tracking branch 'origin/dev' into feat/belief-collector

# Conflicts:
#	src/control_backend/main.py
This commit is contained in:
Twirre Meulenbelt
2025-10-29 15:37:55 +01:00
4 changed files with 137 additions and 37 deletions

View File

@@ -13,17 +13,12 @@ from control_backend.agents.ri_communication_agent import RICommunicationAgent
from control_backend.agents.bdi.bdi_core import BDICoreAgent
from control_backend.agents.vad_agent import VADAgent
from control_backend.agents.llm.llm import LLMAgent
from control_backend.agents.bdi.text_extractor import TBeliefExtractor
from control_backend.agents.belief_collector.belief_collector import BeliefCollectorAgent
from control_backend.api.v1.router import api_router
from control_backend.core.config import settings
from control_backend.core.zmq_context import context
# Agents
from control_backend.agents.bdi.bdi_core import BDICoreAgent
from control_backend.agents.belief_collector.belief_collector import BeliefCollectorAgent
from control_backend.agents.mock_agents.emo_text_mock import EmoTextAgent
from control_backend.agents.mock_agents.belief_text_mock import BeliefTextAgent
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.DEBUG)
@@ -41,41 +36,40 @@ async def lifespan(app: FastAPI):
# 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="tcp://*:5555",
bind=True,
)
await ri_communication_agent.start()
llm_agent = LLMAgent(
settings.agent_settings.llm_agent_name + '@' + settings.agent_settings.host,
settings.agent_settings.llm_agent_name,
)
await llm_agent.start()
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"
"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
settings.agent_settings.belief_collector_agent_name,
)
belief_text_mock = BeliefTextAgent(
settings.agent_settings.belief_text_agent_mock_name + '@' + settings.agent_settings.host,
settings.agent_settings.belief_text_agent_mock_name
)
ri_communication_agent = RICommunicationAgent(
settings.agent_settings.ri_communication_agent_name + "@" + settings.agent_settings.host,
settings.agent_settings.ri_communication_agent_name,
address="tcp://*:5555",
bind=True,
)
llm_agent = LLMAgent(settings.agent_settings.llm_agent_name + '@' + settings.agent_settings.host,
settings.agent_settings.llm_agent_name)
_temp_vad_agent = VADAgent("tcp://localhost:5558", False)
await bdi_core.start()
await belief_collector.start()
await belief_text_mock.start()
await ri_communication_agent.start()
await llm_agent.start()
await bdi_core.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("tcp://localhost:5558", False)
await _temp_vad_agent.start()
yield
@@ -98,4 +92,4 @@ app.include_router(api_router, prefix="") # TODO: make prefix /api/v1
@app.get("/")
async def root():
return {"status": "ok"}
return {"status": "ok"}