fix: merge refactor/zmq-internal-socket-behaviour into feat/cb2ui-robot-connections. (And fixed all ruff/ test issues to commit)

ref: None

test/integration/agents/test_ri_commands_agent.py

@@ -11,25 +11,27 @@ from control_backend.agents.ri_command_agent import RICommandAgent
 async def test_setup_bind(monkeypatch):
     """Test setup with bind=True"""
     fake_socket = MagicMock()
+    fake_context = MagicMock()
+    fake_context.socket.return_value = fake_socket
+
+    # Patch Context.instance() to return fake_context
     monkeypatch.setattr(
-        "control_backend.agents.ri_command_agent.context.socket", lambda _: fake_socket
+        "control_backend.agents.ri_command_agent.Context",
+        MagicMock(instance=MagicMock(return_value=fake_context)),
     )
 
     agent = RICommandAgent("test@server", "password", address="tcp://localhost:5555", bind=True)
+
     monkeypatch.setattr(
         "control_backend.agents.ri_command_agent.settings",
-        MagicMock(zmq_settings=MagicMock(internal_comm_address="tcp://internal:1234")),
+        MagicMock(zmq_settings=MagicMock(internal_sub_address="tcp://internal:1234")),
     )
 
     await agent.setup()
 
-    # Ensure PUB socket bound
     fake_socket.bind.assert_any_call("tcp://localhost:5555")
-    # Ensure SUB socket connected to internal address and subscribed
     fake_socket.connect.assert_any_call("tcp://internal:1234")
     fake_socket.setsockopt.assert_any_call(zmq.SUBSCRIBE, b"command")
-
-    # Ensure behaviour attached
     assert any(isinstance(b, agent.SendCommandsBehaviour) for b in agent.behaviours)
 
 
@@ -37,19 +39,23 @@ async def test_setup_bind(monkeypatch):
 async def test_setup_connect(monkeypatch):
     """Test setup with bind=False"""
     fake_socket = MagicMock()
+    fake_context = MagicMock()
+    fake_context.socket.return_value = fake_socket
+
+    # Patch Context.instance() to return fake_context
     monkeypatch.setattr(
-        "control_backend.agents.ri_command_agent.context.socket", lambda _: fake_socket
+        "control_backend.agents.ri_command_agent.Context",
+        MagicMock(instance=MagicMock(return_value=fake_context)),
     )
 
     agent = RICommandAgent("test@server", "password", address="tcp://localhost:5555", bind=False)
     monkeypatch.setattr(
         "control_backend.agents.ri_command_agent.settings",
-        MagicMock(zmq_settings=MagicMock(internal_comm_address="tcp://internal:1234")),
+        MagicMock(zmq_settings=MagicMock(internal_sub_address="tcp://internal:1234")),
     )
 
     await agent.setup()
 
-    # Ensure PUB socket connected
     fake_socket.connect.assert_any_call("tcp://localhost:5555")