glances_api 0.5.1__tar.gz → 0.7.0__tar.gz

{glances_api-0.5.1 → glances_api-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glances_api
-Version: 0.5.1
+Version: 0.7.0
 Summary: Python API for interacting with Glances
 Home-page: https://github.com/home-assistant-ecosystem/python-glances-api
 License: MIT

{glances_api-0.5.1 → glances_api-0.7.0}/glances_api/__init__.py

@@ -1,4 +1,5 @@
 """Client to interact with the Glances API."""
+
 from __future__ import annotations
 
 import logging
@@ -153,10 +154,19 @@ class Glances:
         if networks := self.data.get("network"):
             sensor_data["network"] = {}
             for network in networks:
+                time_since_update = network["time_since_update"]
+                # New name of network sensors in Glances v4
+                rx = network.get("bytes_recv_rate_per_sec")
+                tx = network.get("bytes_sent_rate_per_sec")
+                # Compatibility with Glances v3
+                if rx is None and (rx_bytes := network.get("rx")) is not None:
+                    rx = round(rx_bytes / time_since_update)
+                if tx is None and (tx_bytes := network.get("tx")) is not None:
+                    tx = round(tx_bytes / time_since_update)
                 sensor_data["network"][network["interface_name"]] = {
                     "is_up": network.get("is_up"),
-                    "rx": round(network["rx"] / 1024, 1),
-                    "tx": round(network["tx"] / 1024, 1),
+                    "rx": rx,
+                    "tx": tx,
                     "speed": round(network["speed"] / 1024**3, 1),
                 }
         data = self.data.get("dockers") or self.data.get("containers")
@@ -182,11 +192,18 @@ class Glances:
         if data := self.data.get("gpu"):
             sensor_data["gpu"] = {}
             for sensor in data:
-                sensor_data["gpu"][f"GPU_{sensor['gpu_id']}__{sensor['name']}"] = {
-                    "name": sensor["name"],
-                    "temperature": sensor["temperature"],
-                    "mem": sensor["mem"],
-                    "proc": sensor["proc"],
-                    "fan_speed": sensor["fan_speed"] if "fan_speed" in sensor else 0,
+                sensor_data["gpu"][f"{sensor['name']} (GPU {sensor['gpu_id']})"] = {
+                    "temperature": sensor.get("temperature", 0),
+                    "mem": sensor.get("mem", 0),
+                    "proc": sensor.get("proc", 0),
+                    "fan_speed": sensor.get("fan_speed", 0),
+                }
+        if data := self.data.get("diskio"):
+            sensor_data["diskio"] = {}
+            for disk in data:
+                time_since_update = disk["time_since_update"]
+                sensor_data["diskio"][disk["disk_name"]] = {
+                    "read": round(disk["read_bytes"] / time_since_update),
+                    "write": round(disk["write_bytes"] / time_since_update),
                 }
         return sensor_data

{glances_api-0.5.1 → glances_api-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "glances_api"
-version = "0.5.1"
+version = "0.7.0"
 description = "Python API for interacting with Glances"
 authors = ["Fabian Affolter <fabian@affolter-engineering.ch>"]
 homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"
@@ -22,8 +22,8 @@ python = "^3.11"
 httpx = ">=0.23,<1"
 
 [tool.poetry.dev-dependencies]
-black = "^23.3"
-pytest = "^7.3.0"
+black = "^24.3"
+pytest = "^8"
 pytest-httpx = ">0.15,<1"
 pytest-asyncio = "^0.16.0"
 isort = "^5.10.0"