chore: revert changes to rpc channel

Author: allenporter

roborock/devices/traits/dnd.py

@@ -5,7 +5,6 @@
 """
 
 import logging
-from collections.abc import Callable
 
 from roborock.containers import DnDTimer
 from roborock.devices.v1_rpc_channel import V1RpcChannel
@@ -25,18 +24,18 @@ class DoNotDisturbTrait(Trait):
 
     name = "do_not_disturb"
 
-    def __init__(self, rpc_channel: Callable[[], V1RpcChannel]) -> None:
+    def __init__(self, rpc_channel: V1RpcChannel) -> None:
         """Initialize the DoNotDisturbTrait."""
-        self._send_command = lambda *args, **kwargs: rpc_channel().send_command(*args, **kwargs)
+        self._rpc_channel = rpc_channel
 
     async def get_dnd_timer(self) -> DnDTimer:
         """Get the current Do Not Disturb (DND) timer settings of the device."""
-        return await self._send_command(RoborockCommand.GET_DND_TIMER, response_type=DnDTimer)
+        return await self._rpc_channel.send_command(RoborockCommand.GET_DND_TIMER, response_type=DnDTimer)
 
     async def set_dnd_timer(self, dnd_timer: DnDTimer) -> None:
         """Set the Do Not Disturb (DND) timer settings of the device."""
-        await self._send_command(RoborockCommand.SET_DND_TIMER, params=dnd_timer.as_dict())
+        await self._rpc_channel.send_command(RoborockCommand.SET_DND_TIMER, params=dnd_timer.as_dict())
 
     async def clear_dnd_timer(self) -> None:
         """Clear the Do Not Disturb (DND) timer settings of the device."""
-        await self._send_command(RoborockCommand.CLOSE_DND_TIMER)
+        await self._rpc_channel.send_command(RoborockCommand.CLOSE_DND_TIMER)

roborock/devices/traits/status.py

@@ -5,7 +5,6 @@
 """
 
 import logging
-from collections.abc import Callable
 
 from roborock.containers import (
     HomeDataProduct,
@@ -30,15 +29,15 @@ class StatusTrait(Trait):
 
     name = "status"
 
-    def __init__(self, product_info: HomeDataProduct, rpc_channel: Callable[[], V1RpcChannel]) -> None:
+    def __init__(self, product_info: HomeDataProduct, rpc_channel: V1RpcChannel) -> None:
         """Initialize the StatusTrait."""
         self._product_info = product_info
-        self._send_command = lambda *args, **kwargs: rpc_channel().send_command(*args, **kwargs)
+        self._rpc_channel = rpc_channel
 
     async def get_status(self) -> Status:
         """Get the current status of the device.
 
         This is a placeholder command and will likely be changed/moved in the future.
         """
         status_type: type[Status] = ModelStatus.get(self._product_info.model, S7MaxVStatus)
-        return await self._send_command(RoborockCommand.GET_STATUS, response_type=status_type)
+        return await self._rpc_channel.send_command(RoborockCommand.GET_STATUS, response_type=status_type)

roborock/devices/v1_channel.py

@@ -81,12 +81,9 @@ def is_mqtt_connected(self) -> bool:
         """Return whether MQTT connection is available."""
         return self._mqtt_unsub is not None and self._mqtt_channel.is_connected
 
+    @property
     def rpc_channel(self) -> V1RpcChannel:
-        """Return the combined RPC channel prefers local with a fallback to MQTT.
-
-        This is dynamic based on the current connection status. That is, it may return
-        a different channel depending on whether local or MQTT is available.
-        """
+        """Return the combined RPC channel prefers local with a fallback to MQTT."""
         return self._combined_rpc_channel or self._mqtt_rpc_channel
 
     @property

tests/devices/test_v1_channel.py

@@ -254,7 +254,7 @@ async def test_v1_channel_send_command_local_preferred(
 
     # Send command
     mock_local_channel.response_queue.append(TEST_RESPONSE)
-    result = await v1_channel.rpc_channel().send_command(
+    result = await v1_channel.rpc_channel.send_command(
         RoborockCommand.CHANGE_SOUND_VOLUME,
         response_type=S5MaxStatus,
     )
@@ -280,7 +280,7 @@ async def test_v1_channel_send_command_local_fails(
 
     # Send command
     with pytest.raises(RoborockException, match="Local failed"):
-        await v1_channel.rpc_channel().send_command(
+        await v1_channel.rpc_channel.send_command(
             RoborockCommand.CHANGE_SOUND_VOLUME,
             response_type=S5MaxStatus,
         )
@@ -300,7 +300,7 @@ async def test_v1_channel_send_decoded_command_mqtt_only(
 
     # Send command
     mock_mqtt_channel.response_queue.append(TEST_RESPONSE)
-    result = await v1_channel.rpc_channel().send_command(
+    result = await v1_channel.rpc_channel.send_command(
         RoborockCommand.CHANGE_SOUND_VOLUME,
         response_type=S5MaxStatus,
     )
@@ -322,7 +322,7 @@ async def test_v1_channel_send_decoded_command_with_params(
     # Send command with params
     mock_local_channel.response_queue.append(TEST_RESPONSE)
     test_params = {"volume": 80}
-    await v1_channel.rpc_channel().send_command(
+    await v1_channel.rpc_channel.send_command(
         RoborockCommand.CHANGE_SOUND_VOLUME,
         response_type=S5MaxStatus,
         params=test_params,
@@ -444,7 +444,7 @@ async def test_v1_channel_command_encoding_validation(
 
     # Send local command and capture the request
     mock_local_channel.response_queue.append(TEST_RESPONSE_2)
-    await v1_channel.rpc_channel().send_command(RoborockCommand.CHANGE_SOUND_VOLUME, params={"volume": 50})
+    await v1_channel.rpc_channel.send_command(RoborockCommand.CHANGE_SOUND_VOLUME, params={"volume": 50})
     assert mock_local_channel.published_messages
     local_message = mock_local_channel.published_messages[0]
 
@@ -512,7 +512,7 @@ async def test_v1_channel_full_subscribe_and_command_flow(
 
     # Send a command (should use local)
     mock_local_channel.response_queue.append(TEST_RESPONSE)
-    result = await v1_channel.rpc_channel().send_command(
+    result = await v1_channel.rpc_channel.send_command(
         RoborockCommand.GET_STATUS,
         response_type=S5MaxStatus,
     )

tests/devices/test_v1_device.py

@@ -44,7 +44,7 @@ def traits_fixture(rpc_channel: AsyncMock) -> list[Trait]:
     return [
         StatusTrait(
             product_info=HOME_DATA.products[0],
-            rpc_channel=lambda: rpc_channel,
+            rpc_channel=rpc_channel,
         )
     ]
 

tests/devices/traits/test_dnd.py

@@ -1,6 +1,6 @@
 """Tests for the DoNotDisturbTrait class."""
 
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 import pytest
 
@@ -20,15 +20,9 @@ def mock_rpc_channel() -> AsyncMock:
 
 
 @pytest.fixture
-def mock_rpc_channel_callable(mock_rpc_channel: AsyncMock) -> Mock:
-    """Create a callable that returns the mock RPC channel."""
-    return Mock(return_value=mock_rpc_channel)
-
-
-@pytest.fixture
-def dnd_trait(mock_rpc_channel_callable: Mock) -> DoNotDisturbTrait:
+def dnd_trait(mock_rpc_channel: AsyncMock) -> DoNotDisturbTrait:
     """Create a DoNotDisturbTrait instance with mocked dependencies."""
-    return DoNotDisturbTrait(mock_rpc_channel_callable)
+    return DoNotDisturbTrait(mock_rpc_channel)
 
 
 @pytest.fixture