refactor: rename all agents and improve structure pt1

ref: N25B-257

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

@@ -4,10 +4,10 @@ from unittest.mock import AsyncMock, MagicMock, call
 
 import pytest
 
-from control_backend.agents.bdi.behaviours.belief_setter import BeliefSetterBehaviour
+from control_backend.agents.bdi_agents.behaviours.belief_setter import BeliefSetterBehaviour
 
 # Define a constant for the collector agent name to use in tests
-COLLECTOR_AGENT_NAME = "belief_collector"
+COLLECTOR_AGENT_NAME = "bel_collector_agent"
 COLLECTOR_AGENT_JID = f"{COLLECTOR_AGENT_NAME}@test"
 
 
@@ -25,7 +25,7 @@ def belief_setter(mock_agent, mocker):
     """Fixture to create an instance of BeliefSetterBehaviour with a mocked agent."""
     # Patch the settings to use a predictable agent name
     mocker.patch(
-        "control_backend.agents.bdi.behaviours.belief_setter.settings.agent_settings.belief_collector_agent_name",
+        "control_backend.agents.bdi_agents.behaviours.belief_setter.settings.agent_settings.bel_collector_agent_name",
         COLLECTOR_AGENT_NAME,
     )
 
@@ -62,7 +62,7 @@ async def test_run_message_received(belief_setter, mocker):
     belief_setter._process_message.assert_called_once_with(msg)
 
 
-def test_process_message_from_belief_collector(belief_setter, mocker):
+def test_process_message_from_bel_collector_agent(belief_setter, mocker):
     """
     Test processing a message from the correct belief collector agent.
     """

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

@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 
-from control_backend.agents.belief_collector.behaviours.continuous_collect import (
+from control_backend.agents.bel_agents.bel_collector_agent.behaviours.continuous_collect import (
     ContinuousBeliefCollector,
 )
 
@@ -20,7 +20,7 @@ def create_mock_message(sender_node: str, body: str) -> MagicMock:
 def mock_agent(mocker):
     """Fixture to create a mock Agent."""
     agent = MagicMock()
-    agent.jid = "belief_collector_agent@test"
+    agent.jid = "bel_collector_agent@test"
     return agent
 
 
@@ -68,7 +68,7 @@ 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 = create_mock_message(
-        "belief_text_agent_mock", json.dumps({"beliefs": {"user_said": [["hi"]]}})
+        "bel_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)
@@ -87,7 +87,7 @@ async def test_routes_to_handle_emo_text(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()
-    await continuous_collector._handle_belief_text(payload, "belief_text_agent_mock")
+    await continuous_collector._handle_belief_text(payload, "bel_text_agent_mock")
 
     # make sure we attempted a send
     continuous_collector.send.assert_awaited_once()

test/unit/agents/belief_from_text/behaviours/test_belief_from_text.py

@@ -4,7 +4,9 @@ from unittest.mock import AsyncMock, MagicMock, patch
 import pytest
 from spade.message import Message
 
-from control_backend.agents.bdi.behaviours.text_belief_extractor import BeliefFromText
+from control_backend.agents.bel_agents.bel_text_extract_agent.behaviours.text_belief_extractor import (  # noqa: E501, We can't shorten this import.
+    BeliefFromText,
+)
 
 
 @pytest.fixture
@@ -15,15 +17,16 @@ def mock_settings():
     """
     # Create a mock object that mimics the nested structure
     settings_mock = MagicMock()
-    settings_mock.agent_settings.transcription_agent_name = "transcriber"
-    settings_mock.agent_settings.belief_collector_agent_name = "collector"
+    settings_mock.agent_settings.per_transcription_agent_name = "transcriber"
+    settings_mock.agent_settings.bel_collector_agent_name = "collector"
     settings_mock.agent_settings.host = "fake.host"
 
     # Use patch to replace the settings object during the test
     # Adjust 'control_backend.behaviours.belief_from_text.settings' to where
     # your behaviour file imports it from.
     with patch(
-        "control_backend.agents.bdi.behaviours.text_belief_extractor.settings", settings_mock
+        "control_backend.agents.bel_agents.bel_text_extract_agent.behaviours.text_belief_extractor.settings",
+        settings_mock,
     ):
         yield settings_mock
 
@@ -100,7 +103,7 @@ async def test_run_message_from_transcriber_demo(behavior, mock_settings, monkey
     # Arrange: Create a mock message from the transcriber
     transcription_text = "hello world"
     mock_msg = create_mock_message(
-        mock_settings.agent_settings.transcription_agent_name, transcription_text, None
+        mock_settings.agent_settings.per_transcription_agent_name, transcription_text, None
     )
     behavior.receive.return_value = mock_msg
 
@@ -119,7 +122,7 @@ async def test_run_message_from_transcriber_demo(behavior, mock_settings, monkey
 
     assert (
         sent_msg.to
-        == mock_settings.agent_settings.belief_collector_agent_name
+        == mock_settings.agent_settings.bel_collector_agent_name
         + "@"
         + mock_settings.agent_settings.host
     )
@@ -159,7 +162,7 @@ async def test_process_transcription_success(behavior, mock_settings):
     # 2. Inspect the sent message
     sent_msg: Message = behavior.send.call_args[0][0]
     expected_to = (
-        mock_settings.agent_settings.belief_collector_agent_name
+        mock_settings.agent_settings.bel_collector_agent_name
         + "@"
         + mock_settings.agent_settings.host
     )

test/unit/agents/test_vad_socket_poller.py

@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, MagicMock
 import pytest
 import zmq
 
-from control_backend.agents.vad_agent import SocketPoller
+from control_backend.agents.per_agents.per_vad_agent import SocketPoller
 
 
 @pytest.fixture
@@ -16,7 +16,9 @@ async def test_socket_poller_with_data(socket, mocker):
     socket_data = b"test"
     socket.recv.return_value = socket_data
 
-    mock_poller: MagicMock = mocker.patch("control_backend.agents.vad_agent.zmq.Poller")
+    mock_poller: MagicMock = mocker.patch(
+        "control_backend.agents.per_agents.per_vad_agent.zmq.Poller"
+    )
     mock_poller.return_value.poll.return_value = [(socket, zmq.POLLIN)]
 
     poller = SocketPoller(socket)
@@ -35,7 +37,9 @@ async def test_socket_poller_with_data(socket, mocker):
 
 @pytest.mark.asyncio
 async def test_socket_poller_no_data(socket, mocker):
-    mock_poller: MagicMock = mocker.patch("control_backend.agents.vad_agent.zmq.Poller")
+    mock_poller: MagicMock = mocker.patch(
+        "control_backend.agents.per_agents.per_vad_agent.zmq.Poller"
+    )
     mock_poller.return_value.poll.return_value = []
 
     poller = SocketPoller(socket)

test/unit/agents/test_vad_streaming.py

@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, MagicMock
 import numpy as np
 import pytest
 
-from control_backend.agents.vad_agent import Streaming
+from control_backend.agents.per_agents.per_vad_agent import Streaming
 
 
 @pytest.fixture
@@ -20,7 +20,7 @@ def audio_out_socket():
 def mock_agent(mocker):
     """Fixture to create a mock BDIAgent."""
     agent = MagicMock()
-    agent.jid = "vad_agent@test"
+    agent.jid = "per_vad_agent@test"
     return agent
 
 

test/unit/agents/transcription/test_speech_recognizer.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from control_backend.agents.transcription.speech_recognizer import (
+from control_backend.agents.per_agents.per_transcription_agent.speech_recognizer import (
     OpenAIWhisperSpeechRecognizer,
     SpeechRecognizer,
 )