hyponcloud 0.9.2__tar.gz → 0.9.4__tar.gz

{hyponcloud-0.9.2 → hyponcloud-0.9.4}/.github/workflows/ci.yml

@@ -70,7 +70,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: matrix.python-version == '3.11'
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           file: ./coverage.xml
           fail_ci_if_error: false

{hyponcloud-0.9.2 → hyponcloud-0.9.4}/.gitignore

@@ -125,6 +125,9 @@ dmypy.json
 # IDEs
 .vscode/
 .idea/
+
+# Claude Code local config
+.claude/settings.local.json
 *.swp
 *.swo
 *~

{hyponcloud-0.9.2/hyponcloud.egg-info → hyponcloud-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyponcloud
-Version: 0.9.2
+Version: 0.9.4
 Summary: Python library for Hypontech Cloud API
 Author-email: jcisio <hainam@jcisio.com>
 License: MIT

{hyponcloud-0.9.2 → hyponcloud-0.9.4}/example.py

@@ -68,10 +68,10 @@ async def main() -> None:
             if plants:
                 # Table header
                 print(
-                    f"{'Name':<20} {'Location':<25} {'Status':<10} "
+                    f"{'Name':<20} {'Location':<25} {'Status':<10} {'Type':<12} "
                     f"{'Power':<15} {'Today':<10} {'Total':<10}"
                 )
-                print("-" * 100)
+                print("-" * 112)
                 # Table rows
                 for plant in plants:
                     location = f"{plant.city}, {plant.country}"
@@ -80,16 +80,21 @@ async def main() -> None:
                         f"{plant.plant_name:<20} "
                         f"{location:<25} "
                         f"{plant.status:<10} "
+                        f"{plant.plant_type:<12} "
                         f"{power_str:<15} "
                         f"{plant.e_today:<10.2f} "
                         f"{plant.e_total:<10.2f}"
                     )
 
-            # Get inverters for the first plant (if available)
-            if plants:
-                first_plant = plants[0]
-                print(f"\nFetching inverters for plant: {first_plant.plant_name}...")
-                inverters = await client.get_inverters(first_plant.plant_id)
+            # Get inverters and monitor data for each plant
+            for plant in plants:
+                print(f"\n{'#' * 60}")
+                print(f"# Plant: {plant.plant_name} (ID: {plant.plant_id})")
+                print(f"{'#' * 60}")
+
+                # Inverters for this plant
+                print(f"\nFetching inverters for plant: {plant.plant_name}...")
+                inverters = await client.get_inverters(plant.plant_id)
                 print(f"\n=== Inverters ({len(inverters)}) ===")
                 if inverters:
                     # Table header
@@ -110,11 +115,9 @@ async def main() -> None:
                             f"{inverter.software_version:<12}"
                         )
 
-            # Get monitor data for the first plant (if available)
-            if plants:
-                first_plant = plants[0]
-                print(f"\nFetching monitor data for plant: {first_plant.plant_name}...")
-                monitor = await client.get_monitor(first_plant.plant_id)
+                # Monitor data for this plant
+                print(f"\nFetching monitor data for plant: {plant.plant_name}...")
+                monitor = await client.get_monitor(plant.plant_id)
                 print("\n=== Plant Monitor ===")
                 print(f"{'Field':<25} {'Value':<30}")
                 print("-" * 55)
@@ -125,6 +128,7 @@ async def main() -> None:
                 print(f"{'PV Power':<25} {monitor.power_pv} W")
                 print(f"{'Load Power':<25} {monitor.power_load} W")
                 print(f"{'Grid Power':<25} {monitor.meter_power} W")
+                print(f"{'Battery Discharge':<25} {monitor.w_cha} W")
                 print(f"{'Battery SOC':<25} {monitor.soc}%")
                 print(f"{'Performance':<25} {monitor.percent}%")
                 print(f"{'CO2 Saved':<25} {monitor.total_co2} kg")

{hyponcloud-0.9.2 → hyponcloud-0.9.4}/hyponcloud/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.9.2'
-__version_tuple__ = version_tuple = (0, 9, 2)
+__version__ = version = '0.9.4'
+__version_tuple__ = version_tuple = (0, 9, 4)
 
-__commit_id__ = commit_id = 'g26813dc98'
+__commit_id__ = commit_id = 'g176e02645'

{hyponcloud-0.9.2 → hyponcloud-0.9.4}/hyponcloud/client.py

@@ -4,7 +4,7 @@ import asyncio
 import json
 import logging
 from time import time
-from typing import Any
+from typing import Any, cast
 
 import aiohttp
 
@@ -45,10 +45,10 @@ class HyponCloud:
 
         self._session = session
         self._own_session = session is None
-        self.__username = username
-        self.__password = password
-        self.__token = ""
-        self.__token_expires_at = 0
+        self._username = username
+        self._password = password
+        self._token = ""
+        self._token_expires_at = 0
 
     async def __aenter__(self) -> "HyponCloud":
         """Async context manager entry."""
@@ -73,7 +73,7 @@ class HyponCloud:
             AuthenticationError: If authentication fails.
             ConnectionError: If connection to API fails.
         """
-        if self.__token and self.__token_expires_at > time():
+        if self._token and self._token_expires_at > time():
             return
 
         if not self._session:
@@ -81,14 +81,12 @@ class HyponCloud:
             self._own_session = True
 
         url = f"{self.base_url}/login"
-        data = {"username": self.__username, "password": self.__password}
+        data = {"username": self._username, "password": self._password}
 
         try:
             async with self._session.post(
                 url, json=data, timeout=self.timeout
             ) as response:
-                result = await self._parse_response(response, "POST", url)
-
                 if response.status == 401:
                     raise AuthenticationError("Invalid credentials")
                 if response.status == 429:
@@ -100,8 +98,9 @@ class HyponCloud:
                         f"Connection failed with status {response.status}"
                     )
 
-                self.__token = result["data"]["token"]
-                self.__token_expires_at = int(time()) + self.token_validity
+                result = await self._parse_response(response, "POST", url)
+                self._token = result["data"]["token"]
+                self._token_expires_at = int(time()) + self.token_validity
         except aiohttp.ClientError as e:
             raise RequestError(f"Failed to connect to Hypon Cloud: {e}") from e
         except KeyError as e:
@@ -119,8 +118,8 @@ class HyponCloud:
             print(f"Headers: {dict(response.headers)}")
             raw_text = await response.text()
             print(f"Response: {raw_text}")
-            return dict(json.loads(raw_text))
-        return dict(await response.json())
+            return cast(dict, json.loads(raw_text))
+        return cast(dict, await response.json())
 
     async def _request(
         self, url: str, endpoint_name: str, retries: int | None = None
@@ -143,13 +142,11 @@ class HyponCloud:
         await self.connect()
         assert self._session is not None  # connect() ensures session exists
 
-        headers = {"authorization": f"Bearer {self.__token}"}
+        headers = {"authorization": f"Bearer {self._token}"}
         try:
             async with self._session.get(
                 url, headers=headers, timeout=self.timeout
             ) as response:
-                result = await self._parse_response(response, "GET", url)
-
                 if response.status == 429:
                     if retries > 0:
                         await asyncio.sleep(10)
@@ -164,8 +161,11 @@ class HyponCloud:
                         f"Failed to get {endpoint_name}: HTTP {response.status}"
                     )
 
-                return result
+                return await self._parse_response(response, "GET", url)
         except aiohttp.ClientError as e:
+            if retries > 0:
+                await asyncio.sleep(10)
+                return await self._request(url, endpoint_name, retries - 1)
             raise RequestError(f"Failed to get {endpoint_name}: {e}") from e
 
     async def get_overview(self, retries: int | None = None) -> OverviewData:
@@ -182,35 +182,55 @@ class HyponCloud:
             AuthenticationError: If authentication fails.
             ConnectionError: If connection to API fails.
         """
+        retries = retries if retries is not None else self.retries
         url = f"{self.base_url}/plant/overview"
         try:
             result = await self._request(url, "plant overview", retries)
             return OverviewData.from_dict(result["data"])
         except KeyError as e:
             _LOGGER.error("Error parsing plant overview data: %s", e)
+            if retries > 0:
+                return await self.get_overview(retries - 1)
             return OverviewData()
 
     async def get_list(self, retries: int | None = None) -> list[PlantData]:
         """Get plant list.
 
+        This method automatically fetches all pages of plants.
+
         Args:
             retries: Number of retry attempts if request fails. If None,
                 uses the client's default retry setting.
 
         Returns:
-            List of PlantData objects.
+            List of all PlantData objects across all pages.
 
         Raises:
             AuthenticationError: If authentication fails.
             ConnectionError: If connection to API fails.
         """
-        url = f"{self.base_url}/plant/list2?page=1&page_size=10&refresh=true"
-        try:
-            result = await self._request(url, "plant list", retries)
-            return [PlantData.from_dict(item) for item in result["data"]]
-        except KeyError as e:
-            _LOGGER.error("Error getting plant list: %s", e)
-            raise RequestError(f"Failed to get plant list: {e}") from e
+        retries = retries if retries is not None else self.retries
+        all_plants: list[PlantData] = []
+        page = 1
+        total_pages = 1
+
+        while page <= total_pages:
+            url = (
+                f"{self.base_url}/plant/list2" f"?page={page}&page_size=10&refresh=true"
+            )
+            try:
+                result = await self._request(url, "plant list", retries)
+                if "totalPage" in result:
+                    total_pages = result["totalPage"]
+                all_plants.extend(PlantData.from_dict(item) for item in result["data"])
+                page += 1
+            except KeyError as e:
+                _LOGGER.error("Error parsing plant list data: %s", e)
+                if retries > 0:
+                    return await self.get_list(retries - 1)
+                return []
+
+        return all_plants
 
     async def get_inverters(
         self, plant_id: str, retries: int | None = None
@@ -231,6 +251,7 @@ class HyponCloud:
             AuthenticationError: If authentication fails.
             ConnectionError: If connection to API fails.
         """
+        retries = retries if retries is not None else self.retries
         all_inverters: list[InverterData] = []
         page = 1
         total_pages = 1
@@ -247,6 +268,8 @@ class HyponCloud:
                 page += 1
             except KeyError as e:
                 _LOGGER.error("Error parsing inverter list data: %s", e)
+                if retries > 0:
+                    return await self.get_inverters(plant_id, retries - 1)
                 return []
 
         return all_inverters
@@ -268,12 +291,15 @@ class HyponCloud:
             AuthenticationError: If authentication fails.
             ConnectionError: If connection to API fails.
         """
+        retries = retries if retries is not None else self.retries
         url = f"{self.base_url}/plant/{plant_id}/monitor?refresh=true"
         try:
             result = await self._request(url, "plant monitor", retries)
             return PlantMonitorData.from_dict(result["data"])
         except KeyError as e:
             _LOGGER.error("Error parsing plant monitor data: %s", e)
+            if retries > 0:
+                return await self.get_monitor(plant_id, retries - 1)
             return PlantMonitorData()
 
     async def get_admin_info(self, retries: int | None = None) -> AdminInfo:
@@ -290,15 +316,20 @@ class HyponCloud:
             AuthenticationError: If authentication fails.
             ConnectionError: If connection to API fails.
         """
+        retries = retries if retries is not None else self.retries
         url = f"{self.base_url}/administrator/admininfo"
         try:
             result = await self._request(url, "admin info", retries)
             data = result["data"]
             # Flatten nested "info" object into the main data dict
             if "info" in data and isinstance(data["info"], dict):
-                info_data = data.pop("info")
-                data.update(info_data)
+                data = {
+                    **{k: v for k, v in data.items() if k != "info"},
+                    **data["info"],
+                }
             return AdminInfo.from_dict(data)
         except KeyError as e:
             _LOGGER.error("Error parsing admin info data: %s", e)
+            if retries > 0:
+                return await self.get_admin_info(retries - 1)
             return AdminInfo()

{hyponcloud-0.9.2 → hyponcloud-0.9.4}/hyponcloud/exceptions.py

@@ -13,5 +13,5 @@ class RequestError(HyponCloudError):
     """Exception raised when API request fails."""
 
 
-class RateLimitError(HyponCloudError):
+class RateLimitError(RequestError):
     """Exception raised when API rate limit is exceeded."""

{hyponcloud-0.9.2 → hyponcloud-0.9.4}/hyponcloud/models.py

@@ -174,10 +174,10 @@ class PlantMonitorData(DataClassDictMixin):
     total_co2: float = 0.0
     total_diesel: float = 0.0
     percent: int = 0
-    meter_power: float = 0.0
-    power_load: float = 0.0
-    w_cha: float = 0.0
-    power_pv: float = 0.0
+    meter_power: float = 0.0  # Power drawn from the grid (W)
+    power_load: float = 0.0  # Home/load power consumption (W)
+    w_cha: float = 0.0  # Battery discharging power (W)
+    power_pv: float = 0.0  # PV (solar) generation power (W)
     soc: float = 0.0
     micro: int = 0
     warning: str = ""

{hyponcloud-0.9.2 → hyponcloud-0.9.4/hyponcloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyponcloud
-Version: 0.9.2
+Version: 0.9.4
 Summary: Python library for Hypontech Cloud API
 Author-email: jcisio <hainam@jcisio.com>
 License: MIT