powervaultpy 0.0.8__tar.gz → 1.0.0__tar.gz

{powervaultpy-0.0.8 → powervaultpy-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powervaultpy
-Version: 0.0.8
+Version: 1.0.0
 Summary: An integration to control the Powervault battery
 Author-email: Adam McDonagh <adam@elitemonkey.net>
 License: GPLv3
@@ -13,4 +13,13 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+Requires-Dist: requests>=2.28
+Requires-Dist: pytz
 Provides-Extra: dev
+Requires-Dist: black>=23.1.0; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-env; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
+Requires-Dist: bumpver; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"

{powervaultpy-0.0.8 → powervaultpy-1.0.0}/pyproject.toml

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

{powervaultpy-0.0.8 → powervaultpy-1.0.0}/src/powervaultpy/powervault.py

@@ -18,7 +18,7 @@ VALID_STATUSES = [
 ]
 
 _LOGGER = logging.getLogger(__name__)
-_LOGGER.setLevel(logging.DEBUG)
+_LOGGER.setLevel(logging.INFO)
 
 class PowerVaultApiClientError(Exception):
     """Exception to indicate a general API error."""
@@ -113,14 +113,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,6 +132,12 @@ class PowerVault:
                 "last-month",
             ]:
                 raise Exception(f"Invalid 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)
@@ -162,10 +166,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:
@@ -189,14 +194,14 @@ class PowerVault:
 
         state_override_response = self._read_response(
             self._session.post(url, json=payload), url)
-        
+
         _LOGGER.debug("State Override: %s", state_override_response)
 
         if (state_override_response is not None) and ("stateOverrides" in state_override_response) and "message" in state_override_response and state_override_response["message"] == "success":
             return True
         else:
             return False
-        
+
 
     def get_battery_state(self, unit_id: str) -> any:
         """Query the schedule and overrides to determine the current battery state."""

{powervaultpy-0.0.8 → powervaultpy-1.0.0}/src/powervaultpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powervaultpy
-Version: 0.0.8
+Version: 1.0.0
 Summary: An integration to control the Powervault battery
 Author-email: Adam McDonagh <adam@elitemonkey.net>
 License: GPLv3
@@ -13,4 +13,13 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+Requires-Dist: requests>=2.28
+Requires-Dist: pytz
 Provides-Extra: dev
+Requires-Dist: black>=23.1.0; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-env; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
+Requires-Dist: bumpver; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"