Merge pull request #37 from 3dg1luk43/copilot/sub-pr-36

Fix code quality issues from PR #36 review

Author: 3dg1luk43

README.md

@@ -9,7 +9,7 @@
 A Home Assistant custom component to monitor washing machines via smart sockets, learn power profiles, and estimate completion time using shape-correlation matching.
 
 > [!CAUTION]  
-> **ELECTRICAL SAFETY WARNING**: Using smart plugs such as Shelly or Sonoff with high-amperage appliances (washing machines, dryers, dishwriters) carries significant risk.  
+> **ELECTRICAL SAFETY WARNING**: Using smart plugs such as Shelly or Sonoff with high-amperage appliances (washing machines, dryers, dishwashers) carries significant risk.  
 > 
 > *   **Fire Hazard**: Cheap or low-rated smart plugs may overheat, melt, or catch fire under sustained high loads (heating/drying phases).  
 > *   **Rating Check**: Ensure your smart plug is rated for the **maximum peak power** of your appliance (often >2500W). Standard 10A plugs may fail; 16A+ or hardwired modules are recommended.  

custom_components/ha_washdata/cycle_detector.py

@@ -73,6 +73,7 @@ def reset(self) -> None:
         self._ma_buffer = []
         self._cycle_status = None
         self._last_power = None
+        self._abrupt_drop = False
         self._potential_start_time = None
         self._end_condition_count = 0
         self._extension_count = 0

custom_components/ha_washdata/manager.py

@@ -301,7 +301,13 @@ async def _attempt_state_restoration(self) -> None:
                 current_power = float(state.state)
                 power_is_valid = True
             except (ValueError, TypeError):
-                pass
+                # Power sensor state is not numeric during restoration; treat as 0W
+                _LOGGER.debug(
+                    "Power sensor %s state %r is not numeric during restoration; "
+                    "treating as 0W and not restoring by power",
+                    self.power_sensor_entity_id,
+                    getattr(state, "state", None),
+                )
 
         should_restore = False
         active_snapshot_to_restore = active_snapshot
@@ -374,9 +380,15 @@ def is_viable_restore(last_save_time: datetime) -> bool:
                     # Restore manual program flag if present
                     self._manual_program_active = active_snapshot_to_restore.get("manual_program", False)
 
-                    # If we restored into a low-power state, ensure we don't immediately quit
+                    # If we restored into a low-power state, ensure we don't immediately quit.
+                    # For now we just log this; the cycle detector's off_delay will handle actual shutdown.
                     if power_is_valid and current_power < self._config.min_power:
-                            pass
+                        _LOGGER.debug(
+                            "Restored active cycle in low-power state (power=%.2fW < min_power=%.2fW); "
+                            "waiting for detector off_delay before marking as finished",
+                            current_power,
+                            self._config.min_power,
+                        )
 
                     if self.detector.matched_profile:
                         self._current_program = self.detector.matched_profile
@@ -819,16 +831,6 @@ def _run_final_profile_match(self) -> None:
                 f"No confident match in final attempt (best: {profile_name}, conf={confidence:.3f})"
             )
 
-    def _check_state_save(self, now: datetime) -> None:
-        """Periodically save active state."""
-        last_save = getattr(self, "_last_state_save", None)
-        if not last_save or (now - last_save).total_seconds() > 60:
-             # Fire and forget save task
-             self.hass.async_create_task(
-                 self.profile_store.async_save_active_cycle(self.detector.get_state_snapshot())
-             )
-             self._last_state_save = now
-
     def _start_watchdog(self) -> None:
         """Start the watchdog timer when a cycle begins."""
         if self._remove_watchdog:

custom_components/ha_washdata/profile_store.py

@@ -611,8 +611,6 @@ def rebuild_envelope(self, profile_name: str) -> bool:
             "cycle_count": len(resampled),
             "target_duration": float(target_duration),
             "sampling_rates": list(sampling_rates),
-            "target_duration": float(target_duration),
-            "sampling_rates": list(sampling_rates),
             "updated_at": datetime.now().isoformat(),
         }
 
@@ -654,8 +652,6 @@ def rebuild_envelope(self, profile_name: str) -> bool:
 
         return True
 
-        return True
-
     def generate_profile_svg(self, profile_name: str) -> str | None:
         """Generate an SVG string for the profile's power envelope."""
         envelope = self.get_envelope(profile_name)

run_tests.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# If you encounter "Permission denied", run: chmod +x run_tests.sh
 set -e
 
 # Define path to venv python