hyxi-cloud-api 1.3.4__tar.gz → 1.3.6__tar.gz

{hyxi_cloud_api-1.3.4/src/hyxi_cloud_api.egg-info → hyxi_cloud_api-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyxi-cloud-api
-Version: 1.3.4
+Version: 1.3.6
 Summary: An async API client for HYXi Cloud.
 Author-email: Veldkornet <Veldkornet@users.noreply.github.com>
 Classifier: Programming Language :: Python :: 3
@@ -14,7 +14,7 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.14.0
+Requires-Dist: aiohttp>=3.13.5
 Provides-Extra: test
 Requires-Dist: pytest>=9.0.3; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"

{hyxi_cloud_api-1.3.4 → hyxi_cloud_api-1.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyxi-cloud-api"
-version = "1.3.4"
+version = "1.3.6"
 authors = [
   { name="Veldkornet", email="Veldkornet@users.noreply.github.com" },
 ]
@@ -12,7 +12,7 @@ description = "An async API client for HYXi Cloud."
 readme = "README.md"
 requires-python = ">=3.14"
 dependencies = [
-    "aiohttp>=3.14.0",
+    "aiohttp>=3.13.5",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",

{hyxi_cloud_api-1.3.4 → hyxi_cloud_api-1.3.6}/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.4"
+__version__ = "1.3.6"
 __all__ = ["VPP_ACTIVE_MODES", "HyxiApiClient"]

{hyxi_cloud_api-1.3.4 → hyxi_cloud_api-1.3.6}/src/hyxi_cloud_api/api.py

@@ -600,8 +600,16 @@ def _compute_load_metrics(m_raw: dict, derived: dict[str, float]) -> None:
 
 def _compute_grid_metrics(m_raw: dict, derived: dict[str, float]) -> None:
     """Calculate grid import/export metrics."""
-    if "gridP" in m_raw:
+    grid = None
+    if "gridP" in m_raw and m_raw["gridP"] is not None and m_raw["gridP"] != "":
         grid = _get_f("gridP", m_raw, 1000.0)
+    elif "ph1p" in m_raw or "ph2p" in m_raw or "ph3p" in m_raw:
+        # Sum up individual phase powers (which are in Watts) to compute grid power fallback
+        grid = _get_f("ph1p", m_raw) + _get_f("ph2p", m_raw) + _get_f("ph3p", m_raw)
+        # Store the derived gridP back in metrics (in kW to align with API standard format)
+        derived["gridP"] = round(grid / 1000.0, 4)
+
+    if grid is not None:
         derived["grid_import"] = abs(grid) if grid < 0 else 0.0
         derived["grid_export"] = grid if grid > 0 else 0.0
 
@@ -820,6 +828,23 @@ def _flatten_nested_push_device(device: dict) -> dict:  # pylint: disable=too-ma
                 if "epsPowerW" in phi:
                     flat[f"ph{i}Loadp"] = phi["epsPowerW"]
 
+    # 9. grid
+    if "grid" in device and isinstance(device["grid"], dict):
+        grd = device["grid"]
+        if "powerW" in grd and grd["powerW"] is not None:
+            try:
+                flat["gridP"] = float(grd["powerW"]) / 1000.0
+            except ValueError, TypeError:
+                flat["gridP"] = grd["powerW"]
+        if "frequencyHz" in grd:
+            flat["gridF"] = grd["frequencyHz"]
+        if "powerFactor" in grd:
+            flat["gridPfd"] = grd["powerFactor"]
+        if "energyInKwh" in grd:
+            flat["gridEIn"] = grd["energyInKwh"]
+        if "energyOutKwh" in grd:
+            flat["gridEOut"] = grd["energyOutKwh"]
+
     # Copy any other keys at the root that aren't dictionaries
     for k, v in device.items():
         if k not in flat and not isinstance(v, dict):

{hyxi_cloud_api-1.3.4 → hyxi_cloud_api-1.3.6/src/hyxi_cloud_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyxi-cloud-api
-Version: 1.3.4
+Version: 1.3.6
 Summary: An async API client for HYXi Cloud.
 Author-email: Veldkornet <Veldkornet@users.noreply.github.com>
 Classifier: Programming Language :: Python :: 3
@@ -14,7 +14,7 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.14.0
+Requires-Dist: aiohttp>=3.13.5
 Provides-Extra: test
 Requires-Dist: pytest>=9.0.3; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"

{hyxi_cloud_api-1.3.4 → hyxi_cloud_api-1.3.6}/src/hyxi_cloud_api.egg-info/requires.txt

@@ -1,4 +1,4 @@
-aiohttp>=3.14.0
+aiohttp>=3.13.5
 
 [test]
 pytest>=9.0.3

hyxi_cloud_api-1.3.6/tests/test_compute_grid_metrics.py

@@ -0,0 +1,79 @@
+"""Tests for the _compute_grid_metrics helper function in api.py."""
+
+from src.hyxi_cloud_api.api import _compute_grid_metrics
+
+
+class TestComputeGridMetrics:
+    """Tests for _compute_grid_metrics."""
+
+    def test_grid_import(self):
+        """Test grid_import when gridP is negative."""
+        m_raw = {"gridP": -1.5}
+        derived: dict[str, float] = {}
+        _compute_grid_metrics(m_raw, derived)
+        assert derived["grid_import"] == 1500.0
+        assert derived["grid_export"] == 0.0
+
+    def test_grid_export(self):
+        """Test grid_export when gridP is positive."""
+        m_raw = {"gridP": 2.25}
+        derived: dict[str, float] = {}
+        _compute_grid_metrics(m_raw, derived)
+        assert derived["grid_import"] == 0.0
+        assert derived["grid_export"] == 2250.0
+
+    def test_grid_zero(self):
+        """Test grid import/export when gridP is zero."""
+        m_raw = {"gridP": 0.0}
+        derived: dict[str, float] = {}
+        _compute_grid_metrics(m_raw, derived)
+        assert derived["grid_import"] == 0.0
+        assert derived["grid_export"] == 0.0
+
+    def test_grid_missing(self):
+        """Test missing gridP."""
+        m_raw = {}
+        derived: dict[str, float] = {}
+        _compute_grid_metrics(m_raw, derived)
+        assert "grid_import" not in derived
+        assert "grid_export" not in derived
+
+    def test_grid_fallback_phases_positive(self):
+        """Test grid fallback to phase active powers when gridP is missing."""
+        m_raw = {
+            "ph1p": 200.0,
+            "ph2p": 150.0,
+            "ph3p": 50.0,
+        }
+        derived: dict[str, float] = {}
+        _compute_grid_metrics(m_raw, derived)
+        assert derived["gridP"] == 0.4  # (200 + 150 + 50) / 1000 = 0.4 kW
+        assert derived["grid_import"] == 0.0
+        assert derived["grid_export"] == 400.0
+
+    def test_grid_fallback_phases_negative(self):
+        """Test grid fallback to phase active powers when importing (negative)."""
+        m_raw = {
+            "ph1p": -300.0,
+            "ph2p": -200.0,
+            "ph3p": -100.0,
+        }
+        derived: dict[str, float] = {}
+        _compute_grid_metrics(m_raw, derived)
+        assert derived["gridP"] == -0.6  # -600W / 1000 = -0.6 kW
+        assert derived["grid_import"] == 600.0
+        assert derived["grid_export"] == 0.0
+
+    def test_grid_priority(self):
+        """Test that gridP takes priority over phase fallback if present."""
+        m_raw = {
+            "gridP": 1.5,
+            "ph1p": -300.0,
+            "ph2p": -200.0,
+            "ph3p": -100.0,
+        }
+        derived: dict[str, float] = {}
+        _compute_grid_metrics(m_raw, derived)
+        assert "gridP" not in derived  # gridP was in m_raw, not computed/derived
+        assert derived["grid_import"] == 0.0
+        assert derived["grid_export"] == 1500.0

{hyxi_cloud_api-1.3.4 → hyxi_cloud_api-1.3.6}/tests/test_push.py

@@ -218,6 +218,13 @@ def test_process_push_data_nested_format():
                         "epsPowerW": 269.0,
                     }
                 },
+                "grid": {
+                    "powerW": -1500.0,
+                    "frequencyHz": 50.02,
+                    "powerFactor": 0.98,
+                    "energyInKwh": 1023.4,
+                    "energyOutKwh": 504.2,
+                },
             }
         ]
     }
@@ -257,6 +264,13 @@ def test_process_push_data_nested_format():
     assert metrics["ph1i"] == 1.88
     assert metrics["ph1p"] == 450.0
     assert metrics["ph1Loadp"] == 269.0
+    assert metrics["gridP"] == -1.5
+    assert metrics["gridF"] == 50.02
+    assert metrics["gridPfd"] == 0.98
+    assert metrics["gridEIn"] == 1023.4
+    assert metrics["gridEOut"] == 504.2
+    assert metrics["grid_import"] == 1500.0
+    assert metrics["grid_export"] == 0.0
 
 
 def test_process_push_data_flat_ms_collect_time():

hyxi_cloud_api-1.3.4/tests/test_compute_grid_metrics.py

@@ -1,39 +0,0 @@
-"""Tests for the _compute_grid_metrics helper function in api.py."""
-
-from src.hyxi_cloud_api.api import _compute_grid_metrics
-
-
-class TestComputeGridMetrics:
-    """Tests for _compute_grid_metrics."""
-
-    def test_grid_import(self):
-        """Test grid_import when gridP is negative."""
-        m_raw = {"gridP": -1.5}
-        derived: dict[str, float] = {}
-        _compute_grid_metrics(m_raw, derived)
-        assert derived["grid_import"] == 1500.0
-        assert derived["grid_export"] == 0.0
-
-    def test_grid_export(self):
-        """Test grid_export when gridP is positive."""
-        m_raw = {"gridP": 2.25}
-        derived: dict[str, float] = {}
-        _compute_grid_metrics(m_raw, derived)
-        assert derived["grid_import"] == 0.0
-        assert derived["grid_export"] == 2250.0
-
-    def test_grid_zero(self):
-        """Test grid import/export when gridP is zero."""
-        m_raw = {"gridP": 0.0}
-        derived: dict[str, float] = {}
-        _compute_grid_metrics(m_raw, derived)
-        assert derived["grid_import"] == 0.0
-        assert derived["grid_export"] == 0.0
-
-    def test_grid_missing(self):
-        """Test missing gridP."""
-        m_raw = {}
-        derived: dict[str, float] = {}
-        _compute_grid_metrics(m_raw, derived)
-        assert "grid_import" not in derived
-        assert "grid_export" not in derived