glances_api 0.7.0__tar.gz → 0.9.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glances_api
-Version: 0.7.0
+Version: 0.9.0
 Summary: Python API for interacting with Glances
 Home-page: https://github.com/home-assistant-ecosystem/python-glances-api
 License: MIT
@@ -17,6 +17,7 @@ Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Utilities
 Requires-Dist: httpx (>=0.23,<1)
 Project-URL: Repository, https://github.com/home-assistant-ecosystem/python-glances-api/releases

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

@@ -41,6 +41,7 @@ class Glances:
         self.password = password
         self.verify_ssl = verify_ssl
         self.httpx_client = httpx_client
+        self.version = version
 
     async def get_data(self, endpoint: str) -> None:
         """Retrieve the data."""
@@ -133,8 +134,9 @@ class Glances:
             }
         if data := self.data.get("load"):
             sensor_data["load"] = {
-                "processor_load": data.get("min15")
-                or self.data["cpu"]["total"]  # to be checked
+                "processor_load": data.get("min15"),
+                "processor_load_1m": data.get("min1"),
+                "processor_load_5m": data.get("min5"),
             }
         if data := self.data.get("processcount"):
             sensor_data["processcount"] = {
@@ -154,27 +156,40 @@ 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)
+                rx = tx = None
+                if self.version <= 3:
+                    time_since_update = network["time_since_update"]
+                    if (rx_bytes := network.get("rx")) is not None:
+                        rx = round(rx_bytes / time_since_update)
+                    if (tx_bytes := network.get("tx")) is not None:
+                        tx = round(tx_bytes / time_since_update)
+                else:
+                    # New network sensors in Glances v4
+                    rx = network.get("bytes_recv_rate_per_sec")
+                    tx = network.get("bytes_sent_rate_per_sec")
                 sensor_data["network"][network["interface_name"]] = {
                     "is_up": network.get("is_up"),
                     "rx": rx,
                     "tx": tx,
                     "speed": round(network["speed"] / 1024**3, 1),
                 }
-        data = self.data.get("dockers") or self.data.get("containers")
-        if data and (containers_data := data.get("containers")):
+        containers_data = None
+        if self.version <= 3:
+            # Glances v3 and earlier provide a dict, with containers inside a list in this dict
+            # Key is "dockers" in 3.3 and before, and "containers" in 3.4
+            data = self.data.get("dockers") or self.data.get("containers")
+            containers_data = data.get("containers") if data else None
+        else:
+            # Glances v4 provides a list of containers
+            containers_data = self.data.get("containers")
+        if containers_data:
+            sensor_data["containers"] = {}
             active_containers = [
                 container
                 for container in containers_data
-                if container["Status"] == "running"
+                # "status" since Glance v4, "Status" in v3 and earlier
+                if container.get("status") == "running"
+                or container.get("Status") == "running"
             ]
             sensor_data["docker"] = {"docker_active": len(active_containers)}
             cpu_use = 0.0
@@ -185,6 +200,13 @@ class Glances:
             for container in active_containers:
                 mem_use += container["memory"].get("usage", 0)
             sensor_data["docker"]["docker_memory_use"] = round(mem_use / 1024**2, 1)
+            for container in active_containers:
+                sensor_data["containers"][container["name"]] = {
+                    "container_cpu_use": round(container["cpu"].get("total", 0), 1),
+                    "container_memory_use": round(
+                        container["memory"].get("usage", 0) / 1024**2, 1
+                    ),
+                }
         if data := self.data.get("raid"):
             sensor_data["raid"] = data
         if data := self.data.get("uptime"):

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "glances_api"
-version = "0.7.0"
+version = "0.9.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"