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

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

@@ -1,12 +1,9 @@
 Metadata-Version: 2.4
 Name: hyxi-cloud-api
-Version: 1.3.8
+Version: 1.4.0
 Summary: An async API client for HYXi Cloud.
 Author-email: Veldkornet <Veldkornet@users.noreply.github.com>
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyxi-cloud-api"
-version = "1.3.8"
+version = "1.4.0"
 authors = [
   { name="Veldkornet", email="Veldkornet@users.noreply.github.com" },
 ]
@@ -16,9 +16,6 @@ dependencies = [
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",

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

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

@@ -15,6 +15,7 @@ import hmac
 import logging
 import os
 import re
+import secrets
 import time
 from collections import defaultdict
 from dataclasses import dataclass, field
@@ -24,10 +25,9 @@ from urllib.parse import urlparse
 try:
     from datetime import UTC, datetime
 except ImportError:
-    from datetime import datetime
+    from datetime import datetime, timezone
 
-    # pylint: disable=W0127,E0601
-    UTC = UTC
+    UTC = timezone.utc  # noqa
 
 import aiohttp
 
@@ -44,18 +44,41 @@ class FetchState:
 
 
 _LOGGER = logging.getLogger(__name__)
-_battery_device_types = (
-    "INVERTER",
-    "ESS",
-    "HALO",
-    "1",
-    "15",
-    "16",
-    "MICRO_STORAGE_ALL_IN_ONE",
+_battery_device_types = frozenset(
+    (
+        "INVERTER",
+        "HYBRID_INVERTER",
+        "STRING_INVERTER",
+        "MICRO_INVERTER",
+        "ESS",
+        "HALO",
+        "1",
+        "15",
+        "16",
+        "MICRO_STORAGE_ALL_IN_ONE",
+    )
+)
+_parent_device_types = frozenset(
+    (
+        "COLLECTOR",
+        "DMU",
+        "INVERTER",
+        "HYBRID_INVERTER",
+        "STRING_INVERTER",
+        "MICRO_INVERTER",
+        "ALL_IN_ONE",
+        "MICRO_STORAGE_ALL_IN_ONE",
+    )
+)
+_EMS_DEVICE_TYPES = frozenset(
+    (
+        "EMS",
+        "ENERGY_STORAGE_BATTERY",
+        "MICRO_STORAGE_ALL_IN_ONE",
+        "15",
+        "16",
+    )
 )
-_BATTERY_DEVICE_REGEX = re.compile("|".join(_battery_device_types))
-_parent_device_types = ("COLLECTOR", "DMU", "INVERTER", "ALL_IN_ONE")
-_PARENT_DEVICE_REGEX = re.compile("|".join(_parent_device_types))
 _COLLECTOR_FILTER_KEYWORDS = (
     "bat",
     "pv",
@@ -563,9 +586,7 @@ def _get_f(key: str, data_map: dict, mult: float = 1.0) -> float:
         if val is None or val == "":
             return 0.0
         return round(float(val) * mult, 2)
-    except ValueError:
-        return 0.0
-    except TypeError:
+    except ValueError, TypeError:
         return 0.0
 
 
@@ -624,7 +645,7 @@ def _compute_battery_metrics(
     pbat = _get_f("pbat", m_raw)
     device_type_str = str(device_type or "")
 
-    if "batP" in m_raw or "pbat" in m_raw or device_type_str in ("EMS", "15", "16"):
+    if "batP" in m_raw or "pbat" in m_raw or device_type_str in _EMS_DEVICE_TYPES:
         # ALL_IN_ONE: prefer pbat — batP can have an inverted sign convention,
         # while pbat is consistently negative-for-charging / positive-for-discharging.
         # Other devices: prefer batP (DC terminals), fall back to pbat.
@@ -731,6 +752,60 @@ def _compute_derived_metrics(m_raw: dict, device_type: str = "") -> dict:
     return derived
 
 
+def _resolve_push_timestamp(device: dict[str, Any], now_utc: datetime) -> datetime:
+    """Determine the last_seen timestamp from collectTime or reportTimestamp."""
+    collect_time = device.get("collectTime")
+    report_ts = device.get("reportTimestamp")
+
+    if collect_time is not None:
+        try:
+            return datetime.fromtimestamp(float(collect_time), UTC)
+        except ValueError, TypeError, OverflowError, OSError:
+            pass
+
+    if report_ts is not None:
+        try:
+            return datetime.fromtimestamp(float(report_ts) / 1000.0, UTC)
+        except ValueError, TypeError, OverflowError, OSError:
+            pass
+
+    return now_utc
+
+
+def _extract_raw_push_metrics(device: dict[str, Any]) -> dict[str, Any]:
+    """Extract metrics from flat payload dictionary, stripping metadata/routing keys."""
+    raw_metrics: dict[str, Any] = {}
+    for k, v in device.items():
+        if k in _METRICS_EXCLUDED_KEYS:
+            continue
+        raw_metrics[k] = v
+    return raw_metrics
+
+
+def _merge_push_metrics(
+    sn: str,
+    raw_metrics: dict[str, Any],
+    device_type: str,
+    existing_metrics: dict[str, dict[str, Any]] | None,
+) -> dict[str, Any]:
+    """Filter collector metrics and merge with existing metrics."""
+    if device_type == "COLLECTOR":
+        metrics_to_update = _filter_collector_metrics(raw_metrics)
+    else:
+        metrics_to_update = raw_metrics.copy()
+
+    merged_metrics: dict[str, Any] = {}
+    if existing_metrics and sn in existing_metrics:
+        # Copy existing to avoid mutating caller's dictionary directly
+        merged_metrics = dict(existing_metrics[sn])
+
+    for k, v in metrics_to_update.items():
+        if v is not None:
+            merged_metrics[k] = v
+
+    return merged_metrics
+
+
 def _flatten_nested_push_device(device: dict) -> dict:  # pylint: disable=too-many-statements
     """Flatten a nested push device payload into the flat layout expected by the SDK."""
     flat: dict = {}
@@ -750,21 +825,31 @@ def _flatten_nested_push_device(device: dict) -> dict:  # pylint: disable=too-ma
         if "deviceState" in rec:
             flat["deviceState"] = rec["deviceState"]
 
-    # Copy root device keys that might already be flat
-    for k in ("deviceSn", "collectTime", "reportTimestamp"):
-        if k in device and device[k] is not None:
-            val = device[k]
-            if k == "collectTime":
+    # Map discrepancies between Flat Push payload and Flat Pull payload
+    _key_map = {
+        "gridEin": "totalEnt",
+        "gridEIn": "totalEnt",
+        "gridEout": "totalEpt",
+        "gridEOut": "totalEpt",
+    }
+
+    # Copy all root-level keys that are primitive types (support new flat format)
+    for k, v in device.items():
+        if not isinstance(v, dict) and not isinstance(v, list) and v is not None:
+            # Normalize push metric names to match pull metric names
+            mapped_k = _key_map.get(k, k)
+
+            if mapped_k == "collectTime":
                 try:
-                    num_val = float(val)
+                    num_val = float(v)
                     if num_val > 10000000000:
-                        flat[k] = num_val / 1000.0
+                        flat[mapped_k] = num_val / 1000.0
                     else:
-                        flat[k] = val
+                        flat[mapped_k] = v
                 except ValueError, TypeError:
-                    flat[k] = val
+                    flat[mapped_k] = v
             else:
-                flat[k] = val
+                flat[mapped_k] = v
 
     # 2. system
     if "system" in device and isinstance(device["system"], dict):
@@ -887,18 +972,35 @@ def _flatten_nested_push_device(device: dict) -> dict:  # pylint: disable=too-ma
         if "powerFactor" in grd:
             flat["gridPfd"] = grd["powerFactor"]
         if "energyInKwh" in grd:
-            flat["gridEIn"] = grd["energyInKwh"]
+            flat["totalEnt"] = grd["energyInKwh"]
         if "energyOutKwh" in grd:
-            flat["gridEOut"] = grd["energyOutKwh"]
+            flat["totalEpt"] = 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):
-            flat[k] = v
+            mapped_k = _key_map.get(k, k)
+            flat[mapped_k] = v
 
     return flat
 
 
+# Deployment-configured secret for log masking. If not provided,
+# falls back to a process-random secret.
+_LOG_SALT = os.environ.get("HYXI_LOG_SALT", "").encode("utf-8") or secrets.token_bytes(
+    16
+)
+
+
+def set_log_salt(salt: str | bytes) -> None:
+    """Set a deployment-stable secret for cross-device log correlation."""
+    global _LOG_SALT  # pylint: disable=global-statement
+    if isinstance(salt, str):
+        salt = salt.encode("utf-8")
+    _LOG_SALT = salt
+    _mask_id.cache_clear()
+
+
 @functools.lru_cache(maxsize=1024)
 def _mask_id(value: str) -> str:
     """Mask an identifier (SN, plant ID, etc.) for logs.
@@ -912,7 +1014,7 @@ def _mask_id(value: str) -> str:
     if not value or value == "None":
         return "****"
     id_str = str(value)
-    return hashlib.sha256(id_str.encode("utf-8")).hexdigest()[:8]
+    return hmac.new(_LOG_SALT, id_str.encode("utf-8"), hashlib.sha256).hexdigest()[:8]
 
 
 # Keys in raw API response dicts that contain identifying or personal information.
@@ -1277,7 +1379,7 @@ class HyxiApiClient:  # pylint: disable=too-many-instance-attributes
         }
 
         device_type_code = entry.get("device_type_code", "")
-        if _BATTERY_DEVICE_REGEX.search(device_type_code):
+        if device_type_code in _battery_device_types:
             base_info.update(HyxiApiClient._extract_battery_info(i_raw))
 
         entry["metrics"].update(base_info)
@@ -1326,8 +1428,11 @@ class HyxiApiClient:  # pylint: disable=too-many-instance-attributes
         ems_task = None
         if not is_comm_unit:
             tasks.append(asyncio.create_task(self._fetch_device_metrics(sn, entry)))
-            ems_task = asyncio.create_task(self.query_ems_basic_details(sn))
-            tasks.append(ems_task)
+
+            actual_type = entry.get("device_type_code", dev_type)
+            if actual_type in _EMS_DEVICE_TYPES:
+                ems_task = asyncio.create_task(self.query_ems_basic_details(sn))
+                tasks.append(ems_task)
 
         # Wait for them to finish
         if tasks:
@@ -1408,7 +1513,7 @@ class HyxiApiClient:  # pylint: disable=too-many-instance-attributes
             state.metric_tasks.append(self._fetch_all_for_device(sn, entry, dev_type))
 
             # 🚀 DEEP DISCOVERY: If this is a Collector, DMU, or Inverter, find its children!
-            if _PARENT_DEVICE_REGEX.search(dev_type):
+            if dev_type in _parent_device_types:
                 _LOGGER.debug(
                     "HYXI Parent Device Found: %s (%s). Probing for sub-devices...",
                     _mask_id(sn),
@@ -1681,7 +1786,7 @@ class HyxiApiClient:  # pylint: disable=too-many-instance-attributes
         state.metric_tasks.append(self._fetch_all_for_device(sn, entry, dev_type))
 
         # 🚀 DEEP BACK-DISCOVERY: If this is a parent, search for ITS children too!
-        if _PARENT_DEVICE_REGEX.search(dev_type):
+        if dev_type in _parent_device_types:
             sub_device_tasks.append(self._fetch_sub_devices(sn, state))
 
     async def _process_alarms_and_back_discovery(
@@ -2178,7 +2283,7 @@ class HyxiApiClient:  # pylint: disable=too-many-instance-attributes
             _LOGGER.warning("HYXI Push: dataList is missing or not a list")
             return {}
 
-        now_utc = datetime.now(UTC).isoformat()
+        now_utc = datetime.now(UTC)
         results = {}
 
         for device in data_list:
@@ -2191,53 +2296,17 @@ class HyxiApiClient:  # pylint: disable=too-many-instance-attributes
             if not sn:
                 continue
 
-            # Extract metrics from flat payload dictionary
-            # Strip metadata/routing keys
-            raw_metrics = {}
-            for k, v in device.items():
-                if k in _METRICS_EXCLUDED_KEYS:
-                    continue
-                raw_metrics[k] = v
-
             # Retrieve info from discovery cache
             device_info = self._discovery_cache.get("device_info", {}).get(sn, {})
             device_type = str(device_info.get("device_type_code") or "")
 
-            # Handle collectTime / reportTimestamp to resolve last_seen
-            last_seen = now_utc
-            collect_time = device.get("collectTime")
-            report_ts = device.get("reportTimestamp")
-
-            if collect_time is not None:
-                try:
-                    last_seen = datetime.fromtimestamp(
-                        float(collect_time), UTC
-                    ).isoformat()
-                except ValueError, TypeError:
-                    pass
-            elif report_ts is not None:
-                try:
-                    last_seen = datetime.fromtimestamp(
-                        float(report_ts) / 1000.0, UTC
-                    ).isoformat()
-                except ValueError, TypeError:
-                    pass
+            raw_metrics = _extract_raw_push_metrics(device)
+            last_seen = _resolve_push_timestamp(device, now_utc)
 
-            # Filter collector metrics
-            if device_type == "COLLECTOR":
-                metrics_to_update = _filter_collector_metrics(raw_metrics)
-            else:
-                metrics_to_update = raw_metrics.copy()
-            # Merge with existing metrics if provided, ignoring None/null values
-            merged_metrics = {}
-            if existing_metrics and sn in existing_metrics:
-                # Copy existing to avoid mutating caller's dictionary directly
-                merged_metrics = dict(existing_metrics[sn])
-
-            for k, v in metrics_to_update.items():
-                if v is not None:
-                    merged_metrics[k] = v
-            merged_metrics["last_seen"] = last_seen
+            merged_metrics = _merge_push_metrics(
+                sn, raw_metrics, device_type, existing_metrics
+            )
+            merged_metrics["last_seen"] = last_seen.isoformat()
 
             # Compute derived metrics on the full merged dataset
             derived = _compute_derived_metrics(merged_metrics, device_type)

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

@@ -1,12 +1,9 @@
 Metadata-Version: 2.4
 Name: hyxi-cloud-api
-Version: 1.3.8
+Version: 1.4.0
 Summary: An async API client for HYXi Cloud.
 Author-email: Veldkornet <Veldkornet@users.noreply.github.com>
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{hyxi_cloud_api-1.3.8 → hyxi_cloud_api-1.4.0}/src/hyxi_cloud_api.egg-info/SOURCES.txt

@@ -12,16 +12,19 @@ tests/test_additional_coverage.py
 tests/test_alarm_push.py
 tests/test_all_in_one.py
 tests/test_api.py
+tests/test_api_imports.py
 tests/test_build_plant_tasks.py
 tests/test_caching.py
 tests/test_compute_battery_metrics.py
 tests/test_compute_derived_metrics.py
 tests/test_compute_grid_metrics.py
 tests/test_compute_load_metrics.py
+tests/test_compute_pv_metrics.py
 tests/test_device_control.py
 tests/test_device_entry.py
 tests/test_devices_errors.py
 tests/test_discovery.py
+tests/test_ensure_authenticated.py
 tests/test_execute_device_tasks.py
 tests/test_execute_metric_tasks.py
 tests/test_execute_metrics_and_map_alarms.py
@@ -33,6 +36,7 @@ tests/test_fetch_plants.py
 tests/test_fetch_state.py
 tests/test_fetch_sub_device_list.py
 tests/test_filter_metrics.py
+tests/test_flatten_nested_push_device.py
 tests/test_fuzz_parser.py
 tests/test_get_f.py
 tests/test_handle_back_discovery_alarm.py
@@ -48,6 +52,7 @@ tests/test_push.py
 tests/test_sanitize_dict.py
 tests/test_sanitize_list.py
 tests/test_security_fix.py
+tests/test_set_log_salt.py
 tests/test_subscriptions.py
 tests/test_token_errors.py
 tests/test_token_handling.py

{hyxi_cloud_api-1.3.8 → hyxi_cloud_api-1.4.0}/tests/test_additional_coverage.py

@@ -32,7 +32,7 @@ async def test_fetch_sub_devices_coverage(caplog):
 
     # Verify debug log was hit (line 1243)
     # PARENT_SN is masked to ca7b0e8c
-    assert "HYXI Found 3 sub-devices under ca7b0e8c" in caplog.text
+    assert "HYXI Found 3 sub-devices under " in caplog.text
     # Verify duplicate/empty check worked (line 1253)
     assert api._fetch_all_for_device.call_count == 1
     api._fetch_all_for_device.assert_called_once_with(
@@ -54,7 +54,8 @@ async def test_fetch_sub_devices_coverage(caplog):
     api._fetch_sub_device_list = AsyncMock(side_effect=Exception("Database failure"))
     await api._fetch_sub_devices("PARENT_SN", state)
     # PARENT_SN is masked to ca7b0e8c
-    assert "Error fetching sub-devices for ca7b0e8c: Database failure" in caplog.text
+    assert "Error fetching sub-devices for " in caplog.text
+    assert "Database failure" in caplog.text
 
 
 @pytest.mark.asyncio
@@ -71,7 +72,7 @@ async def test_fetch_alarms_for_plant_coverage(caplog):
     res = await api._fetch_alarms_for_plant("PLANT_123")
     assert res == []
     # PLANT_123 is masked to b7a0873d
-    assert "HYXI API Alarm Fetch Rejected for Plant b7a0873d" in caplog.text
+    assert "HYXI API Alarm Fetch Rejected for Plant " in caplog.text
 
     # 2. Alarm Name Mapping (line 1295)
     api._request = AsyncMock(

{hyxi_cloud_api-1.3.8 → hyxi_cloud_api-1.4.0}/tests/test_api.py

@@ -281,7 +281,7 @@ async def test_fetch_ems_basic_data_success(caplog):
     ems_sn = "10602251600016"
     entry = {"device_type_code": "EMS", "metrics": {"existing_metric": "value"}}
 
-    await api._fetch_all_for_device(ems_sn, entry, "INVERTER")
+    await api._fetch_all_for_device(ems_sn, entry, "EMS")
 
     # Assert query_ems_basic_details was called
     api.query_ems_basic_details.assert_called_once_with(ems_sn)
@@ -306,7 +306,7 @@ async def test_fetch_ems_basic_data_no_data(caplog):
     ems_sn = "EMS123"
     entry = {"device_type_code": "EMS", "metrics": {"existing_metric": "value"}}
 
-    await api._fetch_all_for_device(ems_sn, entry, "INVERTER")
+    await api._fetch_all_for_device(ems_sn, entry, "EMS")
 
     # Assert query_ems_basic_details was called
     api.query_ems_basic_details.assert_called_once_with("EMS123")
@@ -497,7 +497,7 @@ async def test_fetch_all_for_device_collector():
 async def test_fetch_all_for_device_non_collector():
     """Test _fetch_all_for_device when dev_type is not COLLECTOR.
 
-    Non-collector devices (e.g. INVERTER) trigger device info, metrics, and EMS
+    Non-collector devices (e.g. INVERTER) trigger device info and metrics
     telemetry probing concurrently. query_ems_basic_details must be mocked to
     prevent unawaited coroutine RuntimeWarnings from the real HTTP path.
     """
@@ -520,7 +520,22 @@ async def test_fetch_all_for_device_non_collector():
 
     api._fetch_device_info.assert_called_once_with(sn, entry)
     api._fetch_device_metrics.assert_called_once_with(sn, entry)
-    api.query_ems_basic_details.assert_called_once_with(sn)
+    api.query_ems_basic_details.assert_not_called()
+
+    # Reset mocks before verifying EMS-capable device behaviour
+    api._fetch_device_info.reset_mock()
+    api._fetch_device_metrics.reset_mock()
+    api.query_ems_basic_details.reset_mock()
+
+    # EMS-capable non-collector devices should still trigger the EMS probe
+    ems_sn = "EMS123"
+    ems_entry = {"device_type_code": "EMS", "metrics": {"existing_metric": "value"}}
+
+    await api._fetch_all_for_device(ems_sn, ems_entry, "EMS")
+
+    api._fetch_device_info.assert_called_once_with(ems_sn, ems_entry)
+    api._fetch_device_metrics.assert_called_once_with(ems_sn, ems_entry)
+    api.query_ems_basic_details.assert_called_once_with(ems_sn)
 
 
 # --- TEST 6: Empty Data Response (The "Halo ESS" Scenario) ---
@@ -592,7 +607,8 @@ async def test_fetch_alarms_for_plant_error(caplog):
     assert alarms == []
 
     log_text = caplog.text
-    assert "Error fetching alarms for plant ef797c81: Connection reset" in log_text
+    assert "Error fetching alarms for plant " in log_text
+    assert "Connection reset" in log_text
 
 
 @pytest.mark.asyncio
@@ -688,3 +704,101 @@ async def test_execute_fetch_all_force_discovery_integration():
             # Ensure we successfully parsed the data, meaning full discovery worked
             assert "device_1" in result
             assert result["device_1"]["sw_version"] == "v1.0"
+
+
+@pytest.mark.asyncio
+async def test_get_all_device_data_unexpected_error():
+    """Test that get_all_device_data propagates unexpected errors."""
+    fake_session = MagicMock()
+    api = HyxiApiClient("ak", "sk", "https://api.com", fake_session)
+
+    # Mock _execute_fetch_all to raise Exception
+    api._execute_fetch_all = AsyncMock(side_effect=Exception("Unexpected Error"))
+
+    with pytest.raises(Exception, match="Unexpected Error"):
+        await api.get_all_device_data()
+
+
+@pytest.mark.asyncio
+async def test_process_push_data_flat_payload():
+    """Test process_push_data correctly handles flat payloads and normalizes grid keys."""
+    fake_session = MagicMock()
+    api = HyxiApiClient("ak", "sk", "https://api.com", fake_session)
+    api.devices_cache = {
+        "SN_FLAT": {"device_sn": "SN_FLAT", "metrics": {"oldMetric": "old"}}
+    }
+
+    # Simulate flat payload from webhook
+    payload = {
+        "dataList": [
+            {
+                "deviceSn": "SN_FLAT",
+                "batP": 123,
+                "gridEin": 456,
+                "gridEout": 789,
+                "reportTimestamp": 1000000000000,
+            }
+        ]
+    }
+    existing = {"SN_FLAT": {"oldMetric": "old"}}
+
+    results = api.process_push_data(payload, existing_metrics=existing)
+    assert "SN_FLAT" in results
+    metrics = results["SN_FLAT"]["metrics"]
+    assert metrics["batP"] == 123
+    assert metrics["oldMetric"] == "old"  # preserves existing
+    assert metrics["totalEnt"] == 456  # validates flat key mapping
+    assert metrics["totalEpt"] == 789
+    assert "last_seen" in metrics
+
+
+@pytest.mark.asyncio
+async def test_process_push_data_nested_payload():
+    """Test process_push_data handles legacy nested payloads and normalizes nested grid keys."""
+    fake_session = MagicMock()
+    api = HyxiApiClient("ak", "sk", "https://api.com", fake_session)
+
+    payload = {
+        "dataList": [
+            {
+                "deviceSn": "SN_NEST",
+                "battery": {"powerW": 123},
+                "grid": {"energyInKwh": 456, "energyOutKwh": 789},
+                "reportTimestamp": 1000000000000,
+            }
+        ]
+    }
+    existing = {"SN_NEST": {"old": "old"}}
+
+    results = api.process_push_data(payload, existing_metrics=existing)
+    assert "SN_NEST" in results
+    metrics = results["SN_NEST"]["metrics"]
+    assert metrics["batP"] == 123
+    assert metrics["totalEnt"] == 456
+    assert metrics["totalEpt"] == 789
+    assert metrics["old"] == "old"
+
+
+@pytest.mark.asyncio
+async def test_process_push_data_timestamp_fallback():
+    """Test process_push_data uses fallback timestamps when invalid."""
+    fake_session = MagicMock()
+    api = HyxiApiClient("ak", "sk", "https://api.com", fake_session)
+
+    payload = {
+        "dataList": [
+            {
+                "deviceSn": "SN_TIME",
+                "batP": 123,
+                "reportTimestamp": "INVALID",
+                "collectTime": "INVALID_TOO",
+            }
+        ]
+    }
+
+    # Should not raise exception
+    results = api.process_push_data(payload, existing_metrics={"SN_TIME": {}})
+    assert "SN_TIME" in results
+    metrics = results["SN_TIME"]["metrics"]
+    assert "last_seen" in metrics
+    assert metrics["batP"] == 123

hyxi_cloud_api-1.4.0/tests/test_api_imports.py

@@ -0,0 +1,33 @@
+"""Tests for import fallbacks in the API client module."""
+
+import builtins
+import sys
+import unittest.mock
+
+
+def test_utc_import_fallback():
+    """Test the ImportError fallback for datetime.UTC at line 27."""
+    original_import = builtins.__import__
+
+    def mocked_import(name, global_vars=None, local_vars=None, fromlist=(), level=0):
+        # Trigger ImportError when trying to import UTC from datetime
+        if name == "datetime" and fromlist and "UTC" in fromlist:
+            raise ImportError("mocked ImportError for UTC")
+        return original_import(name, global_vars, local_vars, fromlist, level)
+
+    original_api = sys.modules.get("hyxi_cloud_api.api")
+    if "hyxi_cloud_api.api" in sys.modules:
+        del sys.modules["hyxi_cloud_api.api"]
+
+    try:
+        with unittest.mock.patch("builtins.__import__", side_effect=mocked_import):
+            from hyxi_cloud_api import api  # pylint: disable=import-outside-toplevel
+
+            assert api.UTC is not None
+            assert api.UTC.tzname(None) == "UTC"
+    finally:
+        # Restore normal module state
+        if "hyxi_cloud_api.api" in sys.modules:
+            del sys.modules["hyxi_cloud_api.api"]
+        if original_api is not None:
+            sys.modules["hyxi_cloud_api.api"] = original_api