From 1f34b14dfad268279f9956777c3b50b2e12b6add Mon Sep 17 00:00:00 2001 From: Pim Hutting Date: Tue, 28 Oct 2025 13:07:49 +0100 Subject: [PATCH 1/4] Feat: Implement belief collector [ - Currently implements belief collection from text-based mock agent. - The beliefs communicated by this agent look like this: { "type": "belief_extraction_text", "beliefs": [ {"user_said": [["hello"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} ] } * have yet to add tests (but we want to merge into Dev. asap) ] [ref]: N25B-206 --- .../agents/belief_collector/__init__.py | 0 .../behaviours/continuous_collect.py | 109 ++++++++++++++++++ .../belief_collector/belief_collector.py | 13 +++ .../agents/mock_agents/__init__.py | 0 .../agents/mock_agents/belief_text_mock.py | 31 +++++ src/control_backend/core/config.py | 3 + src/control_backend/main.py | 34 +++++- 7 files changed, 185 insertions(+), 5 deletions(-) create mode 100644 src/control_backend/agents/belief_collector/__init__.py create mode 100644 src/control_backend/agents/belief_collector/behaviours/continuous_collect.py create mode 100644 src/control_backend/agents/belief_collector/belief_collector.py create mode 100644 src/control_backend/agents/mock_agents/__init__.py create mode 100644 src/control_backend/agents/mock_agents/belief_text_mock.py diff --git a/src/control_backend/agents/belief_collector/__init__.py b/src/control_backend/agents/belief_collector/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py new file mode 100644 index 0000000..510a380 --- /dev/null +++ b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py @@ -0,0 +1,109 @@ +import json +import logging +from spade.behaviour import CyclicBehaviour +from spade.message import Message +from control_backend.core.config import settings + +logger = logging.getLogger(__name__) + +class ContinuousBeliefCollector(CyclicBehaviour): + """ + Continuously collects beliefs/emotions from extractor agents: + Then we send a unified belief packet to the BDI agent. + """ + + async def run(self): + msg = await self.receive(timeout=0.1) # Wait for 0.1s + if msg: + await self._process_message(msg) + + + async def _process_message(self, msg: Message): + sender_node = self._sender_node(msg) + + # Parse JSON payload + try: + payload = json.loads(msg.body) + except Exception as e: + logger.warning( + "BeliefCollector: failed to parse JSON from %s. Body=%r Error=%s", + sender_node, msg.body, e + ) + return + + msg_type = payload.get("type") + + # Prefer explicit 'type' field + if msg_type == "belief_extraction_text" or sender_node == "belief_text_agent_mock": + logger.info("BeliefCollector: message routed to _handle_belief_text (sender=%s)", sender_node) + await self._handle_belief_text(payload, sender_node) + #This is not implemented yet, but we keep the structure for future use + elif msg_type == "emotion_extraction_text" or sender_node == "emo_text_agent_mock": + logger.info("BeliefCollector: message routed to _handle_emo_text (sender=%s)", sender_node) + await self._handle_emo_text(payload, sender_node) + else: + logger.info( + "BeliefCollector: unrecognized message (sender=%s, type=%r). Ignoring.", + sender_node, msg_type + ) + + @staticmethod + def _sender_node(msg: Message) -> str: + """ + Extracts the 'node' (localpart) of the sender JID. + E.g., 'agent@host/resource' -> 'agent' + """ + s = str(msg.sender) if msg.sender is not None else "no_sender" + return s.split("@", 1)[0] if "@" in s else s + + + async def _handle_belief_text(self, payload: dict, origin: str): + """ + Expected payload: + { + "type": "belief_extraction_text", + "beliefs": [ + {"user_said": [["hello"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} + ] + } + + """ + beliefs = payload.get("beliefs", []) + if not isinstance(beliefs, list): + logger.warning("BeliefCollector: 'beliefs' is not a list: %r", beliefs) + return + + logger.info("BeliefCollector: forwarding %d beliefs.", len(beliefs)) + for b in beliefs: + logger.info(" - %s", b) + + await self._send_beliefs_to_bdi(beliefs, origin=origin) + + + + async def _handle_emo_text(self, payload: dict, origin: str): + """TODO: implement (after we have emotional recogntion)""" + pass + + + async def _send_beliefs_to_bdi(self, beliefs: list[str], origin: str | None = None): + """ + Sends a unified belief packet to the BDI agent. + """ + if not beliefs: + return + + to_jid = f"{settings.agent_settings.bdi_core_agent_name}@{settings.agent_settings.host}" + + packet = { + "type": "belief_packet", + "origin": origin, + "beliefs": beliefs, + } + + msg = Message(to=to_jid) + msg.body = json.dumps(packet) + + + await self.send(msg) + logger.info("BeliefCollector: sent %d belief(s) to BDI at %s", len(beliefs), to_jid) diff --git a/src/control_backend/agents/belief_collector/belief_collector.py b/src/control_backend/agents/belief_collector/belief_collector.py new file mode 100644 index 0000000..dbb6095 --- /dev/null +++ b/src/control_backend/agents/belief_collector/belief_collector.py @@ -0,0 +1,13 @@ +import logging +from spade.agent import Agent + +from .behaviours.continuous_collect import ContinuousBeliefCollector + +logger = logging.getLogger(__name__) + +class BeliefCollectorAgent(Agent): + async def setup(self): + logger.info("BeliefCollectorAgent starting (%s)", self.jid) + # Attach the continuous collector behaviour (listens and forwards to BDI) + self.add_behaviour(ContinuousBeliefCollector()) + logger.info("BeliefCollectorAgent ready.") \ No newline at end of file diff --git a/src/control_backend/agents/mock_agents/__init__.py b/src/control_backend/agents/mock_agents/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/control_backend/agents/mock_agents/belief_text_mock.py b/src/control_backend/agents/mock_agents/belief_text_mock.py new file mode 100644 index 0000000..2c761ff --- /dev/null +++ b/src/control_backend/agents/mock_agents/belief_text_mock.py @@ -0,0 +1,31 @@ +import json +from spade.agent import Agent +from spade.behaviour import OneShotBehaviour +from spade.message import Message +from control_backend.core.config import settings + +class BeliefTextAgent(Agent): + class SendOnceBehaviourBlfText(OneShotBehaviour): + async def run(self): + to_jid = f"{settings.agent_settings.belief_collector_agent_name}@{settings.agent_settings.host}" + + # Send multiple beliefs in one JSON payload + payload = { + "type": "belief_extraction_text", + "beliefs": [ + {"user_said": [["hello"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} + ] + } + + msg = Message(to=to_jid) + msg.body = json.dumps(payload) + await self.send(msg) + print(f"Beliefs sent to {to_jid}!") + + self.exit_code = "Job Finished!" + await self.agent.stop() + + async def setup(self): + print("BeliefTextAgent started") + self.b = self.SendOnceBehaviourBlfText() + self.add_behaviour(self.b) diff --git a/src/control_backend/core/config.py b/src/control_backend/core/config.py index 07a828d..ad8f68d 100644 --- a/src/control_backend/core/config.py +++ b/src/control_backend/core/config.py @@ -10,6 +10,9 @@ class AgentSettings(BaseModel): bdi_core_agent_name: str = "bdi_core" belief_collector_agent_name: str = "belief_collector" test_agent_name: str = "test_agent" + #mock agents for belief collector + emo_text_agent_mock_name: str = "emo_text_agent_mock" + belief_text_agent_mock_name: str = "belief_text_agent_mock" class Settings(BaseSettings): app_title: str = "PepperPlus" diff --git a/src/control_backend/main.py b/src/control_backend/main.py index 1f377c4..0141f45 100644 --- a/src/control_backend/main.py +++ b/src/control_backend/main.py @@ -12,11 +12,17 @@ from spade.behaviour import OneShotBehaviour import zmq # Internal imports -from control_backend.agents.bdi.bdi_core import BDICoreAgent from control_backend.api.v1.router import api_router from control_backend.core.config import AgentSettings, 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) @@ -32,11 +38,29 @@ async def lifespan(app: FastAPI): logger.info("Internal publishing socket bound to %s", internal_comm_socket) # Initiate agents - 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") + host = settings.agent_settings.host + + bdi_core = BDICoreAgent( + settings.agent_settings.bdi_core_agent_name + '@' + host, + settings.agent_settings.bdi_core_agent_name, + "src/control_backend/agents/bdi/rules.asl" + ) + + belief_collector = BeliefCollectorAgent( + settings.agent_settings.belief_collector_agent_name + '@' + host, + settings.agent_settings.belief_collector_agent_name + ) + belief_text_mock = BeliefTextAgent( + settings.agent_settings.belief_text_agent_mock_name + '@' + host, + settings.agent_settings.belief_text_agent_mock_name + ) + await bdi_core.start() - + await belief_collector.start() + await belief_text_mock.start() + yield - + logger.info("%s shutting down.", app.title) # if __name__ == "__main__": @@ -53,4 +77,4 @@ app.include_router(api_router, prefix="") # TODO: make prefix /api/v1 @app.get("/") async def root(): - return {"status": "ok"} + return {"status": "ok"} \ No newline at end of file -- 2.49.1 From 2efce93a3749c2dfd7844ebe36091b05bf9ecd06 Mon Sep 17 00:00:00 2001 From: Pim Hutting Date: Tue, 28 Oct 2025 14:17:07 +0100 Subject: [PATCH 2/4] fix: made beliefs a dict of lists [ Before it was a list of a dict of lists of lists of strings now it is a dict of lists of lists of strings as prescribed by architecture (knowledge base) *also added some tests, but will have to add some more ] [ref]: N25B-206 --- .../behaviours/continuous_collect.py | 27 ++++-- .../agents/mock_agents/belief_text_mock.py | 5 +- .../bdi/behaviours/test_continuous_collect.py | 90 +++++++++++++++++++ 3 files changed, 110 insertions(+), 12 deletions(-) create mode 100644 test/unit/agents/bdi/behaviours/test_continuous_collect.py diff --git a/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py index 510a380..dbb3bcd 100644 --- a/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py +++ b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py @@ -1,7 +1,7 @@ import json import logging from spade.behaviour import CyclicBehaviour -from spade.message import Message +from spade.agent import Message from control_backend.core.config import settings logger = logging.getLogger(__name__) @@ -62,20 +62,29 @@ class ContinuousBeliefCollector(CyclicBehaviour): Expected payload: { "type": "belief_extraction_text", - "beliefs": [ - {"user_said": [["hello"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} - ] + "beliefs": {"user_said": [["hello","test"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} + } """ - beliefs = payload.get("beliefs", []) - if not isinstance(beliefs, list): - logger.warning("BeliefCollector: 'beliefs' is not a list: %r", beliefs) + beliefs = payload.get("beliefs", dict) + + if not beliefs: + logger.info("BeliefCollector: no beliefs to process.") + return + + if not isinstance(beliefs, dict): + logger.warning("BeliefCollector: 'beliefs' is not a dict: %r", beliefs) + return + + if not all(isinstance(v, list) for v in beliefs.values()): + logger.warning("BeliefCollector: 'beliefs' values are not all lists: %r", beliefs) return logger.info("BeliefCollector: forwarding %d beliefs.", len(beliefs)) - for b in beliefs: - logger.info(" - %s", b) + for belief_name, belief_lists in beliefs.items(): + for args in belief_lists: + logger.info(" - %s %s", belief_name, " ".join(map(str, args))) await self._send_beliefs_to_bdi(beliefs, origin=origin) diff --git a/src/control_backend/agents/mock_agents/belief_text_mock.py b/src/control_backend/agents/mock_agents/belief_text_mock.py index 2c761ff..05a6a13 100644 --- a/src/control_backend/agents/mock_agents/belief_text_mock.py +++ b/src/control_backend/agents/mock_agents/belief_text_mock.py @@ -12,9 +12,8 @@ class BeliefTextAgent(Agent): # Send multiple beliefs in one JSON payload payload = { "type": "belief_extraction_text", - "beliefs": [ - {"user_said": [["hello"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} - ] + "beliefs": {"user_said": [["hello","test"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} + } msg = Message(to=to_jid) diff --git a/test/unit/agents/bdi/behaviours/test_continuous_collect.py b/test/unit/agents/bdi/behaviours/test_continuous_collect.py new file mode 100644 index 0000000..0a19cb3 --- /dev/null +++ b/test/unit/agents/bdi/behaviours/test_continuous_collect.py @@ -0,0 +1,90 @@ +import json +import logging +from unittest.mock import MagicMock, AsyncMock, call + +import pytest + +from control_backend.agents.belief_collector.behaviours.continuous_collect import ContinuousBeliefCollector + +@pytest.fixture +def mock_agent(mocker): + """Fixture to create a mock Agent.""" + agent = MagicMock() + agent.jid = "belief_collector_agent@test" + return agent + +@pytest.fixture +def continuous_collector(mock_agent, mocker): + """Fixture to create an instance of ContinuousBeliefCollector with a mocked agent.""" + # Patch asyncio.sleep to prevent tests from actually waiting + mocker.patch("asyncio.sleep", return_value=None) + + collector = ContinuousBeliefCollector() + collector.agent = mock_agent + # Mock the receive method, we will control its return value in each test + collector.receive = AsyncMock() + return collector + +@pytest.mark.asyncio +async def test_run_no_message_received(continuous_collector, mocker): + """ + Test that when no message is received, _process_message is not called. + """ + # Arrange + continuous_collector.receive.return_value = None + mocker.patch.object(continuous_collector, "_process_message") + + # Act + await continuous_collector.run() + + # Assert + continuous_collector._process_message.assert_not_called() + +@pytest.mark.asyncio +async def test_run_message_received(continuous_collector, mocker): + """ + Test that when a message is received, _process_message is called with that message. + """ + # Arrange + mock_msg = MagicMock() + continuous_collector.receive.return_value = mock_msg + mocker.patch.object(continuous_collector, "_process_message") + + # Act + await continuous_collector.run() + + # Assert + continuous_collector._process_message.assert_awaited_once_with(mock_msg) + +@pytest.mark.asyncio +async def test_process_message_invalid(continuous_collector, mocker): + """ + Test that when an invalid JSON message is received, a warning is logged and processing stops. + """ + # Arrange + invalid_json = "this is not json" + msg = MagicMock() + msg.body = invalid_json + msg.sender = "belief_text_agent_mock@test" + + logger_mock = mocker.patch("control_backend.agents.belief_collector.behaviours.continuous_collect.logger") + + # Act + await continuous_collector._process_message(msg) + + # Assert + logger_mock.warning.assert_called_once() + +def test_get_sender_from_message(continuous_collector): + """ + Test that _sender_node correctly extracts the sender node from the message JID. + """ + # Arrange + msg = MagicMock() + msg.sender = "agent_node@host/resource" + + # Act + sender_node = continuous_collector._sender_node(msg) + + # Assert + assert sender_node == "agent_node" \ No newline at end of file -- 2.49.1 From f8dee6d878d44b1c139d336ff3799b39ed38f1be Mon Sep 17 00:00:00 2001 From: Pim Hutting Date: Wed, 29 Oct 2025 09:58:56 +0100 Subject: [PATCH 3/4] test: added tests [ See test_continuous_collect.py ] [ref]: N25B-206 --- .../behaviours/continuous_collect.py | 2 +- .../agents/mock_agents/belief_text_mock.py | 3 +- .../bdi/behaviours/test_continuous_collect.py | 121 +++++++++++++++++- 3 files changed, 122 insertions(+), 4 deletions(-) diff --git a/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py index dbb3bcd..b94dbd9 100644 --- a/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py +++ b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py @@ -67,7 +67,7 @@ class ContinuousBeliefCollector(CyclicBehaviour): } """ - beliefs = payload.get("beliefs", dict) + beliefs = payload.get("beliefs", {}) if not beliefs: logger.info("BeliefCollector: no beliefs to process.") diff --git a/src/control_backend/agents/mock_agents/belief_text_mock.py b/src/control_backend/agents/mock_agents/belief_text_mock.py index 05a6a13..d8a223f 100644 --- a/src/control_backend/agents/mock_agents/belief_text_mock.py +++ b/src/control_backend/agents/mock_agents/belief_text_mock.py @@ -12,8 +12,7 @@ class BeliefTextAgent(Agent): # Send multiple beliefs in one JSON payload payload = { "type": "belief_extraction_text", - "beliefs": {"user_said": [["hello","test"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} - + "beliefs": {"user_said": [["hello test"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} } msg = Message(to=to_jid) diff --git a/test/unit/agents/bdi/behaviours/test_continuous_collect.py b/test/unit/agents/bdi/behaviours/test_continuous_collect.py index 0a19cb3..c603048 100644 --- a/test/unit/agents/bdi/behaviours/test_continuous_collect.py +++ b/test/unit/agents/bdi/behaviours/test_continuous_collect.py @@ -87,4 +87,123 @@ def test_get_sender_from_message(continuous_collector): sender_node = continuous_collector._sender_node(msg) # Assert - assert sender_node == "agent_node" \ No newline at end of file + assert sender_node == "agent_node" + +@pytest.mark.asyncio +async def test_routes_to_handle_belief_text_by_type(continuous_collector, mocker): + msg = MagicMock() + msg.body = json.dumps({"type": "belief_extraction_text", "beliefs": {"user_said": [["hi"]]}}) + msg.sender = "anyone@test" + spy = mocker.patch.object(continuous_collector, "_handle_belief_text", new=AsyncMock()) + await continuous_collector._process_message(msg) + spy.assert_awaited_once() + +@pytest.mark.asyncio +async def test_routes_to_handle_belief_text_by_sender(continuous_collector, mocker): + msg = MagicMock() + msg.body = json.dumps({"beliefs": {"user_said": [["hi"]]}}) # no type + msg.sender = "belief_text_agent_mock@test" + spy = mocker.patch.object(continuous_collector, "_handle_belief_text", new=AsyncMock()) + await continuous_collector._process_message(msg) + spy.assert_awaited_once() + +@pytest.mark.asyncio +async def test_routes_to_handle_emo_text(continuous_collector, mocker): + msg = MagicMock() + msg.body = json.dumps({"type": "emotion_extraction_text"}) + msg.sender = "anyone@test" + spy = mocker.patch.object(continuous_collector, "_handle_emo_text", new=AsyncMock()) + await continuous_collector._process_message(msg) + spy.assert_awaited_once() + +@pytest.mark.asyncio +async def test_unrecognized_message_logs_info(continuous_collector, mocker): + msg = MagicMock() + msg.body = json.dumps({"type": "something_else"}) + msg.sender = "x@test" + logger_mock = mocker.patch("control_backend.agents.belief_collector.behaviours.continuous_collect.logger") + await continuous_collector._process_message(msg) + logger_mock.info.assert_any_call( + "BeliefCollector: unrecognized message (sender=%s, type=%r). Ignoring.", "x", "something_else" + ) + + +@pytest.mark.asyncio +async def test_belief_text_no_beliefs(continuous_collector, mocker): + msg_payload = {"type": "belief_extraction_text"} # no 'beliefs' + logger_mock = mocker.patch("control_backend.agents.belief_collector.behaviours.continuous_collect.logger") + await continuous_collector._handle_belief_text(msg_payload, "origin_node") + logger_mock.info.assert_any_call("BeliefCollector: no beliefs to process.") + +@pytest.mark.asyncio +async def test_belief_text_beliefs_not_dict(continuous_collector, mocker): + payload = {"type": "belief_extraction_text", "beliefs": ["not", "a", "dict"]} + logger_mock = mocker.patch("control_backend.agents.belief_collector.behaviours.continuous_collect.logger") + await continuous_collector._handle_belief_text(payload, "origin") + logger_mock.warning.assert_any_call("BeliefCollector: 'beliefs' is not a dict: %r", ["not", "a", "dict"]) + +@pytest.mark.asyncio +async def test_belief_text_values_not_lists(continuous_collector, mocker): + payload = {"type": "belief_extraction_text", "beliefs": {"user_said": "not-a-list"}} + logger_mock = mocker.patch("control_backend.agents.belief_collector.behaviours.continuous_collect.logger") + await continuous_collector._handle_belief_text(payload, "origin") + logger_mock.warning.assert_any_call( + "BeliefCollector: 'beliefs' values are not all lists: %r", {"user_said": "not-a-list"} + ) + +@pytest.mark.asyncio +async def test_belief_text_happy_path_logs_items_and_sends(continuous_collector, mocker): + payload = { + "type": "belief_extraction_text", + "beliefs": {"user_said": [["hello", "test"], ["No"]]} + } + # Your code calls self.send(..); patch it (or switch implementation to self.agent.send and patch that) + continuous_collector.send = AsyncMock() + logger_mock = mocker.patch("control_backend.agents.belief_collector.behaviours.continuous_collect.logger") + await continuous_collector._handle_belief_text(payload, "belief_text_agent_mock") + + logger_mock.info.assert_any_call("BeliefCollector: forwarding %d beliefs.", 1) + # and the item logs: + logger_mock.info.assert_any_call(" - %s %s", "user_said", "hello test") + logger_mock.info.assert_any_call(" - %s %s", "user_said", "No") + # make sure we attempted a send + continuous_collector.send.assert_awaited_once() + +@pytest.mark.asyncio +async def test_send_beliefs_noop_on_empty(continuous_collector): + continuous_collector.send = AsyncMock() + await continuous_collector._send_beliefs_to_bdi([], origin="o") + continuous_collector.send.assert_not_awaited() + +@pytest.mark.asyncio +async def test_send_beliefs_sends_json_packet(continuous_collector): + # Patch .send and capture the message body + sent = {} + + async def _fake_send(msg): + sent["body"] = msg.body + sent["to"] = str(msg.to) + + continuous_collector.send = AsyncMock(side_effect=_fake_send) + beliefs = ["user_said hello", "user_said No"] + await continuous_collector._send_beliefs_to_bdi(beliefs, origin="origin_node") + + assert "belief_packet" in json.loads(sent["body"])["type"] + assert json.loads(sent["body"])["beliefs"] == beliefs + +def test_sender_node_no_sender_returns_literal(continuous_collector): + msg = MagicMock() + msg.sender = None + assert continuous_collector._sender_node(msg) == "no_sender" + +def test_sender_node_without_at(continuous_collector): + msg = MagicMock() + msg.sender = "localpartonly" + assert continuous_collector._sender_node(msg) == "localpartonly" + +@pytest.mark.asyncio +async def test_belief_text_coerces_non_strings(continuous_collector, mocker): + payload = {"type": "belief_extraction_text", "beliefs": {"user_said": [["hi", 123]]}} + continuous_collector.send = AsyncMock() + await continuous_collector._handle_belief_text(payload, "origin") + continuous_collector.send.assert_awaited_once() -- 2.49.1 From baeef6142d308d8ec8dfa56907c3fdebfeb9db14 Mon Sep 17 00:00:00 2001 From: Pim Hutting Date: Wed, 29 Oct 2025 11:20:20 +0100 Subject: [PATCH 4/4] fix: beliefs now adhere to expected format [ -before user_said belief was a list of lists of strings, now it's a list of strings ] [ref]: N25B-206 --- .../belief_collector/behaviours/continuous_collect.py | 8 ++++---- .../agents/mock_agents/belief_text_mock.py | 2 +- .../behaviours/test_continuous_collect.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename test/unit/agents/{bdi => belief_collector}/behaviours/test_continuous_collect.py (99%) diff --git a/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py index b94dbd9..50986cd 100644 --- a/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py +++ b/src/control_backend/agents/belief_collector/behaviours/continuous_collect.py @@ -62,7 +62,7 @@ class ContinuousBeliefCollector(CyclicBehaviour): Expected payload: { "type": "belief_extraction_text", - "beliefs": {"user_said": [["hello","test"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} + "beliefs": {"user_said": ["hello"","Can you help me?","stop talking to me","No","Pepper do a dance"]} } @@ -82,9 +82,9 @@ class ContinuousBeliefCollector(CyclicBehaviour): return logger.info("BeliefCollector: forwarding %d beliefs.", len(beliefs)) - for belief_name, belief_lists in beliefs.items(): - for args in belief_lists: - logger.info(" - %s %s", belief_name, " ".join(map(str, args))) + for belief_name, belief_list in beliefs.items(): + for belief in belief_list: + logger.info(" - %s %s", belief_name,str(belief)) await self._send_beliefs_to_bdi(beliefs, origin=origin) diff --git a/src/control_backend/agents/mock_agents/belief_text_mock.py b/src/control_backend/agents/mock_agents/belief_text_mock.py index d8a223f..607c2f5 100644 --- a/src/control_backend/agents/mock_agents/belief_text_mock.py +++ b/src/control_backend/agents/mock_agents/belief_text_mock.py @@ -12,7 +12,7 @@ class BeliefTextAgent(Agent): # Send multiple beliefs in one JSON payload payload = { "type": "belief_extraction_text", - "beliefs": {"user_said": [["hello test"],["Can you help me?"],["stop talking to me"],["No"],["Pepper do a dance"]]} + "beliefs": {"user_said": ["hello test","Can you help me?","stop talking to me","No","Pepper do a dance"]} } msg = Message(to=to_jid) diff --git a/test/unit/agents/bdi/behaviours/test_continuous_collect.py b/test/unit/agents/belief_collector/behaviours/test_continuous_collect.py similarity index 99% rename from test/unit/agents/bdi/behaviours/test_continuous_collect.py rename to test/unit/agents/belief_collector/behaviours/test_continuous_collect.py index c603048..7629fe5 100644 --- a/test/unit/agents/bdi/behaviours/test_continuous_collect.py +++ b/test/unit/agents/belief_collector/behaviours/test_continuous_collect.py @@ -155,7 +155,7 @@ async def test_belief_text_values_not_lists(continuous_collector, mocker): async def test_belief_text_happy_path_logs_items_and_sends(continuous_collector, mocker): payload = { "type": "belief_extraction_text", - "beliefs": {"user_said": [["hello", "test"], ["No"]]} + "beliefs": {"user_said": ["hello test", "No"]} } # Your code calls self.send(..); patch it (or switch implementation to self.agent.send and patch that) continuous_collector.send = AsyncMock() -- 2.49.1