glances_api 0.4.2__tar.gz → 0.5.0__tar.gz

{glances_api-0.4.2 → glances_api-0.5.0}/PKG-INFO

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

{glances_api-0.4.2 → glances_api-0.5.0}/glances_api/__init__.py

@@ -18,7 +18,7 @@ class Glances:
         self,
         host: str = "localhost",
         port: int = 61208,
-        version: int = 2,
+        version: int = 3,
         ssl: bool = False,
         verify_ssl: bool = True,
         username: str | None = None,
@@ -26,6 +26,11 @@ class Glances:
         httpx_client: httpx.AsyncClient | None = None,
     ):
         """Initialize the connection."""
+        if version == 2:
+            _LOGGER.warning(
+                "Glances api older than v3 will not be supported in the next release."
+            )
+
         schema = "https" if ssl else "http"
         self.url = f"{schema}://{host}:{port}/api/{version}"
         self.data: dict[str, Any] = {}
@@ -88,7 +93,7 @@ class Glances:
         else:
             raise exceptions.GlancesApiError("Element data not available")
 
-    async def get_ha_sensor_data(self) -> dict[str, Any] | None:
+    async def get_ha_sensor_data(self) -> dict[str, Any]:
         """Create a dictionary with data for Home Assistant sensors."""
         await self.get_data("all")
 
@@ -135,9 +140,27 @@ class Glances:
             }
         if data := self.data.get("quicklook"):
             sensor_data["cpu"] = {"cpu_use_percent": data["cpu"]}
-        if "docker" in self.data and (data := self.data["docker"].get("containers")):
+        if data := self.data.get("percpu"):
+            sensor_data["percpu"] = {}
+            for cpu in data:
+                sensor_data["percpu"][str(cpu["cpu_number"])] = {
+                    "cpu_use_percent": cpu["total"]
+                }
+        if networks := self.data.get("network"):
+            sensor_data["network"] = {}
+            for network in networks:
+                sensor_data["network"][network["interface_name"]] = {
+                    "is_up": network["is_up"],
+                    "rx": round(network["rx"] / 1024, 1),
+                    "tx": round(network["tx"] / 1024, 1),
+                    "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")):
             active_containers = [
-                container for container in data if container["Status"] == "running"
+                container
+                for container in containers_data
+                if container["Status"] == "running"
             ]
             sensor_data["docker"] = {"docker_active": len(active_containers)}
             cpu_use = 0.0
@@ -150,4 +173,16 @@ class Glances:
             sensor_data["docker"]["docker_memory_use"] = round(mem_use / 1024**2, 1)
         if data := self.data.get("raid"):
             sensor_data["raid"] = data
+        if data := self.data.get("uptime"):
+            sensor_data["uptime"] = data
+        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,
+                }
         return sensor_data

{glances_api-0.4.2 → glances_api-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "glances_api"
-version = "0.4.2"
+version = "0.5.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"
@@ -23,7 +23,7 @@ httpx = ">=0.23,<1"
 
 [tool.poetry.dev-dependencies]
 black = "^23.3"
-pytest = "^7.1.2"
+pytest = "^7.3.0"
 pytest-httpx = ">0.15,<1"
 pytest-asyncio = "^0.16.0"
 isort = "^5.10.0"