glances_api 0.8.0__tar.gz → 0.9.1__tar.gz

{glances_api-0.8.0 → glances_api-0.9.1}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2024 Fabian Affolter <fabian@affolter-engineering.ch>
+Copyright (c) 2017-2025 Fabian Affolter <fabian@affolter-engineering.ch>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: glances_api
-Version: 0.8.0
+Version: 0.9.1
 Summary: Python API for interacting with Glances
-Home-page: https://github.com/home-assistant-ecosystem/python-glances-api
 License: MIT
+License-File: LICENSE
 Author: Fabian Affolter
 Author-email: fabian@affolter-engineering.ch
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.13,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -15,42 +15,42 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 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: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
-Requires-Dist: httpx (>=0.23,<1)
+Requires-Dist: httpx (>=0.28,<1)
+Project-URL: Homepage, https://github.com/home-assistant-ecosystem/python-glances-api
 Project-URL: Repository, https://github.com/home-assistant-ecosystem/python-glances-api/releases
-Description-Content-Type: text/x-rst
+Description-Content-Type: text/markdown
 
 python-glances-api
 ==================
 
-A Python client for interacting with `Glances <https://nicolargo.github.io/glances/>`_.
+A Python client for interacting with [Glances](https://nicolargo.github.io/glances/).
 
 This module is not official, developed, supported or endorsed by Glances.
 
 Installation
 ------------
 
-The module is available from the `Python Package Index <https://pypi.python.org/pypi>`_.
+The module is available from the [Python Package Index](https://pypi.python.org/pypi).
 
-.. code:: bash
-
-    $ pip3 install glances_api
+```bash
+$ pip3 install glances_api
+```
 
 Or on a Fedora-based system or on a CentOS/RHEL machine with has EPEL enabled.
 
-.. code:: bash
-
-    $ sudo dnf -y install python3-glances-api
-
-
-For Nix or NixOS is `pre-packed module <https://search.nixos.org/packages?channel=unstable&query=glances-api>`_
-available. The lastest release is usually present in the ``unstable`` channel.
+```bash
+$ sudo dnf -y install python3-glances-api
+```
 
-.. code:: bash
+For Nix or NixOS is[ pre-packed module](https://search.nixos.org/packages?channel=unstable&query=glances-api)
+available. The latest release is usually present in the ``unstable`` channel.
 
-    $ nix-env -iA nixos.python3Packages.glances-api
+```bash
+$ nix-env -iA nixos.python3Packages.glances-api
+```
 
 Usage
 -----

glances_api-0.9.1/README.md

@@ -0,0 +1,38 @@
+python-glances-api
+==================
+
+A Python client for interacting with [Glances](https://nicolargo.github.io/glances/).
+
+This module is not official, developed, supported or endorsed by Glances.
+
+Installation
+------------
+
+The module is available from the [Python Package Index](https://pypi.python.org/pypi).
+
+```bash
+$ pip3 install glances_api
+```
+
+Or on a Fedora-based system or on a CentOS/RHEL machine with has EPEL enabled.
+
+```bash
+$ sudo dnf -y install python3-glances-api
+```
+
+For Nix or NixOS is[ pre-packed module](https://search.nixos.org/packages?channel=unstable&query=glances-api)
+available. The latest release is usually present in the ``unstable`` channel.
+
+```bash
+$ nix-env -iA nixos.python3Packages.glances-api
+```
+
+Usage
+-----
+
+The file ``example.py`` contains an example about how to use this module.
+
+License
+-------
+
+``python-glances-api`` is licensed under MIT, for more details check LICENSE.

{glances_api-0.8.0 → glances_api-0.9.1}/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.1}/pyproject.toml

@@ -1,11 +1,11 @@
 [tool.poetry]
 name = "glances_api"
-version = "0.8.0"
+version = "0.9.1"
 description = "Python API for interacting with Glances"
 authors = ["Fabian Affolter <fabian@affolter-engineering.ch>"]
 homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"
 repository = "https://github.com/home-assistant-ecosystem/python-glances-api/releases"
-readme = "README.rst"
+readme = "README.md"
 license = "MIT"
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -18,16 +18,16 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.11"
-httpx = ">=0.23,<1"
+python = "^3.13"
+httpx = ">=0.28,<1"
 
-[tool.poetry.dev-dependencies]
-black = "^24.3"
-pytest = "^8"
-pytest-httpx = ">0.15,<1"
-pytest-asyncio = "^0.16.0"
+[tool.poetry.group.dev.dependencies]
+black = "^26.3"
+pytest = "^9"
+pytest-httpx = ">0.35,<1"
+pytest-asyncio = "^1.3.0"
 isort = "^5.10.0"
-mypy = "^0.971"
+mypy = "^1.20.0"
 
 [tool.mypy]
 check_untyped_defs = true
@@ -43,14 +43,6 @@ exclude = [
     'pyproject.toml',
 ]
 
-[[tool.mypy.overrides]]
-module = "tests.*"
-allow_untyped_defs = true
-
-[[tool.mypy.overrides]]
-module = "docs.*"
-ignore_errors = true
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

glances_api-0.8.0/README.rst

@@ -1,39 +0,0 @@
-python-glances-api
-==================
-
-A Python client for interacting with `Glances <https://nicolargo.github.io/glances/>`_.
-
-This module is not official, developed, supported or endorsed by Glances.
-
-Installation
-------------
-
-The module is available from the `Python Package Index <https://pypi.python.org/pypi>`_.
-
-.. code:: bash
-
-    $ pip3 install glances_api
-
-Or on a Fedora-based system or on a CentOS/RHEL machine with has EPEL enabled.
-
-.. code:: bash
-
-    $ sudo dnf -y install python3-glances-api
-
-
-For Nix or NixOS is `pre-packed module <https://search.nixos.org/packages?channel=unstable&query=glances-api>`_
-available. The lastest release is usually present in the ``unstable`` channel.
-
-.. code:: bash
-
-    $ nix-env -iA nixos.python3Packages.glances-api
-
-Usage
------
-
-The file ``example.py`` contains an example about how to use this module.
-
-License
--------
-
-``python-glances-api`` is licensed under MIT, for more details check LICENSE.