Skip to content

Commit 7393c13

Browse files
agnersagners
authored
Merge pull request #15 from home-assistant-libs/update-cached-attributes-incrementally
Add patch to update cached attributes incrementally
2 parents e3a3799 + cff61ee commit 7393c13

File tree

1 file changed

+160
-0
lines changed

1 file changed

+160
-0
lines changed

‎0008-python-update-cached-attributes-incrementally.patch

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
From 375188d7dfa82d7f49f72fbc05cc0904340d732d Mon Sep 17 00:00:00 2001
2+
Message-Id: <375188d7dfa82d7f49f72fbc05cc0904340d732d.1684940532.git.stefan@agner.ch>
3+
In-Reply-To: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684940532.git.stefan@agner.ch>
4+
References: <c46f6cb84fb189da723a9932a5195a553762e2b6.1684940532.git.stefan@agner.ch>
5+
From: Stefan Agner <stefan@agner.ch>
6+
Date: Wed, 24 May 2023 01:02:48 +0200
7+
Subject: [PATCH] [python] update cached attributes incrementally
8+
9+
Instead of rebuilding the cache from scratch on every report, just
10+
update the Endpoint/Cluster/Attributes which actually changed.
11+
Obviously, this is significantly faster, especially for small updates.
12+
---
13+
.../python/chip/clusters/Attribute.py | 101 +++++++++---------
14+
1 file changed, 53 insertions(+), 48 deletions(-)
15+
16+
diff --git a/src/controller/python/chip/clusters/Attribute.py b/src/controller/python/chip/clusters/Attribute.py
17+
index 3660d31234..06b57384ed 100644
18+
--- a/src/controller/python/chip/clusters/Attribute.py
19+
+++ b/src/controller/python/chip/clusters/Attribute.py
20+
@@ -383,7 +383,7 @@ class AttributeCache:
21+
22+
clusterCache[path.AttributeId] = data
23+
24+
- def UpdateCachedData(self):
25+
+ def UpdateCachedData(self, changedPathSet: set[AttributePath]):
26+
''' This converts the raw TLV data into a cluster object format.
27+
28+
Two formats are available:
29+
@@ -401,68 +401,73 @@ class AttributeCache:
30+
tlvCache = self.attributeTLVCache
31+
attributeCache = self.attributeCache
32+
33+
- for endpoint in tlvCache:
34+
+ for attributePath in changedPathSet:
35+
+ endpoint = attributePath.EndpointId
36+
+
37+
if (endpoint not in attributeCache):
38+
attributeCache[endpoint] = {}
39+
40+
endpointCache = attributeCache[endpoint]
41+
42+
- for cluster in tlvCache[endpoint]:
43+
- if cluster not in _ClusterIndex:
44+
+ cluster = attributePath.ClusterId
45+
+
46+
+ if cluster not in _ClusterIndex:
47+
+ #
48+
+ # #22599 tracks dealing with unknown clusters more
49+
+ # gracefully so that clients can still access this data.
50+
+ #
51+
+ continue
52+
+
53+
+ clusterType = _ClusterIndex[cluster]
54+
+
55+
+ if clusterType not in endpointCache:
56+
+ endpointCache[clusterType] = {}
57+
+
58+
+ clusterCache = endpointCache[clusterType]
59+
+ clusterDataVersion = self.versionList.get(
60+
+ endpoint, {}).get(cluster, None)
61+
+
62+
+ if (self.returnClusterObject):
63+
+ try:
64+
+ # Since the TLV data is already organized by attribute tags, we can trivially convert to a cluster object representation.
65+
+ endpointCache[clusterType] = clusterType.FromDict(
66+
+ data=clusterType.descriptor.TagDictToLabelDict([], tlvCache[endpoint][cluster]))
67+
+ endpointCache[clusterType].SetDataVersion(
68+
+ clusterDataVersion)
69+
+ except Exception as ex:
70+
+ decodedValue = ValueDecodeFailure(
71+
+ tlvCache[endpoint][cluster], ex)
72+
+ endpointCache[clusterType] = decodedValue
73+
+ else:
74+
+ clusterCache[DataVersion] = clusterDataVersion
75+
+
76+
+ attribute = attributePath.AttributeId
77+
+
78+
+ value = tlvCache[endpoint][cluster][attribute]
79+
+
80+
+ if (cluster, attribute) not in _AttributeIndex:
81+
#
82+
# #22599 tracks dealing with unknown clusters more
83+
# gracefully so that clients can still access this data.
84+
#
85+
continue
86+
87+
- clusterType = _ClusterIndex[cluster]
88+
-
89+
- if (clusterType not in endpointCache):
90+
- endpointCache[clusterType] = {}
91+
+ attributeType = _AttributeIndex[(
92+
+ cluster, attribute)][0]
93+
94+
- clusterCache = endpointCache[clusterType]
95+
- clusterDataVersion = self.versionList.get(
96+
- endpoint, {}).get(cluster, None)
97+
+ if (attributeType not in clusterCache):
98+
+ clusterCache[attributeType] = {}
99+
100+
- if (self.returnClusterObject):
101+
+ if isinstance(value, ValueDecodeFailure):
102+
+ clusterCache[attributeType] = value
103+
+ else:
104+
try:
105+
- # Since the TLV data is already organized by attribute tags, we can trivially convert to a cluster object representation.
106+
- endpointCache[clusterType] = clusterType.FromDict(
107+
- data=clusterType.descriptor.TagDictToLabelDict([], tlvCache[endpoint][cluster]))
108+
- endpointCache[clusterType].SetDataVersion(
109+
- clusterDataVersion)
110+
+ decodedValue = attributeType.FromTagDictOrRawValue(
111+
+ tlvCache[endpoint][cluster][attribute])
112+
except Exception as ex:
113+
- decodedValue = ValueDecodeFailure(
114+
- tlvCache[endpoint][cluster], ex)
115+
- endpointCache[clusterType] = decodedValue
116+
- else:
117+
- clusterCache[DataVersion] = clusterDataVersion
118+
- for attribute in tlvCache[endpoint][cluster]:
119+
- value = tlvCache[endpoint][cluster][attribute]
120+
-
121+
- if (cluster, attribute) not in _AttributeIndex:
122+
- #
123+
- # #22599 tracks dealing with unknown clusters more
124+
- # gracefully so that clients can still access this data.
125+
- #
126+
- continue
127+
-
128+
- attributeType = _AttributeIndex[(
129+
- cluster, attribute)][0]
130+
-
131+
- if (attributeType not in clusterCache):
132+
- clusterCache[attributeType] = {}
133+
-
134+
- if (type(value) is ValueDecodeFailure):
135+
- clusterCache[attributeType] = value
136+
- else:
137+
- try:
138+
- decodedValue = attributeType.FromTagDictOrRawValue(
139+
- tlvCache[endpoint][cluster][attribute])
140+
- except Exception as ex:
141+
- decodedValue = ValueDecodeFailure(value, ex)
142+
+ decodedValue = ValueDecodeFailure(value, ex)
143+
144+
- clusterCache[attributeType] = decodedValue
145+
+ clusterCache[attributeType] = decodedValue
146+
147+
148+
class SubscriptionTransaction:
149+
@@ -741,7 +746,7 @@ class AsyncReadTransaction:
150+
pass
151+
152+
def _handleReportEnd(self):
153+
- self._cache.UpdateCachedData()
154+
+ self._cache.UpdateCachedData(self._changedPathSet)
155+
156+
if (self._subscription_handler is not None):
157+
for change in self._changedPathSet:
158+
--
159+
2.40.1
160+

0 commit comments

Comments
 (0)