Skip to content

Commit 37820b7

Browse files
committed
Updates by ruff
1 parent c6b2031 commit 37820b7

File tree

1 file changed

+27
-19
lines changed

1 file changed

+27
-19
lines changed

plugwise_usb/nodes/circle.py

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ def _log_no_energy_stats_update(self) -> None:
330330
self.name,
331331
)
332332

333-
334333
@raise_not_loaded
335334
@raise_calibration_missing
336335
async def energy_update(self) -> EnergyStatistics | None:
@@ -465,7 +464,10 @@ async def get_missing_energy_logs(self) -> None:
465464
else:
466465
log_interval = self.energy_consumption_interval
467466
_LOGGER.debug("log_interval: %s", log_interval)
468-
_LOGGER.debug("energy_production_interval: %s", self.energy_production_interval)
467+
_LOGGER.debug(
468+
"energy_production_interval: %s",
469+
self.energy_production_interval,
470+
)
469471
factor = 4
470472
if self.energy_production_interval is not None:
471473
factor = 2
@@ -476,10 +478,15 @@ async def get_missing_energy_logs(self) -> None:
476478
and log_interval is not None
477479
and prev_address_timestamp is not None
478480
and (
479-
prev_address_timestamp - self._last_collected_energy_timestamp
480-
).total_seconds() // 60 > (factor * log_interval) + 5 # minutes
481+
prev_address_timestamp
482+
- self._last_collected_energy_timestamp
483+
).total_seconds()
484+
// 60
485+
> (factor * log_interval) + 5 # minutes
481486
):
482-
_LOGGER.debug("Collected energy data is outdated, stopping collection")
487+
_LOGGER.debug(
488+
"Collected energy data is outdated, stopping collection"
489+
)
483490
break
484491

485492
if self._last_collected_energy_timestamp is not None:
@@ -540,10 +547,7 @@ async def energy_log_update(self, address: int | None) -> bool:
540547
for _slot in range(4, 0, -1):
541548
log_timestamp, log_pulses = response.log_data[_slot]
542549
_LOGGER.debug(
543-
"In slot=%s: pulses=%s, timestamp=%s",
544-
_slot,
545-
log_pulses,
546-
log_timestamp
550+
"In slot=%s: pulses=%s, timestamp=%s", _slot, log_pulses, log_timestamp
547551
)
548552
if log_timestamp is None or log_pulses is None:
549553
self._energy_counters.add_empty_log(response.log_address, _slot)
@@ -556,14 +560,16 @@ async def energy_log_update(self, address: int | None) -> bool:
556560
):
557561
energy_record_update = True
558562
if not last_energy_timestamp_collected:
559-
self._last_collected_energy_timestamp = (
560-
log_timestamp.replace(tzinfo=UTC)
563+
self._last_collected_energy_timestamp = log_timestamp.replace(
564+
tzinfo=UTC
561565
)
562566
last_energy_timestamp_collected = True
563567

564568
self._energy_counters.update()
565569
if energy_record_update:
566-
_LOGGER.debug("Saving energy record update to cache for %s", self._mac_in_str)
570+
_LOGGER.debug(
571+
"Saving energy record update to cache for %s", self._mac_in_str
572+
)
567573
await self.save_cache()
568574

569575
return True
@@ -644,7 +650,7 @@ async def _energy_log_records_save_to_cache(self) -> None:
644650
cached_logs += f"-{log.timestamp.month}-{log.timestamp.day}"
645651
cached_logs += f"-{log.timestamp.hour}-{log.timestamp.minute}"
646652
cached_logs += f"-{log.timestamp.second}:{log.pulses}"
647-
653+
648654
_LOGGER.debug("Saving energy logrecords to cache for %s", self._mac_in_str)
649655
self._set_cache(CACHE_ENERGY_COLLECTION, cached_logs)
650656

@@ -689,7 +695,7 @@ async def _energy_log_record_update_state(
689695
"Cache is empty, adding new logrecord (%s, %s) for %s",
690696
str(address),
691697
str(slot),
692-
self._mac_in_str
698+
self._mac_in_str,
693699
)
694700
self._set_cache(CACHE_ENERGY_COLLECTION, log_cache_record)
695701
return True
@@ -804,7 +810,9 @@ async def _relay_update_lock(self, state: bool, load_from_cache=False) -> None:
804810
NodeFeature.RELAY_LOCK, self._relay_lock
805811
)
806812
if not load_from_cache:
807-
_LOGGER.debug("Saving relay lock state update to cache for %s", self._mac_in_str)
813+
_LOGGER.debug(
814+
"Saving relay lock state update to cache for %s", self._mac_in_str
815+
)
808816
await self.save_cache()
809817

810818
async def clock_synchronize(self) -> bool:
@@ -1151,7 +1159,9 @@ async def _relay_init_update_state(self, state: bool) -> None:
11511159
await self.publish_feature_update_to_subscribers(
11521160
NodeFeature.RELAY_INIT, self._relay_config
11531161
)
1154-
_LOGGER.debug("Saving relay_init state update to cachefor %s", self._mac_in_str)
1162+
_LOGGER.debug(
1163+
"Saving relay_init state update to cachefor %s", self._mac_in_str
1164+
)
11551165
await self.save_cache()
11561166

11571167
@raise_calibration_missing
@@ -1263,9 +1273,7 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
12631273
async def energy_reset_request(self) -> None:
12641274
"""Send an energy-reset to a Node."""
12651275
if self._node_protocols is None:
1266-
raise NodeError(
1267-
"Unable to energy-reset when protocol version is unknown"
1268-
)
1276+
raise NodeError("Unable to energy-reset when protocol version is unknown")
12691277

12701278
request = CircleClockSetRequest(
12711279
self._send,

0 commit comments

Comments
 (0)