solarlog-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{solarlog_cli-0.2.0 → solarlog_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solarlog_cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python library to access the Solar-Log
 Project-URL: Repository, https://github.com/dontinelli/solarlog_cli.git
 Project-URL: Issues, https://github.com/dontinelli/solarlog_cli/issues

{solarlog_cli-0.2.0 → solarlog_cli-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "solarlog_cli"
-version = "0.2.0"
+version = "0.2.2"
 authors = [
   { name="dontinelli", email="73341522+dontinelli@users.noreply.github.com" },
 ]

{solarlog_cli-0.2.0 → solarlog_cli-0.2.2}/src/solarlog_cli/solarlog_client.py

@@ -137,7 +137,7 @@ class Client:
         return data
 
     async def get_energy(self, data: SolarlogData) -> SolarlogData:
-        """Get power data from Solar-Log"""
+        """Get energy data from Solar-Log"""
 
         raw_data: dict = await self.execute_http_request({878: None})
 

{solarlog_cli-0.2.0 → solarlog_cli-0.2.2}/src/solarlog_cli/solarlog_connector.py

@@ -14,20 +14,22 @@ _LOGGER = logging.getLogger(__name__)
 class SolarLogConnector:
     """Connector class to access Solar-Log."""
 
-    def __init__( # pylint: disable=dangerous-default-value
+    def __init__(
         self,
         host: str,
         extended_data: bool = False,
         tz: str = "",
-        device_enabled: dict[int, bool] = {},
+        device_enabled: dict[int, bool] | None = None,
     ):
         self.client = Client(host)
         self.extended_data: bool = extended_data
 
         self._device_list: dict[int, InverterData] = {}
-        if device_enabled != {}:
-            for key, value in device_enabled.items():
-                self._device_list |= {key: InverterData(enabled=value)}
+        if device_enabled is None:
+            device_enabled = {}
+
+        for key, value in device_enabled.items():
+            self._device_list |= {key: InverterData(enabled=value)}
 
         self.timezone: tzinfo = timezone.utc if tz == "" else ZoneInfo(tz)
 
@@ -60,21 +62,21 @@ class SolarLogConnector:
         #calculated values (for downward compatibility)
         data.alternator_loss = data.power_dc - data.power_ac
         if data.power_dc != 0:
-            data.efficiency = data.power_ac / data.power_dc
+            data.efficiency = round(data.power_ac / data.power_dc *100, 1)
         if data.power_ac != 0:
-            data.usage = data.consumption_ac / data.power_ac
+            data.usage = round(data.consumption_ac / data.power_ac * 100, 1)
             data.power_available = data.power_ac - data.consumption_ac
         else:
             data.usage = 0.0
             data.power_available = 0.0
         if data.total_power != 0:
-            data.capacity = data.power_dc / data.total_power
+            data.capacity = round(data.power_dc / data.total_power * 100, 1)
 
         return data
 
     async def update_device_list(self) -> dict[int, InverterData]:
         """Update list of devices."""
-        if not self.extended_data or self._device_list is None:
+        if not self.extended_data:
             return {}
 
         devices = await self.client.get_device_list()

{solarlog_cli-0.2.0 → solarlog_cli-0.2.2}/src/solarlog_cli/solarlog_models.py

@@ -1,5 +1,5 @@
 """Models for SolarLog."""
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from datetime import datetime
 
 from mashumaro import DataClassDictMixin
@@ -12,7 +12,7 @@ class InverterData():
     name: str = ""
     enabled: bool = False
     current_power: float | None = None
-    consumption_year: float | None = None
+    consumption_year: float | None= None
 
 
 @dataclass
@@ -40,13 +40,13 @@ class SolarlogData(DataClassDictMixin):
     yield_total: float
 
     #calculated values
-    alternator_loss: float | None = None
+    alternator_loss: float = 0
     capacity: float | None = None
     efficiency: float | None = None
-    power_available: float | None = None
+    power_available: float = 0
     usage: float | None = None
 
     #extended data
-    inverter_data: dict[int, InverterData] | None = None
+    inverter_data: dict[int, InverterData] = field(default_factory=dict)
     production_year: float | None = None
     self_consumption_year: float | None = None

{solarlog_cli-0.2.0 → solarlog_cli-0.2.2}/tests/__snapshots__/test_solarlog_cli.ambr

@@ -2,14 +2,14 @@
 # name: test_update_data[asyncio]
   dict({
     'alternator_loss': 100,
-    'capacity': 0.27901119402985075,
+    'capacity': 27.9,
     'consumption_ac': 3110,
     'consumption_day': 47819,
     'consumption_month': 697471,
     'consumption_total': 28385247,
     'consumption_year': 4218251,
     'consumption_yesterday': 94350,
-    'efficiency': 0.9665663657639585,
+    'efficiency': 96.7,
     'inverter_data': dict({
       0: dict({
         'consumption_year': 4227027.0,
@@ -43,7 +43,7 @@
     'production_year': 8852462,
     'self_consumption_year': 2071,
     'total_power': 10720,
-    'usage': 1.075752334832238,
+    'usage': 107.6,
     'voltage_ac': 0,
     'voltage_dc': 492,
     'yield_day': 17490,