mirror of
https://github.com/home-assistant/core.git
synced 2025-10-10 04:09:33 +00:00
Compare commits
536 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f0663dc275 | ||
![]() |
96bb67bef9 | ||
![]() |
929d76e236 | ||
![]() |
fe1ff083de | ||
![]() |
90c68f8ad0 | ||
![]() |
6b79aa7738 | ||
![]() |
f6fb4c8d5a | ||
![]() |
a6e575ecfa | ||
![]() |
85392ae167 | ||
![]() |
9d124be491 | ||
![]() |
8bca3931ab | ||
![]() |
0367a01287 | ||
![]() |
86e2c2f361 | ||
![]() |
335c8e50a2 | ||
![]() |
8152a9e5da | ||
![]() |
250e562caf | ||
![]() |
a3b641e53d | ||
![]() |
135ea4c02e | ||
![]() |
bc980c1212 | ||
![]() |
59ca88a7e8 | ||
![]() |
d45114cd11 | ||
![]() |
2eba650064 | ||
![]() |
de4adb8855 | ||
![]() |
1d86c03b02 | ||
![]() |
77fb1036cc | ||
![]() |
b15b4e4888 | ||
![]() |
dddf6d5f1a | ||
![]() |
66fb5f4d95 | ||
![]() |
42a9d5d4e3 | ||
![]() |
93fa162913 | ||
![]() |
c432b1c8da | ||
![]() |
00955b8e6a | ||
![]() |
045b9d7f01 | ||
![]() |
438c4c7871 | ||
![]() |
abc360460c | ||
![]() |
26437bb253 | ||
![]() |
56d953ac1e | ||
![]() |
fe4eb8766d | ||
![]() |
2d9f14c401 | ||
![]() |
7b6ccb07fd | ||
![]() |
2ba5728060 | ||
![]() |
b5f163cc85 | ||
![]() |
65540a3e0b | ||
![]() |
cbf1b39edb | ||
![]() |
142daf5e49 | ||
![]() |
8bd0ff7cca | ||
![]() |
ac676e12f6 | ||
![]() |
c0ac3292cd | ||
![]() |
80fd07c128 | ||
![]() |
3701d8859a | ||
![]() |
6dd26bae88 | ||
![]() |
1a0abe296c | ||
![]() |
de6c61a4ab | ||
![]() |
33c677596e | ||
![]() |
e9b4b8e99b | ||
![]() |
0525c04c42 | ||
![]() |
d57b502551 | ||
![]() |
9fb708baf4 | ||
![]() |
abdf24b7a0 | ||
![]() |
29bfbd27bb | ||
![]() |
224553f8d9 | ||
![]() |
7c9f6a061f | ||
![]() |
8e115d4685 | ||
![]() |
00c189844f | ||
![]() |
4587c286bb | ||
![]() |
b46097a7fc | ||
![]() |
299cb6a2ff | ||
![]() |
1b7b91b328 | ||
![]() |
01a1480ebd | ||
![]() |
26b8abb118 | ||
![]() |
53d1bbb530 | ||
![]() |
a3ef55274e | ||
![]() |
2034915457 | ||
![]() |
9e46d7964a | ||
![]() |
f9828a227b | ||
![]() |
3341fa5f33 | ||
![]() |
e38ae47e76 | ||
![]() |
934c0e3c4c | ||
![]() |
994a6ae7ed | ||
![]() |
cdbe93c289 | ||
![]() |
56f90e4d96 | ||
![]() |
34977abfec | ||
![]() |
5622103eb1 | ||
![]() |
b9a1ab4a44 | ||
![]() |
18997833c4 | ||
![]() |
f99b194afc | ||
![]() |
566a347da7 | ||
![]() |
881306f6a4 | ||
![]() |
f63504af01 | ||
![]() |
d140b82a70 | ||
![]() |
681211b1a5 | ||
![]() |
6c8b1f3618 | ||
![]() |
d341065c34 | ||
![]() |
81b1346080 | ||
![]() |
5613be3980 | ||
![]() |
fbcf0eb94c | ||
![]() |
1c7b9cc354 | ||
![]() |
75e900606e | ||
![]() |
7c665c53b5 | ||
![]() |
f72047eb02 | ||
![]() |
ade424c074 | ||
![]() |
5ad805de3c | ||
![]() |
ece77cf620 | ||
![]() |
7eaa559056 | ||
![]() |
08a9377373 | ||
![]() |
a2837e6aee | ||
![]() |
fa03f6194d | ||
![]() |
d2851ea1df | ||
![]() |
72f8ac7857 | ||
![]() |
77a267bc2f | ||
![]() |
ad238daadc | ||
![]() |
42370ba203 | ||
![]() |
d9691c2a3b | ||
![]() |
66cca981a9 | ||
![]() |
9640ebb593 | ||
![]() |
645f32fd65 | ||
![]() |
cb6e65f972 | ||
![]() |
425bdc0ba6 | ||
![]() |
c36341e51f | ||
![]() |
553d896899 | ||
![]() |
ac79b3072e | ||
![]() |
c0aa9bfd4b | ||
![]() |
e97100028d | ||
![]() |
da89617432 | ||
![]() |
e6203dffd3 | ||
![]() |
c13cfe9c37 | ||
![]() |
2447df9341 | ||
![]() |
1c1fbe0ec1 | ||
![]() |
4a6d2017fd | ||
![]() |
b4997a52df | ||
![]() |
464dec1dcb | ||
![]() |
85506ac78a | ||
![]() |
6d97355b42 | ||
![]() |
f9e75c616a | ||
![]() |
a821d02dfb | ||
![]() |
e05169c7a4 | ||
![]() |
1cc3431529 | ||
![]() |
4ba765f265 | ||
![]() |
50a7af4179 | ||
![]() |
e0a2116e88 | ||
![]() |
d8e1ed5f4a | ||
![]() |
f1b8e8a963 | ||
![]() |
9a9fd44c62 | ||
![]() |
bc3fe7a18e | ||
![]() |
19f3559345 | ||
![]() |
fad0e23797 | ||
![]() |
7f931e4d70 | ||
![]() |
a04835629b | ||
![]() |
78cd80746d | ||
![]() |
9ac93920d8 | ||
![]() |
1818fce1ae | ||
![]() |
f524edc4b9 | ||
![]() |
19f990ed31 | ||
![]() |
5d83c82b81 | ||
![]() |
d63d154457 | ||
![]() |
933b15ce36 | ||
![]() |
6ec7b63ebe | ||
![]() |
26bfbc55e9 | ||
![]() |
d75ca0f5f3 | ||
![]() |
fed8f137e9 | ||
![]() |
f44d65e023 | ||
![]() |
a270bd76de | ||
![]() |
9209e419ec | ||
![]() |
98f8f15e90 | ||
![]() |
b2a2868afd | ||
![]() |
0d4737d360 | ||
![]() |
2b370a0eca | ||
![]() |
618fe81207 | ||
![]() |
c0fe4861f9 | ||
![]() |
dfd33fdab1 | ||
![]() |
cceee05c15 | ||
![]() |
f560d2a05e | ||
![]() |
3601cff88e | ||
![]() |
ca5c0a759f | ||
![]() |
6f9e6909ce | ||
![]() |
ccf563437b | ||
![]() |
78e97428fd | ||
![]() |
8b4c730993 | ||
![]() |
0a071a13e2 | ||
![]() |
ab80991eac | ||
![]() |
ee7262efb4 | ||
![]() |
ea5a52cdc8 | ||
![]() |
31fe0322ab | ||
![]() |
e8e0eabb99 | ||
![]() |
1629dad1a8 | ||
![]() |
d9baad530a | ||
![]() |
4a1d00e59a | ||
![]() |
437e4e027c | ||
![]() |
3726f7eca9 | ||
![]() |
c943cf515c | ||
![]() |
3b0c2a7e56 | ||
![]() |
6ebaa9cd1d | ||
![]() |
f81c32f6ea | ||
![]() |
c0cd7a1a62 | ||
![]() |
7a61c818c6 | ||
![]() |
2800625bcf | ||
![]() |
cfec998221 | ||
![]() |
7203cffbd7 | ||
![]() |
23397ef6a9 | ||
![]() |
0e154635ff | ||
![]() |
2e6e518722 | ||
![]() |
e0cded97c7 | ||
![]() |
87a6a029bb | ||
![]() |
1cc3c22d3f | ||
![]() |
2341d1d965 | ||
![]() |
a0bae9485c | ||
![]() |
f281b0fc6b | ||
![]() |
6f89fe81cc | ||
![]() |
34f6ead7a1 | ||
![]() |
8985527a87 | ||
![]() |
bd87a3aa4d | ||
![]() |
768a505904 | ||
![]() |
d97c1f0fc3 | ||
![]() |
c3fcd34d4c | ||
![]() |
44d9eaea95 | ||
![]() |
0f34f5139a | ||
![]() |
2afb1a673d | ||
![]() |
c2f7f29630 | ||
![]() |
b01f5dd24b | ||
![]() |
0cda0c449f | ||
![]() |
40fdf12bc9 | ||
![]() |
3939a80302 | ||
![]() |
d32a102613 | ||
![]() |
20949d39c4 | ||
![]() |
310a0c8d13 | ||
![]() |
c9e80ac7e9 | ||
![]() |
5df4e9e1cf | ||
![]() |
4022ee74e8 | ||
![]() |
80a4115c44 | ||
![]() |
ce548efd80 | ||
![]() |
2edf622b41 | ||
![]() |
66ac9078aa | ||
![]() |
ba75f18f5a | ||
![]() |
8ee2ece03e | ||
![]() |
7060ab8c44 | ||
![]() |
85d8244b8a | ||
![]() |
3f9421ab08 | ||
![]() |
2f3fbf00b7 | ||
![]() |
d595ec8a07 | ||
![]() |
4ff5462cc4 | ||
![]() |
404f95b442 | ||
![]() |
89cf784022 | ||
![]() |
02142f352d | ||
![]() |
ec3dd7d1e5 | ||
![]() |
7355799030 | ||
![]() |
982166df3c | ||
![]() |
c7d3512ad2 | ||
![]() |
ada6f7b3fb | ||
![]() |
78e16495bd | ||
![]() |
12085e6152 | ||
![]() |
6764463689 | ||
![]() |
7055276665 | ||
![]() |
71b3ebd15a | ||
![]() |
b87910e596 | ||
![]() |
e19bfd670b | ||
![]() |
7b3c96e80b | ||
![]() |
01ff3cf9d9 | ||
![]() |
d66da0c10d | ||
![]() |
3491bb1b40 | ||
![]() |
3bf995eb71 | ||
![]() |
2169ce1722 | ||
![]() |
275e9485e9 | ||
![]() |
95198ae540 | ||
![]() |
aed2d3899d | ||
![]() |
4011d62ac7 | ||
![]() |
d2aa0573de | ||
![]() |
571b2e3ab6 | ||
![]() |
a7f48360b7 | ||
![]() |
22f2f8680a | ||
![]() |
d92004a9e7 | ||
![]() |
64875894d6 | ||
![]() |
3f7a288526 | ||
![]() |
a2a067a81c | ||
![]() |
f9f61b8da7 | ||
![]() |
cd69b82fc9 | ||
![]() |
d20631598e | ||
![]() |
229ebe16f3 | ||
![]() |
a172f67d37 | ||
![]() |
ee4a1de566 | ||
![]() |
7ab99c028c | ||
![]() |
0e1d12b1ae | ||
![]() |
e090ddd761 | ||
![]() |
9721ce6877 | ||
![]() |
8dde94f421 | ||
![]() |
f5f6b22af1 | ||
![]() |
f8a93b6561 | ||
![]() |
840a03f048 | ||
![]() |
85f3b5ce78 | ||
![]() |
f4284fec2f | ||
![]() |
3a89b3152f | ||
![]() |
a0356328c3 | ||
![]() |
4b6f37b1d7 | ||
![]() |
716705fb5a | ||
![]() |
d246836480 | ||
![]() |
6ee2b82d15 | ||
![]() |
73ff8d36a5 | ||
![]() |
1397def3b8 | ||
![]() |
d443529041 | ||
![]() |
373bb20f1b | ||
![]() |
3b44cce6dc | ||
![]() |
46056fe45b | ||
![]() |
1816c190b2 | ||
![]() |
00abaee6b3 | ||
![]() |
3a301f54e0 | ||
![]() |
762accbd6d | ||
![]() |
e0422d7d34 | ||
![]() |
6ba2057a88 | ||
![]() |
752969bce5 | ||
![]() |
efbdfd2954 | ||
![]() |
bb7a177a5d | ||
![]() |
9b56ca8cde | ||
![]() |
b0a08782e0 | ||
![]() |
6c9955f220 | ||
![]() |
f56b94c0f9 | ||
![]() |
3cf035820b | ||
![]() |
99a796d066 | ||
![]() |
1cd1b1aba8 | ||
![]() |
4131c14629 | ||
![]() |
c2acda5796 | ||
![]() |
4806e7e9d9 | ||
![]() |
76606fd44f | ||
![]() |
2983f1a3b6 | ||
![]() |
8019779b3a | ||
![]() |
62cdcbf422 | ||
![]() |
b12a5a36e1 | ||
![]() |
e32763e464 | ||
![]() |
b85cf3f9d2 | ||
![]() |
3777bcc2af | ||
![]() |
52cde48ff0 | ||
![]() |
bf1da35303 | ||
![]() |
c1bf11da34 | ||
![]() |
3c20325b37 | ||
![]() |
fd8ccb8d8f | ||
![]() |
d76e947021 | ||
![]() |
c91ed96543 | ||
![]() |
b164531ba8 | ||
![]() |
7c623a8704 | ||
![]() |
7ae3340336 | ||
![]() |
653b73c601 | ||
![]() |
7c93d91bae | ||
![]() |
07da0cfb2b | ||
![]() |
b411a11c2c | ||
![]() |
0555b84d05 | ||
![]() |
790bddef63 | ||
![]() |
a3089b8aa7 | ||
![]() |
77c8426d63 | ||
![]() |
faf226f6c2 | ||
![]() |
06d143b81a | ||
![]() |
08b6a0a702 | ||
![]() |
a20d1e3656 | ||
![]() |
36cc3682ca | ||
![]() |
1b495ecafa | ||
![]() |
7d1a0be07e | ||
![]() |
327f65c991 | ||
![]() |
4ac89f6849 | ||
![]() |
db3b070ed0 | ||
![]() |
6d940f476a | ||
![]() |
1ca701dda4 | ||
![]() |
291c44100c | ||
![]() |
c8d676e06b | ||
![]() |
4c1ae0eddc | ||
![]() |
39eadc814f | ||
![]() |
f7ecad61ba | ||
![]() |
fa4cb54549 | ||
![]() |
2be33c5e0a | ||
![]() |
904d7e5d5a | ||
![]() |
dbc4a65d48 | ||
![]() |
b93f4aabf1 | ||
![]() |
9eaa40c7a4 | ||
![]() |
b308a882fb | ||
![]() |
7f63ba2087 | ||
![]() |
d7269cfcc6 | ||
![]() |
2850a574f6 | ||
![]() |
dcb8d4f702 | ||
![]() |
aeadc0c4b0 | ||
![]() |
683c6b17be | ||
![]() |
69dd5c91b7 | ||
![]() |
5cf7dfca8f | ||
![]() |
62a49d4244 | ||
![]() |
93ee6322f2 | ||
![]() |
914990b58a | ||
![]() |
f78bb5adb6 | ||
![]() |
905f5e7289 | ||
![]() |
ec503618c3 | ||
![]() |
7a41cbc314 | ||
![]() |
c58ba734e7 | ||
![]() |
68f63be62f | ||
![]() |
2aa4ca1351 | ||
![]() |
fbabb27787 | ||
![]() |
0960d78eb5 | ||
![]() |
474b40511f | ||
![]() |
18b80aced3 | ||
![]() |
b964d362b7 | ||
![]() |
3914e41f3c | ||
![]() |
82bdfcb99b | ||
![]() |
976cea600f | ||
![]() |
8c8713c3f7 | ||
![]() |
2359ae6ce7 | ||
![]() |
b570fd35c8 | ||
![]() |
9d94e6b3b4 | ||
![]() |
cfab789823 | ||
![]() |
81917425dc | ||
![]() |
bfb62709d4 | ||
![]() |
ca3f2ee782 | ||
![]() |
fc8703a40f | ||
![]() |
80517c7ac1 | ||
![]() |
2b4b46eaf8 | ||
![]() |
40b9dae608 | ||
![]() |
5975cd6e09 | ||
![]() |
258c9ff52b | ||
![]() |
89c5d498a4 | ||
![]() |
76cb4d123a | ||
![]() |
f0c29c7699 | ||
![]() |
aa4151ced7 | ||
![]() |
0a6fa978fa | ||
![]() |
dc02002b9d | ||
![]() |
f071a3f38b | ||
![]() |
b935231e47 | ||
![]() |
b9f7613567 | ||
![]() |
1289a031ab | ||
![]() |
289546ef6d | ||
![]() |
aacff4db5d | ||
![]() |
f833b56122 | ||
![]() |
7eb0f2993f | ||
![]() |
abb341abfe | ||
![]() |
0d90614369 | ||
![]() |
ec84bebeea | ||
![]() |
9176867d6b | ||
![]() |
281a137ff5 | ||
![]() |
d6543480ac | ||
![]() |
ae6391b866 | ||
![]() |
10b56e4258 | ||
![]() |
0ff2597957 | ||
![]() |
026b28e962 | ||
![]() |
9a1e67294a | ||
![]() |
cdb448a5cc | ||
![]() |
ab80e726e2 | ||
![]() |
2d5d0f67b2 | ||
![]() |
d4100b6096 | ||
![]() |
955e854d77 | ||
![]() |
0c37f88c49 | ||
![]() |
48167eeb9c | ||
![]() |
24177197f7 | ||
![]() |
863fc0ba97 | ||
![]() |
9f7b229d02 | ||
![]() |
ffd909f3d9 | ||
![]() |
1ebf096a33 | ||
![]() |
96d51965e5 | ||
![]() |
04b510b020 | ||
![]() |
c9a301d50e | ||
![]() |
b304bd1a8b | ||
![]() |
b99525b231 | ||
![]() |
634db13990 | ||
![]() |
ad51a77989 | ||
![]() |
3348a39e8a | ||
![]() |
81c2e356ec | ||
![]() |
de6c3512d2 | ||
![]() |
36dc1e938a | ||
![]() |
07a78cf6f7 | ||
![]() |
eaa673e0c3 | ||
![]() |
f2c4ca081f | ||
![]() |
e3d707f0b4 | ||
![]() |
fb93fed2e5 | ||
![]() |
95dfc2f23d | ||
![]() |
408df2093a | ||
![]() |
f32bf0cc3e | ||
![]() |
dbbe3145b6 | ||
![]() |
f8bf3ea2ef | ||
![]() |
053bd31d43 | ||
![]() |
1aefc3f37a | ||
![]() |
3de955d9ce | ||
![]() |
0ff88fd366 | ||
![]() |
eb84020773 | ||
![]() |
4bbfea3c7c | ||
![]() |
63d4fb7558 | ||
![]() |
953895cd81 | ||
![]() |
a6c3f4efc0 | ||
![]() |
11e880d034 | ||
![]() |
e4d6bdb398 | ||
![]() |
6ced1783e3 | ||
![]() |
8051f78d10 | ||
![]() |
b724176b23 | ||
![]() |
fdca16ea92 | ||
![]() |
f8fd8b432a | ||
![]() |
9148ae70ce | ||
![]() |
447cb26d28 | ||
![]() |
2af36465f6 | ||
![]() |
d5f7265424 | ||
![]() |
cc16af7f2d | ||
![]() |
7a4d75bc44 | ||
![]() |
ec0380fd3b | ||
![]() |
b17cc71dfb | ||
![]() |
89b327ed7b | ||
![]() |
9bf361a1b8 | ||
![]() |
d11c171c75 | ||
![]() |
c523c45d17 | ||
![]() |
c1b9c0e1b6 | ||
![]() |
487b9ff03e | ||
![]() |
ec62b0cdfb | ||
![]() |
6d0470064f | ||
![]() |
7450b3fd1a | ||
![]() |
5b70910d77 | ||
![]() |
52de5ff5ff | ||
![]() |
c4389a1679 | ||
![]() |
35faaa6cae | ||
![]() |
3c0b13975a | ||
![]() |
bc88696339 | ||
![]() |
8f99c3f64a | ||
![]() |
88016d96d4 | ||
![]() |
47df73b18f | ||
![]() |
1c12d2b8cd | ||
![]() |
eb38837a8c | ||
![]() |
159c7fbfd1 | ||
![]() |
7ee31f0884 | ||
![]() |
0c5e12571a | ||
![]() |
9db973217f | ||
![]() |
cf1a745283 | ||
![]() |
834e3f1963 | ||
![]() |
3f8f7573c9 | ||
![]() |
0ae272f1f6 | ||
![]() |
8774295e2e | ||
![]() |
0c8d2594ef | ||
![]() |
205bd2676b | ||
![]() |
25849fd9cc | ||
![]() |
7d6eac9ff7 | ||
![]() |
31017ebc98 | ||
![]() |
724a7b0ecc | ||
![]() |
91e13d447a | ||
![]() |
7c8ad9d535 | ||
![]() |
9cd3ab853d | ||
![]() |
0b0f8c5829 | ||
![]() |
ae7bc7fb1b | ||
![]() |
09750872b5 | ||
![]() |
076e51017b | ||
![]() |
95e7b00996 | ||
![]() |
ddecf1ac21 |
10
.github/workflows/builder.yml
vendored
10
.github/workflows/builder.yml
vendored
@@ -190,7 +190,7 @@ jobs:
|
|||||||
echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
|
echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
|
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -257,7 +257,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
|
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -332,14 +332,14 @@ jobs:
|
|||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
if: matrix.registry == 'docker.io/homeassistant'
|
if: matrix.registry == 'docker.io/homeassistant'
|
||||||
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
|
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
if: matrix.registry == 'ghcr.io/home-assistant'
|
if: matrix.registry == 'ghcr.io/home-assistant'
|
||||||
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
|
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -504,7 +504,7 @@ jobs:
|
|||||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
|
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
|
716
.github/workflows/ci.yaml
vendored
716
.github/workflows/ci.yaml
vendored
File diff suppressed because it is too large
Load Diff
4
.github/workflows/codeql.yml
vendored
4
.github/workflows/codeql.yml
vendored
@@ -24,11 +24,11 @@ jobs:
|
|||||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||||
|
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
|
uses: github/codeql-action/init@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
|
||||||
with:
|
with:
|
||||||
languages: python
|
languages: python
|
||||||
|
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
|
uses: github/codeql-action/analyze@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
|
||||||
with:
|
with:
|
||||||
category: "/language:python"
|
category: "/language:python"
|
||||||
|
6
.github/workflows/stale.yml
vendored
6
.github/workflows/stale.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
|||||||
# - No PRs marked as no-stale
|
# - No PRs marked as no-stale
|
||||||
# - No issues (-1)
|
# - No issues (-1)
|
||||||
- name: 60 days stale PRs policy
|
- name: 60 days stale PRs policy
|
||||||
uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
|
uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
|
||||||
with:
|
with:
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
days-before-stale: 60
|
days-before-stale: 60
|
||||||
@@ -57,7 +57,7 @@ jobs:
|
|||||||
# - No issues marked as no-stale or help-wanted
|
# - No issues marked as no-stale or help-wanted
|
||||||
# - No PRs (-1)
|
# - No PRs (-1)
|
||||||
- name: 90 days stale issues
|
- name: 90 days stale issues
|
||||||
uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
|
uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
|
||||||
with:
|
with:
|
||||||
repo-token: ${{ steps.token.outputs.token }}
|
repo-token: ${{ steps.token.outputs.token }}
|
||||||
days-before-stale: 90
|
days-before-stale: 90
|
||||||
@@ -87,7 +87,7 @@ jobs:
|
|||||||
# - No Issues marked as no-stale or help-wanted
|
# - No Issues marked as no-stale or help-wanted
|
||||||
# - No PRs (-1)
|
# - No PRs (-1)
|
||||||
- name: Needs more information stale issues policy
|
- name: Needs more information stale issues policy
|
||||||
uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
|
uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
|
||||||
with:
|
with:
|
||||||
repo-token: ${{ steps.token.outputs.token }}
|
repo-token: ${{ steps.token.outputs.token }}
|
||||||
only-labels: "needs-more-information"
|
only-labels: "needs-more-information"
|
||||||
|
@@ -203,6 +203,7 @@ homeassistant.components.feedreader.*
|
|||||||
homeassistant.components.file_upload.*
|
homeassistant.components.file_upload.*
|
||||||
homeassistant.components.filesize.*
|
homeassistant.components.filesize.*
|
||||||
homeassistant.components.filter.*
|
homeassistant.components.filter.*
|
||||||
|
homeassistant.components.firefly_iii.*
|
||||||
homeassistant.components.fitbit.*
|
homeassistant.components.fitbit.*
|
||||||
homeassistant.components.flexit_bacnet.*
|
homeassistant.components.flexit_bacnet.*
|
||||||
homeassistant.components.flux_led.*
|
homeassistant.components.flux_led.*
|
||||||
@@ -220,6 +221,7 @@ homeassistant.components.generic_thermostat.*
|
|||||||
homeassistant.components.geo_location.*
|
homeassistant.components.geo_location.*
|
||||||
homeassistant.components.geocaching.*
|
homeassistant.components.geocaching.*
|
||||||
homeassistant.components.gios.*
|
homeassistant.components.gios.*
|
||||||
|
homeassistant.components.github.*
|
||||||
homeassistant.components.glances.*
|
homeassistant.components.glances.*
|
||||||
homeassistant.components.go2rtc.*
|
homeassistant.components.go2rtc.*
|
||||||
homeassistant.components.goalzero.*
|
homeassistant.components.goalzero.*
|
||||||
@@ -325,6 +327,7 @@ homeassistant.components.london_underground.*
|
|||||||
homeassistant.components.lookin.*
|
homeassistant.components.lookin.*
|
||||||
homeassistant.components.lovelace.*
|
homeassistant.components.lovelace.*
|
||||||
homeassistant.components.luftdaten.*
|
homeassistant.components.luftdaten.*
|
||||||
|
homeassistant.components.lunatone.*
|
||||||
homeassistant.components.madvr.*
|
homeassistant.components.madvr.*
|
||||||
homeassistant.components.manual.*
|
homeassistant.components.manual.*
|
||||||
homeassistant.components.mastodon.*
|
homeassistant.components.mastodon.*
|
||||||
@@ -553,6 +556,7 @@ homeassistant.components.vacuum.*
|
|||||||
homeassistant.components.vallox.*
|
homeassistant.components.vallox.*
|
||||||
homeassistant.components.valve.*
|
homeassistant.components.valve.*
|
||||||
homeassistant.components.velbus.*
|
homeassistant.components.velbus.*
|
||||||
|
homeassistant.components.vivotek.*
|
||||||
homeassistant.components.vlc_telnet.*
|
homeassistant.components.vlc_telnet.*
|
||||||
homeassistant.components.vodafone_station.*
|
homeassistant.components.vodafone_station.*
|
||||||
homeassistant.components.volvo.*
|
homeassistant.components.volvo.*
|
||||||
|
14
CODEOWNERS
generated
14
CODEOWNERS
generated
@@ -492,6 +492,8 @@ build.json @home-assistant/supervisor
|
|||||||
/tests/components/filesize/ @gjohansson-ST
|
/tests/components/filesize/ @gjohansson-ST
|
||||||
/homeassistant/components/filter/ @dgomes
|
/homeassistant/components/filter/ @dgomes
|
||||||
/tests/components/filter/ @dgomes
|
/tests/components/filter/ @dgomes
|
||||||
|
/homeassistant/components/firefly_iii/ @erwindouna
|
||||||
|
/tests/components/firefly_iii/ @erwindouna
|
||||||
/homeassistant/components/fireservicerota/ @cyberjunky
|
/homeassistant/components/fireservicerota/ @cyberjunky
|
||||||
/tests/components/fireservicerota/ @cyberjunky
|
/tests/components/fireservicerota/ @cyberjunky
|
||||||
/homeassistant/components/firmata/ @DaAwesomeP
|
/homeassistant/components/firmata/ @DaAwesomeP
|
||||||
@@ -908,6 +910,8 @@ build.json @home-assistant/supervisor
|
|||||||
/homeassistant/components/luci/ @mzdrale
|
/homeassistant/components/luci/ @mzdrale
|
||||||
/homeassistant/components/luftdaten/ @fabaff @frenck
|
/homeassistant/components/luftdaten/ @fabaff @frenck
|
||||||
/tests/components/luftdaten/ @fabaff @frenck
|
/tests/components/luftdaten/ @fabaff @frenck
|
||||||
|
/homeassistant/components/lunatone/ @MoonDevLT
|
||||||
|
/tests/components/lunatone/ @MoonDevLT
|
||||||
/homeassistant/components/lupusec/ @majuss @suaveolent
|
/homeassistant/components/lupusec/ @majuss @suaveolent
|
||||||
/tests/components/lupusec/ @majuss @suaveolent
|
/tests/components/lupusec/ @majuss @suaveolent
|
||||||
/homeassistant/components/lutron/ @cdheiser @wilburCForce
|
/homeassistant/components/lutron/ @cdheiser @wilburCForce
|
||||||
@@ -953,6 +957,8 @@ build.json @home-assistant/supervisor
|
|||||||
/tests/components/met_eireann/ @DylanGore
|
/tests/components/met_eireann/ @DylanGore
|
||||||
/homeassistant/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
|
/homeassistant/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
|
||||||
/tests/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
|
/tests/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
|
||||||
|
/homeassistant/components/meteo_lt/ @xE1H
|
||||||
|
/tests/components/meteo_lt/ @xE1H
|
||||||
/homeassistant/components/meteoalarm/ @rolfberkenbosch
|
/homeassistant/components/meteoalarm/ @rolfberkenbosch
|
||||||
/homeassistant/components/meteoclimatic/ @adrianmo
|
/homeassistant/components/meteoclimatic/ @adrianmo
|
||||||
/tests/components/meteoclimatic/ @adrianmo
|
/tests/components/meteoclimatic/ @adrianmo
|
||||||
@@ -1059,6 +1065,8 @@ build.json @home-assistant/supervisor
|
|||||||
/homeassistant/components/nilu/ @hfurubotten
|
/homeassistant/components/nilu/ @hfurubotten
|
||||||
/homeassistant/components/nina/ @DeerMaximum
|
/homeassistant/components/nina/ @DeerMaximum
|
||||||
/tests/components/nina/ @DeerMaximum
|
/tests/components/nina/ @DeerMaximum
|
||||||
|
/homeassistant/components/nintendo_parental/ @pantherale0
|
||||||
|
/tests/components/nintendo_parental/ @pantherale0
|
||||||
/homeassistant/components/nissan_leaf/ @filcole
|
/homeassistant/components/nissan_leaf/ @filcole
|
||||||
/homeassistant/components/noaa_tides/ @jdelaney72
|
/homeassistant/components/noaa_tides/ @jdelaney72
|
||||||
/homeassistant/components/nobo_hub/ @echoromeo @oyvindwe
|
/homeassistant/components/nobo_hub/ @echoromeo @oyvindwe
|
||||||
@@ -1190,8 +1198,6 @@ build.json @home-assistant/supervisor
|
|||||||
/tests/components/plex/ @jjlawren
|
/tests/components/plex/ @jjlawren
|
||||||
/homeassistant/components/plugwise/ @CoMPaTech @bouwew
|
/homeassistant/components/plugwise/ @CoMPaTech @bouwew
|
||||||
/tests/components/plugwise/ @CoMPaTech @bouwew
|
/tests/components/plugwise/ @CoMPaTech @bouwew
|
||||||
/homeassistant/components/plum_lightpad/ @ColinHarrington @prystupa
|
|
||||||
/tests/components/plum_lightpad/ @ColinHarrington @prystupa
|
|
||||||
/homeassistant/components/point/ @fredrike
|
/homeassistant/components/point/ @fredrike
|
||||||
/tests/components/point/ @fredrike
|
/tests/components/point/ @fredrike
|
||||||
/homeassistant/components/pooldose/ @lmaertin
|
/homeassistant/components/pooldose/ @lmaertin
|
||||||
@@ -1407,8 +1413,8 @@ build.json @home-assistant/supervisor
|
|||||||
/tests/components/sfr_box/ @epenet
|
/tests/components/sfr_box/ @epenet
|
||||||
/homeassistant/components/sftp_storage/ @maretodoric
|
/homeassistant/components/sftp_storage/ @maretodoric
|
||||||
/tests/components/sftp_storage/ @maretodoric
|
/tests/components/sftp_storage/ @maretodoric
|
||||||
/homeassistant/components/sharkiq/ @JeffResc @funkybunch
|
/homeassistant/components/sharkiq/ @JeffResc @funkybunch @TheOneOgre
|
||||||
/tests/components/sharkiq/ @JeffResc @funkybunch
|
/tests/components/sharkiq/ @JeffResc @funkybunch @TheOneOgre
|
||||||
/homeassistant/components/shell_command/ @home-assistant/core
|
/homeassistant/components/shell_command/ @home-assistant/core
|
||||||
/tests/components/shell_command/ @home-assistant/core
|
/tests/components/shell_command/ @home-assistant/core
|
||||||
/homeassistant/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
|
/homeassistant/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
|
||||||
|
@@ -34,9 +34,10 @@ WORKDIR /usr/src
|
|||||||
|
|
||||||
COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
|
COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
|
||||||
|
|
||||||
|
USER vscode
|
||||||
|
|
||||||
RUN uv python install 3.13.2
|
RUN uv python install 3.13.2
|
||||||
|
|
||||||
USER vscode
|
|
||||||
ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"
|
ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"
|
||||||
RUN uv venv $VIRTUAL_ENV
|
RUN uv venv $VIRTUAL_ENV
|
||||||
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
|
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
|
||||||
|
10
build.yaml
10
build.yaml
@@ -1,10 +1,10 @@
|
|||||||
image: ghcr.io/home-assistant/{arch}-homeassistant
|
image: ghcr.io/home-assistant/{arch}-homeassistant
|
||||||
build_from:
|
build_from:
|
||||||
aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.09.3
|
aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.10.0
|
||||||
armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.09.3
|
armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.10.0
|
||||||
armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.09.3
|
armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.10.0
|
||||||
amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.09.3
|
amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.10.0
|
||||||
i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.09.3
|
i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.10.0
|
||||||
codenotary:
|
codenotary:
|
||||||
signer: notary@home-assistant.io
|
signer: notary@home-assistant.io
|
||||||
base_image: notary@home-assistant.io
|
base_image: notary@home-assistant.io
|
||||||
|
@@ -616,34 +616,34 @@ async def async_enable_logging(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
# Log errors to a file if we have write access to file or config dir
|
logger = logging.getLogger()
|
||||||
|
logger.setLevel(logging.INFO if verbose else logging.WARNING)
|
||||||
|
|
||||||
if log_file is None:
|
if log_file is None:
|
||||||
err_log_path = hass.config.path(ERROR_LOG_FILENAME)
|
default_log_path = hass.config.path(ERROR_LOG_FILENAME)
|
||||||
|
if "SUPERVISOR" in os.environ:
|
||||||
|
_LOGGER.info("Running in Supervisor, not logging to file")
|
||||||
|
# Rename the default log file if it exists, since previous versions created
|
||||||
|
# it even on Supervisor
|
||||||
|
if os.path.isfile(default_log_path):
|
||||||
|
with contextlib.suppress(OSError):
|
||||||
|
os.rename(default_log_path, f"{default_log_path}.old")
|
||||||
|
err_log_path = None
|
||||||
|
else:
|
||||||
|
err_log_path = default_log_path
|
||||||
else:
|
else:
|
||||||
err_log_path = os.path.abspath(log_file)
|
err_log_path = os.path.abspath(log_file)
|
||||||
|
|
||||||
err_path_exists = os.path.isfile(err_log_path)
|
if err_log_path:
|
||||||
err_dir = os.path.dirname(err_log_path)
|
|
||||||
|
|
||||||
# Check if we can write to the error log if it exists or that
|
|
||||||
# we can create files in the containing directory if not.
|
|
||||||
if (err_path_exists and os.access(err_log_path, os.W_OK)) or (
|
|
||||||
not err_path_exists and os.access(err_dir, os.W_OK)
|
|
||||||
):
|
|
||||||
err_handler = await hass.async_add_executor_job(
|
err_handler = await hass.async_add_executor_job(
|
||||||
_create_log_file, err_log_path, log_rotate_days
|
_create_log_file, err_log_path, log_rotate_days
|
||||||
)
|
)
|
||||||
|
|
||||||
err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
|
err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
|
||||||
|
|
||||||
logger = logging.getLogger()
|
|
||||||
logger.addHandler(err_handler)
|
logger.addHandler(err_handler)
|
||||||
logger.setLevel(logging.INFO if verbose else logging.WARNING)
|
|
||||||
|
|
||||||
# Save the log file location for access by other components.
|
# Save the log file location for access by other components.
|
||||||
hass.data[DATA_LOGGING] = err_log_path
|
hass.data[DATA_LOGGING] = err_log_path
|
||||||
else:
|
|
||||||
_LOGGER.error("Unable to set up error log %s (access denied)", err_log_path)
|
|
||||||
|
|
||||||
async_activate_log_queue_handler(hass)
|
async_activate_log_queue_handler(hass)
|
||||||
|
|
||||||
|
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"domain": "ibm",
|
|
||||||
"name": "IBM",
|
|
||||||
"integrations": ["watson_iot", "watson_tts"]
|
|
||||||
}
|
|
@@ -12,11 +12,13 @@ from homeassistant.components.bluetooth import async_get_scanner
|
|||||||
from homeassistant.config_entries import ConfigEntry
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.const import CONF_ADDRESS
|
from homeassistant.const import CONF_ADDRESS
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
|
from homeassistant.helpers.debounce import Debouncer
|
||||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
||||||
|
|
||||||
from .const import CONF_IS_NEW_STYLE_SCALE
|
from .const import CONF_IS_NEW_STYLE_SCALE
|
||||||
|
|
||||||
SCAN_INTERVAL = timedelta(seconds=15)
|
SCAN_INTERVAL = timedelta(seconds=15)
|
||||||
|
UPDATE_DEBOUNCE_TIME = 0.2
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -38,11 +40,19 @@ class AcaiaCoordinator(DataUpdateCoordinator[None]):
|
|||||||
config_entry=entry,
|
config_entry=entry,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
debouncer = Debouncer(
|
||||||
|
hass=hass,
|
||||||
|
logger=_LOGGER,
|
||||||
|
cooldown=UPDATE_DEBOUNCE_TIME,
|
||||||
|
immediate=True,
|
||||||
|
function=self.async_update_listeners,
|
||||||
|
)
|
||||||
|
|
||||||
self._scale = AcaiaScale(
|
self._scale = AcaiaScale(
|
||||||
address_or_ble_device=entry.data[CONF_ADDRESS],
|
address_or_ble_device=entry.data[CONF_ADDRESS],
|
||||||
name=entry.title,
|
name=entry.title,
|
||||||
is_new_style_scale=entry.data[CONF_IS_NEW_STYLE_SCALE],
|
is_new_style_scale=entry.data[CONF_IS_NEW_STYLE_SCALE],
|
||||||
notify_callback=self.async_update_listeners,
|
notify_callback=debouncer.async_schedule_call,
|
||||||
scanner=async_get_scanner(hass),
|
scanner=async_get_scanner(hass),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -71,4 +71,4 @@ POLLEN_CATEGORY_MAP = {
|
|||||||
}
|
}
|
||||||
UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=10)
|
UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=10)
|
||||||
UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)
|
UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)
|
||||||
UPDATE_INTERVAL_HOURLY_FORECAST = timedelta(hours=30)
|
UPDATE_INTERVAL_HOURLY_FORECAST = timedelta(minutes=30)
|
||||||
|
@@ -1,6 +1,9 @@
|
|||||||
{
|
{
|
||||||
"entity": {
|
"entity": {
|
||||||
"sensor": {
|
"sensor": {
|
||||||
|
"air_quality": {
|
||||||
|
"default": "mdi:air-filter"
|
||||||
|
},
|
||||||
"cloud_ceiling": {
|
"cloud_ceiling": {
|
||||||
"default": "mdi:weather-fog"
|
"default": "mdi:weather-fog"
|
||||||
},
|
},
|
||||||
@@ -34,9 +37,6 @@
|
|||||||
"thunderstorm_probability_night": {
|
"thunderstorm_probability_night": {
|
||||||
"default": "mdi:weather-lightning"
|
"default": "mdi:weather-lightning"
|
||||||
},
|
},
|
||||||
"translation_key": {
|
|
||||||
"default": "mdi:air-filter"
|
|
||||||
},
|
|
||||||
"tree_pollen": {
|
"tree_pollen": {
|
||||||
"default": "mdi:tree-outline"
|
"default": "mdi:tree-outline"
|
||||||
},
|
},
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
"""Airgradient Update platform."""
|
"""Airgradient Update platform."""
|
||||||
|
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from airgradient import AirGradientConnectionError
|
||||||
from propcache.api import cached_property
|
from propcache.api import cached_property
|
||||||
|
|
||||||
from homeassistant.components.update import UpdateDeviceClass, UpdateEntity
|
from homeassistant.components.update import UpdateDeviceClass, UpdateEntity
|
||||||
@@ -13,6 +15,7 @@ from .entity import AirGradientEntity
|
|||||||
|
|
||||||
PARALLEL_UPDATES = 1
|
PARALLEL_UPDATES = 1
|
||||||
SCAN_INTERVAL = timedelta(hours=1)
|
SCAN_INTERVAL = timedelta(hours=1)
|
||||||
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_entry(
|
async def async_setup_entry(
|
||||||
@@ -31,6 +34,7 @@ class AirGradientUpdate(AirGradientEntity, UpdateEntity):
|
|||||||
"""Representation of Airgradient Update."""
|
"""Representation of Airgradient Update."""
|
||||||
|
|
||||||
_attr_device_class = UpdateDeviceClass.FIRMWARE
|
_attr_device_class = UpdateDeviceClass.FIRMWARE
|
||||||
|
_server_unreachable_logged = False
|
||||||
|
|
||||||
def __init__(self, coordinator: AirGradientCoordinator) -> None:
|
def __init__(self, coordinator: AirGradientCoordinator) -> None:
|
||||||
"""Initialize the entity."""
|
"""Initialize the entity."""
|
||||||
@@ -47,10 +51,27 @@ class AirGradientUpdate(AirGradientEntity, UpdateEntity):
|
|||||||
"""Return the installed version of the entity."""
|
"""Return the installed version of the entity."""
|
||||||
return self.coordinator.data.measures.firmware_version
|
return self.coordinator.data.measures.firmware_version
|
||||||
|
|
||||||
|
@property
|
||||||
|
def available(self) -> bool:
|
||||||
|
"""Return if entity is available."""
|
||||||
|
return super().available and self._attr_available
|
||||||
|
|
||||||
async def async_update(self) -> None:
|
async def async_update(self) -> None:
|
||||||
"""Update the entity."""
|
"""Update the entity."""
|
||||||
self._attr_latest_version = (
|
try:
|
||||||
await self.coordinator.client.get_latest_firmware_version(
|
self._attr_latest_version = (
|
||||||
self.coordinator.serial_number
|
await self.coordinator.client.get_latest_firmware_version(
|
||||||
|
self.coordinator.serial_number
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
except AirGradientConnectionError:
|
||||||
|
self._attr_latest_version = None
|
||||||
|
self._attr_available = False
|
||||||
|
if not self._server_unreachable_logged:
|
||||||
|
_LOGGER.error(
|
||||||
|
"Unable to connect to AirGradient server to check for updates"
|
||||||
|
)
|
||||||
|
self._server_unreachable_logged = True
|
||||||
|
else:
|
||||||
|
self._server_unreachable_logged = False
|
||||||
|
self._attr_available = True
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from collections.abc import Mapping
|
||||||
import logging
|
import logging
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
@@ -14,7 +15,7 @@ from airos.exceptions import (
|
|||||||
)
|
)
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
|
from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
CONF_HOST,
|
CONF_HOST,
|
||||||
CONF_PASSWORD,
|
CONF_PASSWORD,
|
||||||
@@ -24,6 +25,11 @@ from homeassistant.const import (
|
|||||||
)
|
)
|
||||||
from homeassistant.data_entry_flow import section
|
from homeassistant.data_entry_flow import section
|
||||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||||
|
from homeassistant.helpers.selector import (
|
||||||
|
TextSelector,
|
||||||
|
TextSelectorConfig,
|
||||||
|
TextSelectorType,
|
||||||
|
)
|
||||||
|
|
||||||
from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
|
from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
|
||||||
from .coordinator import AirOS8
|
from .coordinator import AirOS8
|
||||||
@@ -54,50 +60,107 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
VERSION = 1
|
VERSION = 1
|
||||||
MINOR_VERSION = 2
|
MINOR_VERSION = 2
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
"""Initialize the config flow."""
|
||||||
|
super().__init__()
|
||||||
|
self.airos_device: AirOS8
|
||||||
|
self.errors: dict[str, str] = {}
|
||||||
|
|
||||||
async def async_step_user(
|
async def async_step_user(
|
||||||
self,
|
self, user_input: dict[str, Any] | None = None
|
||||||
user_input: dict[str, Any] | None = None,
|
|
||||||
) -> ConfigFlowResult:
|
) -> ConfigFlowResult:
|
||||||
"""Handle the initial step."""
|
"""Handle the manual input of host and credentials."""
|
||||||
errors: dict[str, str] = {}
|
self.errors = {}
|
||||||
if user_input is not None:
|
if user_input is not None:
|
||||||
# By default airOS 8 comes with self-signed SSL certificates,
|
validated_info = await self._validate_and_get_device_info(user_input)
|
||||||
# with no option in the web UI to change or upload a custom certificate.
|
if validated_info:
|
||||||
session = async_get_clientsession(
|
|
||||||
self.hass,
|
|
||||||
verify_ssl=user_input[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
|
|
||||||
)
|
|
||||||
|
|
||||||
airos_device = AirOS8(
|
|
||||||
host=user_input[CONF_HOST],
|
|
||||||
username=user_input[CONF_USERNAME],
|
|
||||||
password=user_input[CONF_PASSWORD],
|
|
||||||
session=session,
|
|
||||||
use_ssl=user_input[SECTION_ADVANCED_SETTINGS][CONF_SSL],
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
await airos_device.login()
|
|
||||||
airos_data = await airos_device.status()
|
|
||||||
|
|
||||||
except (
|
|
||||||
AirOSConnectionSetupError,
|
|
||||||
AirOSDeviceConnectionError,
|
|
||||||
):
|
|
||||||
errors["base"] = "cannot_connect"
|
|
||||||
except (AirOSConnectionAuthenticationError, AirOSDataMissingError):
|
|
||||||
errors["base"] = "invalid_auth"
|
|
||||||
except AirOSKeyDataMissingError:
|
|
||||||
errors["base"] = "key_data_missing"
|
|
||||||
except Exception:
|
|
||||||
_LOGGER.exception("Unexpected exception")
|
|
||||||
errors["base"] = "unknown"
|
|
||||||
else:
|
|
||||||
await self.async_set_unique_id(airos_data.derived.mac)
|
|
||||||
self._abort_if_unique_id_configured()
|
|
||||||
return self.async_create_entry(
|
return self.async_create_entry(
|
||||||
title=airos_data.host.hostname, data=user_input
|
title=validated_info["title"],
|
||||||
|
data=validated_info["data"],
|
||||||
|
)
|
||||||
|
return self.async_show_form(
|
||||||
|
step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=self.errors
|
||||||
|
)
|
||||||
|
|
||||||
|
async def _validate_and_get_device_info(
|
||||||
|
self, config_data: dict[str, Any]
|
||||||
|
) -> dict[str, Any] | None:
|
||||||
|
"""Validate user input with the device API."""
|
||||||
|
# By default airOS 8 comes with self-signed SSL certificates,
|
||||||
|
# with no option in the web UI to change or upload a custom certificate.
|
||||||
|
session = async_get_clientsession(
|
||||||
|
self.hass,
|
||||||
|
verify_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
|
||||||
|
)
|
||||||
|
|
||||||
|
airos_device = AirOS8(
|
||||||
|
host=config_data[CONF_HOST],
|
||||||
|
username=config_data[CONF_USERNAME],
|
||||||
|
password=config_data[CONF_PASSWORD],
|
||||||
|
session=session,
|
||||||
|
use_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
await airos_device.login()
|
||||||
|
airos_data = await airos_device.status()
|
||||||
|
|
||||||
|
except (
|
||||||
|
AirOSConnectionSetupError,
|
||||||
|
AirOSDeviceConnectionError,
|
||||||
|
):
|
||||||
|
self.errors["base"] = "cannot_connect"
|
||||||
|
except (AirOSConnectionAuthenticationError, AirOSDataMissingError):
|
||||||
|
self.errors["base"] = "invalid_auth"
|
||||||
|
except AirOSKeyDataMissingError:
|
||||||
|
self.errors["base"] = "key_data_missing"
|
||||||
|
except Exception:
|
||||||
|
_LOGGER.exception("Unexpected exception during credential validation")
|
||||||
|
self.errors["base"] = "unknown"
|
||||||
|
else:
|
||||||
|
await self.async_set_unique_id(airos_data.derived.mac)
|
||||||
|
|
||||||
|
if self.source == SOURCE_REAUTH:
|
||||||
|
self._abort_if_unique_id_mismatch()
|
||||||
|
else:
|
||||||
|
self._abort_if_unique_id_configured()
|
||||||
|
|
||||||
|
return {"title": airos_data.host.hostname, "data": config_data}
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
async def async_step_reauth(
|
||||||
|
self,
|
||||||
|
user_input: Mapping[str, Any],
|
||||||
|
) -> ConfigFlowResult:
|
||||||
|
"""Perform reauthentication upon an API authentication error."""
|
||||||
|
return await self.async_step_reauth_confirm(user_input)
|
||||||
|
|
||||||
|
async def async_step_reauth_confirm(
|
||||||
|
self,
|
||||||
|
user_input: Mapping[str, Any],
|
||||||
|
) -> ConfigFlowResult:
|
||||||
|
"""Perform reauthentication upon an API authentication error."""
|
||||||
|
self.errors = {}
|
||||||
|
|
||||||
|
if user_input:
|
||||||
|
validate_data = {**self._get_reauth_entry().data, **user_input}
|
||||||
|
if await self._validate_and_get_device_info(config_data=validate_data):
|
||||||
|
return self.async_update_reload_and_abort(
|
||||||
|
self._get_reauth_entry(),
|
||||||
|
data_updates=validate_data,
|
||||||
)
|
)
|
||||||
|
|
||||||
return self.async_show_form(
|
return self.async_show_form(
|
||||||
step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
|
step_id="reauth_confirm",
|
||||||
|
data_schema=vol.Schema(
|
||||||
|
{
|
||||||
|
vol.Required(CONF_PASSWORD): TextSelector(
|
||||||
|
TextSelectorConfig(
|
||||||
|
type=TextSelectorType.PASSWORD,
|
||||||
|
autocomplete="current-password",
|
||||||
|
)
|
||||||
|
),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
errors=self.errors,
|
||||||
)
|
)
|
||||||
|
@@ -14,7 +14,7 @@ from airos.exceptions import (
|
|||||||
|
|
||||||
from homeassistant.config_entries import ConfigEntry
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import ConfigEntryError
|
from homeassistant.exceptions import ConfigEntryAuthFailed
|
||||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
|
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
|
||||||
|
|
||||||
from .const import DOMAIN, SCAN_INTERVAL
|
from .const import DOMAIN, SCAN_INTERVAL
|
||||||
@@ -47,9 +47,9 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
|
|||||||
try:
|
try:
|
||||||
await self.airos_device.login()
|
await self.airos_device.login()
|
||||||
return await self.airos_device.status()
|
return await self.airos_device.status()
|
||||||
except (AirOSConnectionAuthenticationError,) as err:
|
except AirOSConnectionAuthenticationError as err:
|
||||||
_LOGGER.exception("Error authenticating with airOS device")
|
_LOGGER.exception("Error authenticating with airOS device")
|
||||||
raise ConfigEntryError(
|
raise ConfigEntryAuthFailed(
|
||||||
translation_domain=DOMAIN, translation_key="invalid_auth"
|
translation_domain=DOMAIN, translation_key="invalid_auth"
|
||||||
) from err
|
) from err
|
||||||
except (
|
except (
|
||||||
|
@@ -6,5 +6,5 @@
|
|||||||
"documentation": "https://www.home-assistant.io/integrations/airos",
|
"documentation": "https://www.home-assistant.io/integrations/airos",
|
||||||
"iot_class": "local_polling",
|
"iot_class": "local_polling",
|
||||||
"quality_scale": "bronze",
|
"quality_scale": "bronze",
|
||||||
"requirements": ["airos==0.5.1"]
|
"requirements": ["airos==0.5.5"]
|
||||||
}
|
}
|
||||||
|
@@ -2,6 +2,14 @@
|
|||||||
"config": {
|
"config": {
|
||||||
"flow_title": "Ubiquiti airOS device",
|
"flow_title": "Ubiquiti airOS device",
|
||||||
"step": {
|
"step": {
|
||||||
|
"reauth_confirm": {
|
||||||
|
"data": {
|
||||||
|
"password": "[%key:common::config_flow::data::password%]"
|
||||||
|
},
|
||||||
|
"data_description": {
|
||||||
|
"password": "[%key:component::airos::config::step::user::data_description::password%]"
|
||||||
|
}
|
||||||
|
},
|
||||||
"user": {
|
"user": {
|
||||||
"data": {
|
"data": {
|
||||||
"host": "[%key:common::config_flow::data::host%]",
|
"host": "[%key:common::config_flow::data::host%]",
|
||||||
@@ -34,7 +42,9 @@
|
|||||||
"unknown": "[%key:common::config_flow::error::unknown%]"
|
"unknown": "[%key:common::config_flow::error::unknown%]"
|
||||||
},
|
},
|
||||||
"abort": {
|
"abort": {
|
||||||
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
|
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
|
||||||
|
"reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
|
||||||
|
"unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"entity": {
|
"entity": {
|
||||||
|
@@ -23,6 +23,10 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
URL_API_INTEGRATION = {
|
||||||
|
"url": "https://dashboard.airthings.com/integrations/api-integration"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
||||||
"""Handle a config flow for Airthings."""
|
"""Handle a config flow for Airthings."""
|
||||||
@@ -37,11 +41,7 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
return self.async_show_form(
|
return self.async_show_form(
|
||||||
step_id="user",
|
step_id="user",
|
||||||
data_schema=STEP_USER_DATA_SCHEMA,
|
data_schema=STEP_USER_DATA_SCHEMA,
|
||||||
description_placeholders={
|
description_placeholders=URL_API_INTEGRATION,
|
||||||
"url": (
|
|
||||||
"https://dashboard.airthings.com/integrations/api-integration"
|
|
||||||
),
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
errors = {}
|
errors = {}
|
||||||
@@ -65,5 +65,8 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
return self.async_create_entry(title="Airthings", data=user_input)
|
return self.async_create_entry(title="Airthings", data=user_input)
|
||||||
|
|
||||||
return self.async_show_form(
|
return self.async_show_form(
|
||||||
step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
|
step_id="user",
|
||||||
|
data_schema=STEP_USER_DATA_SCHEMA,
|
||||||
|
errors=errors,
|
||||||
|
description_placeholders=URL_API_INTEGRATION,
|
||||||
)
|
)
|
||||||
|
@@ -4,9 +4,9 @@
|
|||||||
"user": {
|
"user": {
|
||||||
"data": {
|
"data": {
|
||||||
"id": "ID",
|
"id": "ID",
|
||||||
"secret": "Secret",
|
"secret": "Secret"
|
||||||
"description": "Login at {url} to find your credentials"
|
},
|
||||||
}
|
"description": "Log in at {url} to find your credentials"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
|
@@ -6,8 +6,13 @@ import dataclasses
|
|||||||
import logging
|
import logging
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from airthings_ble import AirthingsBluetoothDeviceData, AirthingsDevice
|
from airthings_ble import (
|
||||||
|
AirthingsBluetoothDeviceData,
|
||||||
|
AirthingsDevice,
|
||||||
|
UnsupportedDeviceError,
|
||||||
|
)
|
||||||
from bleak import BleakError
|
from bleak import BleakError
|
||||||
|
from habluetooth import BluetoothServiceInfoBleak
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components import bluetooth
|
from homeassistant.components import bluetooth
|
||||||
@@ -27,6 +32,7 @@ SERVICE_UUIDS = [
|
|||||||
"b42e4a8e-ade7-11e4-89d3-123b93f75cba",
|
"b42e4a8e-ade7-11e4-89d3-123b93f75cba",
|
||||||
"b42e1c08-ade7-11e4-89d3-123b93f75cba",
|
"b42e1c08-ade7-11e4-89d3-123b93f75cba",
|
||||||
"b42e3882-ade7-11e4-89d3-123b93f75cba",
|
"b42e3882-ade7-11e4-89d3-123b93f75cba",
|
||||||
|
"b42e90a2-ade7-11e4-89d3-123b93f75cba",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@@ -37,6 +43,7 @@ class Discovery:
|
|||||||
name: str
|
name: str
|
||||||
discovery_info: BluetoothServiceInfo
|
discovery_info: BluetoothServiceInfo
|
||||||
device: AirthingsDevice
|
device: AirthingsDevice
|
||||||
|
data: AirthingsBluetoothDeviceData
|
||||||
|
|
||||||
|
|
||||||
def get_name(device: AirthingsDevice) -> str:
|
def get_name(device: AirthingsDevice) -> str:
|
||||||
@@ -44,7 +51,7 @@ def get_name(device: AirthingsDevice) -> str:
|
|||||||
|
|
||||||
name = device.friendly_name()
|
name = device.friendly_name()
|
||||||
if identifier := device.identifier:
|
if identifier := device.identifier:
|
||||||
name += f" ({identifier})"
|
name += f" ({device.model.value}{identifier})"
|
||||||
return name
|
return name
|
||||||
|
|
||||||
|
|
||||||
@@ -62,8 +69,8 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
self._discovered_device: Discovery | None = None
|
self._discovered_device: Discovery | None = None
|
||||||
self._discovered_devices: dict[str, Discovery] = {}
|
self._discovered_devices: dict[str, Discovery] = {}
|
||||||
|
|
||||||
async def _get_device_data(
|
async def _get_device(
|
||||||
self, discovery_info: BluetoothServiceInfo
|
self, data: AirthingsBluetoothDeviceData, discovery_info: BluetoothServiceInfo
|
||||||
) -> AirthingsDevice:
|
) -> AirthingsDevice:
|
||||||
ble_device = bluetooth.async_ble_device_from_address(
|
ble_device = bluetooth.async_ble_device_from_address(
|
||||||
self.hass, discovery_info.address
|
self.hass, discovery_info.address
|
||||||
@@ -72,10 +79,8 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
_LOGGER.debug("no ble_device in _get_device_data")
|
_LOGGER.debug("no ble_device in _get_device_data")
|
||||||
raise AirthingsDeviceUpdateError("No ble_device")
|
raise AirthingsDeviceUpdateError("No ble_device")
|
||||||
|
|
||||||
airthings = AirthingsBluetoothDeviceData(_LOGGER)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
data = await airthings.update_device(ble_device)
|
device = await data.update_device(ble_device)
|
||||||
except BleakError as err:
|
except BleakError as err:
|
||||||
_LOGGER.error(
|
_LOGGER.error(
|
||||||
"Error connecting to and getting data from %s: %s",
|
"Error connecting to and getting data from %s: %s",
|
||||||
@@ -83,12 +88,15 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
err,
|
err,
|
||||||
)
|
)
|
||||||
raise AirthingsDeviceUpdateError("Failed getting device data") from err
|
raise AirthingsDeviceUpdateError("Failed getting device data") from err
|
||||||
|
except UnsupportedDeviceError:
|
||||||
|
_LOGGER.debug("Skipping unsupported device: %s", discovery_info.name)
|
||||||
|
raise
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
_LOGGER.error(
|
_LOGGER.error(
|
||||||
"Unknown error occurred from %s: %s", discovery_info.address, err
|
"Unknown error occurred from %s: %s", discovery_info.address, err
|
||||||
)
|
)
|
||||||
raise
|
raise
|
||||||
return data
|
return device
|
||||||
|
|
||||||
async def async_step_bluetooth(
|
async def async_step_bluetooth(
|
||||||
self, discovery_info: BluetoothServiceInfo
|
self, discovery_info: BluetoothServiceInfo
|
||||||
@@ -98,17 +106,21 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
await self.async_set_unique_id(discovery_info.address)
|
await self.async_set_unique_id(discovery_info.address)
|
||||||
self._abort_if_unique_id_configured()
|
self._abort_if_unique_id_configured()
|
||||||
|
|
||||||
|
data = AirthingsBluetoothDeviceData(logger=_LOGGER)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
device = await self._get_device_data(discovery_info)
|
device = await self._get_device(data=data, discovery_info=discovery_info)
|
||||||
except AirthingsDeviceUpdateError:
|
except AirthingsDeviceUpdateError:
|
||||||
return self.async_abort(reason="cannot_connect")
|
return self.async_abort(reason="cannot_connect")
|
||||||
|
except UnsupportedDeviceError:
|
||||||
|
return self.async_abort(reason="unsupported_device")
|
||||||
except Exception:
|
except Exception:
|
||||||
_LOGGER.exception("Unknown error occurred")
|
_LOGGER.exception("Unknown error occurred")
|
||||||
return self.async_abort(reason="unknown")
|
return self.async_abort(reason="unknown")
|
||||||
|
|
||||||
name = get_name(device)
|
name = get_name(device)
|
||||||
self.context["title_placeholders"] = {"name": name}
|
self.context["title_placeholders"] = {"name": name}
|
||||||
self._discovered_device = Discovery(name, discovery_info, device)
|
self._discovered_device = Discovery(name, discovery_info, device, data=data)
|
||||||
|
|
||||||
return await self.async_step_bluetooth_confirm()
|
return await self.async_step_bluetooth_confirm()
|
||||||
|
|
||||||
@@ -117,6 +129,12 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
) -> ConfigFlowResult:
|
) -> ConfigFlowResult:
|
||||||
"""Confirm discovery."""
|
"""Confirm discovery."""
|
||||||
if user_input is not None:
|
if user_input is not None:
|
||||||
|
if (
|
||||||
|
self._discovered_device is not None
|
||||||
|
and self._discovered_device.device.firmware.need_firmware_upgrade
|
||||||
|
):
|
||||||
|
return self.async_abort(reason="firmware_upgrade_required")
|
||||||
|
|
||||||
return self.async_create_entry(
|
return self.async_create_entry(
|
||||||
title=self.context["title_placeholders"]["name"], data={}
|
title=self.context["title_placeholders"]["name"], data={}
|
||||||
)
|
)
|
||||||
@@ -137,6 +155,9 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
self._abort_if_unique_id_configured()
|
self._abort_if_unique_id_configured()
|
||||||
discovery = self._discovered_devices[address]
|
discovery = self._discovered_devices[address]
|
||||||
|
|
||||||
|
if discovery.device.firmware.need_firmware_upgrade:
|
||||||
|
return self.async_abort(reason="firmware_upgrade_required")
|
||||||
|
|
||||||
self.context["title_placeholders"] = {
|
self.context["title_placeholders"] = {
|
||||||
"name": discovery.name,
|
"name": discovery.name,
|
||||||
}
|
}
|
||||||
@@ -146,32 +167,53 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
return self.async_create_entry(title=discovery.name, data={})
|
return self.async_create_entry(title=discovery.name, data={})
|
||||||
|
|
||||||
current_addresses = self._async_current_ids(include_ignore=False)
|
current_addresses = self._async_current_ids(include_ignore=False)
|
||||||
|
devices: list[BluetoothServiceInfoBleak] = []
|
||||||
for discovery_info in async_discovered_service_info(self.hass):
|
for discovery_info in async_discovered_service_info(self.hass):
|
||||||
address = discovery_info.address
|
address = discovery_info.address
|
||||||
if address in current_addresses or address in self._discovered_devices:
|
if address in current_addresses or address in self._discovered_devices:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if MFCT_ID not in discovery_info.manufacturer_data:
|
if MFCT_ID not in discovery_info.manufacturer_data:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not any(uuid in SERVICE_UUIDS for uuid in discovery_info.service_uuids):
|
if not any(uuid in SERVICE_UUIDS for uuid in discovery_info.service_uuids):
|
||||||
|
_LOGGER.debug(
|
||||||
|
"Skipping unsupported device: %s (%s)", discovery_info.name, address
|
||||||
|
)
|
||||||
continue
|
continue
|
||||||
|
devices.append(discovery_info)
|
||||||
|
|
||||||
|
for discovery_info in devices:
|
||||||
|
address = discovery_info.address
|
||||||
|
data = AirthingsBluetoothDeviceData(logger=_LOGGER)
|
||||||
try:
|
try:
|
||||||
device = await self._get_device_data(discovery_info)
|
device = await self._get_device(data, discovery_info)
|
||||||
except AirthingsDeviceUpdateError:
|
except AirthingsDeviceUpdateError:
|
||||||
return self.async_abort(reason="cannot_connect")
|
_LOGGER.error(
|
||||||
|
"Error connecting to and getting data from %s (%s)",
|
||||||
|
discovery_info.name,
|
||||||
|
discovery_info.address,
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
except UnsupportedDeviceError:
|
||||||
|
_LOGGER.debug(
|
||||||
|
"Skipping unsupported device: %s (%s)",
|
||||||
|
discovery_info.name,
|
||||||
|
discovery_info.address,
|
||||||
|
)
|
||||||
|
continue
|
||||||
except Exception:
|
except Exception:
|
||||||
_LOGGER.exception("Unknown error occurred")
|
_LOGGER.exception("Unknown error occurred")
|
||||||
return self.async_abort(reason="unknown")
|
return self.async_abort(reason="unknown")
|
||||||
name = get_name(device)
|
name = get_name(device)
|
||||||
self._discovered_devices[address] = Discovery(name, discovery_info, device)
|
_LOGGER.debug("Discovered Airthings device: %s (%s)", name, address)
|
||||||
|
self._discovered_devices[address] = Discovery(
|
||||||
|
name, discovery_info, device, data
|
||||||
|
)
|
||||||
|
|
||||||
if not self._discovered_devices:
|
if not self._discovered_devices:
|
||||||
return self.async_abort(reason="no_devices_found")
|
return self.async_abort(reason="no_devices_found")
|
||||||
|
|
||||||
titles = {
|
titles = {
|
||||||
address: discovery.device.name
|
address: get_name(discovery.device)
|
||||||
for (address, discovery) in self._discovered_devices.items()
|
for (address, discovery) in self._discovered_devices.items()
|
||||||
}
|
}
|
||||||
return self.async_show_form(
|
return self.async_show_form(
|
||||||
|
@@ -17,6 +17,10 @@
|
|||||||
{
|
{
|
||||||
"manufacturer_id": 820,
|
"manufacturer_id": 820,
|
||||||
"service_uuid": "b42e3882-ade7-11e4-89d3-123b93f75cba"
|
"service_uuid": "b42e3882-ade7-11e4-89d3-123b93f75cba"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"manufacturer_id": 820,
|
||||||
|
"service_uuid": "b42e90a2-ade7-11e4-89d3-123b93f75cba"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"codeowners": ["@vincegio", "@LaStrada"],
|
"codeowners": ["@vincegio", "@LaStrada"],
|
||||||
@@ -24,5 +28,5 @@
|
|||||||
"dependencies": ["bluetooth_adapters"],
|
"dependencies": ["bluetooth_adapters"],
|
||||||
"documentation": "https://www.home-assistant.io/integrations/airthings_ble",
|
"documentation": "https://www.home-assistant.io/integrations/airthings_ble",
|
||||||
"iot_class": "local_polling",
|
"iot_class": "local_polling",
|
||||||
"requirements": ["airthings-ble==0.9.2"]
|
"requirements": ["airthings-ble==1.1.1"]
|
||||||
}
|
}
|
||||||
|
@@ -16,10 +16,12 @@ from homeassistant.components.sensor import (
|
|||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
CONCENTRATION_PARTS_PER_BILLION,
|
CONCENTRATION_PARTS_PER_BILLION,
|
||||||
CONCENTRATION_PARTS_PER_MILLION,
|
CONCENTRATION_PARTS_PER_MILLION,
|
||||||
|
LIGHT_LUX,
|
||||||
PERCENTAGE,
|
PERCENTAGE,
|
||||||
EntityCategory,
|
EntityCategory,
|
||||||
Platform,
|
Platform,
|
||||||
UnitOfPressure,
|
UnitOfPressure,
|
||||||
|
UnitOfSoundPressure,
|
||||||
UnitOfTemperature,
|
UnitOfTemperature,
|
||||||
)
|
)
|
||||||
from homeassistant.core import HomeAssistant, callback
|
from homeassistant.core import HomeAssistant, callback
|
||||||
@@ -112,8 +114,25 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
|
|||||||
state_class=SensorStateClass.MEASUREMENT,
|
state_class=SensorStateClass.MEASUREMENT,
|
||||||
suggested_display_precision=0,
|
suggested_display_precision=0,
|
||||||
),
|
),
|
||||||
|
"lux": SensorEntityDescription(
|
||||||
|
key="lux",
|
||||||
|
device_class=SensorDeviceClass.ILLUMINANCE,
|
||||||
|
native_unit_of_measurement=LIGHT_LUX,
|
||||||
|
state_class=SensorStateClass.MEASUREMENT,
|
||||||
|
suggested_display_precision=0,
|
||||||
|
),
|
||||||
|
"noise": SensorEntityDescription(
|
||||||
|
key="noise",
|
||||||
|
translation_key="ambient_noise",
|
||||||
|
device_class=SensorDeviceClass.SOUND_PRESSURE,
|
||||||
|
native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
|
||||||
|
state_class=SensorStateClass.MEASUREMENT,
|
||||||
|
suggested_display_precision=0,
|
||||||
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PARALLEL_UPDATES = 0
|
||||||
|
|
||||||
|
|
||||||
@callback
|
@callback
|
||||||
def async_migrate(hass: HomeAssistant, address: str, sensor_name: str) -> None:
|
def async_migrate(hass: HomeAssistant, address: str, sensor_name: str) -> None:
|
||||||
|
@@ -6,6 +6,9 @@
|
|||||||
"description": "[%key:component::bluetooth::config::step::user::description%]",
|
"description": "[%key:component::bluetooth::config::step::user::description%]",
|
||||||
"data": {
|
"data": {
|
||||||
"address": "[%key:common::config_flow::data::device%]"
|
"address": "[%key:common::config_flow::data::device%]"
|
||||||
|
},
|
||||||
|
"data_description": {
|
||||||
|
"address": "The Airthings devices discovered via Bluetooth."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bluetooth_confirm": {
|
"bluetooth_confirm": {
|
||||||
@@ -17,6 +20,8 @@
|
|||||||
"already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
|
"already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
|
||||||
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
|
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
|
||||||
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
|
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
|
||||||
|
"firmware_upgrade_required": "Your device requires a firmware upgrade. Please use the Airthings app (Android/iOS) to upgrade it.",
|
||||||
|
"unsupported_device": "Unsupported device",
|
||||||
"unknown": "[%key:common::config_flow::error::unknown%]"
|
"unknown": "[%key:common::config_flow::error::unknown%]"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -36,6 +41,9 @@
|
|||||||
},
|
},
|
||||||
"illuminance": {
|
"illuminance": {
|
||||||
"name": "[%key:component::sensor::entity_component::illuminance::name%]"
|
"name": "[%key:component::sensor::entity_component::illuminance::name%]"
|
||||||
|
},
|
||||||
|
"ambient_noise": {
|
||||||
|
"name": "Ambient noise"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,17 +2,14 @@
|
|||||||
|
|
||||||
from airtouch4pyapi import AirTouch
|
from airtouch4pyapi import AirTouch
|
||||||
|
|
||||||
from homeassistant.config_entries import ConfigEntry
|
|
||||||
from homeassistant.const import CONF_HOST, Platform
|
from homeassistant.const import CONF_HOST, Platform
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import ConfigEntryNotReady
|
from homeassistant.exceptions import ConfigEntryNotReady
|
||||||
|
|
||||||
from .coordinator import AirtouchDataUpdateCoordinator
|
from .coordinator import AirTouch4ConfigEntry, AirtouchDataUpdateCoordinator
|
||||||
|
|
||||||
PLATFORMS = [Platform.CLIMATE]
|
PLATFORMS = [Platform.CLIMATE]
|
||||||
|
|
||||||
type AirTouch4ConfigEntry = ConfigEntry[AirtouchDataUpdateCoordinator]
|
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_entry(hass: HomeAssistant, entry: AirTouch4ConfigEntry) -> bool:
|
async def async_setup_entry(hass: HomeAssistant, entry: AirTouch4ConfigEntry) -> bool:
|
||||||
"""Set up AirTouch4 from a config entry."""
|
"""Set up AirTouch4 from a config entry."""
|
||||||
@@ -22,7 +19,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirTouch4ConfigEntry) ->
|
|||||||
info = airtouch.GetAcs()
|
info = airtouch.GetAcs()
|
||||||
if not info:
|
if not info:
|
||||||
raise ConfigEntryNotReady
|
raise ConfigEntryNotReady
|
||||||
coordinator = AirtouchDataUpdateCoordinator(hass, airtouch)
|
coordinator = AirtouchDataUpdateCoordinator(hass, entry, airtouch)
|
||||||
await coordinator.async_config_entry_first_refresh()
|
await coordinator.async_config_entry_first_refresh()
|
||||||
entry.runtime_data = coordinator
|
entry.runtime_data = coordinator
|
||||||
|
|
||||||
|
@@ -2,26 +2,34 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from airtouch4pyapi import AirTouch
|
||||||
from airtouch4pyapi.airtouch import AirTouchStatus
|
from airtouch4pyapi.airtouch import AirTouchStatus
|
||||||
|
|
||||||
from homeassistant.components.climate import SCAN_INTERVAL
|
from homeassistant.components.climate import SCAN_INTERVAL
|
||||||
|
from homeassistant.config_entries import ConfigEntry
|
||||||
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
|
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
|
||||||
|
|
||||||
from .const import DOMAIN
|
from .const import DOMAIN
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
type AirTouch4ConfigEntry = ConfigEntry[AirtouchDataUpdateCoordinator]
|
||||||
|
|
||||||
|
|
||||||
class AirtouchDataUpdateCoordinator(DataUpdateCoordinator):
|
class AirtouchDataUpdateCoordinator(DataUpdateCoordinator):
|
||||||
"""Class to manage fetching Airtouch data."""
|
"""Class to manage fetching Airtouch data."""
|
||||||
|
|
||||||
def __init__(self, hass, airtouch):
|
def __init__(
|
||||||
|
self, hass: HomeAssistant, entry: AirTouch4ConfigEntry, airtouch: AirTouch
|
||||||
|
) -> None:
|
||||||
"""Initialize global Airtouch data updater."""
|
"""Initialize global Airtouch data updater."""
|
||||||
self.airtouch = airtouch
|
self.airtouch = airtouch
|
||||||
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
hass,
|
hass,
|
||||||
_LOGGER,
|
_LOGGER,
|
||||||
|
config_entry=entry,
|
||||||
name=DOMAIN,
|
name=DOMAIN,
|
||||||
update_interval=SCAN_INTERVAL,
|
update_interval=SCAN_INTERVAL,
|
||||||
)
|
)
|
||||||
|
@@ -2,10 +2,9 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import asyncio
|
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
import logging
|
import logging
|
||||||
from typing import TYPE_CHECKING, Any, Final, final
|
from typing import Any, Final, final
|
||||||
|
|
||||||
from propcache.api import cached_property
|
from propcache.api import cached_property
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
@@ -28,8 +27,6 @@ from homeassistant.helpers import config_validation as cv
|
|||||||
from homeassistant.helpers.config_validation import make_entity_service_schema
|
from homeassistant.helpers.config_validation import make_entity_service_schema
|
||||||
from homeassistant.helpers.entity import Entity, EntityDescription
|
from homeassistant.helpers.entity import Entity, EntityDescription
|
||||||
from homeassistant.helpers.entity_component import EntityComponent
|
from homeassistant.helpers.entity_component import EntityComponent
|
||||||
from homeassistant.helpers.entity_platform import EntityPlatform
|
|
||||||
from homeassistant.helpers.frame import ReportBehavior, report_usage
|
|
||||||
from homeassistant.helpers.typing import ConfigType
|
from homeassistant.helpers.typing import ConfigType
|
||||||
from homeassistant.util.hass_dict import HassKey
|
from homeassistant.util.hass_dict import HassKey
|
||||||
|
|
||||||
@@ -149,68 +146,11 @@ class AlarmControlPanelEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_A
|
|||||||
)
|
)
|
||||||
_alarm_control_panel_option_default_code: str | None = None
|
_alarm_control_panel_option_default_code: str | None = None
|
||||||
|
|
||||||
__alarm_legacy_state: bool = False
|
|
||||||
|
|
||||||
def __init_subclass__(cls, **kwargs: Any) -> None:
|
|
||||||
"""Post initialisation processing."""
|
|
||||||
super().__init_subclass__(**kwargs)
|
|
||||||
if any(method in cls.__dict__ for method in ("_attr_state", "state")):
|
|
||||||
# Integrations should use the 'alarm_state' property instead of
|
|
||||||
# setting the state directly.
|
|
||||||
cls.__alarm_legacy_state = True
|
|
||||||
|
|
||||||
def __setattr__(self, name: str, value: Any, /) -> None:
|
|
||||||
"""Set attribute.
|
|
||||||
|
|
||||||
Deprecation warning if setting '_attr_state' directly
|
|
||||||
unless already reported.
|
|
||||||
"""
|
|
||||||
if name == "_attr_state":
|
|
||||||
self._report_deprecated_alarm_state_handling()
|
|
||||||
return super().__setattr__(name, value)
|
|
||||||
|
|
||||||
@callback
|
|
||||||
def add_to_platform_start(
|
|
||||||
self,
|
|
||||||
hass: HomeAssistant,
|
|
||||||
platform: EntityPlatform,
|
|
||||||
parallel_updates: asyncio.Semaphore | None,
|
|
||||||
) -> None:
|
|
||||||
"""Start adding an entity to a platform."""
|
|
||||||
super().add_to_platform_start(hass, platform, parallel_updates)
|
|
||||||
if self.__alarm_legacy_state:
|
|
||||||
self._report_deprecated_alarm_state_handling()
|
|
||||||
|
|
||||||
@callback
|
|
||||||
def _report_deprecated_alarm_state_handling(self) -> None:
|
|
||||||
"""Report on deprecated handling of alarm state.
|
|
||||||
|
|
||||||
Integrations should implement alarm_state instead of using state directly.
|
|
||||||
"""
|
|
||||||
report_usage(
|
|
||||||
"is setting state directly."
|
|
||||||
f" Entity {self.entity_id} ({type(self)}) should implement the 'alarm_state'"
|
|
||||||
" property and return its state using the AlarmControlPanelState enum",
|
|
||||||
core_integration_behavior=ReportBehavior.ERROR,
|
|
||||||
custom_integration_behavior=ReportBehavior.LOG,
|
|
||||||
breaks_in_ha_version="2025.11",
|
|
||||||
integration_domain=self.platform.platform_name if self.platform else None,
|
|
||||||
exclude_integrations={DOMAIN},
|
|
||||||
)
|
|
||||||
|
|
||||||
@final
|
@final
|
||||||
@property
|
@property
|
||||||
def state(self) -> str | None:
|
def state(self) -> str | None:
|
||||||
"""Return the current state."""
|
"""Return the current state."""
|
||||||
if (alarm_state := self.alarm_state) is not None:
|
return self.alarm_state
|
||||||
return alarm_state
|
|
||||||
if self._attr_state is not None:
|
|
||||||
# Backwards compatibility for integrations that set state directly
|
|
||||||
# Should be removed in 2025.11
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
assert isinstance(self._attr_state, str)
|
|
||||||
return self._attr_state
|
|
||||||
return None
|
|
||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
def alarm_state(self) -> AlarmControlPanelState | None:
|
def alarm_state(self) -> AlarmControlPanelState | None:
|
||||||
|
@@ -1472,10 +1472,10 @@ class AlexaModeController(AlexaCapability):
|
|||||||
# Return state instead of position when using ModeController.
|
# Return state instead of position when using ModeController.
|
||||||
mode = self.entity.state
|
mode = self.entity.state
|
||||||
if mode in (
|
if mode in (
|
||||||
cover.STATE_OPEN,
|
cover.CoverState.OPEN,
|
||||||
cover.STATE_OPENING,
|
cover.CoverState.OPENING,
|
||||||
cover.STATE_CLOSED,
|
cover.CoverState.CLOSED,
|
||||||
cover.STATE_CLOSING,
|
cover.CoverState.CLOSING,
|
||||||
STATE_UNKNOWN,
|
STATE_UNKNOWN,
|
||||||
):
|
):
|
||||||
return f"{cover.ATTR_POSITION}.{mode}"
|
return f"{cover.ATTR_POSITION}.{mode}"
|
||||||
@@ -1594,11 +1594,11 @@ class AlexaModeController(AlexaCapability):
|
|||||||
["Position", AlexaGlobalCatalog.SETTING_OPENING], False
|
["Position", AlexaGlobalCatalog.SETTING_OPENING], False
|
||||||
)
|
)
|
||||||
self._resource.add_mode(
|
self._resource.add_mode(
|
||||||
f"{cover.ATTR_POSITION}.{cover.STATE_OPEN}",
|
f"{cover.ATTR_POSITION}.{cover.CoverState.OPEN}",
|
||||||
[AlexaGlobalCatalog.VALUE_OPEN],
|
[AlexaGlobalCatalog.VALUE_OPEN],
|
||||||
)
|
)
|
||||||
self._resource.add_mode(
|
self._resource.add_mode(
|
||||||
f"{cover.ATTR_POSITION}.{cover.STATE_CLOSED}",
|
f"{cover.ATTR_POSITION}.{cover.CoverState.CLOSED}",
|
||||||
[AlexaGlobalCatalog.VALUE_CLOSE],
|
[AlexaGlobalCatalog.VALUE_CLOSE],
|
||||||
)
|
)
|
||||||
self._resource.add_mode(
|
self._resource.add_mode(
|
||||||
@@ -1651,22 +1651,22 @@ class AlexaModeController(AlexaCapability):
|
|||||||
raise_labels.append(AlexaSemantics.ACTION_OPEN)
|
raise_labels.append(AlexaSemantics.ACTION_OPEN)
|
||||||
self._semantics.add_states_to_value(
|
self._semantics.add_states_to_value(
|
||||||
[AlexaSemantics.STATES_CLOSED],
|
[AlexaSemantics.STATES_CLOSED],
|
||||||
f"{cover.ATTR_POSITION}.{cover.STATE_CLOSED}",
|
f"{cover.ATTR_POSITION}.{cover.CoverState.CLOSED}",
|
||||||
)
|
)
|
||||||
self._semantics.add_states_to_value(
|
self._semantics.add_states_to_value(
|
||||||
[AlexaSemantics.STATES_OPEN],
|
[AlexaSemantics.STATES_OPEN],
|
||||||
f"{cover.ATTR_POSITION}.{cover.STATE_OPEN}",
|
f"{cover.ATTR_POSITION}.{cover.CoverState.OPEN}",
|
||||||
)
|
)
|
||||||
|
|
||||||
self._semantics.add_action_to_directive(
|
self._semantics.add_action_to_directive(
|
||||||
lower_labels,
|
lower_labels,
|
||||||
"SetMode",
|
"SetMode",
|
||||||
{"mode": f"{cover.ATTR_POSITION}.{cover.STATE_CLOSED}"},
|
{"mode": f"{cover.ATTR_POSITION}.{cover.CoverState.CLOSED}"},
|
||||||
)
|
)
|
||||||
self._semantics.add_action_to_directive(
|
self._semantics.add_action_to_directive(
|
||||||
raise_labels,
|
raise_labels,
|
||||||
"SetMode",
|
"SetMode",
|
||||||
{"mode": f"{cover.ATTR_POSITION}.{cover.STATE_OPEN}"},
|
{"mode": f"{cover.ATTR_POSITION}.{cover.CoverState.OPEN}"},
|
||||||
)
|
)
|
||||||
|
|
||||||
return self._semantics.serialize_semantics()
|
return self._semantics.serialize_semantics()
|
||||||
|
@@ -1261,9 +1261,9 @@ async def async_api_set_mode(
|
|||||||
elif instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
|
elif instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
|
||||||
position = mode.split(".")[1]
|
position = mode.split(".")[1]
|
||||||
|
|
||||||
if position == cover.STATE_CLOSED:
|
if position == cover.CoverState.CLOSED:
|
||||||
service = cover.SERVICE_CLOSE_COVER
|
service = cover.SERVICE_CLOSE_COVER
|
||||||
elif position == cover.STATE_OPEN:
|
elif position == cover.CoverState.OPEN:
|
||||||
service = cover.SERVICE_OPEN_COVER
|
service = cover.SERVICE_OPEN_COVER
|
||||||
elif position == "custom":
|
elif position == "custom":
|
||||||
service = cover.SERVICE_STOP_COVER
|
service = cover.SERVICE_STOP_COVER
|
||||||
|
@@ -18,7 +18,9 @@ from homeassistant.components.binary_sensor import (
|
|||||||
from homeassistant.const import EntityCategory
|
from homeassistant.const import EntityCategory
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||||
|
import homeassistant.helpers.entity_registry as er
|
||||||
|
|
||||||
|
from .const import _LOGGER, DOMAIN
|
||||||
from .coordinator import AmazonConfigEntry
|
from .coordinator import AmazonConfigEntry
|
||||||
from .entity import AmazonEntity
|
from .entity import AmazonEntity
|
||||||
from .utils import async_update_unique_id
|
from .utils import async_update_unique_id
|
||||||
@@ -51,11 +53,47 @@ BINARY_SENSORS: Final = (
|
|||||||
),
|
),
|
||||||
is_supported=lambda device, key: device.sensors.get(key) is not None,
|
is_supported=lambda device, key: device.sensors.get(key) is not None,
|
||||||
is_available_fn=lambda device, key: (
|
is_available_fn=lambda device, key: (
|
||||||
device.online and device.sensors[key].error is False
|
device.online
|
||||||
|
and (sensor := device.sensors.get(key)) is not None
|
||||||
|
and sensor.error is False
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
DEPRECATED_BINARY_SENSORS: Final = (
|
||||||
|
AmazonBinarySensorEntityDescription(
|
||||||
|
key="bluetooth",
|
||||||
|
entity_category=EntityCategory.DIAGNOSTIC,
|
||||||
|
translation_key="bluetooth",
|
||||||
|
is_on_fn=lambda device, key: False,
|
||||||
|
),
|
||||||
|
AmazonBinarySensorEntityDescription(
|
||||||
|
key="babyCryDetectionState",
|
||||||
|
translation_key="baby_cry_detection",
|
||||||
|
is_on_fn=lambda device, key: False,
|
||||||
|
),
|
||||||
|
AmazonBinarySensorEntityDescription(
|
||||||
|
key="beepingApplianceDetectionState",
|
||||||
|
translation_key="beeping_appliance_detection",
|
||||||
|
is_on_fn=lambda device, key: False,
|
||||||
|
),
|
||||||
|
AmazonBinarySensorEntityDescription(
|
||||||
|
key="coughDetectionState",
|
||||||
|
translation_key="cough_detection",
|
||||||
|
is_on_fn=lambda device, key: False,
|
||||||
|
),
|
||||||
|
AmazonBinarySensorEntityDescription(
|
||||||
|
key="dogBarkDetectionState",
|
||||||
|
translation_key="dog_bark_detection",
|
||||||
|
is_on_fn=lambda device, key: False,
|
||||||
|
),
|
||||||
|
AmazonBinarySensorEntityDescription(
|
||||||
|
key="waterSoundsDetectionState",
|
||||||
|
translation_key="water_sounds_detection",
|
||||||
|
is_on_fn=lambda device, key: False,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_entry(
|
async def async_setup_entry(
|
||||||
hass: HomeAssistant,
|
hass: HomeAssistant,
|
||||||
@@ -66,6 +104,8 @@ async def async_setup_entry(
|
|||||||
|
|
||||||
coordinator = entry.runtime_data
|
coordinator = entry.runtime_data
|
||||||
|
|
||||||
|
entity_registry = er.async_get(hass)
|
||||||
|
|
||||||
# Replace unique id for "detectionState" binary sensor
|
# Replace unique id for "detectionState" binary sensor
|
||||||
await async_update_unique_id(
|
await async_update_unique_id(
|
||||||
hass,
|
hass,
|
||||||
@@ -75,6 +115,16 @@ async def async_setup_entry(
|
|||||||
"detectionState",
|
"detectionState",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Clean up deprecated sensors
|
||||||
|
for sensor_desc in DEPRECATED_BINARY_SENSORS:
|
||||||
|
for serial_num in coordinator.data:
|
||||||
|
unique_id = f"{serial_num}-{sensor_desc.key}"
|
||||||
|
if entity_id := entity_registry.async_get_entity_id(
|
||||||
|
BINARY_SENSOR_DOMAIN, DOMAIN, unique_id
|
||||||
|
):
|
||||||
|
_LOGGER.debug("Removing deprecated entity %s", entity_id)
|
||||||
|
entity_registry.async_remove(entity_id)
|
||||||
|
|
||||||
known_devices: set[str] = set()
|
known_devices: set[str] = set()
|
||||||
|
|
||||||
def _check_device() -> None:
|
def _check_device() -> None:
|
||||||
|
@@ -8,5 +8,5 @@
|
|||||||
"iot_class": "cloud_polling",
|
"iot_class": "cloud_polling",
|
||||||
"loggers": ["aioamazondevices"],
|
"loggers": ["aioamazondevices"],
|
||||||
"quality_scale": "platinum",
|
"quality_scale": "platinum",
|
||||||
"requirements": ["aioamazondevices==6.2.7"]
|
"requirements": ["aioamazondevices==6.4.0"]
|
||||||
}
|
}
|
||||||
|
@@ -32,7 +32,9 @@ class AmazonSensorEntityDescription(SensorEntityDescription):
|
|||||||
|
|
||||||
native_unit_of_measurement_fn: Callable[[AmazonDevice, str], str] | None = None
|
native_unit_of_measurement_fn: Callable[[AmazonDevice, str], str] | None = None
|
||||||
is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
|
is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
|
||||||
device.online and device.sensors[key].error is False
|
device.online
|
||||||
|
and (sensor := device.sensors.get(key)) is not None
|
||||||
|
and sensor.error is False
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -40,9 +42,9 @@ SENSORS: Final = (
|
|||||||
AmazonSensorEntityDescription(
|
AmazonSensorEntityDescription(
|
||||||
key="temperature",
|
key="temperature",
|
||||||
device_class=SensorDeviceClass.TEMPERATURE,
|
device_class=SensorDeviceClass.TEMPERATURE,
|
||||||
native_unit_of_measurement_fn=lambda device, _key: (
|
native_unit_of_measurement_fn=lambda device, key: (
|
||||||
UnitOfTemperature.CELSIUS
|
UnitOfTemperature.CELSIUS
|
||||||
if device.sensors[_key].scale == "CELSIUS"
|
if key in device.sensors and device.sensors[key].scale == "CELSIUS"
|
||||||
else UnitOfTemperature.FAHRENHEIT
|
else UnitOfTemperature.FAHRENHEIT
|
||||||
),
|
),
|
||||||
state_class=SensorStateClass.MEASUREMENT,
|
state_class=SensorStateClass.MEASUREMENT,
|
||||||
|
@@ -18,7 +18,11 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
|||||||
|
|
||||||
from .coordinator import AmazonConfigEntry
|
from .coordinator import AmazonConfigEntry
|
||||||
from .entity import AmazonEntity
|
from .entity import AmazonEntity
|
||||||
from .utils import alexa_api_call, async_update_unique_id
|
from .utils import (
|
||||||
|
alexa_api_call,
|
||||||
|
async_remove_dnd_from_virtual_group,
|
||||||
|
async_update_unique_id,
|
||||||
|
)
|
||||||
|
|
||||||
PARALLEL_UPDATES = 1
|
PARALLEL_UPDATES = 1
|
||||||
|
|
||||||
@@ -29,7 +33,9 @@ class AmazonSwitchEntityDescription(SwitchEntityDescription):
|
|||||||
|
|
||||||
is_on_fn: Callable[[AmazonDevice], bool]
|
is_on_fn: Callable[[AmazonDevice], bool]
|
||||||
is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
|
is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
|
||||||
device.online and device.sensors[key].error is False
|
device.online
|
||||||
|
and (sensor := device.sensors.get(key)) is not None
|
||||||
|
and sensor.error is False
|
||||||
)
|
)
|
||||||
method: str
|
method: str
|
||||||
|
|
||||||
@@ -58,6 +64,9 @@ async def async_setup_entry(
|
|||||||
hass, coordinator, SWITCH_DOMAIN, "do_not_disturb", "dnd"
|
hass, coordinator, SWITCH_DOMAIN, "do_not_disturb", "dnd"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Remove DND switch from virtual groups
|
||||||
|
await async_remove_dnd_from_virtual_group(hass, coordinator)
|
||||||
|
|
||||||
known_devices: set[str] = set()
|
known_devices: set[str] = set()
|
||||||
|
|
||||||
def _check_device() -> None:
|
def _check_device() -> None:
|
||||||
|
@@ -4,8 +4,10 @@ from collections.abc import Awaitable, Callable, Coroutine
|
|||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import Any, Concatenate
|
from typing import Any, Concatenate
|
||||||
|
|
||||||
|
from aioamazondevices.const import SPEAKER_GROUP_FAMILY
|
||||||
from aioamazondevices.exceptions import CannotConnect, CannotRetrieveData
|
from aioamazondevices.exceptions import CannotConnect, CannotRetrieveData
|
||||||
|
|
||||||
|
from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import HomeAssistantError
|
from homeassistant.exceptions import HomeAssistantError
|
||||||
import homeassistant.helpers.entity_registry as er
|
import homeassistant.helpers.entity_registry as er
|
||||||
@@ -61,3 +63,21 @@ async def async_update_unique_id(
|
|||||||
|
|
||||||
# Update the registry with the new unique_id
|
# Update the registry with the new unique_id
|
||||||
entity_registry.async_update_entity(entity_id, new_unique_id=new_unique_id)
|
entity_registry.async_update_entity(entity_id, new_unique_id=new_unique_id)
|
||||||
|
|
||||||
|
|
||||||
|
async def async_remove_dnd_from_virtual_group(
|
||||||
|
hass: HomeAssistant,
|
||||||
|
coordinator: AmazonDevicesCoordinator,
|
||||||
|
) -> None:
|
||||||
|
"""Remove entity DND from virtual group."""
|
||||||
|
entity_registry = er.async_get(hass)
|
||||||
|
|
||||||
|
for serial_num in coordinator.data:
|
||||||
|
unique_id = f"{serial_num}-do_not_disturb"
|
||||||
|
entity_id = entity_registry.async_get_entity_id(
|
||||||
|
DOMAIN, SWITCH_DOMAIN, unique_id
|
||||||
|
)
|
||||||
|
is_group = coordinator.data[serial_num].device_family == SPEAKER_GROUP_FAMILY
|
||||||
|
if entity_id and is_group:
|
||||||
|
entity_registry.async_remove(entity_id)
|
||||||
|
_LOGGER.debug("Removed DND switch from virtual group %s", entity_id)
|
||||||
|
@@ -65,6 +65,31 @@ SENSOR_DESCRIPTIONS = [
|
|||||||
suggested_display_precision=2,
|
suggested_display_precision=2,
|
||||||
translation_placeholders={"sensor_name": "BME280"},
|
translation_placeholders={"sensor_name": "BME280"},
|
||||||
),
|
),
|
||||||
|
AltruistSensorEntityDescription(
|
||||||
|
device_class=SensorDeviceClass.HUMIDITY,
|
||||||
|
key="BME680_humidity",
|
||||||
|
translation_key="humidity",
|
||||||
|
native_unit_of_measurement=PERCENTAGE,
|
||||||
|
suggested_display_precision=2,
|
||||||
|
translation_placeholders={"sensor_name": "BME680"},
|
||||||
|
),
|
||||||
|
AltruistSensorEntityDescription(
|
||||||
|
device_class=SensorDeviceClass.PRESSURE,
|
||||||
|
key="BME680_pressure",
|
||||||
|
translation_key="pressure",
|
||||||
|
native_unit_of_measurement=UnitOfPressure.PA,
|
||||||
|
suggested_unit_of_measurement=UnitOfPressure.MMHG,
|
||||||
|
suggested_display_precision=0,
|
||||||
|
translation_placeholders={"sensor_name": "BME680"},
|
||||||
|
),
|
||||||
|
AltruistSensorEntityDescription(
|
||||||
|
device_class=SensorDeviceClass.TEMPERATURE,
|
||||||
|
key="BME680_temperature",
|
||||||
|
translation_key="temperature",
|
||||||
|
native_unit_of_measurement=UnitOfTemperature.CELSIUS,
|
||||||
|
suggested_display_precision=2,
|
||||||
|
translation_placeholders={"sensor_name": "BME680"},
|
||||||
|
),
|
||||||
AltruistSensorEntityDescription(
|
AltruistSensorEntityDescription(
|
||||||
device_class=SensorDeviceClass.PRESSURE,
|
device_class=SensorDeviceClass.PRESSURE,
|
||||||
key="BMP_pressure",
|
key="BMP_pressure",
|
||||||
|
@@ -629,7 +629,6 @@ async def async_devices_payload(hass: HomeAssistant) -> dict: # noqa: C901
|
|||||||
|
|
||||||
devices_info.append(
|
devices_info.append(
|
||||||
{
|
{
|
||||||
"entities": [],
|
|
||||||
"entry_type": device_entry.entry_type,
|
"entry_type": device_entry.entry_type,
|
||||||
"has_configuration_url": device_entry.configuration_url is not None,
|
"has_configuration_url": device_entry.configuration_url is not None,
|
||||||
"hw_version": device_entry.hw_version,
|
"hw_version": device_entry.hw_version,
|
||||||
@@ -638,6 +637,7 @@ async def async_devices_payload(hass: HomeAssistant) -> dict: # noqa: C901
|
|||||||
"model_id": device_entry.model_id,
|
"model_id": device_entry.model_id,
|
||||||
"sw_version": device_entry.sw_version,
|
"sw_version": device_entry.sw_version,
|
||||||
"via_device": device_entry.via_device_id,
|
"via_device": device_entry.via_device_id,
|
||||||
|
"entities": [],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -19,9 +19,8 @@ CONF_THINKING_BUDGET = "thinking_budget"
|
|||||||
RECOMMENDED_THINKING_BUDGET = 0
|
RECOMMENDED_THINKING_BUDGET = 0
|
||||||
MIN_THINKING_BUDGET = 1024
|
MIN_THINKING_BUDGET = 1024
|
||||||
|
|
||||||
THINKING_MODELS = [
|
NON_THINKING_MODELS = [
|
||||||
"claude-3-7-sonnet",
|
"claude-3-5", # Both sonnet and haiku
|
||||||
"claude-sonnet-4-0",
|
"claude-3-opus",
|
||||||
"claude-opus-4-0",
|
"claude-3-haiku",
|
||||||
"claude-opus-4-1",
|
|
||||||
]
|
]
|
||||||
|
@@ -51,11 +51,11 @@ from .const import (
|
|||||||
DOMAIN,
|
DOMAIN,
|
||||||
LOGGER,
|
LOGGER,
|
||||||
MIN_THINKING_BUDGET,
|
MIN_THINKING_BUDGET,
|
||||||
|
NON_THINKING_MODELS,
|
||||||
RECOMMENDED_CHAT_MODEL,
|
RECOMMENDED_CHAT_MODEL,
|
||||||
RECOMMENDED_MAX_TOKENS,
|
RECOMMENDED_MAX_TOKENS,
|
||||||
RECOMMENDED_TEMPERATURE,
|
RECOMMENDED_TEMPERATURE,
|
||||||
RECOMMENDED_THINKING_BUDGET,
|
RECOMMENDED_THINKING_BUDGET,
|
||||||
THINKING_MODELS,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Max number of back and forth with the LLM to generate a response
|
# Max number of back and forth with the LLM to generate a response
|
||||||
@@ -364,7 +364,7 @@ class AnthropicBaseLLMEntity(Entity):
|
|||||||
if tools:
|
if tools:
|
||||||
model_args["tools"] = tools
|
model_args["tools"] = tools
|
||||||
if (
|
if (
|
||||||
model.startswith(tuple(THINKING_MODELS))
|
not model.startswith(tuple(NON_THINKING_MODELS))
|
||||||
and thinking_budget >= MIN_THINKING_BUDGET
|
and thinking_budget >= MIN_THINKING_BUDGET
|
||||||
):
|
):
|
||||||
model_args["thinking"] = ThinkingConfigEnabledParam(
|
model_args["thinking"] = ThinkingConfigEnabledParam(
|
||||||
|
@@ -8,5 +8,5 @@
|
|||||||
"documentation": "https://www.home-assistant.io/integrations/anthropic",
|
"documentation": "https://www.home-assistant.io/integrations/anthropic",
|
||||||
"integration_type": "service",
|
"integration_type": "service",
|
||||||
"iot_class": "cloud_polling",
|
"iot_class": "cloud_polling",
|
||||||
"requirements": ["anthropic==0.62.0"]
|
"requirements": ["anthropic==0.69.0"]
|
||||||
}
|
}
|
||||||
|
@@ -7,6 +7,8 @@ from typing import Any
|
|||||||
from pyaprilaire.const import Attribute
|
from pyaprilaire.const import Attribute
|
||||||
|
|
||||||
from homeassistant.components.climate import (
|
from homeassistant.components.climate import (
|
||||||
|
ATTR_TARGET_TEMP_HIGH,
|
||||||
|
ATTR_TARGET_TEMP_LOW,
|
||||||
FAN_AUTO,
|
FAN_AUTO,
|
||||||
FAN_ON,
|
FAN_ON,
|
||||||
PRESET_AWAY,
|
PRESET_AWAY,
|
||||||
@@ -16,7 +18,12 @@ from homeassistant.components.climate import (
|
|||||||
HVACAction,
|
HVACAction,
|
||||||
HVACMode,
|
HVACMode,
|
||||||
)
|
)
|
||||||
from homeassistant.const import PRECISION_HALVES, PRECISION_WHOLE, UnitOfTemperature
|
from homeassistant.const import (
|
||||||
|
ATTR_TEMPERATURE,
|
||||||
|
PRECISION_HALVES,
|
||||||
|
PRECISION_WHOLE,
|
||||||
|
UnitOfTemperature,
|
||||||
|
)
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||||
|
|
||||||
@@ -232,15 +239,15 @@ class AprilaireClimate(BaseAprilaireEntity, ClimateEntity):
|
|||||||
cool_setpoint = 0
|
cool_setpoint = 0
|
||||||
heat_setpoint = 0
|
heat_setpoint = 0
|
||||||
|
|
||||||
if temperature := kwargs.get("temperature"):
|
if temperature := kwargs.get(ATTR_TEMPERATURE):
|
||||||
if self.coordinator.data.get(Attribute.MODE) == 3:
|
if self.coordinator.data.get(Attribute.MODE) == 3:
|
||||||
cool_setpoint = temperature
|
cool_setpoint = temperature
|
||||||
else:
|
else:
|
||||||
heat_setpoint = temperature
|
heat_setpoint = temperature
|
||||||
else:
|
else:
|
||||||
if target_temp_low := kwargs.get("target_temp_low"):
|
if target_temp_low := kwargs.get(ATTR_TARGET_TEMP_LOW):
|
||||||
heat_setpoint = target_temp_low
|
heat_setpoint = target_temp_low
|
||||||
if target_temp_high := kwargs.get("target_temp_high"):
|
if target_temp_high := kwargs.get(ATTR_TARGET_TEMP_HIGH):
|
||||||
cool_setpoint = target_temp_high
|
cool_setpoint = target_temp_high
|
||||||
|
|
||||||
if cool_setpoint == 0 and heat_setpoint == 0:
|
if cool_setpoint == 0 and heat_setpoint == 0:
|
||||||
|
@@ -2,9 +2,7 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from typing import Any, TypeVar
|
from typing import Any
|
||||||
|
|
||||||
T = TypeVar("T", dict[str, Any], list[Any], None)
|
|
||||||
|
|
||||||
TRANSLATION_MAP = {
|
TRANSLATION_MAP = {
|
||||||
"wan_rx": "sensor_rx_bytes",
|
"wan_rx": "sensor_rx_bytes",
|
||||||
@@ -36,7 +34,7 @@ def clean_dict(raw: dict[str, Any]) -> dict[str, Any]:
|
|||||||
return {k: v for k, v in raw.items() if v is not None or k.endswith("state")}
|
return {k: v for k, v in raw.items() if v is not None or k.endswith("state")}
|
||||||
|
|
||||||
|
|
||||||
def translate_to_legacy(raw: T) -> T:
|
def translate_to_legacy[T: (dict[str, Any], list[Any], None)](raw: T) -> T:
|
||||||
"""Translate raw data to legacy format for dicts and lists."""
|
"""Translate raw data to legacy format for dicts and lists."""
|
||||||
|
|
||||||
if raw is None:
|
if raw is None:
|
||||||
|
@@ -5,5 +5,5 @@
|
|||||||
"config_flow": true,
|
"config_flow": true,
|
||||||
"documentation": "https://www.home-assistant.io/integrations/autarco",
|
"documentation": "https://www.home-assistant.io/integrations/autarco",
|
||||||
"iot_class": "cloud_polling",
|
"iot_class": "cloud_polling",
|
||||||
"requirements": ["autarco==3.1.0"]
|
"requirements": ["autarco==3.2.0"]
|
||||||
}
|
}
|
||||||
|
@@ -26,9 +26,6 @@ async def async_setup_entry(
|
|||||||
|
|
||||||
if CONF_HOST in config_entry.data:
|
if CONF_HOST in config_entry.data:
|
||||||
coordinator = AwairLocalDataUpdateCoordinator(hass, config_entry, session)
|
coordinator = AwairLocalDataUpdateCoordinator(hass, config_entry, session)
|
||||||
config_entry.async_on_unload(
|
|
||||||
config_entry.add_update_listener(_async_update_listener)
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
coordinator = AwairCloudDataUpdateCoordinator(hass, config_entry, session)
|
coordinator = AwairCloudDataUpdateCoordinator(hass, config_entry, session)
|
||||||
|
|
||||||
@@ -36,6 +33,11 @@ async def async_setup_entry(
|
|||||||
|
|
||||||
config_entry.runtime_data = coordinator
|
config_entry.runtime_data = coordinator
|
||||||
|
|
||||||
|
if CONF_HOST in config_entry.data:
|
||||||
|
config_entry.async_on_unload(
|
||||||
|
config_entry.add_update_listener(_async_update_listener)
|
||||||
|
)
|
||||||
|
|
||||||
await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
|
await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
@@ -17,6 +17,7 @@ from homeassistant.core import HomeAssistant, callback
|
|||||||
from homeassistant.exceptions import HomeAssistantError
|
from homeassistant.exceptions import HomeAssistantError
|
||||||
from homeassistant.helpers import frame
|
from homeassistant.helpers import frame
|
||||||
from homeassistant.util import slugify
|
from homeassistant.util import slugify
|
||||||
|
from homeassistant.util.async_iterator import AsyncIteratorReader, AsyncIteratorWriter
|
||||||
|
|
||||||
from . import util
|
from . import util
|
||||||
from .agent import BackupAgent
|
from .agent import BackupAgent
|
||||||
@@ -144,7 +145,7 @@ class DownloadBackupView(HomeAssistantView):
|
|||||||
return Response(status=HTTPStatus.NOT_FOUND)
|
return Response(status=HTTPStatus.NOT_FOUND)
|
||||||
else:
|
else:
|
||||||
stream = await agent.async_download_backup(backup_id)
|
stream = await agent.async_download_backup(backup_id)
|
||||||
reader = cast(IO[bytes], util.AsyncIteratorReader(hass, stream))
|
reader = cast(IO[bytes], AsyncIteratorReader(hass.loop, stream))
|
||||||
|
|
||||||
worker_done_event = asyncio.Event()
|
worker_done_event = asyncio.Event()
|
||||||
|
|
||||||
@@ -152,7 +153,7 @@ class DownloadBackupView(HomeAssistantView):
|
|||||||
"""Call by the worker thread when it's done."""
|
"""Call by the worker thread when it's done."""
|
||||||
hass.loop.call_soon_threadsafe(worker_done_event.set)
|
hass.loop.call_soon_threadsafe(worker_done_event.set)
|
||||||
|
|
||||||
stream = util.AsyncIteratorWriter(hass)
|
stream = AsyncIteratorWriter(hass.loop)
|
||||||
worker = threading.Thread(
|
worker = threading.Thread(
|
||||||
target=util.decrypt_backup,
|
target=util.decrypt_backup,
|
||||||
args=[backup, reader, stream, password, on_done, 0, []],
|
args=[backup, reader, stream, password, on_done, 0, []],
|
||||||
|
@@ -38,6 +38,7 @@ from homeassistant.helpers import (
|
|||||||
)
|
)
|
||||||
from homeassistant.helpers.json import json_bytes
|
from homeassistant.helpers.json import json_bytes
|
||||||
from homeassistant.util import dt as dt_util, json as json_util
|
from homeassistant.util import dt as dt_util, json as json_util
|
||||||
|
from homeassistant.util.async_iterator import AsyncIteratorReader
|
||||||
|
|
||||||
from . import util as backup_util
|
from . import util as backup_util
|
||||||
from .agent import (
|
from .agent import (
|
||||||
@@ -72,7 +73,6 @@ from .models import (
|
|||||||
)
|
)
|
||||||
from .store import BackupStore
|
from .store import BackupStore
|
||||||
from .util import (
|
from .util import (
|
||||||
AsyncIteratorReader,
|
|
||||||
DecryptedBackupStreamer,
|
DecryptedBackupStreamer,
|
||||||
EncryptedBackupStreamer,
|
EncryptedBackupStreamer,
|
||||||
make_backup_dir,
|
make_backup_dir,
|
||||||
@@ -1525,7 +1525,7 @@ class BackupManager:
|
|||||||
reader = await self.hass.async_add_executor_job(open, path.as_posix(), "rb")
|
reader = await self.hass.async_add_executor_job(open, path.as_posix(), "rb")
|
||||||
else:
|
else:
|
||||||
backup_stream = await agent.async_download_backup(backup_id)
|
backup_stream = await agent.async_download_backup(backup_id)
|
||||||
reader = cast(IO[bytes], AsyncIteratorReader(self.hass, backup_stream))
|
reader = cast(IO[bytes], AsyncIteratorReader(self.hass.loop, backup_stream))
|
||||||
try:
|
try:
|
||||||
await self.hass.async_add_executor_job(
|
await self.hass.async_add_executor_job(
|
||||||
validate_password_stream, reader, password
|
validate_password_stream, reader, password
|
||||||
|
@@ -4,7 +4,6 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
from collections.abc import AsyncIterator, Callable, Coroutine
|
from collections.abc import AsyncIterator, Callable, Coroutine
|
||||||
from concurrent.futures import CancelledError, Future
|
|
||||||
import copy
|
import copy
|
||||||
from dataclasses import dataclass, replace
|
from dataclasses import dataclass, replace
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
@@ -14,7 +13,7 @@ from pathlib import Path, PurePath
|
|||||||
from queue import SimpleQueue
|
from queue import SimpleQueue
|
||||||
import tarfile
|
import tarfile
|
||||||
import threading
|
import threading
|
||||||
from typing import IO, Any, Self, cast
|
from typing import IO, Any, cast
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
from securetar import SecureTarError, SecureTarFile, SecureTarReadError
|
from securetar import SecureTarError, SecureTarFile, SecureTarReadError
|
||||||
@@ -23,6 +22,11 @@ from homeassistant.backup_restore import password_to_key
|
|||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import HomeAssistantError
|
from homeassistant.exceptions import HomeAssistantError
|
||||||
from homeassistant.util import dt as dt_util
|
from homeassistant.util import dt as dt_util
|
||||||
|
from homeassistant.util.async_iterator import (
|
||||||
|
Abort,
|
||||||
|
AsyncIteratorReader,
|
||||||
|
AsyncIteratorWriter,
|
||||||
|
)
|
||||||
from homeassistant.util.json import JsonObjectType, json_loads_object
|
from homeassistant.util.json import JsonObjectType, json_loads_object
|
||||||
|
|
||||||
from .const import BUF_SIZE, LOGGER
|
from .const import BUF_SIZE, LOGGER
|
||||||
@@ -59,12 +63,6 @@ class BackupEmpty(DecryptError):
|
|||||||
_message = "No tar files found in the backup."
|
_message = "No tar files found in the backup."
|
||||||
|
|
||||||
|
|
||||||
class AbortCipher(HomeAssistantError):
|
|
||||||
"""Abort the cipher operation."""
|
|
||||||
|
|
||||||
_message = "Abort cipher operation."
|
|
||||||
|
|
||||||
|
|
||||||
def make_backup_dir(path: Path) -> None:
|
def make_backup_dir(path: Path) -> None:
|
||||||
"""Create a backup directory if it does not exist."""
|
"""Create a backup directory if it does not exist."""
|
||||||
path.mkdir(exist_ok=True)
|
path.mkdir(exist_ok=True)
|
||||||
@@ -166,106 +164,6 @@ def validate_password(path: Path, password: str | None) -> bool:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
class AsyncIteratorReader:
|
|
||||||
"""Wrap an AsyncIterator."""
|
|
||||||
|
|
||||||
def __init__(self, hass: HomeAssistant, stream: AsyncIterator[bytes]) -> None:
|
|
||||||
"""Initialize the wrapper."""
|
|
||||||
self._aborted = False
|
|
||||||
self._hass = hass
|
|
||||||
self._stream = stream
|
|
||||||
self._buffer: bytes | None = None
|
|
||||||
self._next_future: Future[bytes | None] | None = None
|
|
||||||
self._pos: int = 0
|
|
||||||
|
|
||||||
async def _next(self) -> bytes | None:
|
|
||||||
"""Get the next chunk from the iterator."""
|
|
||||||
return await anext(self._stream, None)
|
|
||||||
|
|
||||||
def abort(self) -> None:
|
|
||||||
"""Abort the reader."""
|
|
||||||
self._aborted = True
|
|
||||||
if self._next_future is not None:
|
|
||||||
self._next_future.cancel()
|
|
||||||
|
|
||||||
def read(self, n: int = -1, /) -> bytes:
|
|
||||||
"""Read data from the iterator."""
|
|
||||||
result = bytearray()
|
|
||||||
while n < 0 or len(result) < n:
|
|
||||||
if not self._buffer:
|
|
||||||
self._next_future = asyncio.run_coroutine_threadsafe(
|
|
||||||
self._next(), self._hass.loop
|
|
||||||
)
|
|
||||||
if self._aborted:
|
|
||||||
self._next_future.cancel()
|
|
||||||
raise AbortCipher
|
|
||||||
try:
|
|
||||||
self._buffer = self._next_future.result()
|
|
||||||
except CancelledError as err:
|
|
||||||
raise AbortCipher from err
|
|
||||||
self._pos = 0
|
|
||||||
if not self._buffer:
|
|
||||||
# The stream is exhausted
|
|
||||||
break
|
|
||||||
chunk = self._buffer[self._pos : self._pos + n]
|
|
||||||
result.extend(chunk)
|
|
||||||
n -= len(chunk)
|
|
||||||
self._pos += len(chunk)
|
|
||||||
if self._pos == len(self._buffer):
|
|
||||||
self._buffer = None
|
|
||||||
return bytes(result)
|
|
||||||
|
|
||||||
def close(self) -> None:
|
|
||||||
"""Close the iterator."""
|
|
||||||
|
|
||||||
|
|
||||||
class AsyncIteratorWriter:
|
|
||||||
"""Wrap an AsyncIterator."""
|
|
||||||
|
|
||||||
def __init__(self, hass: HomeAssistant) -> None:
|
|
||||||
"""Initialize the wrapper."""
|
|
||||||
self._aborted = False
|
|
||||||
self._hass = hass
|
|
||||||
self._pos: int = 0
|
|
||||||
self._queue: asyncio.Queue[bytes | None] = asyncio.Queue(maxsize=1)
|
|
||||||
self._write_future: Future[bytes | None] | None = None
|
|
||||||
|
|
||||||
def __aiter__(self) -> Self:
|
|
||||||
"""Return the iterator."""
|
|
||||||
return self
|
|
||||||
|
|
||||||
async def __anext__(self) -> bytes:
|
|
||||||
"""Get the next chunk from the iterator."""
|
|
||||||
if data := await self._queue.get():
|
|
||||||
return data
|
|
||||||
raise StopAsyncIteration
|
|
||||||
|
|
||||||
def abort(self) -> None:
|
|
||||||
"""Abort the writer."""
|
|
||||||
self._aborted = True
|
|
||||||
if self._write_future is not None:
|
|
||||||
self._write_future.cancel()
|
|
||||||
|
|
||||||
def tell(self) -> int:
|
|
||||||
"""Return the current position in the iterator."""
|
|
||||||
return self._pos
|
|
||||||
|
|
||||||
def write(self, s: bytes, /) -> int:
|
|
||||||
"""Write data to the iterator."""
|
|
||||||
self._write_future = asyncio.run_coroutine_threadsafe(
|
|
||||||
self._queue.put(s), self._hass.loop
|
|
||||||
)
|
|
||||||
if self._aborted:
|
|
||||||
self._write_future.cancel()
|
|
||||||
raise AbortCipher
|
|
||||||
try:
|
|
||||||
self._write_future.result()
|
|
||||||
except CancelledError as err:
|
|
||||||
raise AbortCipher from err
|
|
||||||
self._pos += len(s)
|
|
||||||
return len(s)
|
|
||||||
|
|
||||||
|
|
||||||
def validate_password_stream(
|
def validate_password_stream(
|
||||||
input_stream: IO[bytes],
|
input_stream: IO[bytes],
|
||||||
password: str | None,
|
password: str | None,
|
||||||
@@ -342,7 +240,7 @@ def decrypt_backup(
|
|||||||
finally:
|
finally:
|
||||||
# Write an empty chunk to signal the end of the stream
|
# Write an empty chunk to signal the end of the stream
|
||||||
output_stream.write(b"")
|
output_stream.write(b"")
|
||||||
except AbortCipher:
|
except Abort:
|
||||||
LOGGER.debug("Cipher operation aborted")
|
LOGGER.debug("Cipher operation aborted")
|
||||||
finally:
|
finally:
|
||||||
on_done(error)
|
on_done(error)
|
||||||
@@ -430,7 +328,7 @@ def encrypt_backup(
|
|||||||
finally:
|
finally:
|
||||||
# Write an empty chunk to signal the end of the stream
|
# Write an empty chunk to signal the end of the stream
|
||||||
output_stream.write(b"")
|
output_stream.write(b"")
|
||||||
except AbortCipher:
|
except Abort:
|
||||||
LOGGER.debug("Cipher operation aborted")
|
LOGGER.debug("Cipher operation aborted")
|
||||||
finally:
|
finally:
|
||||||
on_done(error)
|
on_done(error)
|
||||||
@@ -557,8 +455,8 @@ class _CipherBackupStreamer:
|
|||||||
self._hass.loop.call_soon_threadsafe(worker_status.done.set)
|
self._hass.loop.call_soon_threadsafe(worker_status.done.set)
|
||||||
|
|
||||||
stream = await self._open_stream()
|
stream = await self._open_stream()
|
||||||
reader = AsyncIteratorReader(self._hass, stream)
|
reader = AsyncIteratorReader(self._hass.loop, stream)
|
||||||
writer = AsyncIteratorWriter(self._hass)
|
writer = AsyncIteratorWriter(self._hass.loop)
|
||||||
worker = threading.Thread(
|
worker = threading.Thread(
|
||||||
target=self._cipher_func,
|
target=self._cipher_func,
|
||||||
args=[
|
args=[
|
||||||
|
@@ -73,11 +73,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: BangOlufsenConfigEntry)
|
|||||||
# Add the websocket and API client
|
# Add the websocket and API client
|
||||||
entry.runtime_data = BangOlufsenData(websocket, client)
|
entry.runtime_data = BangOlufsenData(websocket, client)
|
||||||
|
|
||||||
# Start WebSocket connection
|
|
||||||
await client.connect_notifications(remote_control=True, reconnect=True)
|
|
||||||
|
|
||||||
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
|
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
|
||||||
|
|
||||||
|
# Start WebSocket connection once the platforms have been loaded.
|
||||||
|
# This ensures that the initial WebSocket notifications are dispatched to entities
|
||||||
|
await client.connect_notifications(remote_control=True, reconnect=True)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@@ -125,7 +125,8 @@ async def async_setup_entry(
|
|||||||
async_add_entities(
|
async_add_entities(
|
||||||
new_entities=[
|
new_entities=[
|
||||||
BangOlufsenMediaPlayer(config_entry, config_entry.runtime_data.client)
|
BangOlufsenMediaPlayer(config_entry, config_entry.runtime_data.client)
|
||||||
]
|
],
|
||||||
|
update_before_add=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Register actions.
|
# Register actions.
|
||||||
@@ -266,34 +267,8 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
|
|||||||
self._software_status.software_version,
|
self._software_status.software_version,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Get overall device state once. This is handled by WebSocket events the rest of the time.
|
|
||||||
product_state = await self._client.get_product_state()
|
|
||||||
|
|
||||||
# Get volume information.
|
|
||||||
if product_state.volume:
|
|
||||||
self._volume = product_state.volume
|
|
||||||
|
|
||||||
# Get all playback information.
|
|
||||||
# Ensure that the metadata is not None upon startup
|
|
||||||
if product_state.playback:
|
|
||||||
if product_state.playback.metadata:
|
|
||||||
self._playback_metadata = product_state.playback.metadata
|
|
||||||
self._remote_leader = product_state.playback.metadata.remote_leader
|
|
||||||
if product_state.playback.progress:
|
|
||||||
self._playback_progress = product_state.playback.progress
|
|
||||||
if product_state.playback.source:
|
|
||||||
self._source_change = product_state.playback.source
|
|
||||||
if product_state.playback.state:
|
|
||||||
self._playback_state = product_state.playback.state
|
|
||||||
# Set initial state
|
|
||||||
if self._playback_state.value:
|
|
||||||
self._state = self._playback_state.value
|
|
||||||
|
|
||||||
self._attr_media_position_updated_at = utcnow()
|
self._attr_media_position_updated_at = utcnow()
|
||||||
|
|
||||||
# Get the highest resolution available of the given images.
|
|
||||||
self._media_image = get_highest_resolution_artwork(self._playback_metadata)
|
|
||||||
|
|
||||||
# If the device has been updated with new sources, then the API will fail here.
|
# If the device has been updated with new sources, then the API will fail here.
|
||||||
await self._async_update_sources()
|
await self._async_update_sources()
|
||||||
|
|
||||||
|
@@ -3,16 +3,12 @@ beolink_allstandby:
|
|||||||
entity:
|
entity:
|
||||||
integration: bang_olufsen
|
integration: bang_olufsen
|
||||||
domain: media_player
|
domain: media_player
|
||||||
device:
|
|
||||||
integration: bang_olufsen
|
|
||||||
|
|
||||||
beolink_expand:
|
beolink_expand:
|
||||||
target:
|
target:
|
||||||
entity:
|
entity:
|
||||||
integration: bang_olufsen
|
integration: bang_olufsen
|
||||||
domain: media_player
|
domain: media_player
|
||||||
device:
|
|
||||||
integration: bang_olufsen
|
|
||||||
fields:
|
fields:
|
||||||
all_discovered:
|
all_discovered:
|
||||||
required: false
|
required: false
|
||||||
@@ -37,8 +33,6 @@ beolink_join:
|
|||||||
entity:
|
entity:
|
||||||
integration: bang_olufsen
|
integration: bang_olufsen
|
||||||
domain: media_player
|
domain: media_player
|
||||||
device:
|
|
||||||
integration: bang_olufsen
|
|
||||||
fields:
|
fields:
|
||||||
jid_options:
|
jid_options:
|
||||||
collapsed: false
|
collapsed: false
|
||||||
@@ -71,16 +65,12 @@ beolink_leave:
|
|||||||
entity:
|
entity:
|
||||||
integration: bang_olufsen
|
integration: bang_olufsen
|
||||||
domain: media_player
|
domain: media_player
|
||||||
device:
|
|
||||||
integration: bang_olufsen
|
|
||||||
|
|
||||||
beolink_unexpand:
|
beolink_unexpand:
|
||||||
target:
|
target:
|
||||||
entity:
|
entity:
|
||||||
integration: bang_olufsen
|
integration: bang_olufsen
|
||||||
domain: media_player
|
domain: media_player
|
||||||
device:
|
|
||||||
integration: bang_olufsen
|
|
||||||
fields:
|
fields:
|
||||||
jid_options:
|
jid_options:
|
||||||
collapsed: false
|
collapsed: false
|
||||||
|
@@ -19,8 +19,8 @@
|
|||||||
"bleak-retry-connector==4.4.3",
|
"bleak-retry-connector==4.4.3",
|
||||||
"bluetooth-adapters==2.1.0",
|
"bluetooth-adapters==2.1.0",
|
||||||
"bluetooth-auto-recovery==1.5.3",
|
"bluetooth-auto-recovery==1.5.3",
|
||||||
"bluetooth-data-tools==1.28.2",
|
"bluetooth-data-tools==1.28.3",
|
||||||
"dbus-fast==2.44.3",
|
"dbus-fast==2.44.5",
|
||||||
"habluetooth==5.6.4"
|
"habluetooth==5.7.0"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
"integration_type": "device",
|
"integration_type": "device",
|
||||||
"iot_class": "local_polling",
|
"iot_class": "local_polling",
|
||||||
"loggers": ["brother", "pyasn1", "pysmi", "pysnmp"],
|
"loggers": ["brother", "pyasn1", "pysmi", "pysnmp"],
|
||||||
"requirements": ["brother==5.1.0"],
|
"requirements": ["brother==5.1.1"],
|
||||||
"zeroconf": [
|
"zeroconf": [
|
||||||
{
|
{
|
||||||
"type": "_printer._tcp.local.",
|
"type": "_printer._tcp.local.",
|
||||||
|
@@ -7,12 +7,14 @@ from typing import Any
|
|||||||
from evolutionhttp import BryantEvolutionLocalClient
|
from evolutionhttp import BryantEvolutionLocalClient
|
||||||
|
|
||||||
from homeassistant.components.climate import (
|
from homeassistant.components.climate import (
|
||||||
|
ATTR_TARGET_TEMP_HIGH,
|
||||||
|
ATTR_TARGET_TEMP_LOW,
|
||||||
ClimateEntity,
|
ClimateEntity,
|
||||||
ClimateEntityFeature,
|
ClimateEntityFeature,
|
||||||
HVACAction,
|
HVACAction,
|
||||||
HVACMode,
|
HVACMode,
|
||||||
)
|
)
|
||||||
from homeassistant.const import UnitOfTemperature
|
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import HomeAssistantError
|
from homeassistant.exceptions import HomeAssistantError
|
||||||
from homeassistant.helpers.device_registry import DeviceInfo
|
from homeassistant.helpers.device_registry import DeviceInfo
|
||||||
@@ -208,24 +210,24 @@ class BryantEvolutionClimate(ClimateEntity):
|
|||||||
|
|
||||||
async def async_set_temperature(self, **kwargs: Any) -> None:
|
async def async_set_temperature(self, **kwargs: Any) -> None:
|
||||||
"""Set new target temperature."""
|
"""Set new target temperature."""
|
||||||
if kwargs.get("target_temp_high"):
|
if value := kwargs.get(ATTR_TARGET_TEMP_HIGH):
|
||||||
temp = int(kwargs["target_temp_high"])
|
temp = int(value)
|
||||||
if not await self._client.set_cooling_setpoint(temp):
|
if not await self._client.set_cooling_setpoint(temp):
|
||||||
raise HomeAssistantError(
|
raise HomeAssistantError(
|
||||||
translation_domain=DOMAIN, translation_key="failed_to_set_clsp"
|
translation_domain=DOMAIN, translation_key="failed_to_set_clsp"
|
||||||
)
|
)
|
||||||
self._attr_target_temperature_high = temp
|
self._attr_target_temperature_high = temp
|
||||||
|
|
||||||
if kwargs.get("target_temp_low"):
|
if value := kwargs.get(ATTR_TARGET_TEMP_LOW):
|
||||||
temp = int(kwargs["target_temp_low"])
|
temp = int(value)
|
||||||
if not await self._client.set_heating_setpoint(temp):
|
if not await self._client.set_heating_setpoint(temp):
|
||||||
raise HomeAssistantError(
|
raise HomeAssistantError(
|
||||||
translation_domain=DOMAIN, translation_key="failed_to_set_htsp"
|
translation_domain=DOMAIN, translation_key="failed_to_set_htsp"
|
||||||
)
|
)
|
||||||
self._attr_target_temperature_low = temp
|
self._attr_target_temperature_low = temp
|
||||||
|
|
||||||
if kwargs.get("temperature"):
|
if value := kwargs.get(ATTR_TEMPERATURE):
|
||||||
temp = int(kwargs["temperature"])
|
temp = int(value)
|
||||||
fn = (
|
fn = (
|
||||||
self._client.set_heating_setpoint
|
self._client.set_heating_setpoint
|
||||||
if self.hvac_mode == HVACMode.HEAT
|
if self.hvac_mode == HVACMode.HEAT
|
||||||
|
@@ -315,9 +315,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
|
|||||||
hass.http.register_view(CalendarListView(component))
|
hass.http.register_view(CalendarListView(component))
|
||||||
hass.http.register_view(CalendarEventView(component))
|
hass.http.register_view(CalendarEventView(component))
|
||||||
|
|
||||||
frontend.async_register_built_in_panel(
|
frontend.async_register_built_in_panel(hass, "calendar", "calendar", "mdi:calendar")
|
||||||
hass, "calendar", "calendar", "hass:calendar"
|
|
||||||
)
|
|
||||||
|
|
||||||
websocket_api.async_register_command(hass, handle_calendar_event_create)
|
websocket_api.async_register_command(hass, handle_calendar_event_create)
|
||||||
websocket_api.async_register_command(hass, handle_calendar_event_delete)
|
websocket_api.async_register_command(hass, handle_calendar_event_delete)
|
||||||
|
@@ -169,7 +169,7 @@ class CalendarEventListener:
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
hass: HomeAssistant,
|
hass: HomeAssistant,
|
||||||
job: HassJob[..., Coroutine[Any, Any, None]],
|
job: HassJob[..., Coroutine[Any, Any, None] | Any],
|
||||||
trigger_data: dict[str, Any],
|
trigger_data: dict[str, Any],
|
||||||
fetcher: QueuedEventFetcher,
|
fetcher: QueuedEventFetcher,
|
||||||
) -> None:
|
) -> None:
|
||||||
|
@@ -51,12 +51,6 @@ from homeassistant.const import (
|
|||||||
from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
|
from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
|
||||||
from homeassistant.exceptions import HomeAssistantError
|
from homeassistant.exceptions import HomeAssistantError
|
||||||
from homeassistant.helpers import config_validation as cv, issue_registry as ir
|
from homeassistant.helpers import config_validation as cv, issue_registry as ir
|
||||||
from homeassistant.helpers.deprecation import (
|
|
||||||
DeprecatedConstantEnum,
|
|
||||||
all_with_deprecated_constants,
|
|
||||||
check_if_deprecated_constant,
|
|
||||||
dir_with_deprecated_constants,
|
|
||||||
)
|
|
||||||
from homeassistant.helpers.entity import Entity, EntityDescription
|
from homeassistant.helpers.entity import Entity, EntityDescription
|
||||||
from homeassistant.helpers.entity_component import EntityComponent
|
from homeassistant.helpers.entity_component import EntityComponent
|
||||||
from homeassistant.helpers.event import async_track_time_interval
|
from homeassistant.helpers.event import async_track_time_interval
|
||||||
@@ -118,12 +112,6 @@ ATTR_FILENAME: Final = "filename"
|
|||||||
ATTR_MEDIA_PLAYER: Final = "media_player"
|
ATTR_MEDIA_PLAYER: Final = "media_player"
|
||||||
ATTR_FORMAT: Final = "format"
|
ATTR_FORMAT: Final = "format"
|
||||||
|
|
||||||
# These constants are deprecated as of Home Assistant 2024.10
|
|
||||||
# Please use the StreamType enum instead.
|
|
||||||
_DEPRECATED_STATE_RECORDING = DeprecatedConstantEnum(CameraState.RECORDING, "2025.10")
|
|
||||||
_DEPRECATED_STATE_STREAMING = DeprecatedConstantEnum(CameraState.STREAMING, "2025.10")
|
|
||||||
_DEPRECATED_STATE_IDLE = DeprecatedConstantEnum(CameraState.IDLE, "2025.10")
|
|
||||||
|
|
||||||
|
|
||||||
class CameraEntityFeature(IntFlag):
|
class CameraEntityFeature(IntFlag):
|
||||||
"""Supported features of the camera entity."""
|
"""Supported features of the camera entity."""
|
||||||
@@ -1117,11 +1105,3 @@ async def async_handle_record_service(
|
|||||||
duration=service_call.data[CONF_DURATION],
|
duration=service_call.data[CONF_DURATION],
|
||||||
lookback=service_call.data[CONF_LOOKBACK],
|
lookback=service_call.data[CONF_LOOKBACK],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# These can be removed if no deprecated constant are in this module anymore
|
|
||||||
__getattr__ = partial(check_if_deprecated_constant, module_globals=globals())
|
|
||||||
__dir__ = partial(
|
|
||||||
dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
|
|
||||||
)
|
|
||||||
__all__ = all_with_deprecated_constants(globals())
|
|
||||||
|
@@ -4,5 +4,6 @@
|
|||||||
"codeowners": [],
|
"codeowners": [],
|
||||||
"documentation": "https://www.home-assistant.io/integrations/citybikes",
|
"documentation": "https://www.home-assistant.io/integrations/citybikes",
|
||||||
"iot_class": "cloud_polling",
|
"iot_class": "cloud_polling",
|
||||||
"quality_scale": "legacy"
|
"quality_scale": "legacy",
|
||||||
|
"requirements": ["python-citybikes==0.3.3"]
|
||||||
}
|
}
|
||||||
|
@@ -5,8 +5,11 @@ from __future__ import annotations
|
|||||||
import asyncio
|
import asyncio
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
import logging
|
import logging
|
||||||
|
import sys
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
|
from citybikes import __version__ as CITYBIKES_CLIENT_VERSION
|
||||||
|
from citybikes.asyncio import Client as CitybikesClient
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components.sensor import (
|
from homeassistant.components.sensor import (
|
||||||
@@ -15,21 +18,18 @@ from homeassistant.components.sensor import (
|
|||||||
SensorEntity,
|
SensorEntity,
|
||||||
)
|
)
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
ATTR_ID,
|
APPLICATION_NAME,
|
||||||
ATTR_LATITUDE,
|
|
||||||
ATTR_LOCATION,
|
|
||||||
ATTR_LONGITUDE,
|
|
||||||
ATTR_NAME,
|
|
||||||
CONF_LATITUDE,
|
CONF_LATITUDE,
|
||||||
CONF_LONGITUDE,
|
CONF_LONGITUDE,
|
||||||
CONF_NAME,
|
CONF_NAME,
|
||||||
CONF_RADIUS,
|
CONF_RADIUS,
|
||||||
|
EVENT_HOMEASSISTANT_CLOSE,
|
||||||
UnitOfLength,
|
UnitOfLength,
|
||||||
|
__version__,
|
||||||
)
|
)
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import PlatformNotReady
|
from homeassistant.exceptions import PlatformNotReady
|
||||||
from homeassistant.helpers import config_validation as cv
|
from homeassistant.helpers import config_validation as cv
|
||||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
|
||||||
from homeassistant.helpers.entity import async_generate_entity_id
|
from homeassistant.helpers.entity import async_generate_entity_id
|
||||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||||
from homeassistant.helpers.event import async_track_time_interval
|
from homeassistant.helpers.event import async_track_time_interval
|
||||||
@@ -40,31 +40,33 @@ from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
|
|||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
ATTR_EMPTY_SLOTS = "empty_slots"
|
HA_USER_AGENT = (
|
||||||
ATTR_EXTRA = "extra"
|
f"{APPLICATION_NAME}/{__version__} "
|
||||||
ATTR_FREE_BIKES = "free_bikes"
|
f"python-citybikes/{CITYBIKES_CLIENT_VERSION} "
|
||||||
ATTR_NETWORK = "network"
|
f"Python/{sys.version_info[0]}.{sys.version_info[1]}"
|
||||||
ATTR_NETWORKS_LIST = "networks"
|
)
|
||||||
ATTR_STATIONS_LIST = "stations"
|
|
||||||
ATTR_TIMESTAMP = "timestamp"
|
|
||||||
ATTR_UID = "uid"
|
ATTR_UID = "uid"
|
||||||
|
ATTR_LATITUDE = "latitude"
|
||||||
|
ATTR_LONGITUDE = "longitude"
|
||||||
|
ATTR_EMPTY_SLOTS = "empty_slots"
|
||||||
|
ATTR_TIMESTAMP = "timestamp"
|
||||||
|
|
||||||
CONF_NETWORK = "network"
|
CONF_NETWORK = "network"
|
||||||
CONF_STATIONS_LIST = "stations"
|
CONF_STATIONS_LIST = "stations"
|
||||||
|
|
||||||
DEFAULT_ENDPOINT = "https://api.citybik.es/{uri}"
|
|
||||||
PLATFORM = "citybikes"
|
PLATFORM = "citybikes"
|
||||||
|
|
||||||
MONITORED_NETWORKS = "monitored-networks"
|
MONITORED_NETWORKS = "monitored-networks"
|
||||||
|
|
||||||
|
DATA_CLIENT = "client"
|
||||||
|
|
||||||
NETWORKS_URI = "v2/networks"
|
NETWORKS_URI = "v2/networks"
|
||||||
|
|
||||||
REQUEST_TIMEOUT = 5 # In seconds; argument to asyncio.timeout
|
REQUEST_TIMEOUT = aiohttp.ClientTimeout(total=5)
|
||||||
|
|
||||||
SCAN_INTERVAL = timedelta(minutes=5) # Timely, and doesn't suffocate the API
|
SCAN_INTERVAL = timedelta(minutes=5) # Timely, and doesn't suffocate the API
|
||||||
|
|
||||||
STATIONS_URI = "v2/networks/{uid}?fields=network.stations"
|
|
||||||
|
|
||||||
CITYBIKES_ATTRIBUTION = (
|
CITYBIKES_ATTRIBUTION = (
|
||||||
"Information provided by the CityBikes Project (https://citybik.es/#about)"
|
"Information provided by the CityBikes Project (https://citybik.es/#about)"
|
||||||
)
|
)
|
||||||
@@ -87,72 +89,6 @@ PLATFORM_SCHEMA = vol.All(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
NETWORK_SCHEMA = vol.Schema(
|
|
||||||
{
|
|
||||||
vol.Required(ATTR_ID): cv.string,
|
|
||||||
vol.Required(ATTR_NAME): cv.string,
|
|
||||||
vol.Required(ATTR_LOCATION): vol.Schema(
|
|
||||||
{
|
|
||||||
vol.Required(ATTR_LATITUDE): cv.latitude,
|
|
||||||
vol.Required(ATTR_LONGITUDE): cv.longitude,
|
|
||||||
},
|
|
||||||
extra=vol.REMOVE_EXTRA,
|
|
||||||
),
|
|
||||||
},
|
|
||||||
extra=vol.REMOVE_EXTRA,
|
|
||||||
)
|
|
||||||
|
|
||||||
NETWORKS_RESPONSE_SCHEMA = vol.Schema(
|
|
||||||
{vol.Required(ATTR_NETWORKS_LIST): [NETWORK_SCHEMA]}
|
|
||||||
)
|
|
||||||
|
|
||||||
STATION_SCHEMA = vol.Schema(
|
|
||||||
{
|
|
||||||
vol.Required(ATTR_FREE_BIKES): cv.positive_int,
|
|
||||||
vol.Required(ATTR_EMPTY_SLOTS): vol.Any(cv.positive_int, None),
|
|
||||||
vol.Required(ATTR_LATITUDE): cv.latitude,
|
|
||||||
vol.Required(ATTR_LONGITUDE): cv.longitude,
|
|
||||||
vol.Required(ATTR_ID): cv.string,
|
|
||||||
vol.Required(ATTR_NAME): cv.string,
|
|
||||||
vol.Required(ATTR_TIMESTAMP): cv.string,
|
|
||||||
vol.Optional(ATTR_EXTRA): vol.Schema(
|
|
||||||
{vol.Optional(ATTR_UID): cv.string}, extra=vol.REMOVE_EXTRA
|
|
||||||
),
|
|
||||||
},
|
|
||||||
extra=vol.REMOVE_EXTRA,
|
|
||||||
)
|
|
||||||
|
|
||||||
STATIONS_RESPONSE_SCHEMA = vol.Schema(
|
|
||||||
{
|
|
||||||
vol.Required(ATTR_NETWORK): vol.Schema(
|
|
||||||
{vol.Required(ATTR_STATIONS_LIST): [STATION_SCHEMA]}, extra=vol.REMOVE_EXTRA
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class CityBikesRequestError(Exception):
|
|
||||||
"""Error to indicate a CityBikes API request has failed."""
|
|
||||||
|
|
||||||
|
|
||||||
async def async_citybikes_request(hass, uri, schema):
|
|
||||||
"""Perform a request to CityBikes API endpoint, and parse the response."""
|
|
||||||
try:
|
|
||||||
session = async_get_clientsession(hass)
|
|
||||||
|
|
||||||
async with asyncio.timeout(REQUEST_TIMEOUT):
|
|
||||||
req = await session.get(DEFAULT_ENDPOINT.format(uri=uri))
|
|
||||||
|
|
||||||
json_response = await req.json()
|
|
||||||
return schema(json_response)
|
|
||||||
except (TimeoutError, aiohttp.ClientError):
|
|
||||||
_LOGGER.error("Could not connect to CityBikes API endpoint")
|
|
||||||
except ValueError:
|
|
||||||
_LOGGER.error("Received non-JSON data from CityBikes API endpoint")
|
|
||||||
except vol.Invalid as err:
|
|
||||||
_LOGGER.error("Received unexpected JSON from CityBikes API endpoint: %s", err)
|
|
||||||
raise CityBikesRequestError
|
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_platform(
|
async def async_setup_platform(
|
||||||
hass: HomeAssistant,
|
hass: HomeAssistant,
|
||||||
@@ -175,6 +111,14 @@ async def async_setup_platform(
|
|||||||
radius, UnitOfLength.FEET, UnitOfLength.METERS
|
radius, UnitOfLength.FEET, UnitOfLength.METERS
|
||||||
)
|
)
|
||||||
|
|
||||||
|
client = CitybikesClient(user_agent=HA_USER_AGENT, timeout=REQUEST_TIMEOUT)
|
||||||
|
hass.data[PLATFORM][DATA_CLIENT] = client
|
||||||
|
|
||||||
|
async def _async_close_client(event):
|
||||||
|
await client.close()
|
||||||
|
|
||||||
|
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_CLOSE, _async_close_client)
|
||||||
|
|
||||||
# Create a single instance of CityBikesNetworks.
|
# Create a single instance of CityBikesNetworks.
|
||||||
networks = hass.data.setdefault(CITYBIKES_NETWORKS, CityBikesNetworks(hass))
|
networks = hass.data.setdefault(CITYBIKES_NETWORKS, CityBikesNetworks(hass))
|
||||||
|
|
||||||
@@ -194,10 +138,10 @@ async def async_setup_platform(
|
|||||||
devices = []
|
devices = []
|
||||||
for station in network.stations:
|
for station in network.stations:
|
||||||
dist = location_util.distance(
|
dist = location_util.distance(
|
||||||
latitude, longitude, station[ATTR_LATITUDE], station[ATTR_LONGITUDE]
|
latitude, longitude, station.latitude, station.longitude
|
||||||
)
|
)
|
||||||
station_id = station[ATTR_ID]
|
station_id = station.id
|
||||||
station_uid = str(station.get(ATTR_EXTRA, {}).get(ATTR_UID, ""))
|
station_uid = str(station.extra.get(ATTR_UID, ""))
|
||||||
|
|
||||||
if radius > dist or stations_list.intersection((station_id, station_uid)):
|
if radius > dist or stations_list.intersection((station_id, station_uid)):
|
||||||
if name:
|
if name:
|
||||||
@@ -216,6 +160,7 @@ class CityBikesNetworks:
|
|||||||
def __init__(self, hass):
|
def __init__(self, hass):
|
||||||
"""Initialize the networks instance."""
|
"""Initialize the networks instance."""
|
||||||
self.hass = hass
|
self.hass = hass
|
||||||
|
self.client = hass.data[PLATFORM][DATA_CLIENT]
|
||||||
self.networks = None
|
self.networks = None
|
||||||
self.networks_loading = asyncio.Condition()
|
self.networks_loading = asyncio.Condition()
|
||||||
|
|
||||||
@@ -224,24 +169,21 @@ class CityBikesNetworks:
|
|||||||
try:
|
try:
|
||||||
await self.networks_loading.acquire()
|
await self.networks_loading.acquire()
|
||||||
if self.networks is None:
|
if self.networks is None:
|
||||||
networks = await async_citybikes_request(
|
self.networks = await self.client.networks.fetch()
|
||||||
self.hass, NETWORKS_URI, NETWORKS_RESPONSE_SCHEMA
|
except aiohttp.ClientError as err:
|
||||||
)
|
|
||||||
self.networks = networks[ATTR_NETWORKS_LIST]
|
|
||||||
except CityBikesRequestError as err:
|
|
||||||
raise PlatformNotReady from err
|
raise PlatformNotReady from err
|
||||||
else:
|
else:
|
||||||
result = None
|
result = None
|
||||||
minimum_dist = None
|
minimum_dist = None
|
||||||
for network in self.networks:
|
for network in self.networks:
|
||||||
network_latitude = network[ATTR_LOCATION][ATTR_LATITUDE]
|
network_latitude = network.location.latitude
|
||||||
network_longitude = network[ATTR_LOCATION][ATTR_LONGITUDE]
|
network_longitude = network.location.longitude
|
||||||
dist = location_util.distance(
|
dist = location_util.distance(
|
||||||
latitude, longitude, network_latitude, network_longitude
|
latitude, longitude, network_latitude, network_longitude
|
||||||
)
|
)
|
||||||
if minimum_dist is None or dist < minimum_dist:
|
if minimum_dist is None or dist < minimum_dist:
|
||||||
minimum_dist = dist
|
minimum_dist = dist
|
||||||
result = network[ATTR_ID]
|
result = network.id
|
||||||
|
|
||||||
return result
|
return result
|
||||||
finally:
|
finally:
|
||||||
@@ -257,22 +199,20 @@ class CityBikesNetwork:
|
|||||||
self.network_id = network_id
|
self.network_id = network_id
|
||||||
self.stations = []
|
self.stations = []
|
||||||
self.ready = asyncio.Event()
|
self.ready = asyncio.Event()
|
||||||
|
self.client = hass.data[PLATFORM][DATA_CLIENT]
|
||||||
|
|
||||||
async def async_refresh(self, now=None):
|
async def async_refresh(self, now=None):
|
||||||
"""Refresh the state of the network."""
|
"""Refresh the state of the network."""
|
||||||
try:
|
try:
|
||||||
network = await async_citybikes_request(
|
network = await self.client.network(uid=self.network_id).fetch()
|
||||||
self.hass,
|
except aiohttp.ClientError as err:
|
||||||
STATIONS_URI.format(uid=self.network_id),
|
if now is None:
|
||||||
STATIONS_RESPONSE_SCHEMA,
|
|
||||||
)
|
|
||||||
self.stations = network[ATTR_NETWORK][ATTR_STATIONS_LIST]
|
|
||||||
self.ready.set()
|
|
||||||
except CityBikesRequestError as err:
|
|
||||||
if now is not None:
|
|
||||||
self.ready.clear()
|
|
||||||
else:
|
|
||||||
raise PlatformNotReady from err
|
raise PlatformNotReady from err
|
||||||
|
self.ready.clear()
|
||||||
|
return
|
||||||
|
|
||||||
|
self.stations = network.stations
|
||||||
|
self.ready.set()
|
||||||
|
|
||||||
|
|
||||||
class CityBikesStation(SensorEntity):
|
class CityBikesStation(SensorEntity):
|
||||||
@@ -290,16 +230,13 @@ class CityBikesStation(SensorEntity):
|
|||||||
|
|
||||||
async def async_update(self) -> None:
|
async def async_update(self) -> None:
|
||||||
"""Update station state."""
|
"""Update station state."""
|
||||||
for station in self._network.stations:
|
station = next(s for s in self._network.stations if s.id == self._station_id)
|
||||||
if station[ATTR_ID] == self._station_id:
|
self._attr_name = station.name
|
||||||
station_data = station
|
self._attr_native_value = station.free_bikes
|
||||||
break
|
|
||||||
self._attr_name = station_data.get(ATTR_NAME)
|
|
||||||
self._attr_native_value = station_data.get(ATTR_FREE_BIKES)
|
|
||||||
self._attr_extra_state_attributes = {
|
self._attr_extra_state_attributes = {
|
||||||
ATTR_UID: station_data.get(ATTR_EXTRA, {}).get(ATTR_UID),
|
ATTR_UID: station.extra.get(ATTR_UID),
|
||||||
ATTR_LATITUDE: station_data.get(ATTR_LATITUDE),
|
ATTR_LATITUDE: station.latitude,
|
||||||
ATTR_LONGITUDE: station_data.get(ATTR_LONGITUDE),
|
ATTR_LONGITUDE: station.longitude,
|
||||||
ATTR_EMPTY_SLOTS: station_data.get(ATTR_EMPTY_SLOTS),
|
ATTR_EMPTY_SLOTS: station.empty_slots,
|
||||||
ATTR_TIMESTAMP: station_data.get(ATTR_TIMESTAMP),
|
ATTR_TIMESTAMP: station.timestamp,
|
||||||
}
|
}
|
||||||
|
@@ -53,7 +53,6 @@ from .const import (
|
|||||||
CONF_ACME_SERVER,
|
CONF_ACME_SERVER,
|
||||||
CONF_ALEXA,
|
CONF_ALEXA,
|
||||||
CONF_ALIASES,
|
CONF_ALIASES,
|
||||||
CONF_CLOUDHOOK_SERVER,
|
|
||||||
CONF_COGNITO_CLIENT_ID,
|
CONF_COGNITO_CLIENT_ID,
|
||||||
CONF_ENTITY_CONFIG,
|
CONF_ENTITY_CONFIG,
|
||||||
CONF_FILTER,
|
CONF_FILTER,
|
||||||
@@ -130,7 +129,6 @@ CONFIG_SCHEMA = vol.Schema(
|
|||||||
vol.Optional(CONF_ACCOUNT_LINK_SERVER): str,
|
vol.Optional(CONF_ACCOUNT_LINK_SERVER): str,
|
||||||
vol.Optional(CONF_ACCOUNTS_SERVER): str,
|
vol.Optional(CONF_ACCOUNTS_SERVER): str,
|
||||||
vol.Optional(CONF_ACME_SERVER): str,
|
vol.Optional(CONF_ACME_SERVER): str,
|
||||||
vol.Optional(CONF_CLOUDHOOK_SERVER): str,
|
|
||||||
vol.Optional(CONF_RELAYER_SERVER): str,
|
vol.Optional(CONF_RELAYER_SERVER): str,
|
||||||
vol.Optional(CONF_REMOTESTATE_SERVER): str,
|
vol.Optional(CONF_REMOTESTATE_SERVER): str,
|
||||||
vol.Optional(CONF_SERVICEHANDLERS_SERVER): str,
|
vol.Optional(CONF_SERVICEHANDLERS_SERVER): str,
|
||||||
|
@@ -78,7 +78,6 @@ CONF_USER_POOL_ID = "user_pool_id"
|
|||||||
CONF_ACCOUNT_LINK_SERVER = "account_link_server"
|
CONF_ACCOUNT_LINK_SERVER = "account_link_server"
|
||||||
CONF_ACCOUNTS_SERVER = "accounts_server"
|
CONF_ACCOUNTS_SERVER = "accounts_server"
|
||||||
CONF_ACME_SERVER = "acme_server"
|
CONF_ACME_SERVER = "acme_server"
|
||||||
CONF_CLOUDHOOK_SERVER = "cloudhook_server"
|
|
||||||
CONF_RELAYER_SERVER = "relayer_server"
|
CONF_RELAYER_SERVER = "relayer_server"
|
||||||
CONF_REMOTESTATE_SERVER = "remotestate_server"
|
CONF_REMOTESTATE_SERVER = "remotestate_server"
|
||||||
CONF_SERVICEHANDLERS_SERVER = "servicehandlers_server"
|
CONF_SERVICEHANDLERS_SERVER = "servicehandlers_server"
|
||||||
|
@@ -13,6 +13,6 @@
|
|||||||
"integration_type": "system",
|
"integration_type": "system",
|
||||||
"iot_class": "cloud_push",
|
"iot_class": "cloud_push",
|
||||||
"loggers": ["acme", "hass_nabucasa", "snitun"],
|
"loggers": ["acme", "hass_nabucasa", "snitun"],
|
||||||
"requirements": ["hass-nabucasa==1.1.1"],
|
"requirements": ["hass-nabucasa==1.2.0"],
|
||||||
"single_config_entry": true
|
"single_config_entry": true
|
||||||
}
|
}
|
||||||
|
106
homeassistant/components/co2signal/quality_scale.yaml
Normal file
106
homeassistant/components/co2signal/quality_scale.yaml
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
rules:
|
||||||
|
# Bronze
|
||||||
|
action-setup:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
The integration does not provide any actions.
|
||||||
|
appropriate-polling: done
|
||||||
|
brands: done
|
||||||
|
common-modules: done
|
||||||
|
config-flow-test-coverage:
|
||||||
|
status: todo
|
||||||
|
comment: |
|
||||||
|
Stale docstring and test name: `test_form_home` and reusing result.
|
||||||
|
Extract `async_setup_entry` into own fixture.
|
||||||
|
Avoid importing `config_flow` in tests.
|
||||||
|
Test reauth with errors
|
||||||
|
config-flow:
|
||||||
|
status: todo
|
||||||
|
comment: |
|
||||||
|
The config flow misses data descriptions.
|
||||||
|
Remove URLs from data descriptions, they should be replaced with placeholders.
|
||||||
|
Make use of Electricity Maps zone keys in country code as dropdown.
|
||||||
|
Make use of location selector for coordinates.
|
||||||
|
dependency-transparency: done
|
||||||
|
docs-actions:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
The integration does not provide any actions.
|
||||||
|
docs-high-level-description: done
|
||||||
|
docs-installation-instructions: done
|
||||||
|
docs-removal-instructions: done
|
||||||
|
entity-event-setup:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
Entities of this integration do not explicitly subscribe to events.
|
||||||
|
entity-unique-id: done
|
||||||
|
has-entity-name: done
|
||||||
|
runtime-data: done
|
||||||
|
test-before-configure: done
|
||||||
|
test-before-setup: done
|
||||||
|
unique-config-entry: todo
|
||||||
|
|
||||||
|
# Silver
|
||||||
|
action-exceptions:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
The integration does not provide any actions.
|
||||||
|
config-entry-unloading: done
|
||||||
|
docs-configuration-parameters:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
The integration does not provide any additional options.
|
||||||
|
docs-installation-parameters: done
|
||||||
|
entity-unavailable: done
|
||||||
|
integration-owner: done
|
||||||
|
log-when-unavailable: done
|
||||||
|
parallel-updates: todo
|
||||||
|
reauthentication-flow: done
|
||||||
|
test-coverage:
|
||||||
|
status: todo
|
||||||
|
comment: |
|
||||||
|
Use `hass.config_entries.async_setup` instead of assert await `async_setup_component(hass, DOMAIN, {})`
|
||||||
|
`test_sensor` could use `snapshot_platform`
|
||||||
|
|
||||||
|
# Gold
|
||||||
|
devices: done
|
||||||
|
diagnostics: done
|
||||||
|
discovery-update-info:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
This integration cannot be discovered, it is a connecting to a cloud service.
|
||||||
|
discovery:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
This integration cannot be discovered, it is a connecting to a cloud service.
|
||||||
|
docs-data-update: done
|
||||||
|
docs-examples: done
|
||||||
|
docs-known-limitations: done
|
||||||
|
docs-supported-devices: done
|
||||||
|
docs-supported-functions: done
|
||||||
|
docs-troubleshooting: done
|
||||||
|
docs-use-cases: done
|
||||||
|
dynamic-devices:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
The integration connects to a single service per configuration entry.
|
||||||
|
entity-category: done
|
||||||
|
entity-device-class: done
|
||||||
|
entity-disabled-by-default: done
|
||||||
|
entity-translations: done
|
||||||
|
exception-translations: todo
|
||||||
|
icon-translations: todo
|
||||||
|
reconfiguration-flow: todo
|
||||||
|
repair-issues:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
This integration does not raise any repairable issues.
|
||||||
|
stale-devices:
|
||||||
|
status: exempt
|
||||||
|
comment: |
|
||||||
|
This integration connect to a single device per configuration entry.
|
||||||
|
|
||||||
|
# Platinum
|
||||||
|
async-dependency: done
|
||||||
|
inject-websession: done
|
||||||
|
strict-typing: done
|
@@ -15,6 +15,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
|||||||
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
||||||
|
|
||||||
from .coordinator import ComelitConfigEntry, ComelitVedoSystem
|
from .coordinator import ComelitConfigEntry, ComelitVedoSystem
|
||||||
|
from .utils import DeviceType, new_device_listener
|
||||||
|
|
||||||
# Coordinator is used to centralize the data updates
|
# Coordinator is used to centralize the data updates
|
||||||
PARALLEL_UPDATES = 0
|
PARALLEL_UPDATES = 0
|
||||||
@@ -29,23 +30,19 @@ async def async_setup_entry(
|
|||||||
|
|
||||||
coordinator = cast(ComelitVedoSystem, config_entry.runtime_data)
|
coordinator = cast(ComelitVedoSystem, config_entry.runtime_data)
|
||||||
|
|
||||||
known_devices: set[int] = set()
|
def _add_new_entities(new_devices: list[DeviceType], dev_type: str) -> None:
|
||||||
|
"""Add entities for new monitors."""
|
||||||
|
entities = [
|
||||||
|
ComelitVedoBinarySensorEntity(coordinator, device, config_entry.entry_id)
|
||||||
|
for device in coordinator.data["alarm_zones"].values()
|
||||||
|
if device in new_devices
|
||||||
|
]
|
||||||
|
if entities:
|
||||||
|
async_add_entities(entities)
|
||||||
|
|
||||||
def _check_device() -> None:
|
config_entry.async_on_unload(
|
||||||
current_devices = set(coordinator.data["alarm_zones"])
|
new_device_listener(coordinator, _add_new_entities, "alarm_zones")
|
||||||
new_devices = current_devices - known_devices
|
)
|
||||||
if new_devices:
|
|
||||||
known_devices.update(new_devices)
|
|
||||||
async_add_entities(
|
|
||||||
ComelitVedoBinarySensorEntity(
|
|
||||||
coordinator, device, config_entry.entry_id
|
|
||||||
)
|
|
||||||
for device in coordinator.data["alarm_zones"].values()
|
|
||||||
if device.index in new_devices
|
|
||||||
)
|
|
||||||
|
|
||||||
_check_device()
|
|
||||||
config_entry.async_on_unload(coordinator.async_add_listener(_check_device))
|
|
||||||
|
|
||||||
|
|
||||||
class ComelitVedoBinarySensorEntity(
|
class ComelitVedoBinarySensorEntity(
|
||||||
|
@@ -4,6 +4,7 @@ from __future__ import annotations
|
|||||||
|
|
||||||
from asyncio.exceptions import TimeoutError
|
from asyncio.exceptions import TimeoutError
|
||||||
from collections.abc import Mapping
|
from collections.abc import Mapping
|
||||||
|
import re
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from aiocomelit import (
|
from aiocomelit import (
|
||||||
@@ -27,25 +28,20 @@ from .utils import async_client_session
|
|||||||
DEFAULT_HOST = "192.168.1.252"
|
DEFAULT_HOST = "192.168.1.252"
|
||||||
DEFAULT_PIN = "111111"
|
DEFAULT_PIN = "111111"
|
||||||
|
|
||||||
|
|
||||||
pin_regex = r"^[0-9]{4,10}$"
|
|
||||||
|
|
||||||
USER_SCHEMA = vol.Schema(
|
USER_SCHEMA = vol.Schema(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_HOST, default=DEFAULT_HOST): cv.string,
|
vol.Required(CONF_HOST, default=DEFAULT_HOST): cv.string,
|
||||||
vol.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
|
vol.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
|
||||||
vol.Optional(CONF_PIN, default=DEFAULT_PIN): cv.matches_regex(pin_regex),
|
vol.Optional(CONF_PIN, default=DEFAULT_PIN): cv.string,
|
||||||
vol.Required(CONF_TYPE, default=BRIDGE): vol.In(DEVICE_TYPE_LIST),
|
vol.Required(CONF_TYPE, default=BRIDGE): vol.In(DEVICE_TYPE_LIST),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
STEP_REAUTH_DATA_SCHEMA = vol.Schema(
|
STEP_REAUTH_DATA_SCHEMA = vol.Schema({vol.Required(CONF_PIN): cv.string})
|
||||||
{vol.Required(CONF_PIN): cv.matches_regex(pin_regex)}
|
|
||||||
)
|
|
||||||
STEP_RECONFIGURE = vol.Schema(
|
STEP_RECONFIGURE = vol.Schema(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_HOST): cv.string,
|
vol.Required(CONF_HOST): cv.string,
|
||||||
vol.Required(CONF_PORT): cv.port,
|
vol.Required(CONF_PORT): cv.port,
|
||||||
vol.Optional(CONF_PIN, default=DEFAULT_PIN): cv.matches_regex(pin_regex),
|
vol.Optional(CONF_PIN, default=DEFAULT_PIN): cv.string,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -55,6 +51,9 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
|
|||||||
|
|
||||||
api: ComelitCommonApi
|
api: ComelitCommonApi
|
||||||
|
|
||||||
|
if not re.fullmatch(r"[0-9]{4,10}", data[CONF_PIN]):
|
||||||
|
raise InvalidPin
|
||||||
|
|
||||||
session = await async_client_session(hass)
|
session = await async_client_session(hass)
|
||||||
if data.get(CONF_TYPE, BRIDGE) == BRIDGE:
|
if data.get(CONF_TYPE, BRIDGE) == BRIDGE:
|
||||||
api = ComeliteSerialBridgeApi(
|
api = ComeliteSerialBridgeApi(
|
||||||
@@ -105,6 +104,8 @@ class ComelitConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
errors["base"] = "cannot_connect"
|
errors["base"] = "cannot_connect"
|
||||||
except InvalidAuth:
|
except InvalidAuth:
|
||||||
errors["base"] = "invalid_auth"
|
errors["base"] = "invalid_auth"
|
||||||
|
except InvalidPin:
|
||||||
|
errors["base"] = "invalid_pin"
|
||||||
except Exception: # noqa: BLE001
|
except Exception: # noqa: BLE001
|
||||||
_LOGGER.exception("Unexpected exception")
|
_LOGGER.exception("Unexpected exception")
|
||||||
errors["base"] = "unknown"
|
errors["base"] = "unknown"
|
||||||
@@ -146,6 +147,8 @@ class ComelitConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
errors["base"] = "cannot_connect"
|
errors["base"] = "cannot_connect"
|
||||||
except InvalidAuth:
|
except InvalidAuth:
|
||||||
errors["base"] = "invalid_auth"
|
errors["base"] = "invalid_auth"
|
||||||
|
except InvalidPin:
|
||||||
|
errors["base"] = "invalid_pin"
|
||||||
except Exception: # noqa: BLE001
|
except Exception: # noqa: BLE001
|
||||||
_LOGGER.exception("Unexpected exception")
|
_LOGGER.exception("Unexpected exception")
|
||||||
errors["base"] = "unknown"
|
errors["base"] = "unknown"
|
||||||
@@ -189,6 +192,8 @@ class ComelitConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
errors["base"] = "cannot_connect"
|
errors["base"] = "cannot_connect"
|
||||||
except InvalidAuth:
|
except InvalidAuth:
|
||||||
errors["base"] = "invalid_auth"
|
errors["base"] = "invalid_auth"
|
||||||
|
except InvalidPin:
|
||||||
|
errors["base"] = "invalid_pin"
|
||||||
except Exception: # noqa: BLE001
|
except Exception: # noqa: BLE001
|
||||||
_LOGGER.exception("Unexpected exception")
|
_LOGGER.exception("Unexpected exception")
|
||||||
errors["base"] = "unknown"
|
errors["base"] = "unknown"
|
||||||
@@ -210,3 +215,7 @@ class CannotConnect(HomeAssistantError):
|
|||||||
|
|
||||||
class InvalidAuth(HomeAssistantError):
|
class InvalidAuth(HomeAssistantError):
|
||||||
"""Error to indicate there is invalid auth."""
|
"""Error to indicate there is invalid auth."""
|
||||||
|
|
||||||
|
|
||||||
|
class InvalidPin(HomeAssistantError):
|
||||||
|
"""Error to indicate an invalid pin."""
|
||||||
|
@@ -161,7 +161,7 @@ class ComelitSerialBridge(
|
|||||||
entry: ComelitConfigEntry,
|
entry: ComelitConfigEntry,
|
||||||
host: str,
|
host: str,
|
||||||
port: int,
|
port: int,
|
||||||
pin: int,
|
pin: str,
|
||||||
session: ClientSession,
|
session: ClientSession,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the scanner."""
|
"""Initialize the scanner."""
|
||||||
@@ -195,7 +195,7 @@ class ComelitVedoSystem(ComelitBaseCoordinator[AlarmDataObject]):
|
|||||||
entry: ComelitConfigEntry,
|
entry: ComelitConfigEntry,
|
||||||
host: str,
|
host: str,
|
||||||
port: int,
|
port: int,
|
||||||
pin: int,
|
pin: str,
|
||||||
session: ClientSession,
|
session: ClientSession,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the scanner."""
|
"""Initialize the scanner."""
|
||||||
|
@@ -7,14 +7,14 @@ from typing import Any, cast
|
|||||||
from aiocomelit import ComelitSerialBridgeObject
|
from aiocomelit import ComelitSerialBridgeObject
|
||||||
from aiocomelit.const import COVER, STATE_COVER, STATE_OFF, STATE_ON
|
from aiocomelit.const import COVER, STATE_COVER, STATE_OFF, STATE_ON
|
||||||
|
|
||||||
from homeassistant.components.cover import CoverDeviceClass, CoverEntity
|
from homeassistant.components.cover import CoverDeviceClass, CoverEntity, CoverState
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||||
from homeassistant.helpers.restore_state import RestoreEntity
|
from homeassistant.helpers.restore_state import RestoreEntity
|
||||||
|
|
||||||
from .coordinator import ComelitConfigEntry, ComelitSerialBridge
|
from .coordinator import ComelitConfigEntry, ComelitSerialBridge
|
||||||
from .entity import ComelitBridgeBaseEntity
|
from .entity import ComelitBridgeBaseEntity
|
||||||
from .utils import bridge_api_call
|
from .utils import DeviceType, bridge_api_call, new_device_listener
|
||||||
|
|
||||||
# Coordinator is used to centralize the data updates
|
# Coordinator is used to centralize the data updates
|
||||||
PARALLEL_UPDATES = 0
|
PARALLEL_UPDATES = 0
|
||||||
@@ -29,21 +29,19 @@ async def async_setup_entry(
|
|||||||
|
|
||||||
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
||||||
|
|
||||||
known_devices: set[int] = set()
|
def _add_new_entities(new_devices: list[DeviceType], dev_type: str) -> None:
|
||||||
|
"""Add entities for new monitors."""
|
||||||
|
entities = [
|
||||||
|
ComelitCoverEntity(coordinator, device, config_entry.entry_id)
|
||||||
|
for device in coordinator.data[dev_type].values()
|
||||||
|
if device in new_devices
|
||||||
|
]
|
||||||
|
if entities:
|
||||||
|
async_add_entities(entities)
|
||||||
|
|
||||||
def _check_device() -> None:
|
config_entry.async_on_unload(
|
||||||
current_devices = set(coordinator.data[COVER])
|
new_device_listener(coordinator, _add_new_entities, COVER)
|
||||||
new_devices = current_devices - known_devices
|
)
|
||||||
if new_devices:
|
|
||||||
known_devices.update(new_devices)
|
|
||||||
async_add_entities(
|
|
||||||
ComelitCoverEntity(coordinator, device, config_entry.entry_id)
|
|
||||||
for device in coordinator.data[COVER].values()
|
|
||||||
if device.index in new_devices
|
|
||||||
)
|
|
||||||
|
|
||||||
_check_device()
|
|
||||||
config_entry.async_on_unload(coordinator.async_add_listener(_check_device))
|
|
||||||
|
|
||||||
|
|
||||||
class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
|
class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
|
||||||
@@ -62,7 +60,6 @@ class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
|
|||||||
super().__init__(coordinator, device, config_entry_entry_id)
|
super().__init__(coordinator, device, config_entry_entry_id)
|
||||||
# Device doesn't provide a status so we assume UNKNOWN at first startup
|
# Device doesn't provide a status so we assume UNKNOWN at first startup
|
||||||
self._last_action: int | None = None
|
self._last_action: int | None = None
|
||||||
self._last_state: str | None = None
|
|
||||||
|
|
||||||
def _current_action(self, action: str) -> bool:
|
def _current_action(self, action: str) -> bool:
|
||||||
"""Return the current cover action."""
|
"""Return the current cover action."""
|
||||||
@@ -98,7 +95,6 @@ class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
|
|||||||
@bridge_api_call
|
@bridge_api_call
|
||||||
async def _cover_set_state(self, action: int, state: int) -> None:
|
async def _cover_set_state(self, action: int, state: int) -> None:
|
||||||
"""Set desired cover state."""
|
"""Set desired cover state."""
|
||||||
self._last_state = self.state
|
|
||||||
await self.coordinator.api.set_device_status(COVER, self._device.index, action)
|
await self.coordinator.api.set_device_status(COVER, self._device.index, action)
|
||||||
self.coordinator.data[COVER][self._device.index].status = state
|
self.coordinator.data[COVER][self._device.index].status = state
|
||||||
self.async_write_ha_state()
|
self.async_write_ha_state()
|
||||||
@@ -124,5 +120,10 @@ class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
|
|||||||
|
|
||||||
await super().async_added_to_hass()
|
await super().async_added_to_hass()
|
||||||
|
|
||||||
if last_state := await self.async_get_last_state():
|
if (state := await self.async_get_last_state()) is not None:
|
||||||
self._last_state = last_state.state
|
if state.state == CoverState.CLOSED:
|
||||||
|
self._last_action = STATE_COVER.index(CoverState.CLOSING)
|
||||||
|
if state.state == CoverState.OPEN:
|
||||||
|
self._last_action = STATE_COVER.index(CoverState.OPENING)
|
||||||
|
|
||||||
|
self._attr_is_closed = state.state == CoverState.CLOSED
|
||||||
|
@@ -12,7 +12,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
|||||||
|
|
||||||
from .coordinator import ComelitConfigEntry, ComelitSerialBridge
|
from .coordinator import ComelitConfigEntry, ComelitSerialBridge
|
||||||
from .entity import ComelitBridgeBaseEntity
|
from .entity import ComelitBridgeBaseEntity
|
||||||
from .utils import bridge_api_call
|
from .utils import DeviceType, bridge_api_call, new_device_listener
|
||||||
|
|
||||||
# Coordinator is used to centralize the data updates
|
# Coordinator is used to centralize the data updates
|
||||||
PARALLEL_UPDATES = 0
|
PARALLEL_UPDATES = 0
|
||||||
@@ -27,21 +27,19 @@ async def async_setup_entry(
|
|||||||
|
|
||||||
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
||||||
|
|
||||||
known_devices: set[int] = set()
|
def _add_new_entities(new_devices: list[DeviceType], dev_type: str) -> None:
|
||||||
|
"""Add entities for new monitors."""
|
||||||
|
entities = [
|
||||||
|
ComelitLightEntity(coordinator, device, config_entry.entry_id)
|
||||||
|
for device in coordinator.data[dev_type].values()
|
||||||
|
if device in new_devices
|
||||||
|
]
|
||||||
|
if entities:
|
||||||
|
async_add_entities(entities)
|
||||||
|
|
||||||
def _check_device() -> None:
|
config_entry.async_on_unload(
|
||||||
current_devices = set(coordinator.data[LIGHT])
|
new_device_listener(coordinator, _add_new_entities, LIGHT)
|
||||||
new_devices = current_devices - known_devices
|
)
|
||||||
if new_devices:
|
|
||||||
known_devices.update(new_devices)
|
|
||||||
async_add_entities(
|
|
||||||
ComelitLightEntity(coordinator, device, config_entry.entry_id)
|
|
||||||
for device in coordinator.data[LIGHT].values()
|
|
||||||
if device.index in new_devices
|
|
||||||
)
|
|
||||||
|
|
||||||
_check_device()
|
|
||||||
config_entry.async_on_unload(coordinator.async_add_listener(_check_device))
|
|
||||||
|
|
||||||
|
|
||||||
class ComelitLightEntity(ComelitBridgeBaseEntity, LightEntity):
|
class ComelitLightEntity(ComelitBridgeBaseEntity, LightEntity):
|
||||||
|
@@ -8,5 +8,5 @@
|
|||||||
"iot_class": "local_polling",
|
"iot_class": "local_polling",
|
||||||
"loggers": ["aiocomelit"],
|
"loggers": ["aiocomelit"],
|
||||||
"quality_scale": "platinum",
|
"quality_scale": "platinum",
|
||||||
"requirements": ["aiocomelit==0.12.3"]
|
"requirements": ["aiocomelit==1.1.1"]
|
||||||
}
|
}
|
||||||
|
@@ -20,6 +20,7 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
|||||||
|
|
||||||
from .coordinator import ComelitConfigEntry, ComelitSerialBridge, ComelitVedoSystem
|
from .coordinator import ComelitConfigEntry, ComelitSerialBridge, ComelitVedoSystem
|
||||||
from .entity import ComelitBridgeBaseEntity
|
from .entity import ComelitBridgeBaseEntity
|
||||||
|
from .utils import DeviceType, new_device_listener
|
||||||
|
|
||||||
# Coordinator is used to centralize the data updates
|
# Coordinator is used to centralize the data updates
|
||||||
PARALLEL_UPDATES = 0
|
PARALLEL_UPDATES = 0
|
||||||
@@ -65,24 +66,22 @@ async def async_setup_bridge_entry(
|
|||||||
|
|
||||||
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
||||||
|
|
||||||
known_devices: set[int] = set()
|
def _add_new_entities(new_devices: list[DeviceType], dev_type: str) -> None:
|
||||||
|
"""Add entities for new monitors."""
|
||||||
def _check_device() -> None:
|
entities = [
|
||||||
current_devices = set(coordinator.data[OTHER])
|
ComelitBridgeSensorEntity(
|
||||||
new_devices = current_devices - known_devices
|
coordinator, device, config_entry.entry_id, sensor_desc
|
||||||
if new_devices:
|
|
||||||
known_devices.update(new_devices)
|
|
||||||
async_add_entities(
|
|
||||||
ComelitBridgeSensorEntity(
|
|
||||||
coordinator, device, config_entry.entry_id, sensor_desc
|
|
||||||
)
|
|
||||||
for sensor_desc in SENSOR_BRIDGE_TYPES
|
|
||||||
for device in coordinator.data[OTHER].values()
|
|
||||||
if device.index in new_devices
|
|
||||||
)
|
)
|
||||||
|
for sensor_desc in SENSOR_BRIDGE_TYPES
|
||||||
|
for device in coordinator.data[dev_type].values()
|
||||||
|
if device in new_devices
|
||||||
|
]
|
||||||
|
if entities:
|
||||||
|
async_add_entities(entities)
|
||||||
|
|
||||||
_check_device()
|
config_entry.async_on_unload(
|
||||||
config_entry.async_on_unload(coordinator.async_add_listener(_check_device))
|
new_device_listener(coordinator, _add_new_entities, OTHER)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_vedo_entry(
|
async def async_setup_vedo_entry(
|
||||||
@@ -94,24 +93,22 @@ async def async_setup_vedo_entry(
|
|||||||
|
|
||||||
coordinator = cast(ComelitVedoSystem, config_entry.runtime_data)
|
coordinator = cast(ComelitVedoSystem, config_entry.runtime_data)
|
||||||
|
|
||||||
known_devices: set[int] = set()
|
def _add_new_entities(new_devices: list[DeviceType], dev_type: str) -> None:
|
||||||
|
"""Add entities for new monitors."""
|
||||||
def _check_device() -> None:
|
entities = [
|
||||||
current_devices = set(coordinator.data["alarm_zones"])
|
ComelitVedoSensorEntity(
|
||||||
new_devices = current_devices - known_devices
|
coordinator, device, config_entry.entry_id, sensor_desc
|
||||||
if new_devices:
|
|
||||||
known_devices.update(new_devices)
|
|
||||||
async_add_entities(
|
|
||||||
ComelitVedoSensorEntity(
|
|
||||||
coordinator, device, config_entry.entry_id, sensor_desc
|
|
||||||
)
|
|
||||||
for sensor_desc in SENSOR_VEDO_TYPES
|
|
||||||
for device in coordinator.data["alarm_zones"].values()
|
|
||||||
if device.index in new_devices
|
|
||||||
)
|
)
|
||||||
|
for sensor_desc in SENSOR_VEDO_TYPES
|
||||||
|
for device in coordinator.data["alarm_zones"].values()
|
||||||
|
if device in new_devices
|
||||||
|
]
|
||||||
|
if entities:
|
||||||
|
async_add_entities(entities)
|
||||||
|
|
||||||
_check_device()
|
config_entry.async_on_unload(
|
||||||
config_entry.async_on_unload(coordinator.async_add_listener(_check_device))
|
new_device_listener(coordinator, _add_new_entities, "alarm_zones")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class ComelitBridgeSensorEntity(ComelitBridgeBaseEntity, SensorEntity):
|
class ComelitBridgeSensorEntity(ComelitBridgeBaseEntity, SensorEntity):
|
||||||
|
@@ -43,11 +43,13 @@
|
|||||||
"reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
|
"reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
|
||||||
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
|
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
|
||||||
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
|
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
|
||||||
|
"invalid_pin": "The provided PIN is invalid. It must be a 4-10 digit number.",
|
||||||
"unknown": "[%key:common::config_flow::error::unknown%]"
|
"unknown": "[%key:common::config_flow::error::unknown%]"
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
|
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
|
||||||
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
|
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
|
||||||
|
"invalid_pin": "[%key:component::comelit::config::abort::invalid_pin%]",
|
||||||
"unknown": "[%key:common::config_flow::error::unknown%]"
|
"unknown": "[%key:common::config_flow::error::unknown%]"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -13,7 +13,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
|||||||
|
|
||||||
from .coordinator import ComelitConfigEntry, ComelitSerialBridge
|
from .coordinator import ComelitConfigEntry, ComelitSerialBridge
|
||||||
from .entity import ComelitBridgeBaseEntity
|
from .entity import ComelitBridgeBaseEntity
|
||||||
from .utils import bridge_api_call
|
from .utils import DeviceType, bridge_api_call, new_device_listener
|
||||||
|
|
||||||
# Coordinator is used to centralize the data updates
|
# Coordinator is used to centralize the data updates
|
||||||
PARALLEL_UPDATES = 0
|
PARALLEL_UPDATES = 0
|
||||||
@@ -28,35 +28,20 @@ async def async_setup_entry(
|
|||||||
|
|
||||||
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
coordinator = cast(ComelitSerialBridge, config_entry.runtime_data)
|
||||||
|
|
||||||
entities: list[ComelitSwitchEntity] = []
|
def _add_new_entities(new_devices: list[DeviceType], dev_type: str) -> None:
|
||||||
entities.extend(
|
"""Add entities for new monitors."""
|
||||||
ComelitSwitchEntity(coordinator, device, config_entry.entry_id)
|
entities = [
|
||||||
for device in coordinator.data[IRRIGATION].values()
|
ComelitSwitchEntity(coordinator, device, config_entry.entry_id)
|
||||||
)
|
for device in coordinator.data[dev_type].values()
|
||||||
entities.extend(
|
if device in new_devices
|
||||||
ComelitSwitchEntity(coordinator, device, config_entry.entry_id)
|
]
|
||||||
for device in coordinator.data[OTHER].values()
|
if entities:
|
||||||
)
|
async_add_entities(entities)
|
||||||
async_add_entities(entities)
|
|
||||||
|
|
||||||
known_devices: dict[str, set[int]] = {
|
for dev_type in (IRRIGATION, OTHER):
|
||||||
dev_type: set() for dev_type in (IRRIGATION, OTHER)
|
config_entry.async_on_unload(
|
||||||
}
|
new_device_listener(coordinator, _add_new_entities, dev_type)
|
||||||
|
)
|
||||||
def _check_device() -> None:
|
|
||||||
for dev_type in (IRRIGATION, OTHER):
|
|
||||||
current_devices = set(coordinator.data[dev_type])
|
|
||||||
new_devices = current_devices - known_devices[dev_type]
|
|
||||||
if new_devices:
|
|
||||||
known_devices[dev_type].update(new_devices)
|
|
||||||
async_add_entities(
|
|
||||||
ComelitSwitchEntity(coordinator, device, config_entry.entry_id)
|
|
||||||
for device in coordinator.data[dev_type].values()
|
|
||||||
if device.index in new_devices
|
|
||||||
)
|
|
||||||
|
|
||||||
_check_device()
|
|
||||||
config_entry.async_on_unload(coordinator.async_add_listener(_check_device))
|
|
||||||
|
|
||||||
|
|
||||||
class ComelitSwitchEntity(ComelitBridgeBaseEntity, SwitchEntity):
|
class ComelitSwitchEntity(ComelitBridgeBaseEntity, SwitchEntity):
|
||||||
|
@@ -4,7 +4,11 @@ from collections.abc import Awaitable, Callable, Coroutine
|
|||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import Any, Concatenate
|
from typing import Any, Concatenate
|
||||||
|
|
||||||
from aiocomelit import ComelitSerialBridgeObject
|
from aiocomelit.api import (
|
||||||
|
ComelitSerialBridgeObject,
|
||||||
|
ComelitVedoAreaObject,
|
||||||
|
ComelitVedoZoneObject,
|
||||||
|
)
|
||||||
from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
|
from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
|
||||||
from aiohttp import ClientSession, CookieJar
|
from aiohttp import ClientSession, CookieJar
|
||||||
|
|
||||||
@@ -19,8 +23,11 @@ from homeassistant.helpers import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
from .const import _LOGGER, DOMAIN
|
from .const import _LOGGER, DOMAIN
|
||||||
|
from .coordinator import ComelitBaseCoordinator
|
||||||
from .entity import ComelitBridgeBaseEntity
|
from .entity import ComelitBridgeBaseEntity
|
||||||
|
|
||||||
|
DeviceType = ComelitSerialBridgeObject | ComelitVedoAreaObject | ComelitVedoZoneObject
|
||||||
|
|
||||||
|
|
||||||
async def async_client_session(hass: HomeAssistant) -> ClientSession:
|
async def async_client_session(hass: HomeAssistant) -> ClientSession:
|
||||||
"""Return a new aiohttp session."""
|
"""Return a new aiohttp session."""
|
||||||
@@ -113,3 +120,41 @@ def bridge_api_call[_T: ComelitBridgeBaseEntity, **_P](
|
|||||||
self.coordinator.config_entry.async_start_reauth(self.hass)
|
self.coordinator.config_entry.async_start_reauth(self.hass)
|
||||||
|
|
||||||
return cmd_wrapper
|
return cmd_wrapper
|
||||||
|
|
||||||
|
|
||||||
|
def new_device_listener(
|
||||||
|
coordinator: ComelitBaseCoordinator,
|
||||||
|
new_devices_callback: Callable[
|
||||||
|
[
|
||||||
|
list[
|
||||||
|
ComelitSerialBridgeObject
|
||||||
|
| ComelitVedoAreaObject
|
||||||
|
| ComelitVedoZoneObject
|
||||||
|
],
|
||||||
|
str,
|
||||||
|
],
|
||||||
|
None,
|
||||||
|
],
|
||||||
|
data_type: str,
|
||||||
|
) -> Callable[[], None]:
|
||||||
|
"""Subscribe to coordinator updates to check for new devices."""
|
||||||
|
known_devices: set[int] = set()
|
||||||
|
|
||||||
|
def _check_devices() -> None:
|
||||||
|
"""Check for new devices and call callback with any new monitors."""
|
||||||
|
if not coordinator.data:
|
||||||
|
return
|
||||||
|
|
||||||
|
new_devices: list[DeviceType] = []
|
||||||
|
for _id in coordinator.data[data_type]:
|
||||||
|
if _id not in known_devices:
|
||||||
|
known_devices.add(_id)
|
||||||
|
new_devices.append(coordinator.data[data_type][_id])
|
||||||
|
|
||||||
|
if new_devices:
|
||||||
|
new_devices_callback(new_devices, data_type)
|
||||||
|
|
||||||
|
# Check for devices immediately
|
||||||
|
_check_devices()
|
||||||
|
|
||||||
|
return coordinator.async_add_listener(_check_devices)
|
||||||
|
@@ -49,7 +49,7 @@ CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
|
|||||||
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
|
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
|
||||||
"""Set up the config component."""
|
"""Set up the config component."""
|
||||||
frontend.async_register_built_in_panel(
|
frontend.async_register_built_in_panel(
|
||||||
hass, "config", "config", "hass:cog", require_admin=True
|
hass, "config", "config", "mdi:cog", require_admin=True
|
||||||
)
|
)
|
||||||
|
|
||||||
for panel in SECTIONS:
|
for panel in SECTIONS:
|
||||||
|
@@ -4,6 +4,7 @@ from __future__ import annotations
|
|||||||
|
|
||||||
from collections.abc import Callable
|
from collections.abc import Callable
|
||||||
from http import HTTPStatus
|
from http import HTTPStatus
|
||||||
|
import logging
|
||||||
from typing import Any, NoReturn
|
from typing import Any, NoReturn
|
||||||
|
|
||||||
from aiohttp import web
|
from aiohttp import web
|
||||||
@@ -23,7 +24,12 @@ from homeassistant.helpers.data_entry_flow import (
|
|||||||
FlowManagerResourceView,
|
FlowManagerResourceView,
|
||||||
)
|
)
|
||||||
from homeassistant.helpers.dispatcher import async_dispatcher_connect
|
from homeassistant.helpers.dispatcher import async_dispatcher_connect
|
||||||
from homeassistant.helpers.json import json_fragment
|
from homeassistant.helpers.json import (
|
||||||
|
JSON_DUMP,
|
||||||
|
find_paths_unserializable_data,
|
||||||
|
json_bytes,
|
||||||
|
json_fragment,
|
||||||
|
)
|
||||||
from homeassistant.loader import (
|
from homeassistant.loader import (
|
||||||
Integration,
|
Integration,
|
||||||
IntegrationNotFound,
|
IntegrationNotFound,
|
||||||
@@ -31,6 +37,9 @@ from homeassistant.loader import (
|
|||||||
async_get_integrations,
|
async_get_integrations,
|
||||||
async_get_loaded_integration,
|
async_get_loaded_integration,
|
||||||
)
|
)
|
||||||
|
from homeassistant.util.json import format_unserializable_data
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@callback
|
@callback
|
||||||
@@ -402,18 +411,40 @@ def config_entries_flow_subscribe(
|
|||||||
connection.subscriptions[msg["id"]] = hass.config_entries.flow.async_subscribe_flow(
|
connection.subscriptions[msg["id"]] = hass.config_entries.flow.async_subscribe_flow(
|
||||||
async_on_flow_init_remove
|
async_on_flow_init_remove
|
||||||
)
|
)
|
||||||
connection.send_message(
|
try:
|
||||||
websocket_api.event_message(
|
serialized_flows = [
|
||||||
msg["id"],
|
json_bytes({"type": None, "flow_id": flw["flow_id"], "flow": flw})
|
||||||
[
|
for flw in hass.config_entries.flow.async_progress()
|
||||||
{"type": None, "flow_id": flw["flow_id"], "flow": flw}
|
if flw["context"]["source"]
|
||||||
for flw in hass.config_entries.flow.async_progress()
|
not in (
|
||||||
if flw["context"]["source"]
|
config_entries.SOURCE_RECONFIGURE,
|
||||||
not in (
|
config_entries.SOURCE_USER,
|
||||||
config_entries.SOURCE_RECONFIGURE,
|
)
|
||||||
config_entries.SOURCE_USER,
|
]
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
# If we can't serialize, we'll filter out unserializable flows
|
||||||
|
serialized_flows = []
|
||||||
|
for flw in hass.config_entries.flow.async_progress():
|
||||||
|
if flw["context"]["source"] in (
|
||||||
|
config_entries.SOURCE_RECONFIGURE,
|
||||||
|
config_entries.SOURCE_USER,
|
||||||
|
):
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
serialized_flows.append(
|
||||||
|
json_bytes({"type": None, "flow_id": flw["flow_id"], "flow": flw})
|
||||||
)
|
)
|
||||||
],
|
except (ValueError, TypeError):
|
||||||
|
_LOGGER.error(
|
||||||
|
"Unable to serialize to JSON. Bad data found at %s",
|
||||||
|
format_unserializable_data(
|
||||||
|
find_paths_unserializable_data(flw, dump=JSON_DUMP)
|
||||||
|
),
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
connection.send_message(
|
||||||
|
websocket_api.messages.construct_event_message(
|
||||||
|
msg["id"], b"".join((b"[", b",".join(serialized_flows), b"]"))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
connection.send_result(msg["id"])
|
connection.send_result(msg["id"])
|
||||||
|
@@ -514,7 +514,7 @@ class ChatLog:
|
|||||||
"""Set the LLM system prompt."""
|
"""Set the LLM system prompt."""
|
||||||
llm_api: llm.APIInstance | None = None
|
llm_api: llm.APIInstance | None = None
|
||||||
|
|
||||||
if user_llm_hass_api is None:
|
if not user_llm_hass_api:
|
||||||
pass
|
pass
|
||||||
elif isinstance(user_llm_hass_api, llm.API):
|
elif isinstance(user_llm_hass_api, llm.API):
|
||||||
llm_api = await user_llm_hass_api.async_get_api_instance(llm_context)
|
llm_api = await user_llm_hass_api.async_get_api_instance(llm_context)
|
||||||
|
@@ -38,22 +38,30 @@ from home_assistant_intents import (
|
|||||||
ErrorKey,
|
ErrorKey,
|
||||||
FuzzyConfig,
|
FuzzyConfig,
|
||||||
FuzzyLanguageResponses,
|
FuzzyLanguageResponses,
|
||||||
|
LanguageScores,
|
||||||
get_fuzzy_config,
|
get_fuzzy_config,
|
||||||
get_fuzzy_language,
|
get_fuzzy_language,
|
||||||
get_intents,
|
get_intents,
|
||||||
|
get_language_scores,
|
||||||
get_languages,
|
get_languages,
|
||||||
)
|
)
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from homeassistant import core
|
|
||||||
from homeassistant.components.homeassistant.exposed_entities import (
|
from homeassistant.components.homeassistant.exposed_entities import (
|
||||||
async_listen_entity_updates,
|
async_listen_entity_updates,
|
||||||
async_should_expose,
|
async_should_expose,
|
||||||
)
|
)
|
||||||
from homeassistant.const import EVENT_STATE_CHANGED, MATCH_ALL
|
from homeassistant.const import EVENT_STATE_CHANGED, MATCH_ALL
|
||||||
from homeassistant.core import Event, callback
|
from homeassistant.core import (
|
||||||
|
Event,
|
||||||
|
EventStateChangedData,
|
||||||
|
HomeAssistant,
|
||||||
|
State,
|
||||||
|
callback,
|
||||||
|
)
|
||||||
from homeassistant.helpers import (
|
from homeassistant.helpers import (
|
||||||
area_registry as ar,
|
area_registry as ar,
|
||||||
|
config_validation as cv,
|
||||||
device_registry as dr,
|
device_registry as dr,
|
||||||
entity_registry as er,
|
entity_registry as er,
|
||||||
floor_registry as fr,
|
floor_registry as fr,
|
||||||
@@ -192,7 +200,7 @@ class IntentCache:
|
|||||||
|
|
||||||
|
|
||||||
async def async_setup_default_agent(
|
async def async_setup_default_agent(
|
||||||
hass: core.HomeAssistant,
|
hass: HomeAssistant,
|
||||||
entity_component: EntityComponent[ConversationEntity],
|
entity_component: EntityComponent[ConversationEntity],
|
||||||
config_intents: dict[str, Any],
|
config_intents: dict[str, Any],
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -201,15 +209,13 @@ async def async_setup_default_agent(
|
|||||||
await entity_component.async_add_entities([agent])
|
await entity_component.async_add_entities([agent])
|
||||||
await get_agent_manager(hass).async_setup_default_agent(agent)
|
await get_agent_manager(hass).async_setup_default_agent(agent)
|
||||||
|
|
||||||
@core.callback
|
@callback
|
||||||
def async_entity_state_listener(
|
def async_entity_state_listener(event: Event[EventStateChangedData]) -> None:
|
||||||
event: core.Event[core.EventStateChangedData],
|
|
||||||
) -> None:
|
|
||||||
"""Set expose flag on new entities."""
|
"""Set expose flag on new entities."""
|
||||||
async_should_expose(hass, DOMAIN, event.data["entity_id"])
|
async_should_expose(hass, DOMAIN, event.data["entity_id"])
|
||||||
|
|
||||||
@core.callback
|
@callback
|
||||||
def async_hass_started(hass: core.HomeAssistant) -> None:
|
def async_hass_started(hass: HomeAssistant) -> None:
|
||||||
"""Set expose flag on all entities."""
|
"""Set expose flag on all entities."""
|
||||||
for state in hass.states.async_all():
|
for state in hass.states.async_all():
|
||||||
async_should_expose(hass, DOMAIN, state.entity_id)
|
async_should_expose(hass, DOMAIN, state.entity_id)
|
||||||
@@ -224,9 +230,7 @@ class DefaultAgent(ConversationEntity):
|
|||||||
_attr_name = "Home Assistant"
|
_attr_name = "Home Assistant"
|
||||||
_attr_supported_features = ConversationEntityFeature.CONTROL
|
_attr_supported_features = ConversationEntityFeature.CONTROL
|
||||||
|
|
||||||
def __init__(
|
def __init__(self, hass: HomeAssistant, config_intents: dict[str, Any]) -> None:
|
||||||
self, hass: core.HomeAssistant, config_intents: dict[str, Any]
|
|
||||||
) -> None:
|
|
||||||
"""Initialize the default agent."""
|
"""Initialize the default agent."""
|
||||||
self.hass = hass
|
self.hass = hass
|
||||||
self._lang_intents: dict[str, LanguageIntents | object] = {}
|
self._lang_intents: dict[str, LanguageIntents | object] = {}
|
||||||
@@ -259,7 +263,7 @@ class DefaultAgent(ConversationEntity):
|
|||||||
"""Return a list of supported languages."""
|
"""Return a list of supported languages."""
|
||||||
return get_languages()
|
return get_languages()
|
||||||
|
|
||||||
@core.callback
|
@callback
|
||||||
def _filter_entity_registry_changes(
|
def _filter_entity_registry_changes(
|
||||||
self, event_data: er.EventEntityRegistryUpdatedData
|
self, event_data: er.EventEntityRegistryUpdatedData
|
||||||
) -> bool:
|
) -> bool:
|
||||||
@@ -268,12 +272,12 @@ class DefaultAgent(ConversationEntity):
|
|||||||
field in event_data["changes"] for field in _ENTITY_REGISTRY_UPDATE_FIELDS
|
field in event_data["changes"] for field in _ENTITY_REGISTRY_UPDATE_FIELDS
|
||||||
)
|
)
|
||||||
|
|
||||||
@core.callback
|
@callback
|
||||||
def _filter_state_changes(self, event_data: core.EventStateChangedData) -> bool:
|
def _filter_state_changes(self, event_data: EventStateChangedData) -> bool:
|
||||||
"""Filter state changed events."""
|
"""Filter state changed events."""
|
||||||
return not event_data["old_state"] or not event_data["new_state"]
|
return not event_data["old_state"] or not event_data["new_state"]
|
||||||
|
|
||||||
@core.callback
|
@callback
|
||||||
def _listen_clear_slot_list(self) -> None:
|
def _listen_clear_slot_list(self) -> None:
|
||||||
"""Listen for changes that can invalidate slot list."""
|
"""Listen for changes that can invalidate slot list."""
|
||||||
assert self._unsub_clear_slot_list is None
|
assert self._unsub_clear_slot_list is None
|
||||||
@@ -342,6 +346,81 @@ class DefaultAgent(ConversationEntity):
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
async def async_debug_recognize(
|
||||||
|
self, user_input: ConversationInput
|
||||||
|
) -> dict[str, Any] | None:
|
||||||
|
"""Debug recognize from user input."""
|
||||||
|
result_dict: dict[str, Any] | None = None
|
||||||
|
|
||||||
|
if trigger_result := await self.async_recognize_sentence_trigger(user_input):
|
||||||
|
result_dict = {
|
||||||
|
# Matched a user-defined sentence trigger.
|
||||||
|
# We can't provide the response here without executing the
|
||||||
|
# trigger.
|
||||||
|
"match": True,
|
||||||
|
"source": "trigger",
|
||||||
|
"sentence_template": trigger_result.sentence_template or "",
|
||||||
|
}
|
||||||
|
elif intent_result := await self.async_recognize_intent(user_input):
|
||||||
|
successful_match = not intent_result.unmatched_entities
|
||||||
|
result_dict = {
|
||||||
|
# Name of the matching intent (or the closest)
|
||||||
|
"intent": {
|
||||||
|
"name": intent_result.intent.name,
|
||||||
|
},
|
||||||
|
# Slot values that would be received by the intent
|
||||||
|
"slots": { # direct access to values
|
||||||
|
entity_key: entity.text or entity.value
|
||||||
|
for entity_key, entity in intent_result.entities.items()
|
||||||
|
},
|
||||||
|
# Extra slot details, such as the originally matched text
|
||||||
|
"details": {
|
||||||
|
entity_key: {
|
||||||
|
"name": entity.name,
|
||||||
|
"value": entity.value,
|
||||||
|
"text": entity.text,
|
||||||
|
}
|
||||||
|
for entity_key, entity in intent_result.entities.items()
|
||||||
|
},
|
||||||
|
# Entities/areas/etc. that would be targeted
|
||||||
|
"targets": {},
|
||||||
|
# True if match was successful
|
||||||
|
"match": successful_match,
|
||||||
|
# Text of the sentence template that matched (or was closest)
|
||||||
|
"sentence_template": "",
|
||||||
|
# When match is incomplete, this will contain the best slot guesses
|
||||||
|
"unmatched_slots": _get_unmatched_slots(intent_result),
|
||||||
|
# True if match was not exact
|
||||||
|
"fuzzy_match": False,
|
||||||
|
}
|
||||||
|
|
||||||
|
if successful_match:
|
||||||
|
result_dict["targets"] = {
|
||||||
|
state.entity_id: {"matched": is_matched}
|
||||||
|
for state, is_matched in _get_debug_targets(
|
||||||
|
self.hass, intent_result
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if intent_result.intent_sentence is not None:
|
||||||
|
result_dict["sentence_template"] = intent_result.intent_sentence.text
|
||||||
|
|
||||||
|
if intent_result.intent_metadata:
|
||||||
|
# Inspect metadata to determine if this matched a custom sentence
|
||||||
|
if intent_result.intent_metadata.get(METADATA_CUSTOM_SENTENCE):
|
||||||
|
result_dict["source"] = "custom"
|
||||||
|
result_dict["file"] = intent_result.intent_metadata.get(
|
||||||
|
METADATA_CUSTOM_FILE
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
result_dict["source"] = "builtin"
|
||||||
|
|
||||||
|
result_dict["fuzzy_match"] = intent_result.intent_metadata.get(
|
||||||
|
METADATA_FUZZY_MATCH, False
|
||||||
|
)
|
||||||
|
|
||||||
|
return result_dict
|
||||||
|
|
||||||
async def _async_handle_message(
|
async def _async_handle_message(
|
||||||
self,
|
self,
|
||||||
user_input: ConversationInput,
|
user_input: ConversationInput,
|
||||||
@@ -890,7 +969,7 @@ class DefaultAgent(ConversationEntity):
|
|||||||
) -> str:
|
) -> str:
|
||||||
# Get first matched or unmatched state.
|
# Get first matched or unmatched state.
|
||||||
# This is available in the response template as "state".
|
# This is available in the response template as "state".
|
||||||
state1: core.State | None = None
|
state1: State | None = None
|
||||||
if intent_response.matched_states:
|
if intent_response.matched_states:
|
||||||
state1 = intent_response.matched_states[0]
|
state1 = intent_response.matched_states[0]
|
||||||
elif intent_response.unmatched_states:
|
elif intent_response.unmatched_states:
|
||||||
@@ -1528,6 +1607,10 @@ class DefaultAgent(ConversationEntity):
|
|||||||
return None
|
return None
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
async def async_get_language_scores(self) -> dict[str, LanguageScores]:
|
||||||
|
"""Get support scores per language."""
|
||||||
|
return await self.hass.async_add_executor_job(get_language_scores)
|
||||||
|
|
||||||
|
|
||||||
def _make_error_result(
|
def _make_error_result(
|
||||||
language: str,
|
language: str,
|
||||||
@@ -1589,7 +1672,7 @@ def _get_unmatched_response(result: RecognizeResult) -> tuple[ErrorKey, dict[str
|
|||||||
|
|
||||||
|
|
||||||
def _get_match_error_response(
|
def _get_match_error_response(
|
||||||
hass: core.HomeAssistant,
|
hass: HomeAssistant,
|
||||||
match_error: intent.MatchFailedError,
|
match_error: intent.MatchFailedError,
|
||||||
) -> tuple[ErrorKey, dict[str, Any]]:
|
) -> tuple[ErrorKey, dict[str, Any]]:
|
||||||
"""Return key and template arguments for error when target matching fails."""
|
"""Return key and template arguments for error when target matching fails."""
|
||||||
@@ -1724,3 +1807,75 @@ def _collect_list_references(expression: Expression, list_names: set[str]) -> No
|
|||||||
elif isinstance(expression, ListReference):
|
elif isinstance(expression, ListReference):
|
||||||
# {list}
|
# {list}
|
||||||
list_names.add(expression.slot_name)
|
list_names.add(expression.slot_name)
|
||||||
|
|
||||||
|
|
||||||
|
def _get_debug_targets(
|
||||||
|
hass: HomeAssistant,
|
||||||
|
result: RecognizeResult,
|
||||||
|
) -> Iterable[tuple[State, bool]]:
|
||||||
|
"""Yield state/is_matched pairs for a hassil recognition."""
|
||||||
|
entities = result.entities
|
||||||
|
|
||||||
|
name: str | None = None
|
||||||
|
area_name: str | None = None
|
||||||
|
domains: set[str] | None = None
|
||||||
|
device_classes: set[str] | None = None
|
||||||
|
state_names: set[str] | None = None
|
||||||
|
|
||||||
|
if "name" in entities:
|
||||||
|
name = str(entities["name"].value)
|
||||||
|
|
||||||
|
if "area" in entities:
|
||||||
|
area_name = str(entities["area"].value)
|
||||||
|
|
||||||
|
if "domain" in entities:
|
||||||
|
domains = set(cv.ensure_list(entities["domain"].value))
|
||||||
|
|
||||||
|
if "device_class" in entities:
|
||||||
|
device_classes = set(cv.ensure_list(entities["device_class"].value))
|
||||||
|
|
||||||
|
if "state" in entities:
|
||||||
|
# HassGetState only
|
||||||
|
state_names = set(cv.ensure_list(entities["state"].value))
|
||||||
|
|
||||||
|
if (
|
||||||
|
(name is None)
|
||||||
|
and (area_name is None)
|
||||||
|
and (not domains)
|
||||||
|
and (not device_classes)
|
||||||
|
and (not state_names)
|
||||||
|
):
|
||||||
|
# Avoid "matching" all entities when there is no filter
|
||||||
|
return
|
||||||
|
|
||||||
|
states = intent.async_match_states(
|
||||||
|
hass,
|
||||||
|
name=name,
|
||||||
|
area_name=area_name,
|
||||||
|
domains=domains,
|
||||||
|
device_classes=device_classes,
|
||||||
|
)
|
||||||
|
|
||||||
|
for state in states:
|
||||||
|
# For queries, a target is "matched" based on its state
|
||||||
|
is_matched = (state_names is None) or (state.state in state_names)
|
||||||
|
yield state, is_matched
|
||||||
|
|
||||||
|
|
||||||
|
def _get_unmatched_slots(
|
||||||
|
result: RecognizeResult,
|
||||||
|
) -> dict[str, str | int | float]:
|
||||||
|
"""Return a dict of unmatched text/range slot entities."""
|
||||||
|
unmatched_slots: dict[str, str | int | float] = {}
|
||||||
|
for entity in result.unmatched_entities_list:
|
||||||
|
if isinstance(entity, UnmatchedTextEntity):
|
||||||
|
if entity.text == MISSING_ENTITY:
|
||||||
|
# Don't report <missing> since these are just missing context
|
||||||
|
# slots.
|
||||||
|
continue
|
||||||
|
|
||||||
|
unmatched_slots[entity.name] = entity.text
|
||||||
|
elif isinstance(entity, UnmatchedRangeEntity):
|
||||||
|
unmatched_slots[entity.name] = entity.value
|
||||||
|
|
||||||
|
return unmatched_slots
|
||||||
|
@@ -2,21 +2,16 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from collections.abc import Iterable
|
|
||||||
from dataclasses import asdict
|
from dataclasses import asdict
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from aiohttp import web
|
from aiohttp import web
|
||||||
from hassil.recognize import MISSING_ENTITY, RecognizeResult
|
|
||||||
from hassil.string_matcher import UnmatchedRangeEntity, UnmatchedTextEntity
|
|
||||||
from home_assistant_intents import get_language_scores
|
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components import http, websocket_api
|
from homeassistant.components import http, websocket_api
|
||||||
from homeassistant.components.http.data_validator import RequestDataValidator
|
from homeassistant.components.http.data_validator import RequestDataValidator
|
||||||
from homeassistant.const import MATCH_ALL
|
from homeassistant.const import MATCH_ALL
|
||||||
from homeassistant.core import HomeAssistant, State, callback
|
from homeassistant.core import HomeAssistant, callback
|
||||||
from homeassistant.helpers import config_validation as cv, intent
|
|
||||||
from homeassistant.util import language as language_util
|
from homeassistant.util import language as language_util
|
||||||
|
|
||||||
from .agent_manager import (
|
from .agent_manager import (
|
||||||
@@ -26,11 +21,6 @@ from .agent_manager import (
|
|||||||
get_agent_manager,
|
get_agent_manager,
|
||||||
)
|
)
|
||||||
from .const import DATA_COMPONENT
|
from .const import DATA_COMPONENT
|
||||||
from .default_agent import (
|
|
||||||
METADATA_CUSTOM_FILE,
|
|
||||||
METADATA_CUSTOM_SENTENCE,
|
|
||||||
METADATA_FUZZY_MATCH,
|
|
||||||
)
|
|
||||||
from .entity import ConversationEntity
|
from .entity import ConversationEntity
|
||||||
from .models import ConversationInput
|
from .models import ConversationInput
|
||||||
|
|
||||||
@@ -206,150 +196,12 @@ async def websocket_hass_agent_debug(
|
|||||||
language=msg.get("language", hass.config.language),
|
language=msg.get("language", hass.config.language),
|
||||||
agent_id=agent.entity_id,
|
agent_id=agent.entity_id,
|
||||||
)
|
)
|
||||||
result_dict: dict[str, Any] | None = None
|
result_dict = await agent.async_debug_recognize(user_input)
|
||||||
|
|
||||||
if trigger_result := await agent.async_recognize_sentence_trigger(user_input):
|
|
||||||
result_dict = {
|
|
||||||
# Matched a user-defined sentence trigger.
|
|
||||||
# We can't provide the response here without executing the
|
|
||||||
# trigger.
|
|
||||||
"match": True,
|
|
||||||
"source": "trigger",
|
|
||||||
"sentence_template": trigger_result.sentence_template or "",
|
|
||||||
}
|
|
||||||
elif intent_result := await agent.async_recognize_intent(user_input):
|
|
||||||
successful_match = not intent_result.unmatched_entities
|
|
||||||
result_dict = {
|
|
||||||
# Name of the matching intent (or the closest)
|
|
||||||
"intent": {
|
|
||||||
"name": intent_result.intent.name,
|
|
||||||
},
|
|
||||||
# Slot values that would be received by the intent
|
|
||||||
"slots": { # direct access to values
|
|
||||||
entity_key: entity.text or entity.value
|
|
||||||
for entity_key, entity in intent_result.entities.items()
|
|
||||||
},
|
|
||||||
# Extra slot details, such as the originally matched text
|
|
||||||
"details": {
|
|
||||||
entity_key: {
|
|
||||||
"name": entity.name,
|
|
||||||
"value": entity.value,
|
|
||||||
"text": entity.text,
|
|
||||||
}
|
|
||||||
for entity_key, entity in intent_result.entities.items()
|
|
||||||
},
|
|
||||||
# Entities/areas/etc. that would be targeted
|
|
||||||
"targets": {},
|
|
||||||
# True if match was successful
|
|
||||||
"match": successful_match,
|
|
||||||
# Text of the sentence template that matched (or was closest)
|
|
||||||
"sentence_template": "",
|
|
||||||
# When match is incomplete, this will contain the best slot guesses
|
|
||||||
"unmatched_slots": _get_unmatched_slots(intent_result),
|
|
||||||
# True if match was not exact
|
|
||||||
"fuzzy_match": False,
|
|
||||||
}
|
|
||||||
|
|
||||||
if successful_match:
|
|
||||||
result_dict["targets"] = {
|
|
||||||
state.entity_id: {"matched": is_matched}
|
|
||||||
for state, is_matched in _get_debug_targets(hass, intent_result)
|
|
||||||
}
|
|
||||||
|
|
||||||
if intent_result.intent_sentence is not None:
|
|
||||||
result_dict["sentence_template"] = intent_result.intent_sentence.text
|
|
||||||
|
|
||||||
if intent_result.intent_metadata:
|
|
||||||
# Inspect metadata to determine if this matched a custom sentence
|
|
||||||
if intent_result.intent_metadata.get(METADATA_CUSTOM_SENTENCE):
|
|
||||||
result_dict["source"] = "custom"
|
|
||||||
result_dict["file"] = intent_result.intent_metadata.get(
|
|
||||||
METADATA_CUSTOM_FILE
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
result_dict["source"] = "builtin"
|
|
||||||
|
|
||||||
result_dict["fuzzy_match"] = intent_result.intent_metadata.get(
|
|
||||||
METADATA_FUZZY_MATCH, False
|
|
||||||
)
|
|
||||||
|
|
||||||
result_dicts.append(result_dict)
|
result_dicts.append(result_dict)
|
||||||
|
|
||||||
connection.send_result(msg["id"], {"results": result_dicts})
|
connection.send_result(msg["id"], {"results": result_dicts})
|
||||||
|
|
||||||
|
|
||||||
def _get_debug_targets(
|
|
||||||
hass: HomeAssistant,
|
|
||||||
result: RecognizeResult,
|
|
||||||
) -> Iterable[tuple[State, bool]]:
|
|
||||||
"""Yield state/is_matched pairs for a hassil recognition."""
|
|
||||||
entities = result.entities
|
|
||||||
|
|
||||||
name: str | None = None
|
|
||||||
area_name: str | None = None
|
|
||||||
domains: set[str] | None = None
|
|
||||||
device_classes: set[str] | None = None
|
|
||||||
state_names: set[str] | None = None
|
|
||||||
|
|
||||||
if "name" in entities:
|
|
||||||
name = str(entities["name"].value)
|
|
||||||
|
|
||||||
if "area" in entities:
|
|
||||||
area_name = str(entities["area"].value)
|
|
||||||
|
|
||||||
if "domain" in entities:
|
|
||||||
domains = set(cv.ensure_list(entities["domain"].value))
|
|
||||||
|
|
||||||
if "device_class" in entities:
|
|
||||||
device_classes = set(cv.ensure_list(entities["device_class"].value))
|
|
||||||
|
|
||||||
if "state" in entities:
|
|
||||||
# HassGetState only
|
|
||||||
state_names = set(cv.ensure_list(entities["state"].value))
|
|
||||||
|
|
||||||
if (
|
|
||||||
(name is None)
|
|
||||||
and (area_name is None)
|
|
||||||
and (not domains)
|
|
||||||
and (not device_classes)
|
|
||||||
and (not state_names)
|
|
||||||
):
|
|
||||||
# Avoid "matching" all entities when there is no filter
|
|
||||||
return
|
|
||||||
|
|
||||||
states = intent.async_match_states(
|
|
||||||
hass,
|
|
||||||
name=name,
|
|
||||||
area_name=area_name,
|
|
||||||
domains=domains,
|
|
||||||
device_classes=device_classes,
|
|
||||||
)
|
|
||||||
|
|
||||||
for state in states:
|
|
||||||
# For queries, a target is "matched" based on its state
|
|
||||||
is_matched = (state_names is None) or (state.state in state_names)
|
|
||||||
yield state, is_matched
|
|
||||||
|
|
||||||
|
|
||||||
def _get_unmatched_slots(
|
|
||||||
result: RecognizeResult,
|
|
||||||
) -> dict[str, str | int | float]:
|
|
||||||
"""Return a dict of unmatched text/range slot entities."""
|
|
||||||
unmatched_slots: dict[str, str | int | float] = {}
|
|
||||||
for entity in result.unmatched_entities_list:
|
|
||||||
if isinstance(entity, UnmatchedTextEntity):
|
|
||||||
if entity.text == MISSING_ENTITY:
|
|
||||||
# Don't report <missing> since these are just missing context
|
|
||||||
# slots.
|
|
||||||
continue
|
|
||||||
|
|
||||||
unmatched_slots[entity.name] = entity.text
|
|
||||||
elif isinstance(entity, UnmatchedRangeEntity):
|
|
||||||
unmatched_slots[entity.name] = entity.value
|
|
||||||
|
|
||||||
return unmatched_slots
|
|
||||||
|
|
||||||
|
|
||||||
@websocket_api.websocket_command(
|
@websocket_api.websocket_command(
|
||||||
{
|
{
|
||||||
vol.Required("type"): "conversation/agent/homeassistant/language_scores",
|
vol.Required("type"): "conversation/agent/homeassistant/language_scores",
|
||||||
@@ -364,10 +216,13 @@ async def websocket_hass_agent_language_scores(
|
|||||||
msg: dict[str, Any],
|
msg: dict[str, Any],
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Get support scores per language."""
|
"""Get support scores per language."""
|
||||||
|
agent = get_agent_manager(hass).default_agent
|
||||||
|
assert agent is not None
|
||||||
|
|
||||||
language = msg.get("language", hass.config.language)
|
language = msg.get("language", hass.config.language)
|
||||||
country = msg.get("country", hass.config.country)
|
country = msg.get("country", hass.config.country)
|
||||||
|
|
||||||
scores = await hass.async_add_executor_job(get_language_scores)
|
scores = await agent.async_get_language_scores()
|
||||||
matching_langs = language_util.matches(language, scores.keys(), country=country)
|
matching_langs = language_util.matches(language, scores.keys(), country=country)
|
||||||
preferred_lang = matching_langs[0] if matching_langs else language
|
preferred_lang = matching_langs[0] if matching_langs else language
|
||||||
result = {
|
result = {
|
||||||
|
@@ -13,7 +13,7 @@ from propcache.api import cached_property
|
|||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.config_entries import ConfigEntry
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.const import ( # noqa: F401
|
from homeassistant.const import (
|
||||||
SERVICE_CLOSE_COVER,
|
SERVICE_CLOSE_COVER,
|
||||||
SERVICE_CLOSE_COVER_TILT,
|
SERVICE_CLOSE_COVER_TILT,
|
||||||
SERVICE_OPEN_COVER,
|
SERVICE_OPEN_COVER,
|
||||||
@@ -24,19 +24,9 @@ from homeassistant.const import ( # noqa: F401
|
|||||||
SERVICE_STOP_COVER_TILT,
|
SERVICE_STOP_COVER_TILT,
|
||||||
SERVICE_TOGGLE,
|
SERVICE_TOGGLE,
|
||||||
SERVICE_TOGGLE_COVER_TILT,
|
SERVICE_TOGGLE_COVER_TILT,
|
||||||
STATE_CLOSED,
|
|
||||||
STATE_CLOSING,
|
|
||||||
STATE_OPEN,
|
|
||||||
STATE_OPENING,
|
|
||||||
)
|
)
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers import config_validation as cv
|
from homeassistant.helpers import config_validation as cv
|
||||||
from homeassistant.helpers.deprecation import (
|
|
||||||
DeprecatedConstantEnum,
|
|
||||||
all_with_deprecated_constants,
|
|
||||||
check_if_deprecated_constant,
|
|
||||||
dir_with_deprecated_constants,
|
|
||||||
)
|
|
||||||
from homeassistant.helpers.entity import Entity, EntityDescription
|
from homeassistant.helpers.entity import Entity, EntityDescription
|
||||||
from homeassistant.helpers.entity_component import EntityComponent
|
from homeassistant.helpers.entity_component import EntityComponent
|
||||||
from homeassistant.helpers.typing import ConfigType
|
from homeassistant.helpers.typing import ConfigType
|
||||||
@@ -63,15 +53,6 @@ class CoverState(StrEnum):
|
|||||||
OPENING = "opening"
|
OPENING = "opening"
|
||||||
|
|
||||||
|
|
||||||
# STATE_* below are deprecated as of 2024.11
|
|
||||||
# when imported from homeassistant.components.cover
|
|
||||||
# use the CoverState enum instead.
|
|
||||||
_DEPRECATED_STATE_CLOSED = DeprecatedConstantEnum(CoverState.CLOSED, "2025.11")
|
|
||||||
_DEPRECATED_STATE_CLOSING = DeprecatedConstantEnum(CoverState.CLOSING, "2025.11")
|
|
||||||
_DEPRECATED_STATE_OPEN = DeprecatedConstantEnum(CoverState.OPEN, "2025.11")
|
|
||||||
_DEPRECATED_STATE_OPENING = DeprecatedConstantEnum(CoverState.OPENING, "2025.11")
|
|
||||||
|
|
||||||
|
|
||||||
class CoverDeviceClass(StrEnum):
|
class CoverDeviceClass(StrEnum):
|
||||||
"""Device class for cover."""
|
"""Device class for cover."""
|
||||||
|
|
||||||
@@ -463,11 +444,3 @@ class CoverEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
return (
|
return (
|
||||||
fns["close"] if self._cover_is_last_toggle_direction_open else fns["open"]
|
fns["close"] if self._cover_is_last_toggle_direction_open else fns["open"]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# These can be removed if no deprecated constant are in this module anymore
|
|
||||||
__getattr__ = ft.partial(check_if_deprecated_constant, module_globals=globals())
|
|
||||||
__dir__ = ft.partial(
|
|
||||||
dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
|
|
||||||
)
|
|
||||||
__all__ = all_with_deprecated_constants(globals())
|
|
||||||
|
@@ -7,5 +7,5 @@
|
|||||||
"integration_type": "hub",
|
"integration_type": "hub",
|
||||||
"iot_class": "cloud_push",
|
"iot_class": "cloud_push",
|
||||||
"quality_scale": "bronze",
|
"quality_scale": "bronze",
|
||||||
"requirements": ["pycync==0.4.0"]
|
"requirements": ["pycync==0.4.1"]
|
||||||
}
|
}
|
||||||
|
@@ -23,7 +23,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
|||||||
from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
|
from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
|
||||||
from homeassistant.util.ssl import client_context_no_verify
|
from homeassistant.util.ssl import client_context_no_verify
|
||||||
|
|
||||||
from .const import KEY_MAC, TIMEOUT
|
from .const import KEY_MAC, TIMEOUT_SEC
|
||||||
from .coordinator import DaikinConfigEntry, DaikinCoordinator
|
from .coordinator import DaikinConfigEntry, DaikinCoordinator
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
@@ -42,7 +42,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DaikinConfigEntry) -> bo
|
|||||||
session = async_get_clientsession(hass)
|
session = async_get_clientsession(hass)
|
||||||
host = conf[CONF_HOST]
|
host = conf[CONF_HOST]
|
||||||
try:
|
try:
|
||||||
async with asyncio.timeout(TIMEOUT):
|
async with asyncio.timeout(TIMEOUT_SEC):
|
||||||
device: Appliance = await DaikinFactory(
|
device: Appliance = await DaikinFactory(
|
||||||
host,
|
host,
|
||||||
session,
|
session,
|
||||||
@@ -53,7 +53,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DaikinConfigEntry) -> bo
|
|||||||
)
|
)
|
||||||
_LOGGER.debug("Connection to %s successful", host)
|
_LOGGER.debug("Connection to %s successful", host)
|
||||||
except TimeoutError as err:
|
except TimeoutError as err:
|
||||||
_LOGGER.debug("Connection to %s timed out in 60 seconds", host)
|
_LOGGER.debug("Connection to %s timed out in %s seconds", host, TIMEOUT_SEC)
|
||||||
raise ConfigEntryNotReady from err
|
raise ConfigEntryNotReady from err
|
||||||
except ClientConnectionError as err:
|
except ClientConnectionError as err:
|
||||||
_LOGGER.debug("ClientConnectionError to %s", host)
|
_LOGGER.debug("ClientConnectionError to %s", host)
|
||||||
|
@@ -20,7 +20,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
|||||||
from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
|
from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
|
||||||
from homeassistant.util.ssl import client_context_no_verify
|
from homeassistant.util.ssl import client_context_no_verify
|
||||||
|
|
||||||
from .const import DOMAIN, KEY_MAC, TIMEOUT
|
from .const import DOMAIN, KEY_MAC, TIMEOUT_SEC
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -84,7 +84,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
|
|||||||
password = None
|
password = None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
async with asyncio.timeout(TIMEOUT):
|
async with asyncio.timeout(TIMEOUT_SEC):
|
||||||
device: Appliance = await DaikinFactory(
|
device: Appliance = await DaikinFactory(
|
||||||
host,
|
host,
|
||||||
async_get_clientsession(self.hass),
|
async_get_clientsession(self.hass),
|
||||||
|
@@ -24,4 +24,4 @@ ATTR_STATE_OFF = "off"
|
|||||||
KEY_MAC = "mac"
|
KEY_MAC = "mac"
|
||||||
KEY_IP = "ip"
|
KEY_IP = "ip"
|
||||||
|
|
||||||
TIMEOUT = 60
|
TIMEOUT_SEC = 120
|
||||||
|
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
|
|||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
||||||
|
|
||||||
from .const import DOMAIN
|
from .const import DOMAIN, TIMEOUT_SEC
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ class DaikinCoordinator(DataUpdateCoordinator[None]):
|
|||||||
_LOGGER,
|
_LOGGER,
|
||||||
config_entry=entry,
|
config_entry=entry,
|
||||||
name=device.values.get("name", DOMAIN),
|
name=device.values.get("name", DOMAIN),
|
||||||
update_interval=timedelta(seconds=60),
|
update_interval=timedelta(seconds=TIMEOUT_SEC),
|
||||||
)
|
)
|
||||||
self.device = device
|
self.device = device
|
||||||
|
|
||||||
|
@@ -6,6 +6,6 @@
|
|||||||
"documentation": "https://www.home-assistant.io/integrations/daikin",
|
"documentation": "https://www.home-assistant.io/integrations/daikin",
|
||||||
"iot_class": "local_polling",
|
"iot_class": "local_polling",
|
||||||
"loggers": ["pydaikin"],
|
"loggers": ["pydaikin"],
|
||||||
"requirements": ["pydaikin==2.16.0"],
|
"requirements": ["pydaikin==2.17.1"],
|
||||||
"zeroconf": ["_dkapi._tcp.local."]
|
"zeroconf": ["_dkapi._tcp.local."]
|
||||||
}
|
}
|
||||||
|
@@ -32,6 +32,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|||||||
entry,
|
entry,
|
||||||
options={**entry.options, CONF_SOURCE: source_entity_id},
|
options={**entry.options, CONF_SOURCE: source_entity_id},
|
||||||
)
|
)
|
||||||
|
hass.config_entries.async_schedule_reload(entry.entry_id)
|
||||||
|
|
||||||
entry.async_on_unload(
|
entry.async_on_unload(
|
||||||
async_handle_source_entity_changes(
|
async_handle_source_entity_changes(
|
||||||
@@ -46,15 +47,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
await hass.config_entries.async_forward_entry_setups(entry, (Platform.SENSOR,))
|
await hass.config_entries.async_forward_entry_setups(entry, (Platform.SENSOR,))
|
||||||
entry.async_on_unload(entry.add_update_listener(config_entry_update_listener))
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
|
|
||||||
"""Update listener, called when the config entry options are changed."""
|
|
||||||
await hass.config_entries.async_reload(entry.entry_id)
|
|
||||||
|
|
||||||
|
|
||||||
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||||
"""Unload a config entry."""
|
"""Unload a config entry."""
|
||||||
return await hass.config_entries.async_unload_platforms(entry, (Platform.SENSOR,))
|
return await hass.config_entries.async_unload_platforms(entry, (Platform.SENSOR,))
|
||||||
|
@@ -140,6 +140,7 @@ class ConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
|
|||||||
|
|
||||||
config_flow = CONFIG_FLOW
|
config_flow = CONFIG_FLOW
|
||||||
options_flow = OPTIONS_FLOW
|
options_flow = OPTIONS_FLOW
|
||||||
|
options_flow_reloads = True
|
||||||
|
|
||||||
VERSION = 1
|
VERSION = 1
|
||||||
MINOR_VERSION = 4
|
MINOR_VERSION = 4
|
||||||
|
@@ -6,12 +6,13 @@ from typing import TYPE_CHECKING, Any, Protocol
|
|||||||
|
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.const import CONF_DOMAIN
|
from homeassistant.const import CONF_DOMAIN, CONF_OPTIONS
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers import config_validation as cv
|
from homeassistant.helpers import config_validation as cv
|
||||||
from homeassistant.helpers.condition import (
|
from homeassistant.helpers.condition import (
|
||||||
Condition,
|
Condition,
|
||||||
ConditionCheckerType,
|
ConditionCheckerType,
|
||||||
|
ConditionConfig,
|
||||||
trace_condition_function,
|
trace_condition_function,
|
||||||
)
|
)
|
||||||
from homeassistant.helpers.typing import ConfigType
|
from homeassistant.helpers.typing import ConfigType
|
||||||
@@ -55,19 +56,40 @@ class DeviceAutomationConditionProtocol(Protocol):
|
|||||||
class DeviceCondition(Condition):
|
class DeviceCondition(Condition):
|
||||||
"""Device condition."""
|
"""Device condition."""
|
||||||
|
|
||||||
def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
|
_hass: HomeAssistant
|
||||||
"""Initialize condition."""
|
_config: ConfigType
|
||||||
self._config = config
|
|
||||||
self._hass = hass
|
@classmethod
|
||||||
|
async def async_validate_complete_config(
|
||||||
|
cls, hass: HomeAssistant, complete_config: ConfigType
|
||||||
|
) -> ConfigType:
|
||||||
|
"""Validate complete config."""
|
||||||
|
complete_config = await async_validate_device_automation_config(
|
||||||
|
hass,
|
||||||
|
complete_config,
|
||||||
|
cv.DEVICE_CONDITION_SCHEMA,
|
||||||
|
DeviceAutomationType.CONDITION,
|
||||||
|
)
|
||||||
|
# Since we don't want to migrate device conditions to a new format
|
||||||
|
# we just pass the entire config as options.
|
||||||
|
complete_config[CONF_OPTIONS] = complete_config.copy()
|
||||||
|
return complete_config
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
async def async_validate_config(
|
async def async_validate_config(
|
||||||
cls, hass: HomeAssistant, config: ConfigType
|
cls, hass: HomeAssistant, config: ConfigType
|
||||||
) -> ConfigType:
|
) -> ConfigType:
|
||||||
"""Validate device condition config."""
|
"""Validate config.
|
||||||
return await async_validate_device_automation_config(
|
|
||||||
hass, config, cv.DEVICE_CONDITION_SCHEMA, DeviceAutomationType.CONDITION
|
This is here just to satisfy the abstract class interface. It is never called.
|
||||||
)
|
"""
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
|
||||||
|
"""Initialize condition."""
|
||||||
|
self._hass = hass
|
||||||
|
assert config.options is not None
|
||||||
|
self._config = config.options
|
||||||
|
|
||||||
async def async_get_checker(self) -> condition.ConditionCheckerType:
|
async def async_get_checker(self) -> condition.ConditionCheckerType:
|
||||||
"""Test a device condition."""
|
"""Test a device condition."""
|
||||||
|
@@ -126,7 +126,7 @@ class DevoloRemoteControl(DevoloDeviceEntity, BinarySensorEntity):
|
|||||||
self._attr_translation_key = "button"
|
self._attr_translation_key = "button"
|
||||||
self._attr_translation_placeholders = {"key": str(key)}
|
self._attr_translation_placeholders = {"key": str(key)}
|
||||||
|
|
||||||
def _sync(self, message: tuple) -> None:
|
def sync_callback(self, message: tuple) -> None:
|
||||||
"""Update the binary sensor state."""
|
"""Update the binary sensor state."""
|
||||||
if (
|
if (
|
||||||
message[0] == self._remote_control_property.element_uid
|
message[0] == self._remote_control_property.element_uid
|
||||||
|
@@ -48,7 +48,6 @@ class DevoloDeviceEntity(Entity):
|
|||||||
)
|
)
|
||||||
|
|
||||||
self.subscriber: Subscriber | None = None
|
self.subscriber: Subscriber | None = None
|
||||||
self.sync_callback = self._sync
|
|
||||||
|
|
||||||
self._value: float
|
self._value: float
|
||||||
|
|
||||||
@@ -69,7 +68,7 @@ class DevoloDeviceEntity(Entity):
|
|||||||
self._device_instance.uid, self.subscriber
|
self._device_instance.uid, self.subscriber
|
||||||
)
|
)
|
||||||
|
|
||||||
def _sync(self, message: tuple) -> None:
|
def sync_callback(self, message: tuple) -> None:
|
||||||
"""Update the state."""
|
"""Update the state."""
|
||||||
if message[0] == self._attr_unique_id:
|
if message[0] == self._attr_unique_id:
|
||||||
self._value = message[1]
|
self._value = message[1]
|
||||||
|
@@ -185,7 +185,7 @@ class DevoloConsumptionEntity(DevoloMultiLevelDeviceEntity):
|
|||||||
"""
|
"""
|
||||||
return f"{self._attr_unique_id}_{self._sensor_type}"
|
return f"{self._attr_unique_id}_{self._sensor_type}"
|
||||||
|
|
||||||
def _sync(self, message: tuple) -> None:
|
def sync_callback(self, message: tuple) -> None:
|
||||||
"""Update the consumption sensor state."""
|
"""Update the consumption sensor state."""
|
||||||
if message[0] == self._attr_unique_id:
|
if message[0] == self._attr_unique_id:
|
||||||
self._value = getattr(
|
self._value = getattr(
|
||||||
|
@@ -13,8 +13,3 @@ class Subscriber:
|
|||||||
"""Initiate the subscriber."""
|
"""Initiate the subscriber."""
|
||||||
self.name = name
|
self.name = name
|
||||||
self.callback = callback
|
self.callback = callback
|
||||||
|
|
||||||
def update(self, message: str) -> None:
|
|
||||||
"""Trigger hass to update the device."""
|
|
||||||
_LOGGER.debug('%s got message "%s"', self.name, message)
|
|
||||||
self.callback(message)
|
|
||||||
|
@@ -64,7 +64,7 @@ class DevoloSwitch(DevoloDeviceEntity, SwitchEntity):
|
|||||||
"""Switch off the device."""
|
"""Switch off the device."""
|
||||||
self._binary_switch_property.set(state=False)
|
self._binary_switch_property.set(state=False)
|
||||||
|
|
||||||
def _sync(self, message: tuple) -> None:
|
def sync_callback(self, message: tuple) -> None:
|
||||||
"""Update the binary switch state and consumption."""
|
"""Update the binary switch state and consumption."""
|
||||||
if message[0].startswith("devolo.BinarySwitch"):
|
if message[0].startswith("devolo.BinarySwitch"):
|
||||||
self._attr_is_on = self._device_instance.binary_switch_property[
|
self._attr_is_on = self._device_instance.binary_switch_property[
|
||||||
|
@@ -17,6 +17,6 @@
|
|||||||
"requirements": [
|
"requirements": [
|
||||||
"aiodhcpwatcher==1.2.1",
|
"aiodhcpwatcher==1.2.1",
|
||||||
"aiodiscover==2.7.1",
|
"aiodiscover==2.7.1",
|
||||||
"cached-ipaddress==0.10.0"
|
"cached-ipaddress==1.0.1"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@@ -56,16 +56,16 @@ async def async_setup_entry(
|
|||||||
hostname = entry.data[CONF_HOSTNAME]
|
hostname = entry.data[CONF_HOSTNAME]
|
||||||
name = entry.data[CONF_NAME]
|
name = entry.data[CONF_NAME]
|
||||||
|
|
||||||
resolver_ipv4 = entry.options[CONF_RESOLVER]
|
nameserver_ipv4 = entry.options[CONF_RESOLVER]
|
||||||
resolver_ipv6 = entry.options[CONF_RESOLVER_IPV6]
|
nameserver_ipv6 = entry.options[CONF_RESOLVER_IPV6]
|
||||||
port_ipv4 = entry.options[CONF_PORT]
|
port_ipv4 = entry.options[CONF_PORT]
|
||||||
port_ipv6 = entry.options[CONF_PORT_IPV6]
|
port_ipv6 = entry.options[CONF_PORT_IPV6]
|
||||||
|
|
||||||
entities = []
|
entities = []
|
||||||
if entry.data[CONF_IPV4]:
|
if entry.data[CONF_IPV4]:
|
||||||
entities.append(WanIpSensor(name, hostname, resolver_ipv4, False, port_ipv4))
|
entities.append(WanIpSensor(name, hostname, nameserver_ipv4, False, port_ipv4))
|
||||||
if entry.data[CONF_IPV6]:
|
if entry.data[CONF_IPV6]:
|
||||||
entities.append(WanIpSensor(name, hostname, resolver_ipv6, True, port_ipv6))
|
entities.append(WanIpSensor(name, hostname, nameserver_ipv6, True, port_ipv6))
|
||||||
|
|
||||||
async_add_entities(entities, update_before_add=True)
|
async_add_entities(entities, update_before_add=True)
|
||||||
|
|
||||||
@@ -77,11 +77,13 @@ class WanIpSensor(SensorEntity):
|
|||||||
_attr_translation_key = "dnsip"
|
_attr_translation_key = "dnsip"
|
||||||
_unrecorded_attributes = frozenset({"resolver", "querytype", "ip_addresses"})
|
_unrecorded_attributes = frozenset({"resolver", "querytype", "ip_addresses"})
|
||||||
|
|
||||||
|
resolver: aiodns.DNSResolver
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
name: str,
|
name: str,
|
||||||
hostname: str,
|
hostname: str,
|
||||||
resolver: str,
|
nameserver: str,
|
||||||
ipv6: bool,
|
ipv6: bool,
|
||||||
port: int,
|
port: int,
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -90,11 +92,11 @@ class WanIpSensor(SensorEntity):
|
|||||||
self._attr_unique_id = f"{hostname}_{ipv6}"
|
self._attr_unique_id = f"{hostname}_{ipv6}"
|
||||||
self.hostname = hostname
|
self.hostname = hostname
|
||||||
self.port = port
|
self.port = port
|
||||||
self._resolver = resolver
|
self.nameserver = nameserver
|
||||||
self.querytype: Literal["A", "AAAA"] = "AAAA" if ipv6 else "A"
|
self.querytype: Literal["A", "AAAA"] = "AAAA" if ipv6 else "A"
|
||||||
self._retries = DEFAULT_RETRIES
|
self._retries = DEFAULT_RETRIES
|
||||||
self._attr_extra_state_attributes = {
|
self._attr_extra_state_attributes = {
|
||||||
"resolver": resolver,
|
"resolver": nameserver,
|
||||||
"querytype": self.querytype,
|
"querytype": self.querytype,
|
||||||
}
|
}
|
||||||
self._attr_device_info = DeviceInfo(
|
self._attr_device_info = DeviceInfo(
|
||||||
@@ -104,13 +106,13 @@ class WanIpSensor(SensorEntity):
|
|||||||
model=aiodns.__version__,
|
model=aiodns.__version__,
|
||||||
name=name,
|
name=name,
|
||||||
)
|
)
|
||||||
self.resolver: aiodns.DNSResolver
|
|
||||||
self.create_dns_resolver()
|
self.create_dns_resolver()
|
||||||
|
|
||||||
def create_dns_resolver(self) -> None:
|
def create_dns_resolver(self) -> None:
|
||||||
"""Create the DNS resolver."""
|
"""Create the DNS resolver."""
|
||||||
self.resolver = aiodns.DNSResolver(tcp_port=self.port, udp_port=self.port)
|
self.resolver = aiodns.DNSResolver(
|
||||||
self.resolver.nameservers = [self._resolver]
|
nameservers=[self.nameserver], tcp_port=self.port, udp_port=self.port
|
||||||
|
)
|
||||||
|
|
||||||
async def async_update(self) -> None:
|
async def async_update(self) -> None:
|
||||||
"""Get the current DNS IP address for hostname."""
|
"""Get the current DNS IP address for hostname."""
|
||||||
|
@@ -24,6 +24,7 @@ from homeassistant.core import HomeAssistant, callback
|
|||||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
||||||
from homeassistant.util import dt as dt_util
|
from homeassistant.util import dt as dt_util
|
||||||
|
from homeassistant.util.unit_conversion import EnergyConverter
|
||||||
|
|
||||||
from .const import DOMAIN
|
from .const import DOMAIN
|
||||||
|
|
||||||
@@ -146,6 +147,7 @@ class DukeEnergyCoordinator(DataUpdateCoordinator[None]):
|
|||||||
name=f"{name_prefix} Consumption",
|
name=f"{name_prefix} Consumption",
|
||||||
source=DOMAIN,
|
source=DOMAIN,
|
||||||
statistic_id=consumption_statistic_id,
|
statistic_id=consumption_statistic_id,
|
||||||
|
unit_class=EnergyConverter.UNIT_CLASS,
|
||||||
unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR
|
unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR
|
||||||
if meter["serviceType"] == "ELECTRIC"
|
if meter["serviceType"] == "ELECTRIC"
|
||||||
else UnitOfVolume.CENTUM_CUBIC_FEET,
|
else UnitOfVolume.CENTUM_CUBIC_FEET,
|
||||||
|
@@ -116,6 +116,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"select": {
|
"select": {
|
||||||
|
"active_map": {
|
||||||
|
"default": "mdi:floor-plan"
|
||||||
|
},
|
||||||
"water_amount": {
|
"water_amount": {
|
||||||
"default": "mdi:water"
|
"default": "mdi:water"
|
||||||
},
|
},
|
||||||
|
@@ -2,12 +2,13 @@
|
|||||||
|
|
||||||
from collections.abc import Callable
|
from collections.abc import Callable
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import Any
|
from typing import TYPE_CHECKING, Any
|
||||||
|
|
||||||
from deebot_client.capabilities import CapabilitySetTypes
|
from deebot_client.capabilities import CapabilityMap, CapabilitySet, CapabilitySetTypes
|
||||||
from deebot_client.device import Device
|
from deebot_client.device import Device
|
||||||
from deebot_client.events import WorkModeEvent
|
from deebot_client.events import WorkModeEvent
|
||||||
from deebot_client.events.base import Event
|
from deebot_client.events.base import Event
|
||||||
|
from deebot_client.events.map import CachedMapInfoEvent, MajorMapEvent
|
||||||
from deebot_client.events.water_info import WaterAmountEvent
|
from deebot_client.events.water_info import WaterAmountEvent
|
||||||
|
|
||||||
from homeassistant.components.select import SelectEntity, SelectEntityDescription
|
from homeassistant.components.select import SelectEntity, SelectEntityDescription
|
||||||
@@ -16,7 +17,11 @@ from homeassistant.core import HomeAssistant
|
|||||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||||
|
|
||||||
from . import EcovacsConfigEntry
|
from . import EcovacsConfigEntry
|
||||||
from .entity import EcovacsCapabilityEntityDescription, EcovacsDescriptionEntity
|
from .entity import (
|
||||||
|
EcovacsCapabilityEntityDescription,
|
||||||
|
EcovacsDescriptionEntity,
|
||||||
|
EcovacsEntity,
|
||||||
|
)
|
||||||
from .util import get_name_key, get_supported_entities
|
from .util import get_name_key, get_supported_entities
|
||||||
|
|
||||||
|
|
||||||
@@ -66,6 +71,12 @@ async def async_setup_entry(
|
|||||||
entities = get_supported_entities(
|
entities = get_supported_entities(
|
||||||
controller, EcovacsSelectEntity, ENTITY_DESCRIPTIONS
|
controller, EcovacsSelectEntity, ENTITY_DESCRIPTIONS
|
||||||
)
|
)
|
||||||
|
entities.extend(
|
||||||
|
EcovacsActiveMapSelectEntity(device, device.capabilities.map)
|
||||||
|
for device in controller.devices
|
||||||
|
if (map_cap := device.capabilities.map)
|
||||||
|
and isinstance(map_cap.major, CapabilitySet)
|
||||||
|
)
|
||||||
if entities:
|
if entities:
|
||||||
async_add_entities(entities)
|
async_add_entities(entities)
|
||||||
|
|
||||||
@@ -103,3 +114,76 @@ class EcovacsSelectEntity[EventT: Event](
|
|||||||
async def async_select_option(self, option: str) -> None:
|
async def async_select_option(self, option: str) -> None:
|
||||||
"""Change the selected option."""
|
"""Change the selected option."""
|
||||||
await self._device.execute_command(self._capability.set(option))
|
await self._device.execute_command(self._capability.set(option))
|
||||||
|
|
||||||
|
|
||||||
|
class EcovacsActiveMapSelectEntity(
|
||||||
|
EcovacsEntity[CapabilityMap],
|
||||||
|
SelectEntity,
|
||||||
|
):
|
||||||
|
"""Ecovacs active map select entity."""
|
||||||
|
|
||||||
|
entity_description = SelectEntityDescription(
|
||||||
|
key="active_map",
|
||||||
|
translation_key="active_map",
|
||||||
|
entity_category=EntityCategory.CONFIG,
|
||||||
|
)
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
device: Device,
|
||||||
|
capability: CapabilityMap,
|
||||||
|
**kwargs: Any,
|
||||||
|
) -> None:
|
||||||
|
"""Initialize entity."""
|
||||||
|
super().__init__(device, capability, **kwargs)
|
||||||
|
self._option_to_id: dict[str, str] = {}
|
||||||
|
self._id_to_option: dict[str, str] = {}
|
||||||
|
|
||||||
|
self._handle_on_cached_map(
|
||||||
|
device.events.get_last_event(CachedMapInfoEvent)
|
||||||
|
or CachedMapInfoEvent(set())
|
||||||
|
)
|
||||||
|
|
||||||
|
def _handle_on_cached_map(self, event: CachedMapInfoEvent) -> None:
|
||||||
|
self._id_to_option.clear()
|
||||||
|
self._option_to_id.clear()
|
||||||
|
|
||||||
|
for map_info in event.maps:
|
||||||
|
name = map_info.name if map_info.name else map_info.id
|
||||||
|
self._id_to_option[map_info.id] = name
|
||||||
|
self._option_to_id[name] = map_info.id
|
||||||
|
|
||||||
|
if map_info.using:
|
||||||
|
self._attr_current_option = name
|
||||||
|
|
||||||
|
if self._attr_current_option not in self._option_to_id:
|
||||||
|
self._attr_current_option = None
|
||||||
|
|
||||||
|
# Sort named maps first, then numeric IDs (unnamed maps during building) in ascending order.
|
||||||
|
self._attr_options = sorted(
|
||||||
|
self._option_to_id.keys(), key=lambda x: (x.isdigit(), x.lower())
|
||||||
|
)
|
||||||
|
|
||||||
|
async def async_added_to_hass(self) -> None:
|
||||||
|
"""Set up the event listeners now that hass is ready."""
|
||||||
|
await super().async_added_to_hass()
|
||||||
|
|
||||||
|
async def on_cached_map(event: CachedMapInfoEvent) -> None:
|
||||||
|
self._handle_on_cached_map(event)
|
||||||
|
self.async_write_ha_state()
|
||||||
|
|
||||||
|
self._subscribe(self._capability.cached_info.event, on_cached_map)
|
||||||
|
|
||||||
|
async def on_major_map(event: MajorMapEvent) -> None:
|
||||||
|
self._attr_current_option = self._id_to_option.get(event.map_id)
|
||||||
|
self.async_write_ha_state()
|
||||||
|
|
||||||
|
self._subscribe(self._capability.major.event, on_major_map)
|
||||||
|
|
||||||
|
async def async_select_option(self, option: str) -> None:
|
||||||
|
"""Change the selected option."""
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
assert isinstance(self._capability.major, CapabilitySet)
|
||||||
|
await self._device.execute_command(
|
||||||
|
self._capability.major.set(self._option_to_id[option])
|
||||||
|
)
|
||||||
|
@@ -2,3 +2,4 @@ raw_get_positions:
|
|||||||
target:
|
target:
|
||||||
entity:
|
entity:
|
||||||
domain: vacuum
|
domain: vacuum
|
||||||
|
integration: ecovacs
|
||||||
|
@@ -178,6 +178,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"select": {
|
"select": {
|
||||||
|
"active_map": {
|
||||||
|
"name": "Active map"
|
||||||
|
},
|
||||||
"water_amount": {
|
"water_amount": {
|
||||||
"name": "[%key:component::ecovacs::entity::number::water_amount::name%]",
|
"name": "[%key:component::ecovacs::entity::number::water_amount::name%]",
|
||||||
"state": {
|
"state": {
|
||||||
|
@@ -20,6 +20,7 @@ from homeassistant.components.recorder.statistics import (
|
|||||||
from homeassistant.components.recorder.util import get_instance
|
from homeassistant.components.recorder.util import get_instance
|
||||||
from homeassistant.const import UnitOfEnergy
|
from homeassistant.const import UnitOfEnergy
|
||||||
from homeassistant.util import dt as dt_util
|
from homeassistant.util import dt as dt_util
|
||||||
|
from homeassistant.util.unit_conversion import EnergyConverter
|
||||||
|
|
||||||
from .const import DOMAIN, LOGGER
|
from .const import DOMAIN, LOGGER
|
||||||
|
|
||||||
@@ -153,6 +154,7 @@ class ElviaImporter:
|
|||||||
name=f"{self.metering_point_id} Consumption",
|
name=f"{self.metering_point_id} Consumption",
|
||||||
source=DOMAIN,
|
source=DOMAIN,
|
||||||
statistic_id=statistic_id,
|
statistic_id=statistic_id,
|
||||||
|
unit_class=EnergyConverter.UNIT_CLASS,
|
||||||
unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
|
unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
|
||||||
),
|
),
|
||||||
statistics=statistics,
|
statistics=statistics,
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user