Restructure logging #21

Merged
k.marinus merged 11 commits from refactor/logging into dev 2025-11-05 15:31:06 +00:00
5 changed files with 20 additions and 27 deletions
Showing only changes of commit c7bdb5aeda - Show all commits

View File

@@ -1,17 +1,7 @@
from .base import BaseAgent from .base import BaseAgent as BaseAgent
from .belief_collector.belief_collector import BeliefCollectorAgent from .belief_collector.belief_collector import BeliefCollectorAgent as BeliefCollectorAgent
from .llm.llm import LLMAgent from .llm.llm import LLMAgent as LLMAgent
from .ri_command_agent import RICommandAgent from .ri_command_agent import RICommandAgent as RICommandAgent
from .ri_communication_agent import RICommunicationAgent from .ri_communication_agent import RICommunicationAgent as RICommunicationAgent
from .transcription.transcription_agent import TranscriptionAgent from .transcription.transcription_agent import TranscriptionAgent as TranscriptionAgent
from .vad_agent import VADAgent from .vad_agent import VADAgent as VADAgent
__all__ = [
"BaseAgent",
"BeliefCollectorAgent",
"LLMAgent",
"RICommandAgent",
"RICommunicationAgent",
"TranscriptionAgent",
"VADAgent",
]

View File

@@ -1,2 +1,2 @@
from .bdi_core import BDICoreAgent from .bdi_core import BDICoreAgent as BDICoreAgent
from .text_extractor import TBeliefExtractorAgent from .text_extractor import TBeliefExtractorAgent as TBeliefExtractorAgent

View File

@@ -7,7 +7,6 @@ from spade.behaviour import CyclicBehaviour
from control_backend.core.config import settings from control_backend.core.config import settings
class ContinuousBeliefCollector(CyclicBehaviour): class ContinuousBeliefCollector(CyclicBehaviour):
""" """
Continuously collects beliefs/emotions from extractor agents: Continuously collects beliefs/emotions from extractor agents:
@@ -24,8 +23,8 @@ class ContinuousBeliefCollector(CyclicBehaviour):
# Parse JSON payload # Parse JSON payload
try: try:
payload = json.loads(msg.body) payload = json.loads(msg.body)
except Exception as e: except JSONDecodeError as e:
logger.warning( self.agent.logger.warning(
"BeliefCollector: failed to parse JSON from %s. Body=%r Error=%s", "BeliefCollector: failed to parse JSON from %s. Body=%r Error=%s",
sender_node, sender_node,
msg.body, msg.body,

View File

@@ -1 +1 @@
from .setup_logging import setup_logging from .setup_logging import setup_logging as setup_logging

View File

@@ -49,7 +49,8 @@ async def lifespan(app: FastAPI):
RICommunicationAgent, RICommunicationAgent,
{ {
"name": settings.agent_settings.ri_communication_agent_name, "name": settings.agent_settings.ri_communication_agent_name,
"jid": f"{settings.agent_settings.ri_communication_agent_name}@{settings.agent_settings.host}", "jid": f"{settings.agent_settings.ri_communication_agent_name}\
@{settings.agent_settings.host}",
"password": settings.agent_settings.ri_communication_agent_name, "password": settings.agent_settings.ri_communication_agent_name,
"address": "tcp://*:5555", "address": "tcp://*:5555",
"bind": True, "bind": True,
@@ -67,7 +68,8 @@ async def lifespan(app: FastAPI):
BDICoreAgent, BDICoreAgent,
{ {
"name": settings.agent_settings.bdi_core_agent_name, "name": settings.agent_settings.bdi_core_agent_name,
"jid": f"{settings.agent_settings.bdi_core_agent_name}@{settings.agent_settings.host}", "jid": f"{settings.agent_settings.bdi_core_agent_name}@\
{settings.agent_settings.host}",
"password": settings.agent_settings.bdi_core_agent_name, "password": settings.agent_settings.bdi_core_agent_name,
"asl": "src/control_backend/agents/bdi/rules.asl", "asl": "src/control_backend/agents/bdi/rules.asl",
}, },
@@ -76,7 +78,8 @@ async def lifespan(app: FastAPI):
BeliefCollectorAgent, BeliefCollectorAgent,
{ {
"name": settings.agent_settings.belief_collector_agent_name, "name": settings.agent_settings.belief_collector_agent_name,
"jid": f"{settings.agent_settings.belief_collector_agent_name}@{settings.agent_settings.host}", "jid": f"{settings.agent_settings.belief_collector_agent_name}@\
{settings.agent_settings.host}",
"password": settings.agent_settings.belief_collector_agent_name, "password": settings.agent_settings.belief_collector_agent_name,
}, },
), ),
@@ -84,7 +87,8 @@ async def lifespan(app: FastAPI):
TBeliefExtractorAgent, TBeliefExtractorAgent,
{ {
"name": settings.agent_settings.text_belief_extractor_agent_name, "name": settings.agent_settings.text_belief_extractor_agent_name,
"jid": f"{settings.agent_settings.text_belief_extractor_agent_name}@{settings.agent_settings.host}", "jid": f"{settings.agent_settings.text_belief_extractor_agent_name}@\
{settings.agent_settings.host}",
"password": settings.agent_settings.text_belief_extractor_agent_name, "password": settings.agent_settings.text_belief_extractor_agent_name,
}, },
), ),