Skip to content

Commit 04bd950

Browse files
bouwewbouwew
committed
Try 2
1 parent ce56e7a commit 04bd950

File tree

1 file changed

+56
-88
lines changed

1 file changed

+56
-88
lines changed

‎plugwise_usb/messages/requests.py‎

Lines changed: 56 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,9 @@ class StickNetworkInfoRequest(PlugwiseRequest):
355355
_identifier = b"0001"
356356
_reply_identifier = b"0002"
357357

358-
async def send(
359-
self, suppress_node_errors: bool = False
360-
) -> StickNetworkInfoResponse | None:
358+
async def send(self) -> StickNetworkInfoResponse | None:
361359
"""Send request."""
362-
result = await self._send_request(suppress_node_errors)
360+
result = await self._send_request()
363361
if isinstance(result, StickNetworkInfoResponse):
364362
return result
365363
if result is None:
@@ -379,11 +377,9 @@ class CirclePlusConnectRequest(PlugwiseRequest):
379377
_identifier = b"0004"
380378
_reply_identifier = b"0005"
381379

382-
async def send(
383-
self, suppress_node_errors: bool = False
384-
) -> CirclePlusConnectResponse | None:
380+
async def send(self) -> CirclePlusConnectResponse | None:
385381
"""Send request."""
386-
result = await self._send_request(suppress_node_errors)
382+
result = await self._send_request()
387383
if isinstance(result, CirclePlusConnectResponse):
388384
return result
389385
if result is None:
@@ -429,10 +425,10 @@ def __init__(
429425
accept_value = 1 if accept else 0
430426
self._args.append(Int(accept_value, length=2))
431427

432-
async def send(self, suppress_node_errors, no_response_expected) -> None:
428+
async def send(self) -> None:
433429
"""Send request."""
434430
if (
435-
result := await self._send_request(False, True)
431+
result := await self._send_request()
436432
) is not None:
437433
raise MessageError(
438434
f"Invalid response message. Received {result.__class__.__name__}, expected no Response"
@@ -472,9 +468,9 @@ def __init__(
472468
val = 1 if enable else 0
473469
self._args.append(Int(val, length=2))
474470

475-
async def send(self, suppress_node_errors: bool = False) -> NodeResponse | None:
471+
async def send(self) -> NodeResponse | None:
476472
"""Send request."""
477-
result = await self._send_request(suppress_node_errors)
473+
result = await self._send_request()
478474
if isinstance(result, NodeResponse):
479475
return result
480476
if result is None:
@@ -508,11 +504,9 @@ def __init__(
508504
Int(timeout, length=2),
509505
]
510506

511-
async def send(
512-
self, suppress_node_errors: bool = False
513-
) -> NodeSpecificResponse | None:
507+
async def send(self) -> NodeSpecificResponse | None:
514508
"""Send request."""
515-
result = await self._send_request(suppress_node_errors)
509+
result = await self._send_request()
516510
if isinstance(result, NodeSpecificResponse):
517511
return result
518512
if result is None:
@@ -540,13 +534,11 @@ def __init__(
540534
super().__init__(send_fn, None)
541535
self._max_retries = 1
542536

543-
async def send(
544-
self, suppress_node_errors: bool = False
545-
) -> StickInitResponse | None:
537+
async def send(self) -> StickInitResponse | None:
546538
"""Send request."""
547539
if self._send_fn is None:
548540
raise MessageError("Send function missing")
549-
result = await self._send_request(suppress_node_errors)
541+
result = await self._send_request()
550542
if isinstance(result, StickInitResponse):
551543
return result
552544
if result is None:
@@ -566,11 +558,9 @@ class NodeImagePrepareRequest(PlugwiseRequest):
566558
_identifier = b"000B"
567559
_reply_identifier = b"0003"
568560

569-
async def send(
570-
self, suppress_node_errors: bool = False
571-
) -> NodeSpecificResponse | None:
561+
async def send(self) -> NodeSpecificResponse | None:
572562
"""Send request."""
573-
result = await self._send_request(suppress_node_errors)
563+
result = await self._send_request()
574564
if isinstance(result, NodeSpecificResponse):
575565
return result
576566
if result is None:
@@ -590,11 +580,9 @@ class NodeImageValidateRequest(PlugwiseRequest):
590580
_identifier = b"000C"
591581
_reply_identifier = b"0010"
592582

593-
async def send(
594-
self, suppress_node_errors: bool = False
595-
) -> NodeImageValidationResponse | None:
583+
async def send(self) -> NodeImageValidationResponse | None:
596584
"""Send request."""
597-
result = await self._send_request(suppress_node_errors)
585+
result = await self._send_request()
598586
if isinstance(result, NodeImageValidationResponse):
599587
return result
600588
if result is None:
@@ -625,9 +613,9 @@ def __init__(
625613
self._reply_identifier = b"000E"
626614
self._max_retries = retries
627615

628-
async def send(self, suppress_node_errors: bool = False) -> NodePingResponse | None:
616+
async def send(self) -> NodePingResponse | None:
629617
"""Send request."""
630-
result = await self._send_request(suppress_node_errors)
618+
result = await self._send_request()
631619
if isinstance(result, NodePingResponse):
632620
return result
633621
if result is None:
@@ -671,11 +659,9 @@ class CirclePowerUsageRequest(PlugwiseRequest):
671659
_identifier = b"0012"
672660
_reply_identifier = b"0013"
673661

674-
async def send(
675-
self, suppress_node_errors: bool = False
676-
) -> CirclePowerUsageResponse | None:
662+
async def send(self) -> CirclePowerUsageResponse | None:
677663
"""Send request."""
678-
result = await self._send_request(suppress_node_errors)
664+
result = await self._send_request()
679665
if isinstance(result, CirclePowerUsageResponse):
680666
return result
681667
if result is None:
@@ -725,11 +711,9 @@ def __init__(
725711
to_abs = DateTime(end.year, end.month, month_minutes_end)
726712
self._args += [from_abs, to_abs]
727713

728-
async def send(
729-
self, suppress_node_errors: bool = False
730-
) -> CircleLogDataResponse | None:
714+
async def send(self) -> CircleLogDataResponse | None:
731715
"""Send request."""
732-
result = await self._send_request(suppress_node_errors)
716+
result = await self._send_request()
733717
if isinstance(result, CircleLogDataResponse):
734718
return result
735719
if result is None:
@@ -783,9 +767,9 @@ def __init__(
783767
else:
784768
self._args += [this_date, String("FFFFFFFF", 8), this_time, day_of_week]
785769

786-
async def send(self, suppress_node_errors: bool = False) -> NodeResponse | None:
770+
async def send(self) -> NodeResponse | None:
787771
"""Send request."""
788-
result = await self._send_request(suppress_node_errors)
772+
result = await self._send_request()
789773
if isinstance(result, NodeResponse):
790774
return result
791775
if result is None:
@@ -816,9 +800,9 @@ def __init__(
816800
val = 1 if on else 0
817801
self._args.append(Int(val, length=2))
818802

819-
async def send(self, suppress_node_errors: bool = False) -> NodeResponse | None:
803+
async def send(self) -> NodeResponse | None:
820804
"""Send request."""
821-
result = await self._send_request(suppress_node_errors)
805+
result = await self._send_request()
822806
if isinstance(result, NodeResponse):
823807
return result
824808
if result is None:
@@ -856,11 +840,9 @@ def __repr__(self) -> str:
856840
"""Convert request into writable str."""
857841
return f"{super().__repr__()[:-1]}, network_address={self.network_address})"
858842

859-
async def send(
860-
self, suppress_node_errors: bool = False
861-
) -> CirclePlusScanResponse | None:
843+
async def send(self) -> CirclePlusScanResponse | None:
862844
"""Send request."""
863-
result = await self._send_request(suppress_node_errors)
845+
result = await self._send_request()
864846
if isinstance(result, CirclePlusScanResponse):
865847
return result
866848
if result is None:
@@ -890,11 +872,9 @@ def __init__(
890872
super().__init__(send_fn, mac_circle_plus)
891873
self._args.append(String(mac_to_unjoined, length=16))
892874

893-
async def send(
894-
self, suppress_node_errors: bool = False
895-
) -> NodeRemoveResponse | None:
875+
async def send(self) -> NodeRemoveResponse | None:
896876
"""Send request."""
897-
result = await self._send_request(suppress_node_errors)
877+
result = await self._send_request()
898878
if isinstance(result, NodeRemoveResponse):
899879
return result
900880
if result is None:
@@ -924,9 +904,9 @@ def __init__(
924904
super().__init__(send_fn, mac)
925905
self._max_retries = retries
926906

927-
async def send(self, suppress_node_errors: bool = False) -> NodeInfoResponse | None:
907+
async def send(self) -> NodeInfoResponse | None:
928908
"""Send request."""
929-
result = await self._send_request(suppress_node_errors)
909+
result = await self._send_request()
930910
if isinstance(result, NodeInfoResponse):
931911
return result
932912
if result is None:
@@ -946,11 +926,9 @@ class EnergyCalibrationRequest(PlugwiseRequest):
946926
_identifier = b"0026"
947927
_reply_identifier = b"0027"
948928

949-
async def send(
950-
self, suppress_node_errors: bool = False
951-
) -> EnergyCalibrationResponse | None:
929+
async def send(self) -> EnergyCalibrationResponse | None:
952930
"""Send request."""
953-
result = await self._send_request(suppress_node_errors)
931+
result = await self._send_request()
954932
if isinstance(result, EnergyCalibrationResponse):
955933
return result
956934
if result is None:
@@ -983,9 +961,9 @@ def __init__(
983961
this_date = RealClockDate(dt.day, dt.month, dt.year)
984962
self._args += [this_time, day_of_week, this_date]
985963

986-
async def send(self, suppress_node_errors: bool = False) -> NodeResponse | None:
964+
async def send(self) -> NodeResponse | None:
987965
"""Send request."""
988-
result = await self._send_request(suppress_node_errors)
966+
result = await self._send_request()
989967
if isinstance(result, NodeResponse):
990968
return result
991969
if result is None:
@@ -1005,11 +983,9 @@ class CirclePlusRealTimeClockGetRequest(PlugwiseRequest):
1005983
_identifier = b"0029"
1006984
_reply_identifier = b"003A"
1007985

1008-
async def send(
1009-
self, suppress_node_errors: bool = False
1010-
) -> CirclePlusRealTimeClockResponse | None:
986+
async def send(self) -> CirclePlusRealTimeClockResponse | None:
1011987
"""Send request."""
1012-
result = await self._send_request(suppress_node_errors)
988+
result = await self._send_request()
1013989
if isinstance(result, CirclePlusRealTimeClockResponse):
1014990
return result
1015991
if result is None:
@@ -1035,11 +1011,9 @@ class CircleClockGetRequest(PlugwiseRequest):
10351011
_identifier = b"003E"
10361012
_reply_identifier = b"003F"
10371013

1038-
async def send(
1039-
self, suppress_node_errors: bool = False
1040-
) -> CircleClockResponse | None:
1014+
async def send(self) -> CircleClockResponse | None:
10411015
"""Send request."""
1042-
result = await self._send_request(suppress_node_errors)
1016+
result = await self._send_request()
10431017
if isinstance(result, CircleClockResponse):
10441018
return result
10451019
if result is None:
@@ -1096,9 +1070,9 @@ def __init__(
10961070
port_mask_val = String(port_mask, length=16)
10971071
self._args += [group_mac_val, task_id_val, port_mask_val]
10981072

1099-
async def send(self, suppress_node_errors: bool = False) -> NodeResponse | None:
1073+
async def send(self) -> NodeResponse | None:
11001074
"""Send request."""
1101-
result = await self._send_request(suppress_node_errors)
1075+
result = await self._send_request()
11021076
if isinstance(result, NodeResponse):
11031077
return result
11041078
if result is None:
@@ -1173,11 +1147,9 @@ def __repr__(self) -> str:
11731147
"""Convert request into writable str."""
11741148
return f"{super().__repr__()[:-1]}, log_address={self._log_address})"
11751149

1176-
async def send(
1177-
self, suppress_node_errors: bool = False
1178-
) -> CircleEnergyLogsResponse | None:
1150+
async def send(self) -> CircleEnergyLogsResponse | None:
11791151
"""Send request."""
1180-
result = await self._send_request(suppress_node_errors)
1152+
result = await self._send_request()
11811153
if isinstance(result, CircleEnergyLogsResponse):
11821154
return result
11831155
if result is None:
@@ -1251,9 +1223,9 @@ def __init__(
12511223
self.clock_interval_val,
12521224
]
12531225

1254-
async def send(self, suppress_node_errors: bool = False) -> NodeResponse | None:
1226+
async def send(self) -> NodeResponse | None:
12551227
"""Send request."""
1256-
result = await self._send_request(suppress_node_errors)
1228+
result = await self._send_request()
12571229
_LOGGER.warning("NodeSleepConfigRequest result: %s", result)
12581230
if isinstance(result, NodeResponse):
12591231
return result
@@ -1362,11 +1334,9 @@ def __init__(
13621334
super().__init__(send_fn, mac)
13631335
self._args.append(SInt(val, length=4))
13641336

1365-
async def send(
1366-
self, suppress_node_errors: bool = False
1367-
) -> NodeFeaturesResponse | None:
1337+
async def send(self) -> NodeFeaturesResponse | None:
13681338
"""Send request."""
1369-
result = await self._send_request(suppress_node_errors)
1339+
result = await self._send_request()
13701340
if isinstance(result, NodeFeaturesResponse):
13711341
return result
13721342
if result is None:
@@ -1414,9 +1384,9 @@ def __init__(
14141384
reset_timer_value,
14151385
]
14161386

1417-
async def send(self, suppress_node_errors: bool = False) -> NodeAckResponse | None:
1387+
async def send(self) -> NodeAckResponse | None:
14181388
"""Send request."""
1419-
result = await self._send_request(suppress_node_errors)
1389+
result = await self._send_request()
14201390
if isinstance(result, NodeAckResponse):
14211391
return result
14221392
if result is None:
@@ -1435,9 +1405,9 @@ class ScanLightCalibrateRequest(PlugwiseRequest):
14351405
_identifier = b"0102"
14361406
_reply_identifier = b"0100"
14371407

1438-
async def send(self, suppress_node_errors: bool = False) -> NodeAckResponse | None:
1408+
async def send(self) -> NodeAckResponse | None:
14391409
"""Send request."""
1440-
result = await self._send_request(suppress_node_errors)
1410+
result = await self._send_request()
14411411
if isinstance(result, NodeAckResponse):
14421412
return result
14431413
if result is None:
@@ -1468,9 +1438,9 @@ def __init__(
14681438
super().__init__(send_fn, mac)
14691439
self._args.append(Int(interval, length=2))
14701440

1471-
async def send(self, suppress_node_errors: bool = False) -> NodeAckResponse | None:
1441+
async def send(self) -> NodeAckResponse | None:
14721442
"""Send request."""
1473-
result = await self._send_request(suppress_node_errors)
1443+
result = await self._send_request()
14741444
if isinstance(result, NodeAckResponse):
14751445
return result
14761446
if result is None:
@@ -1504,11 +1474,9 @@ def __init__(
15041474
self.relay = Int(1 if relay_state else 0, length=2)
15051475
self._args += [self.set_or_get, self.relay]
15061476

1507-
async def send(
1508-
self, suppress_node_errors: bool = False
1509-
) -> CircleRelayInitStateResponse | None:
1477+
async def send(self) -> CircleRelayInitStateResponse | None:
15101478
"""Send request."""
1511-
result = await self._send_request(suppress_node_errors)
1479+
result = await self._send_request()
15121480
if isinstance(result, CircleRelayInitStateResponse):
15131481
return result
15141482
if result is None:

0 commit comments

Comments
 (0)