diff --git a/homeassistant/components/matter/adapter.py b/homeassistant/components/matter/adapter.py index f3a764bc99f..8e76706b7fd 100644 --- a/homeassistant/components/matter/adapter.py +++ b/homeassistant/components/matter/adapter.py @@ -96,20 +96,24 @@ class MatterAdapter: ) self.config_entry.async_on_unload( - self.matter_client.subscribe( + self.matter_client.subscribe_events( endpoint_added_callback, EventType.ENDPOINT_ADDED ) ) self.config_entry.async_on_unload( - self.matter_client.subscribe( + self.matter_client.subscribe_events( endpoint_removed_callback, EventType.ENDPOINT_REMOVED ) ) self.config_entry.async_on_unload( - self.matter_client.subscribe(node_removed_callback, EventType.NODE_REMOVED) + self.matter_client.subscribe_events( + node_removed_callback, EventType.NODE_REMOVED + ) ) self.config_entry.async_on_unload( - self.matter_client.subscribe(node_added_callback, EventType.NODE_ADDED) + self.matter_client.subscribe_events( + node_added_callback, EventType.NODE_ADDED + ) ) def _setup_node(self, node: MatterNode) -> None: diff --git a/homeassistant/components/matter/entity.py b/homeassistant/components/matter/entity.py index d4e90508afa..0457cfaa810 100644 --- a/homeassistant/components/matter/entity.py +++ b/homeassistant/components/matter/entity.py @@ -81,7 +81,7 @@ class MatterEntity(Entity): self._attributes_map[attr_cls] = attr_path sub_paths.append(attr_path) self._unsubscribes.append( - self.matter_client.subscribe( + self.matter_client.subscribe_events( callback=self._on_matter_event, event_filter=EventType.ATTRIBUTE_UPDATED, node_filter=self._endpoint.node.node_id, @@ -93,7 +93,7 @@ class MatterEntity(Entity): ) # subscribe to node (availability changes) self._unsubscribes.append( - self.matter_client.subscribe( + self.matter_client.subscribe_events( callback=self._on_matter_event, event_filter=EventType.NODE_UPDATED, node_filter=self._endpoint.node.node_id, diff --git a/homeassistant/components/matter/manifest.json b/homeassistant/components/matter/manifest.json index 0bf900c8812..85434407a10 100644 --- a/homeassistant/components/matter/manifest.json +++ b/homeassistant/components/matter/manifest.json @@ -6,5 +6,5 @@ "dependencies": ["websocket_api"], "documentation": "https://www.home-assistant.io/integrations/matter", "iot_class": "local_push", - "requirements": ["python-matter-server==3.6.0"] + "requirements": ["python-matter-server==3.6.3"] } diff --git a/requirements_all.txt b/requirements_all.txt index b0d6425d442..aab14224dc9 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2105,7 +2105,7 @@ python-kasa==0.5.1 # python-lirc==1.2.3 # homeassistant.components.matter -python-matter-server==3.6.0 +python-matter-server==3.6.3 # homeassistant.components.xiaomi_miio python-miio==0.5.12 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 51f614a685f..2863b4c90f7 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1543,7 +1543,7 @@ python-juicenet==1.1.0 python-kasa==0.5.1 # homeassistant.components.matter -python-matter-server==3.6.0 +python-matter-server==3.6.3 # homeassistant.components.xiaomi_miio python-miio==0.5.12 diff --git a/tests/components/matter/common.py b/tests/components/matter/common.py index 7582b9c415d..a0935154054 100644 --- a/tests/components/matter/common.py +++ b/tests/components/matter/common.py @@ -71,6 +71,6 @@ async def trigger_subscription_callback( data: Any = None, ) -> None: """Trigger a subscription callback.""" - callback = client.subscribe.call_args.kwargs["callback"] + callback = client.subscribe_events.call_args.kwargs["callback"] callback(event, data) await hass.async_block_till_done() diff --git a/tests/components/matter/test_adapter.py b/tests/components/matter/test_adapter.py index 0d7cfc9c2ed..62ed847bf28 100644 --- a/tests/components/matter/test_adapter.py +++ b/tests/components/matter/test_adapter.py @@ -136,10 +136,10 @@ async def test_node_added_subscription( integration: MagicMock, ) -> None: """Test subscription to new devices work.""" - assert matter_client.subscribe.call_count == 4 - assert matter_client.subscribe.call_args[0][1] == EventType.NODE_ADDED + assert matter_client.subscribe_events.call_count == 4 + assert matter_client.subscribe_events.call_args[0][1] == EventType.NODE_ADDED - node_added_callback = matter_client.subscribe.call_args[0][0] + node_added_callback = matter_client.subscribe_events.call_args[0][0] node_data = load_and_parse_node_fixture("onoff-light") node = MatterNode( dataclass_from_dict(