pepperplus/pepperplus-cb
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: improve logging and module structure

Browse Source 
Changed some folders to not be modules and organized some `__init__.py`
files.

ref: N25B-223
This commit is contained in:
Kasper
2025-11-02 11:32:21 +01:00
parent d66fe07438
commit d43cb9394a
18 changed files with 179 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/control_backend/agents/bdi/__init__.py
View File

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

14
src/control_backend/agents/bdi/bdi_core.py
View File

@@ -5,10 +5,8 @@ from spade.behaviour import OneShotBehaviour
from spade.message import Message
from spade_bdi.bdi import BDIAgent
from control_backend.agents.bdi.behaviours.belief_setter import BeliefSetterBehaviour
from control_backend.agents.bdi.behaviours.receive_llm_resp_behaviour import (
ReceiveLLMResponseBehaviour,
)
from .behaviours.belief_setter import BeliefSetterBehaviour
from .behaviours.receive_llm_resp_behaviour import ReceiveLLMResponseBehaviour
from control_backend.core.config import settings
@@ -26,12 +24,12 @@ class BDICoreAgent(BDIAgent):
"""
Initializes belief behaviors and message routing.
"""
self.logger.info("BDICoreAgent setup started")
self.logger.info("BDICoreAgent setup started.")
self.add_behaviour(BeliefSetterBehaviour())
self.add_behaviour(ReceiveLLMResponseBehaviour())
self.logger.info("BDICoreAgent setup complete")
self.logger.info("BDICoreAgent setup complete.")
def add_custom_actions(self, actions) -> None:
"""
@@ -45,7 +43,7 @@ class BDICoreAgent(BDIAgent):
Example: .reply("Hello LLM!")
"""
message_text = agentspeak.grounded(term.args[0], intention.scope)
self.logger.info("Reply action sending: %s", message_text)
self.logger.debug("Reply action sending: %s", message_text)
self._send_to_llm(str(message_text))
yield
@@ -63,6 +61,6 @@ class BDICoreAgent(BDIAgent):
)
await self.send(msg)
self.agent.logger.info("Message sent to LLM: %s", text)
self.agent.logger.info("Message sent to LLM agent: %s", text)
self.add_behaviour(SendBehaviour())

0
src/control_backend/agents/bdi/behaviours/__init__.py
View File

48
src/control_backend/agents/bdi/behaviours/belief_setter.py
View File

@@ -3,7 +3,7 @@ import logging
from spade.agent import Message
from spade.behaviour import CyclicBehaviour
from spade_bdi.bdi import BDIAgent, BeliefNotInitiated
from spade_bdi.bdi import BDIAgent
from control_backend.core.config import settings
@@ -11,26 +11,32 @@ from control_backend.core.config import settings
class BeliefSetterBehaviour(CyclicBehaviour):
"""
This is the behaviour that the BDI agent runs. This behaviour waits for incoming
message and processes it based on sender.
message and updates the agent's beliefs accordingly.
"""
agent: BDIAgent
logger = logging.getLogger("BDI/Belief Setter")
logger = logging.getLogger(__name__)
async def run(self):
msg = await self.receive(timeout=0.1)
if msg:
self.logger.info(f"Received message {msg.body}")
self._process_message(msg)
"""Polls for messages and processes them."""
msg = await self.receive()
self.logger.debug(
"Received message from %s with thread '%s' and body: %s",
msg.sender,
msg.thread,
msg.body,
)
self._process_message(msg)
def _process_message(self, message: Message):
"""Routes the message to the correct processing function based on the sender."""
sender = message.sender.node # removes host from jid and converts to str
self.logger.debug("Sender: %s", sender)
self.logger.debug("Processing message from sender: %s", sender)
match sender:
case settings.agent_settings.belief_collector_agent_name:
self.logger.debug("Processing message from belief collector.")
self.logger.debug("Message is from the belief collector agent. Processing as belief message.")
self._process_belief_message(message)
case _:
self.logger.debug("Not the belief agent, discarding message")
@@ -38,6 +44,7 @@ class BeliefSetterBehaviour(CyclicBehaviour):
def _process_belief_message(self, message: Message):
if not message.body:
self.logger.debug("Ignoring message with empty body from %s", message.sender.node)
return
match message.thread:
@@ -45,22 +52,33 @@ class BeliefSetterBehaviour(CyclicBehaviour):
try:
beliefs: dict[str, list[str]] = json.loads(message.body)
self._set_beliefs(beliefs)
except json.JSONDecodeError as e:
self.logger.error("Could not decode beliefs into JSON format: %s", e)
except json.JSONDecodeError:
self.logger.error(
"Could not decode beliefs from JSON. Message body: '%s'",
message.body,
exc_info=True
)
case _:
pass
def _set_beliefs(self, beliefs: dict[str, list[str]]):
"""Remove previous values for beliefs and update them with the provided values."""
"""Removes previous values for beliefs and updates them with the provided values."""
if self.agent.bdi is None:
self.logger.warning("Cannot set beliefs, since agent's BDI is not yet initialized.")
self.logger.warning("Cannot set beliefs; agent's BDI is not yet initialized.")
return
if not beliefs:
self.logger.debug("Received an empty set of beliefs. No beliefs were updated.")
return
# Set new beliefs (outdated beliefs are automatically removed)
for belief, arguments in beliefs.items():
self.logger.debug("Setting belief %s with arguments %s", belief, arguments)
self.agent.bdi.set_belief(belief, *arguments)
# Special case: if there's a new user message, flag that we haven't responded yet
if belief == "user_said": self.agent.bdi.set_belief("new_message")
if belief == "user_said":
self.agent.bdi.set_belief("new_message")
self.logger.debug("Detected 'user_said' belief, also setting 'new_message' belief.")
self.logger.info("Set belief %s with arguments %s", belief, arguments)
self.logger.info("Successfully updated %d beliefs.", len(beliefs))

8
src/control_backend/agents/bdi/behaviours/receive_llm_resp_behaviour.py
View File

@@ -9,11 +9,9 @@ class ReceiveLLMResponseBehaviour(CyclicBehaviour):
"""
Adds behavior to receive responses from the LLM Agent.
"""
logger = logging.getLogger("BDI/LLM Reciever")
logger = logging.getLogger(__name__)
async def run(self):
msg = await self.receive(timeout=2)
if not msg:
return
msg = await self.receive()
sender = msg.sender.node
match sender:
@@ -22,5 +20,5 @@ class ReceiveLLMResponseBehaviour(CyclicBehaviour):
self.logger.info("Received LLM response: %s", content)
#Here the BDI can pass the message back as a response
case _:
self.logger.debug("Not from the llm, discarding message")
self.logger.debug("Discarding message from %s", sender)
pass

22
src/control_backend/agents/bdi/behaviours/text_belief_extractor.py
View File

@@ -37,17 +37,15 @@ class BeliefFromText(CyclicBehaviour):
}
async def run(self):
msg = await self.receive(timeout=0.1)
if msg:
sender = msg.sender.node
match sender:
case settings.agent_settings.transcription_agent_name:
self.logger.info("Received text from transcriber.")
await self._process_transcription_demo(msg.body)
case _:
self.logger.info("Received message from other agent.")
pass
await asyncio.sleep(1)
msg = await self.receive()
sender = msg.sender.node
match sender:
case settings.agent_settings.transcription_agent_name:
self.logger.debug("Received text from transcriber: %s", msg.body)
await self._process_transcription_demo(msg.body)
case _:
self.logger.info("Discarding message from %s", sender)
pass
async def _process_transcription(self, text: str):
text_prompt = f"Text: {text}"
@@ -91,4 +89,4 @@ class BeliefFromText(CyclicBehaviour):
belief_msg.thread = "beliefs"
await self.send(belief_msg)
self.logger.info("Sent beliefs to Belief Collector.")
self.logger.info("Sent %d beliefs to the belief collector.", len(belief["beliefs"]))

7
src/control_backend/agents/bdi/text_extractor.py
View File

@@ -1,9 +1,8 @@
from spade.agent import Agent
from control_backend.agents.bdi.behaviours.text_belief_extractor import BeliefFromText
from .behaviours.text_belief_extractor import BeliefFromText
class TBeliefExtractor(Agent):
class TBeliefExtractorAgent(Agent):
async def setup(self):
self.b = BeliefFromText()
self.add_behaviour(self.b)
self.add_behaviour(BeliefFromText())