glances_api 0.8.0__tar.gz → 0.9.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glances_api
-Version: 0.8.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.8.0 → glances_api-0.9.0}/glances_api/__init__.py

@@ -134,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"] = {
@@ -182,6 +183,7 @@ class Glances:
             # 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
@@ -198,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.8.0 → glances_api-0.9.0}/pyproject.toml

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