matter-python-client 1.5.6a0.dev202610260308__tar.gz → 1.5.6a0.dev202611110253__tar.gz

{matter_python_client-1.5.6a0.dev202610260308 → matter_python_client-1.5.6a0.dev202611110253}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matter-python-client
-Version: 1.5.6a0.dev202610260308
+Version: 1.5.6a0.dev202611110253
 Summary: Python Client for the OHF Matter Server
 Author-email: Open Home Foundation <hello@openhomefoundation.io>
 License-Expression: Apache-2.0

{matter_python_client-1.5.6a0.dev202610260308 → matter_python_client-1.5.6a0.dev202611110253}/matter_python_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matter-python-client
-Version: 1.5.6a0.dev202610260308
+Version: 1.5.6a0.dev202611110253
 Summary: Python Client for the OHF Matter Server
 Author-email: Open Home Foundation <hello@openhomefoundation.io>
 License-Expression: Apache-2.0

{matter_python_client-1.5.6a0.dev202610260308 → matter_python_client-1.5.6a0.dev202611110253}/matter_server/client/models/node.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from enum import Enum
 import logging
-from typing import TYPE_CHECKING, Any, TypeVar, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from chip.clusters import Objects as Clusters
 from chip.clusters.ClusterObjects import ALL_ATTRIBUTES, ALL_CLUSTERS
@@ -33,11 +33,6 @@ LOGGER = logging.getLogger(__name__)
 # the Matter specification places the Root Node on endpoint 0 of every node
 ROOT_ENDPOINT_ID = 0
 
-# pylint: disable=invalid-name
-_CLUSTER_T = TypeVar("_CLUSTER_T", bound=Clusters.Cluster)
-_ATTRIBUTE_T = TypeVar("_ATTRIBUTE_T", bound=Clusters.ClusterAttributeDescriptor)
-# pylint: enable=invalid-name
-
 
 def get_object_params(
     descriptor: Clusters.ClusterObjectDescriptor, object_id: int
@@ -122,7 +117,7 @@ class MatterEndpoint:
             endpoint = parent
         return self.node.device_info
 
-    def has_cluster(self, cluster: type[_CLUSTER_T] | int) -> bool:
+    def has_cluster(self, cluster: type[Clusters.Cluster] | int) -> bool:
         """
         Check if endpoint has a specific cluster.
 
@@ -132,7 +127,7 @@ class MatterEndpoint:
             return cluster.id in self.clusters
         return cluster in self.clusters
 
-    def get_cluster(self, cluster: type[_CLUSTER_T] | int) -> _CLUSTER_T | None:
+    def get_cluster[T: Clusters.Cluster](self, cluster: type[T] | int) -> T | None:
         """
         Get a full Cluster object containing all attributes.
 
@@ -145,8 +140,8 @@ class MatterEndpoint:
 
     def get_attribute_value(
         self,
-        cluster: type[_CLUSTER_T] | int | None,
-        attribute: int | type[_ATTRIBUTE_T],
+        cluster: type[Clusters.Cluster] | int | None,
+        attribute: int | type[Clusters.ClusterAttributeDescriptor],
     ) -> Any:
         """
         Return Matter Cluster Attribute object for given parameters.
@@ -178,8 +173,8 @@ class MatterEndpoint:
 
     def has_attribute(
         self,
-        cluster: type[_CLUSTER_T] | int | None,
-        attribute: int | type[_ATTRIBUTE_T],
+        cluster: type[Clusters.Cluster] | int | None,
+        attribute: int | type[Clusters.ClusterAttributeDescriptor],
     ) -> bool:
         """
         Perform a quick check if the endpoint has a specific attribute.
@@ -308,14 +303,14 @@ class MatterNode:
     def get_attribute_value(
         self,
         endpoint: int,
-        cluster: type[_CLUSTER_T] | int | None,
-        attribute: int | type[_ATTRIBUTE_T],
+        cluster: type[Clusters.Cluster] | int | None,
+        attribute: int | type[Clusters.ClusterAttributeDescriptor],
     ) -> Any:
         """Return Matter Cluster Attribute value for given parameters."""
         return self.endpoints[endpoint].get_attribute_value(cluster, attribute)
 
     def has_cluster(
-        self, cluster: type[_CLUSTER_T] | int, endpoint: int | None = None
+        self, cluster: type[Clusters.Cluster] | int, endpoint: int | None = None
     ) -> bool:
         """Check if node has a specific cluster on any of the endpoints."""
         return any(
@@ -325,9 +320,9 @@ class MatterNode:
             and (endpoint is None or x.endpoint_id == endpoint)
         )
 
-    def get_cluster(
-        self, endpoint: int, cluster: type[_CLUSTER_T] | int
-    ) -> _CLUSTER_T | None:
+    def get_cluster[T: Clusters.Cluster](
+        self, endpoint: int, cluster: type[T] | int
+    ) -> T | None:
         """
         Get a Cluster object containing all attributes.
 

{matter_python_client-1.5.6a0.dev202610260308 → matter_python_client-1.5.6a0.dev202611110253}/matter_server/common/helpers/api.py

@@ -5,12 +5,10 @@ from __future__ import annotations
 from collections.abc import Callable, Coroutine
 from dataclasses import MISSING, dataclass
 import inspect
-from typing import Any, TypeVar, get_type_hints
+from typing import Any, get_type_hints
 
 from matter_server.common.helpers.util import parse_value
 
-_F = TypeVar("_F", bound=Callable[..., Any])
-
 
 @dataclass
 class APICommandHandler:
@@ -34,10 +32,10 @@ class APICommandHandler:
         )
 
 
-def api_command(command: str) -> Callable[[_F], _F]:
+def api_command[F: Callable[..., Any]](command: str) -> Callable[[F], F]:
     """Decorate a function as API route/command."""
 
-    def decorate(func: _F) -> _F:
+    def decorate(func: F) -> F:
         func.api_cmd = command  # type: ignore[attr-defined]
         return func
 

{matter_python_client-1.5.6a0.dev202610260308 → matter_python_client-1.5.6a0.dev202611110253}/matter_server/common/helpers/util.py

@@ -17,7 +17,6 @@ from types import NoneType, UnionType
 from typing import (
     TYPE_CHECKING,
     Any,
-    TypeVar,
     Union,
     cast,
     get_args,
@@ -36,8 +35,6 @@ if TYPE_CHECKING:
         ClusterObjectDescriptor,
     )
 
-    _T = TypeVar("_T", bound=DataclassInstance)
-
 CHIP_CLUSTERS_PKG_NAME = "home-assistant-chip-clusters"
 CHIP_CORE_PKG_NAME = "home-assistant-chip-core"
 
@@ -303,12 +300,12 @@ def parse_value(
     return value
 
 
-def dataclass_from_dict[T: DataclassInstance](  # type: ignore[valid-type]
-    cls: type[_T],
+def dataclass_from_dict[T: DataclassInstance](
+    cls: type[T],
     dict_obj: dict,
     strict: bool = False,
     allow_sdk_types: bool = False,
-) -> _T:
+) -> T:
     """
     Create (instance of) a dataclass by providing a dict with values.
 

{matter_python_client-1.5.6a0.dev202610260308 → matter_python_client-1.5.6a0.dev202611110253}/pyproject.toml

@@ -25,7 +25,7 @@ license = "Apache-2.0"
 name = "matter-python-client"
 readme = "README.md"
 requires-python = ">=3.12"
-version = "1.5.6a0.dev202610260308"
+version = "1.5.6a0.dev202611110253"
 
 [project.urls]
 Homepage = "https://github.com/matter-js/matterjs-server"