Merge pull request #327 from claudegel/energy

claudegel · web-flow · commit efeb012e3078 · 2025-05-31T21:21:25.000-04:00
fix broken Energy stat
diff --git a/README.md b/README.md
@@ -282,12 +282,12 @@ It is then possible to make an automation to set all HA devices ready for peak p
 
 ## Statistic for energy
 Six attributes are added to track energy usage for devices:
-- hourly_kwh_count: total count of kwh hourly usage
-- daily_kwh_count: total count of kwh daily usage
-- monthly_kwh_count: total count of kwh monthly usage
 - hourly_kwh: kwh used for last hour
 - daily_kwh: kwh used for last day
 - monthly_kwh: kwh used for last month
+- current_hour_kwh": kwh used during current hour
+- current_today_kwh: kwh used during current day
+- current_month_kwh: kwh used during current month
 
 They are polled from Neviweb every 30 minutes. The first polling start 5 minutes after HA restart.
 
diff --git a/custom_components.json b/custom_components.json
@@ -1,6 +1,6 @@
 {
     "neviweb130": {
-        "version": "3.0.4",
+        "version": "3.0.5",
         "local_location": "/custom_components/neviweb130/__init__.py",
         "remote_location": "https://github.com/claudegel/sinope-130/tree/master/custom_components/__init__.py",
         "visit_repo": "https://github.com/claudegel/sinope-130",
diff --git a/custom_components/neviweb130/__init__.py b/custom_components/neviweb130/__init__.py
@@ -635,7 +635,7 @@ def get_device_monthly_stats(self, device_id):
         # Http requests
         try:
             raw_res = requests.get(
-                DEVICE_DATA_URL + str(device_id) + "/energy/monthly",
+                DEVICE_DATA_URL + str(device_id) + "/consumption/monthly",
                 headers=self._headers,
                 cookies=self._cookies,
                 timeout=self._timeout,
@@ -661,7 +661,7 @@ def get_device_daily_stats(self, device_id):
         # Http requests
         try:
             raw_res = requests.get(
-                DEVICE_DATA_URL + str(device_id) + "/energy/daily",
+                DEVICE_DATA_URL + str(device_id) + "/consumption/daily",
                 headers=self._headers,
                 cookies=self._cookies,
                 timeout=self._timeout,
@@ -687,7 +687,7 @@ def get_device_hourly_stats(self, device_id):
         # Http requests
         try:
             raw_res = requests.get(
-                DEVICE_DATA_URL + str(device_id) + "/energy/hourly",
+                DEVICE_DATA_URL + str(device_id) + "/consumption/hourly",
                 headers=self._headers,
                 cookies=self._cookies,
                 timeout=self._timeout,
diff --git a/custom_components/neviweb130/climate.py b/custom_components/neviweb130/climate.py
diff --git a/custom_components/neviweb130/light.py b/custom_components/neviweb130/light.py
@@ -358,12 +358,12 @@ def __init__(self, data, device_info, name, sku, firmware):
         self._id = device_info["id"]
         self._device_model = device_info["signature"]["model"]
         self._device_model_cfg = device_info["signature"]["modelCfg"]
-        self._hour_energy_kwh_count = None
-        self._today_energy_kwh_count = None
-        self._month_energy_kwh_count = None
-        self._hour_kwh = None
-        self._today_kwh = None
-        self._month_kwh = None
+        self._hour_kwh = 0
+        self._today_kwh = 0
+        self._month_kwh = 0
+        self._current_hour_kwh = 0
+        self._current_today_kwh = 0
+        self._current_month_kwh = 0
         self._brightness_pct = 0
         self._keypad = "Unlocked"
         self._timer = 0
@@ -499,12 +499,12 @@ def extra_state_attributes(self):
                 "timer": self._timer,
                 "led_on": self._led_on,
                 "led_off": self._led_off,
-                "hourly_kwh_count": self._hour_energy_kwh_count,
-                "daily_kwh_count": self._today_energy_kwh_count,
-                "monthly_kwh_count": self._month_energy_kwh_count,
                 "hourly_kwh": self._hour_kwh,
                 "daily_kwh": self._today_kwh,
                 "monthly_kwh": self._month_kwh,
+                "current_hour_kwh": self._current_hour_kwh,
+                "current_today_kwh": self._current_today_kwh,
+                "current_month_kwh": self._current_month_kwh,
                 "sku": self._sku,
                 "device_model": str(self._device_model),
                 "device_model_cfg": self._device_model_cfg,
@@ -630,29 +630,32 @@ def do_stat(self, start):
             device_hourly_stats = self._client.get_device_hourly_stats(self._id)
             #            _LOGGER.warning("%s device_hourly_stats = %s", self._name, device_hourly_stats)
             if device_hourly_stats is not None and len(device_hourly_stats) > 1:
-                self._hour_energy_kwh_count = device_hourly_stats[1]["counter"] / 1000
-                self._hour_kwh = device_hourly_stats[1]["period"] / 1000
+                n = len(device_hourly_stats) - 2
+                self._hour_kwh = device_hourly_stats[n]["period"] / 1000
+                self._current_hour_kwh = device_hourly_stats[n + 1]["period"] / 1000
             else:
-                self._hour_energy_kwh_count = 0
                 self._hour_kwh = 0
+                self._current_hour_kwh = 0
                 _LOGGER.warning("Got None for device_hourly_stats")
             device_daily_stats = self._client.get_device_daily_stats(self._id)
             #            _LOGGER.warning("%s device_daily_stats = %s", self._name, device_daily_stats)
             if device_daily_stats is not None and len(device_daily_stats) > 1:
-                self._today_energy_kwh_count = device_daily_stats[0]["counter"] / 1000
-                self._today_kwh = device_daily_stats[0]["period"] / 1000
+                n = len(device_daily_stats) - 2
+                self._today_kwh = device_daily_stats[n]["period"] / 1000
+                self._current_today_kwh = device_daily_stats[n + 1]["period"] / 1000
             else:
-                self._today_energy_kwh_count = 0
                 self._today_kwh = 0
+                self._current_today_kwh = 0
                 _LOGGER.warning("Got None for device_daily_stats")
             device_monthly_stats = self._client.get_device_monthly_stats(self._id)
             #            _LOGGER.warning("%s device_monthly_stats = %s", self._name, device_monthly_stats)
             if device_monthly_stats is not None and len(device_monthly_stats) > 1:
-                self._month_energy_kwh_count = device_monthly_stats[0]["counter"] / 1000
-                self._month_kwh = device_monthly_stats[0]["period"] / 1000
+                n = len(device_monthly_stats) - 2
+                self._month_kwh = device_monthly_stats[n]["period"] / 1000
+                self._current_month_kwh = device_monthly_stats[n + 1]["period"] / 1000
             else:
-                self._month_energy_kwh_count = 0
                 self._month_kwh = 0
+                self._current_month_kwh = 0
                 _LOGGER.warning("Got None for device_monthly_stats")
             self._energy_stat_time = time.time()
         if self._energy_stat_time == 0:
@@ -793,12 +796,12 @@ def __init__(self, data, device_info, name, sku, firmware):
         self._id = device_info["id"]
         self._device_model = device_info["signature"]["model"]
         self._device_model_cfg = device_info["signature"]["modelCfg"]
-        self._hour_energy_kwh_count = None
-        self._today_energy_kwh_count = None
-        self._month_energy_kwh_count = None
-        self._hour_kwh = None
-        self._today_kwh = None
-        self._month_kwh = None
+        self._hour_kwh = 0
+        self._today_kwh = 0
+        self._month_kwh = 0
+        self._current_hour_kwh = 0
+        self._current_today_kwh = 0
+        self._current_month_kwh = 0
         self._brightness_pct = 0
         self._keypad = "Unlocked"
         self._timer = 0
@@ -908,12 +911,12 @@ def extra_state_attributes(self):
                 "timer": self._timer,
                 "led_on": self._led_on,
                 "led_off": self._led_off,
-                "hourly_kwh_count": self._hour_energy_kwh_count,
-                "daily_kwh_count": self._today_energy_kwh_count,
-                "monthly_kwh_count": self._month_energy_kwh_count,
                 "hourly_kwh": self._hour_kwh,
                 "daily_kwh": self._today_kwh,
                 "monthly_kwh": self._month_kwh,
+                "current_hour_kwh": self._current_hour_kwh,
+                "current_today_kwh": self._current_today_kwh,
+                "current_month_kwh": self._current_month_kwh,
                 "sku": self._sku,
                 "device_model": str(self._device_model),
                 "device_model_cfg": self._device_model_cfg,
@@ -938,12 +941,12 @@ def __init__(self, data, device_info, name, sku, firmware):
         self._id = device_info["id"]
         self._device_model = device_info["signature"]["model"]
         self._device_model_cfg = device_info["signature"]["modelCfg"]
-        self._hour_energy_kwh_count = None
-        self._today_energy_kwh_count = None
-        self._month_energy_kwh_count = None
-        self._hour_kwh = None
-        self._today_kwh = None
-        self._month_kwh = None
+        self._hour_kwh = 0
+        self._today_kwh = 0
+        self._month_kwh = 0
+        self._current_hour_kwh = 0
+        self._current_today_kwh = 0
+        self._current_month_kwh = 0
         self._brightness_pct = 0
         self._keypad = "Unlocked"
         self._timer = 0
@@ -1064,12 +1067,12 @@ def extra_state_attributes(self):
                 "timer": self._timer,
                 "led_on": self._led_on,
                 "led_off": self._led_off,
-                "hourly_kwh_count": self._hour_energy_kwh_count,
-                "daily_kwh_count": self._today_energy_kwh_count,
-                "monthly_kwh_count": self._month_energy_kwh_count,
                 "hourly_kwh": self._hour_kwh,
                 "daily_kwh": self._today_kwh,
                 "monthly_kwh": self._month_kwh,
+                "current_hour_kwh": self._current_hour_kwh,
+                "current_today_kwh": self._current_today_kwh,
+                "current_month_kwh": self._current_month_kwh,
                 "sku": self._sku,
                 "device_model": str(self._device_model),
                 "device_model_cfg": self._device_model_cfg,
diff --git a/custom_components/neviweb130/manifest.json b/custom_components/neviweb130/manifest.json
@@ -7,6 +7,6 @@
   "dependencies": [],
   "requirements": [],
   "iot_class": "cloud_polling",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "homeassistant": "2025.1.1"
 }
diff --git a/custom_components/neviweb130/schema.py b/custom_components/neviweb130/schema.py
@@ -38,7 +38,7 @@
 
 """Default parameters values."""
 
-VERSION = "3.0.4"
+VERSION = "3.0.5"
 SCAN_INTERVAL = timedelta(seconds=540)
 HOMEKIT_MODE = False
 STAT_INTERVAL = 1800
diff --git a/custom_components/neviweb130/switch.py b/custom_components/neviweb130/switch.py
diff --git a/custom_components/neviweb130/valve.py b/custom_components/neviweb130/valve.py

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"neviweb130": {`
`3`		`- "version": "3.0.4",`
	`3`	`+ "version": "3.0.5",`
`4`	`4`	`"local_location": "/custom_components/neviweb130/__init__.py",`
`5`	`5`	`"remote_location": "https://github.com/claudegel/sinope-130/tree/master/custom_components/__init__.py",`
`6`	`6`	`"visit_repo": "https://github.com/claudegel/sinope-130",`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`"dependencies": [],`
`8`	`8`	`"requirements": [],`
`9`	`9`	`"iot_class": "cloud_polling",`
`10`		`- "version": "3.0.4",`
	`10`	`+ "version": "3.0.5",`
`11`	`11`	`"homeassistant": "2025.1.1"`
`12`	`12`	`}`