hyxi-cloud-api 1.3.7__tar.gz → 1.3.8__tar.gz

{hyxi_cloud_api-1.3.7/src/hyxi_cloud_api.egg-info → hyxi_cloud_api-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyxi-cloud-api
-Version: 1.3.7
+Version: 1.3.8
 Summary: An async API client for HYXi Cloud.
 Author-email: Veldkornet <Veldkornet@users.noreply.github.com>
 Classifier: Programming Language :: Python :: 3

{hyxi_cloud_api-1.3.7 → hyxi_cloud_api-1.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyxi-cloud-api"
-version = "1.3.7"
+version = "1.3.8"
 authors = [
   { name="Veldkornet", email="Veldkornet@users.noreply.github.com" },
 ]

{hyxi_cloud_api-1.3.7 → hyxi_cloud_api-1.3.8}/src/hyxi_cloud_api/__init__.py

@@ -5,5 +5,5 @@ from .api import HyxiApiClient
 # Module-level alias so callers can do: from hyxi_cloud_api import VPP_ACTIVE_MODES
 VPP_ACTIVE_MODES: frozenset[str] = HyxiApiClient.VPP_ACTIVE_MODES
 
-__version__ = "1.3.7"
+__version__ = "1.3.8"
 __all__ = ["VPP_ACTIVE_MODES", "HyxiApiClient"]

{hyxi_cloud_api-1.3.7 → hyxi_cloud_api-1.3.8}/src/hyxi_cloud_api/api.py

@@ -646,28 +646,44 @@ def _compute_battery_metrics(
         return True
 
     # Unify cumulative battery charge energy telemetry keys to resolve polling/push mismatch
-    charge_val = None
-    if _is_valid_metric("batCharge"):
-        charge_val = _get_f("batCharge", m_raw)
-    elif _is_valid_metric("totalEchg"):
-        charge_val = _get_f("totalEchg", m_raw)
-
-    if charge_val is not None:
-        derived["bat_charge_total"] = charge_val
-        derived["totalEchg"] = charge_val
-        derived["batCharge"] = charge_val
+    total_echg_val = (
+        _get_f("totalEchg", m_raw) if _is_valid_metric("totalEchg") else None
+    )
+    bat_charge_val = (
+        _get_f("batCharge", m_raw) if _is_valid_metric("batCharge") else None
+    )
+
+    if total_echg_val is not None:
+        derived["totalEchg"] = total_echg_val
+        derived["bat_charge_total"] = total_echg_val
+        if bat_charge_val is None:
+            derived["batCharge"] = total_echg_val
+
+    if bat_charge_val is not None:
+        derived["batCharge"] = bat_charge_val
+        if total_echg_val is None:
+            derived["totalEchg"] = bat_charge_val
+            derived["bat_charge_total"] = bat_charge_val
 
     # Unify cumulative battery discharge energy telemetry keys to resolve polling/push mismatch
-    discharge_val = None
-    if _is_valid_metric("batDisCharge"):
-        discharge_val = _get_f("batDisCharge", m_raw)
-    elif _is_valid_metric("totalEdchg"):
-        discharge_val = _get_f("totalEdchg", m_raw)
-
-    if discharge_val is not None:
-        derived["bat_discharge_total"] = discharge_val
-        derived["totalEdchg"] = discharge_val
-        derived["batDisCharge"] = discharge_val
+    total_edchg_val = (
+        _get_f("totalEdchg", m_raw) if _is_valid_metric("totalEdchg") else None
+    )
+    bat_discharge_val = (
+        _get_f("batDisCharge", m_raw) if _is_valid_metric("batDisCharge") else None
+    )
+
+    if total_edchg_val is not None:
+        derived["totalEdchg"] = total_edchg_val
+        derived["bat_discharge_total"] = total_edchg_val
+        if bat_discharge_val is None:
+            derived["batDisCharge"] = total_edchg_val
+
+    if bat_discharge_val is not None:
+        derived["batDisCharge"] = bat_discharge_val
+        if total_edchg_val is None:
+            derived["totalEdchg"] = bat_discharge_val
+            derived["bat_discharge_total"] = bat_discharge_val
 
 
 def _compute_pv_metrics(m_raw: dict, derived: dict[str, float]) -> None:

{hyxi_cloud_api-1.3.7 → hyxi_cloud_api-1.3.8/src/hyxi_cloud_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyxi-cloud-api
-Version: 1.3.7
+Version: 1.3.8
 Summary: An async API client for HYXi Cloud.
 Author-email: Veldkornet <Veldkornet@users.noreply.github.com>
 Classifier: Programming Language :: Python :: 3

{hyxi_cloud_api-1.3.7 → hyxi_cloud_api-1.3.8}/tests/test_compute_battery_metrics.py

@@ -107,3 +107,24 @@ def test_compute_battery_metrics_none_device_type():
     _compute_battery_metrics(m_raw, derived, None)  # type: ignore
     assert derived["bat_charging"] == 100.0
     assert derived["bat_power_dc"] == -100.0
+
+
+def test_compute_battery_metrics_both_present():
+    """Test that when both polling and daily keys are present, they are preserved.
+
+    Cumulative values should take priority for battery totals.
+    """
+    derived: dict[str, float] = {}
+    m_raw = {
+        "totalEchg": 366.3,
+        "totalEdchg": 371.3,
+        "batCharge": 2.3,
+        "batDisCharge": 4.4,
+    }
+    _compute_battery_metrics(m_raw, derived, "OTHER")
+    assert derived["bat_charge_total"] == 366.3
+    assert derived["bat_discharge_total"] == 371.3
+    assert derived["totalEchg"] == 366.3
+    assert derived["totalEdchg"] == 371.3
+    assert derived["batCharge"] == 2.3
+    assert derived["batDisCharge"] == 4.4