powervaultpy 0.0.9__tar.gz → 1.0.1__tar.gz

{powervaultpy-0.0.9 → powervaultpy-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powervaultpy
-Version: 0.0.9
+Version: 1.0.1
 Summary: An integration to control the Powervault battery
 Author-email: Adam McDonagh <adam@elitemonkey.net>
 License: GPLv3

{powervaultpy-0.0.9 → powervaultpy-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "powervaultpy"
-version = "0.0.9"
+version = "1.0.1"
 authors = [
   { name="Adam McDonagh", email="adam@elitemonkey.net" },
 ]
@@ -43,7 +43,7 @@ dev = [
 profile = 'black'
 
 [tool.bumpver]
-current_version = "0.0.9"
+current_version = "1.0.1"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{powervaultpy-0.0.9 → powervaultpy-1.0.1}/src/powervaultpy/powervault.py

@@ -56,10 +56,16 @@ class PowerVault:
         self._session.headers.update(
             {
                 "x-api-key": self._api_key,
-                "accept": "application/json",
+                "accept": "*/*",
             }
         )
 
+        # Get list of header keys, and remove any that are not in the list above
+        headers = list(self._session.headers.keys())
+        for key in headers:
+            if key not in ["x-api-key", "accept"]:
+                self._session.headers.pop(key)
+
     def get_units(self, account_id: int) -> any:
         """Get the user's units from the API."""
         url = f"{self._base_url}/unit?customerAccountId={account_id}"
@@ -113,14 +119,12 @@ class PowerVault:
         _LOGGER.error("Failed to retrieve account")
 
     def get_data(
-        self, unit_id: str, from_: int = -1, to: int = -1, period: str = None
+        self, unit_id: str, period: str = None
     ) -> any:
         """Get the latest metrics from the unit."""
         url = f"{self._base_url}/unit/{unit_id}/data"
 
-        if from_ > 0 and to > 0:
-            url = f"{url}?from={from_}&to={to}"
-        elif period is not None:
+        if period is not None:
             if period not in [
                 "today",
                 "yesterday",
@@ -134,7 +138,13 @@ class PowerVault:
                 "last-month",
             ]:
                 raise Exception(f"Invalid period: {period}")
-            url = f"{url}?period={period}"
+
+        if not period:
+            # If period is not set, set it to anything,
+            # because for some reason if you leave it blank you get nulls most of the time
+            period = "past_hour" # This is not a valid period, but it gets you the last live values regardless
+
+        url = f"{url}?period={period}"
 
         data_response = self._read_response(self._session.get(url), url)
         _LOGGER.debug("Data: %s", data_response)
@@ -162,10 +172,11 @@ class PowerVault:
         for row in data:
             for attribute in attributes:
                 if attribute in row:
-                    if attribute not in totals:
+                    if attribute not in totals or not totals[attribute]:
                         totals[attribute] = 0
-                    totals[attribute] += round(row[attribute] / 1000 * (5/60), 2)
-
+                    value = row[attribute]
+                    if value:
+                        totals[attribute] += round(value / 1000 * (5/60), 2)
         return totals
 
     def set_battery_state(self, unit_id: str, battery_state) -> bool:

{powervaultpy-0.0.9 → powervaultpy-1.0.1}/src/powervaultpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powervaultpy
-Version: 0.0.9
+Version: 1.0.1
 Summary: An integration to control the Powervault battery
 Author-email: Adam McDonagh <adam@elitemonkey.net>
 License: GPLv3