feat: apply new agent naming standards

Expanding abbreviations to remove ambiguity, simplifying agent names to reduce repetition.

ref: N25B-257

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

@@ -4,12 +4,12 @@ from unittest.mock import AsyncMock, MagicMock, call
 
 import pytest
 
-from control_backend.agents.bdi_agents.bdi_core_agent.behaviours.belief_setter_behaviour import (
+from control_backend.agents.bdi.bdi_core_agent.behaviours.belief_setter_behaviour import (
     BeliefSetterBehaviour,
 )
 
 # Define a constant for the collector agent name to use in tests
-COLLECTOR_AGENT_NAME = "bdi_belief_collector_agent"
+COLLECTOR_AGENT_NAME = "belief_collector_agent"
 COLLECTOR_AGENT_JID = f"{COLLECTOR_AGENT_NAME}@test"
 
 
@@ -27,8 +27,8 @@ def belief_setter_behaviour(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_agents.bdi_core_agent."
-        "behaviours.belief_setter_behaviour.settings.agent_settings.bdi_belief_collector_agent_name",
+        "control_backend.agents.bdi.bdi_core_agent."
+        "behaviours.belief_setter_behaviour.settings.agent_settings.bdi_belief_collector_name",
         COLLECTOR_AGENT_NAME,
     )
 

test/unit/agents/bdi/belief_collector_agent/behaviours/test_continuous_collect.py

@@ -3,8 +3,8 @@ from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 
-from control_backend.agents.bdi_agents.bdi_belief_collector_agent.behaviours.bel_collector_behaviour import (  # noqa: E501
-    BelCollectorBehaviour,
+from control_backend.agents.bdi.belief_collector_agent.behaviours.belief_collector_behaviour import (  # noqa: E501
+    BeliefCollectorBehaviour,
 )
 
 
@@ -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 = "bdi_belief_collector_agent@test"
+    agent.jid = "belief_collector_agent@test"
     return agent
 
 
@@ -30,7 +30,7 @@ def bel_collector_behaviouror(mock_agent, mocker):
     # Patch asyncio.sleep to prevent tests from actually waiting
     mocker.patch("asyncio.sleep", return_value=None)
 
-    collector = BelCollectorBehaviour()
+    collector = BeliefCollectorBehaviour()
     collector.agent = mock_agent
     # Mock the receive method, we will control its return value in each test
     collector.receive = AsyncMock()

test/unit/agents/bdi/text_belief_agent/behaviours/test_belief_from_text.py

@@ -4,8 +4,8 @@ from unittest.mock import AsyncMock, MagicMock, patch
 import pytest
 from spade.message import Message
 
-from control_backend.agents.bdi_agents.bdi_text_belief_agent.behaviours.bdi_text_belief_behaviour import (  # noqa: E501, We can't shorten this import.
-    BDITextBeliefBehaviour,
+from control_backend.agents.bdi.text_belief_extractor_agent.behaviours.text_belief_extractor_behaviour import (  # noqa: E501, We can't shorten this import.
+    TextBeliefExtractorBehaviour,
 )
 
 
@@ -17,15 +17,16 @@ def mock_settings():
     """
     # Create a mock object that mimics the nested structure
     settings_mock = MagicMock()
-    settings_mock.agent_settings.per_transcription_agent_name = "transcriber"
-    settings_mock.agent_settings.bdi_belief_collector_agent_name = "collector"
+    settings_mock.agent_settings.transcription_name = "transcriber"
+    settings_mock.agent_settings.bdi_belief_collector_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_agents.bdi_text_belief_agent.behaviours.bdi_text_belief_behaviour.settings",
+        "control_backend.agents.bdi.text_belief_extractor_agent.behaviours"
+        ".text_belief_extractor_behaviour.settings",
         settings_mock,
     ):
         yield settings_mock
@@ -37,7 +38,7 @@ def behavior(mock_settings):
     Creates an instance of the BDITextBeliefBehaviour behaviour and mocks its
     agent, logger, send, and receive methods.
     """
-    b = BDITextBeliefBehaviour()
+    b = TextBeliefExtractorBehaviour()
 
     b.agent = MagicMock()
     b.send = AsyncMock()
@@ -103,7 +104,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.per_transcription_agent_name, transcription_text, None
+        mock_settings.agent_settings.transcription_name, transcription_text, None
     )
     behavior.receive.return_value = mock_msg
 
@@ -122,7 +123,7 @@ async def test_run_message_from_transcriber_demo(behavior, mock_settings, monkey
 
     assert (
         sent_msg.to
-        == mock_settings.agent_settings.bdi_belief_collector_agent_name
+        == mock_settings.agent_settings.bdi_belief_collector_name
         + "@"
         + mock_settings.agent_settings.host
     )
@@ -162,7 +163,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.bdi_belief_collector_agent_name
+        mock_settings.agent_settings.bdi_belief_collector_name
         + "@"
         + mock_settings.agent_settings.host
     )

test/unit/agents/perception/transcription_agent/test_speech_recognizer.py

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

test/unit/agents/perception/vad_agent/test_vad_socket_poller.py

@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, MagicMock
 import pytest
 import zmq
 
-from control_backend.agents.per_agents.per_vad_agent import SocketPoller
+from control_backend.agents.perception.vad_agent import SocketPoller
 
 
 @pytest.fixture
@@ -16,9 +16,7 @@ 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.per_agents.per_vad_agent.zmq.Poller"
-    )
+    mock_poller: MagicMock = mocker.patch("control_backend.agents.perception.vad_agent.zmq.Poller")
     mock_poller.return_value.poll.return_value = [(socket, zmq.POLLIN)]
 
     poller = SocketPoller(socket)
@@ -37,9 +35,7 @@ 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.per_agents.per_vad_agent.zmq.Poller"
-    )
+    mock_poller: MagicMock = mocker.patch("control_backend.agents.perception.vad_agent.zmq.Poller")
     mock_poller.return_value.poll.return_value = []
 
     poller = SocketPoller(socket)

test/unit/agents/perception/vad_agent/test_vad_streaming.py

@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, MagicMock
 import numpy as np
 import pytest
 
-from control_backend.agents.per_agents.per_vad_agent import Streaming
+from control_backend.agents.perception.vad_agent import StreamingBehaviour
 
 
 @pytest.fixture
@@ -20,7 +20,7 @@ def audio_out_socket():
 def mock_agent(mocker):
     """Fixture to create a mock BDIAgent."""
     agent = MagicMock()
-    agent.jid = "per_vad_agent@test"
+    agent.jid = "vad_agent@test"
     return agent
 
 
@@ -29,7 +29,7 @@ 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 = StreamingBehaviour(audio_in_socket, audio_out_socket)
     streaming._ready = True
     streaming.agent = mock_agent
     return streaming