Merge pull request #8 from marcelveldt/patch-2

Update 0006-Add-lookup-dicts-for-clusters-and-attributes.patch

Author: MartinHjelmare

0006-Add-lookup-dicts-for-clusters-and-attributes.patch

@@ -1,14 +1,14 @@
-From ad37e367f4989efb5cd8668e3a086101385d2c2a Mon Sep 17 00:00:00 2001
+From a3abb758e0cab1f7e1dd9639af59f7c7e58c0c47 Mon Sep 17 00:00:00 2001
 From: Marcel van der Veldt <m.vanderveldt@outlook.com>
-Date: Mon, 20 Feb 2023 19:17:39 +0100
+Date: Tue, 21 Feb 2023 16:05:53 +0100
 Subject: [PATCH] Add lookup dicts for clusters and attributes
 
 ---
- .../python/chip/clusters/ClusterObjects.py    | 20 +++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ .../python/chip/clusters/ClusterObjects.py    | 26 +++++++++++++++++++
+ 1 file changed, 26 insertions(+)
 
 diff --git a/src/controller/python/chip/clusters/ClusterObjects.py b/src/controller/python/chip/clusters/ClusterObjects.py
-index c3af537da..2d3a73a10 100644
+index c3af537da..6c745f6d3 100644
 --- a/src/controller/python/chip/clusters/ClusterObjects.py
 +++ b/src/controller/python/chip/clusters/ClusterObjects.py
 @@ -217,6 +217,10 @@ class ClusterCommand(ClusterObject):
@@ -22,7 +22,7 @@ index c3af537da..2d3a73a10 100644
 
  class Cluster(ClusterObject):
      '''
-@@ -227,6 +231,13 @@ class Cluster(ClusterObject):
+@@ -227,6 +231,16 @@ class Cluster(ClusterObject):
      especially the TLV decoding logic. Also ThreadNetworkDiagnostics has an attribute with the same name so we
      picked data_version as its name.
      '''
@@ -31,23 +31,29 @@ index c3af537da..2d3a73a10 100644
 +        """Register a subclass."""
 +        super().__init_subclass__(*args, **kwargs)
 +        # register this cluster in the ALL_CLUSTERS dict for quick lookups
-+        ALL_CLUSTERS[cls.id] = cls
++        try:
++            ALL_CLUSTERS[cls.id] = cls
++        except NotImplementedError:
++            pass # we can safely ignore this
 +
      @property
      def data_version(self) -> int:
          return self._data_version
-@@ -253,6 +264,15 @@ class ClusterAttributeDescriptor:
+@@ -253,6 +267,18 @@ class ClusterAttributeDescriptor:
 
      The implementation of this functions is quite tricky, it will create a cluster object on-the-fly, and use it for actual encode / decode routine to save lines of code.
      '''
 +
 +    def __init_subclass__(cls, *args, **kwargs) -> None:
 +        """Register a subclass."""
 +        super().__init_subclass__(*args, **kwargs)
-+        if cls.cluster_id not in ALL_ATTRIBUTES:
-+            ALL_ATTRIBUTES[cls.cluster_id] = {}
-+        # register this clusterattribute in the ALL_ATTRIBUTES dict for quick lookups
-+        ALL_ATTRIBUTES[cls.cluster_id][cls.attribute_id] = cls
++        try:
++            if cls.cluster_id not in ALL_ATTRIBUTES:
++                ALL_ATTRIBUTES[cls.cluster_id] = {}
++            # register this clusterattribute in the ALL_ATTRIBUTES dict for quick lookups
++            ALL_ATTRIBUTES[cls.cluster_id][cls.attribute_id] = cls
++        except NotImplementedError:
++            pass # we can safely ignore this
 +
      @classmethod
      def ToTLV(cls, tag: Union[int, None], value):