solarlog-cli 0.1.0__tar.gz → 0.1.1__tar.gz

{solarlog_cli-0.1.0 → solarlog_cli-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solarlog_cli
-Version: 0.1.0
+Version: 0.1.1
 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.1.0 → solarlog_cli-0.1.1}/pyproject.toml

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

{solarlog_cli-0.1.0 → solarlog_cli-0.1.1}/src/solarlog_cli/solarlog_client.py

@@ -64,7 +64,7 @@ class Client:
         content_type = response.headers.get("Content-Type", "")
 
         if response.status != 200:
-            msg = f"The server responded with error code {response.status} while fetching data from Solar-Log at {self.host}."
+            msg = f"The server responded with error code {response.status} while fetching data from Solar-Log at {self.host}.\n{url}\n{header}\n{json_payload}"
             text = await response.text()
             raise SolarLogUpdateError(
                 msg,

{solarlog_cli-0.1.0 → solarlog_cli-0.1.1}/src/solarlog_cli/solarlog_connector.py

@@ -47,6 +47,21 @@ class SolarLogConnector:
             data |= await self.client.get_energy()
             data |= {"devices": await self.update_inverter_data()}
             # print(f"extended data updated: {data}")
+
+        #calculated values (for downward compatibility)
+        if data.get("power_dc") != 0:
+            data |= {"efficiency": data.get("power_ac") / data.get("power_dc")}
+        if data.get("power_ac") != 0:
+            data |= {"usage": data.get("consumption_ac") / data.get("power_ac")}
+            data |= {"power_available": data.get("power_ac") - data.get("consumption_ac")}
+        else:
+            data |= {"usage": 0.0}
+            data |= {"power_available": 0.0}
+        data |= {"alternator_loss": data.get("power_dc") - data.get("power_ac")}
+
+        if data.get("total_power") != 0:
+            data |= {"capacity": - data.get("power_dc") / data.get("total_power")}
+
         return data
 
     async def update_device_list(self) -> dict[int, dict[str, str | bool]]: