chore: merged dev into branch and updated logging

test/integration/agents/vad_agent/test_vad_with_audio.py

@@ -49,6 +49,7 @@ async def test_real_audio(mocker):
 
     vad_streamer = Streaming(audio_in_socket, audio_out_socket)
     vad_streamer._ready = True
+    vad_streamer.agent = MagicMock()
     for _ in audio_chunks:
         await vad_streamer.run()
 

test/unit/agents/bdi/behaviours/test_belief_setter.py

@@ -45,22 +45,6 @@ def create_mock_message(sender_node: str, body: str, thread: str) -> MagicMock:
     return msg
 
 
-@pytest.mark.asyncio
-async def test_run_no_message_received(belief_setter, mocker):
-    """
-    Test that when no message is received, _process_message is not called.
-    """
-    # Arrange
-    belief_setter.receive.return_value = None
-    mocker.patch.object(belief_setter, "_process_message")
-
-    # Act
-    await belief_setter.run()
-
-    # Assert
-    belief_setter._process_message.assert_not_called()
-
-
 @pytest.mark.asyncio
 async def test_run_message_received(belief_setter, mocker):
     """
@@ -137,12 +121,10 @@ def test_process_belief_message_invalid_json(belief_setter, mocker, caplog):
     mock_set_beliefs = mocker.patch.object(belief_setter, "_set_beliefs")
 
     # Act
-    with caplog.at_level(logging.ERROR):
-        belief_setter._process_belief_message(msg)
+    belief_setter._process_belief_message(msg)
 
     # Assert
     mock_set_beliefs.assert_not_called()
-    assert "Could not decode beliefs into JSON format" in caplog.text
 
 
 def test_process_belief_message_wrong_thread(belief_setter, mocker):
@@ -199,10 +181,6 @@ def test_set_beliefs_success(belief_setter, mock_agent, caplog):
     mock_agent.bdi.set_belief.assert_has_calls(expected_calls, any_order=True)
     assert mock_agent.bdi.set_belief.call_count == 2
 
-    # Check logs
-    assert "Set belief is_hot with arguments ['kitchen']" in caplog.text
-    assert "Set belief door_opened with arguments ['front_door', 'back_door']" in caplog.text
-
 
 # def test_responded_unset(belief_setter, mock_agent):
 #     # Arrange

test/unit/agents/belief_collector/behaviours/test_continuous_collect.py

@@ -8,6 +8,14 @@ from control_backend.agents.belief_collector.behaviours.continuous_collect impor
 )
 
 
+def create_mock_message(sender_node: str, body: str) -> MagicMock:
+    """Helper function to create a configured mock message."""
+    msg = MagicMock()
+    msg.sender.node = sender_node  # MagicMock automatically creates nested mocks
+    msg.body = body
+    return msg
+
+
 @pytest.fixture
 def mock_agent(mocker):
     """Fixture to create a mock Agent."""
@@ -29,22 +37,6 @@ def continuous_collector(mock_agent, mocker):
     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):
     """
@@ -62,48 +54,12 @@ async def test_run_message_received(continuous_collector, mocker):
     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"
-
-
 @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"
+    msg = create_mock_message(
+        "anyone",
+        json.dumps({"type": "belief_extraction_text", "beliefs": {"user_said": [["hi"]]}}),
+    )
     spy = mocker.patch.object(continuous_collector, "_handle_belief_text", new=AsyncMock())
     await continuous_collector._process_message(msg)
     spy.assert_awaited_once()
@@ -111,9 +67,9 @@ async def test_routes_to_handle_belief_text_by_type(continuous_collector, mocker
 
 @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"
+    msg = create_mock_message(
+        "belief_text_agent_mock", json.dumps({"beliefs": {"user_said": [["hi"]]}})
+    )
     spy = mocker.patch.object(continuous_collector, "_handle_belief_text", new=AsyncMock())
     await continuous_collector._process_message(msg)
     spy.assert_awaited_once()
@@ -121,117 +77,22 @@ async def test_routes_to_handle_belief_text_by_sender(continuous_collector, mock
 
 @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"
+    msg = create_mock_message("anyone", json.dumps({"type": "emotion_extraction_text"}))
     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):
+async def test_belief_text_happy_path_sends(continuous_collector, mocker):
     payload = {"type": "belief_extraction_text", "beliefs": {"user_said": ["hello test", "No"]}}
     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]]}}

test/unit/agents/test_vad_streaming.py

@@ -17,12 +17,21 @@ def audio_out_socket():
 
 
 @pytest.fixture
-def streaming(audio_in_socket, audio_out_socket):
+def mock_agent(mocker):
+    """Fixture to create a mock BDIAgent."""
+    agent = MagicMock()
+    agent.jid = "vad_agent@test"
+    return agent
+
+
+@pytest.fixture
+def streaming(audio_in_socket, audio_out_socket, mock_agent):
     import torch
 
     torch.hub.load.return_value = (..., ...)  # Mock
     streaming = Streaming(audio_in_socket, audio_out_socket)
     streaming._ready = True
+    streaming.agent = mock_agent
     return streaming
 
 

test/unit/agents/transcription/test_speech_recognizer.py

@@ -1,7 +1,9 @@
 import numpy as np
 
-from control_backend.agents.transcription import SpeechRecognizer
-from control_backend.agents.transcription.speech_recognizer import OpenAIWhisperSpeechRecognizer
+from control_backend.agents.transcription.speech_recognizer import (
+    OpenAIWhisperSpeechRecognizer,
+    SpeechRecognizer,
+)
 
 
 def test_estimate_max_tokens():

test/unit/conftest.py

@@ -8,6 +8,9 @@ def pytest_configure(config):
     collected. It mocks heavy or unavailable modules to prevent ImportErrors.
     """
     # --- Mock spade and spade-bdi ---
+    mock_agentspeak = MagicMock()
+    mock_httpx = MagicMock()
+    mock_pydantic = MagicMock()
     mock_spade = MagicMock()
     mock_spade.agent = MagicMock()
     mock_spade.behaviour = MagicMock()
@@ -19,6 +22,9 @@ def pytest_configure(config):
     mock_spade.behaviour.CyclicBehaviour = type("CyclicBehaviour", (object,), {})
     mock_spade_bdi.bdi.BDIAgent = type("BDIAgent", (object,), {})
 
+    sys.modules["agentspeak"] = mock_agentspeak
+    sys.modules["httpx"] = mock_httpx
+    sys.modules["pydantic"] = mock_pydantic
     sys.modules["spade"] = mock_spade
     sys.modules["spade.agent"] = mock_spade.agent
     sys.modules["spade.behaviour"] = mock_spade.behaviour