glances_api 0.4.0__tar.gz → 0.4.2__tar.gz

{glances_api-0.4.0 → glances_api-0.4.2}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2022 Fabian Affolter <fabian@affolter-engineering.ch>
+Copyright (c) 2017-2023 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.4.0 → glances_api-0.4.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: glances-api
-Version: 0.4.0
+Version: 0.4.2
 Summary: Python API for interacting with Glances
 Home-page: https://github.com/home-assistant-ecosystem/python-glances-api
 License: MIT
 Author: Fabian Affolter
 Author-email: fabian@affolter-engineering.ch
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -15,9 +15,9 @@ 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.10
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 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.4.0 → glances_api-0.4.2}/glances_api/__init__.py

@@ -61,22 +61,22 @@ class Glances:
             raise exceptions.GlancesApiAuthorizationError(
                 "Please check your credentials"
             )
-        if response.status_code == httpx.codes.BAD_REQUEST:
+
+        if response.status_code != httpx.codes.OK:
             raise exceptions.GlancesApiNoDataAvailable(
                 f"endpoint: '{endpoint}' is not valid"
             )
-        if response.status_code == httpx.codes.OK:
-            try:
-                _LOGGER.debug(response.json())
-                if endpoint == "all":
-                    self.data = response.json()
-                elif endpoint == "pluginslist":
-                    self.plugins = response.json()
-            except TypeError:
-                _LOGGER.error("Can not load data from Glances")
-                raise exceptions.GlancesApiConnectionError(
-                    "Unable to get the data from Glances"
-                )
+        try:
+            _LOGGER.debug(response.json())
+            if endpoint == "all":
+                self.data = response.json()
+            elif endpoint == "pluginslist":
+                self.plugins = response.json()
+        except TypeError:
+            _LOGGER.error("Can not load data from Glances")
+            raise exceptions.GlancesApiConnectionError(
+                "Unable to get the data from Glances"
+            )
 
     async def get_metrics(self, element: str) -> None:
         """Get all the metrics for a monitored element."""
@@ -142,11 +142,11 @@ class Glances:
             sensor_data["docker"] = {"docker_active": len(active_containers)}
             cpu_use = 0.0
             for container in active_containers:
-                cpu_use += container["cpu"]["total"]
+                cpu_use += container["cpu"].get("total", 0)
             sensor_data["docker"]["docker_cpu_use"] = round(cpu_use, 1)
             mem_use = 0.0
             for container in active_containers:
-                mem_use += container["memory"]["usage"]
+                mem_use += container["memory"].get("usage", 0)
             sensor_data["docker"]["docker_memory_use"] = round(mem_use / 1024**2, 1)
         if data := self.data.get("raid"):
             sensor_data["raid"] = data

{glances_api-0.4.0 → glances_api-0.4.2}/glances_api/exceptions.py

@@ -6,15 +6,19 @@ class GlancesApiError(Exception):
 
     pass
 
+
 class GlancesApiConnectionError(GlancesApiError):
     """When a connection error is encountered."""
 
     pass
+
+
 class GlancesApiAuthorizationError(GlancesApiError):
     """When a connection error is encountered."""
 
     pass
 
+
 class GlancesApiNoDataAvailable(GlancesApiError):
     """When no data is available."""
 

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "glances_api"
-version = "0.4.0"
+version = "0.4.2"
 description = "Python API for interacting with Glances"
 authors = ["Fabian Affolter <fabian@affolter-engineering.ch>"]
 homepage = "https://github.com/home-assistant-ecosystem/python-glances-api"
@@ -18,12 +18,12 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 httpx = ">=0.23,<1"
 
 [tool.poetry.dev-dependencies]
-black = "^22.3.0"
-pytest = "^6.2.5"
+black = "^23.3"
+pytest = "^7.1.2"
 pytest-httpx = ">0.15,<1"
 pytest-asyncio = "^0.16.0"
 isort = "^5.10.0"

glances_api-0.4.0/setup.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['glances_api']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['httpx>=0.23,<1']
-
-setup_kwargs = {
-    'name': 'glances-api',
-    'version': '0.4.0',
-    'description': 'Python API for interacting with Glances',
-    'long_description': 'python-glances-api\n==================\n\nA Python client for interacting with `Glances <https://nicolargo.github.io/glances/>`_.\n\nThis module is not official, developed, supported or endorsed by Glances.\n\nInstallation\n------------\n\nThe module is available from the `Python Package Index <https://pypi.python.org/pypi>`_.\n\n.. code:: bash\n\n    $ pip3 install glances_api\n\nOr on a Fedora-based system or on a CentOS/RHEL machine with has EPEL enabled.\n\n.. code:: bash\n\n    $ sudo dnf -y install python3-glances-api\n\n\nFor Nix or NixOS is `pre-packed module <https://search.nixos.org/packages?channel=unstable&query=glances-api>`_\navailable. The lastest release is usually present in the ``unstable`` channel.\n\n.. code:: bash\n\n    $ nix-env -iA nixos.python3Packages.glances-api\n\nUsage\n-----\n\nThe file ``example.py`` contains an example about how to use this module.\n\nLicense\n-------\n\n``python-glances-api`` is licensed under MIT, for more details check LICENSE.\n',
-    'author': 'Fabian Affolter',
-    'author_email': 'fabian@affolter-engineering.ch',
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': 'https://github.com/home-assistant-ecosystem/python-glances-api',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'python_requires': '>=3.8,<4.0',
-}
-
-
-setup(**setup_kwargs)