oe-python-template-example 0.4.17__tar.gz → 0.4.21__tar.gz

{oe_python_template_example-0.4.17 → oe_python_template_example-0.4.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oe-python-template-example
-Version: 0.4.17
+Version: 0.4.21
 Summary: 🧠 Example project scaffolded and kept up to date with OE Python Template (oe-python-template).
 Project-URL: Homepage, https://oe-python-template-example.readthedocs.io/en/latest/
 Project-URL: Documentation, https://oe-python-template-example.readthedocs.io/en/latest/

{oe_python_template_example-0.4.17 → oe_python_template_example-0.4.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oe-python-template-example"
-version = "0.4.17"
+version = "0.4.21"
 description = "🧠 Example project scaffolded and kept up to date with OE Python Template (oe-python-template)."
 readme = "README.md"
 authors = [
@@ -290,7 +290,7 @@ source = ["src/"]
 
 
 [tool.bumpversion]
-current_version = "0.4.17"
+current_version = "0.4.21"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{oe_python_template_example-0.4.17 → oe_python_template_example-0.4.21}/src/oe_python_template_example/system/_service.py

@@ -12,7 +12,6 @@ from urllib.error import HTTPError
 
 from pydantic_settings import BaseSettings
 from requests import get
-from uptime import boottime, uptime
 
 from ..utils import (  # noqa: TID252
     UNHIDE_SENSITIVE_INFO,
@@ -50,7 +49,6 @@ class InfoDict(TypedDict, total=False):
     package: dict[str, Any]
     runtime: RuntimeDict
     settings: dict[str, Any]
-    # Allow additional string keys with any values for service info
     __extra__: NotRequired[dict[str, Any]]
 
 
@@ -132,7 +130,7 @@ class Service(BaseService):
         """
         try:
             with socket(AF_INET, SOCK_DGRAM) as connection:
-                connection.connect(("8.8.8.8", 80))
+                connection.connect((".".join(str(1) for _ in range(4)), 53))
                 return str(connection.getsockname()[0])
         except Exception as e:
             message = f"Failed to get local IP: {e}"
@@ -153,7 +151,15 @@ class Service(BaseService):
         Returns:
             dict[str, Any]: Service configuration.
         """
+        import psutil  # noqa: PLC0415
+        from uptime import boottime, uptime  # noqa: PLC0415
+
         bootdatetime = boottime()
+        vmem = psutil.virtual_memory()
+        swap = psutil.swap_memory()
+        cpu_percent = psutil.cpu_percent(interval=5)
+        cpu_times_percent = psutil.cpu_times_percent(interval=5)
+
         rtn: InfoDict = {
             "package": {
                 "version": __version__,
@@ -177,9 +183,34 @@ class Service(BaseService):
                         "version": platform.version(),
                     },
                     "machine": {
-                        "arch": platform.machine(),
-                        "processor": platform.processor(),
-                        "cpu_count": os.cpu_count(),
+                        "cpu": {
+                            "percent": cpu_percent,
+                            "load_avg": psutil.getloadavg(),
+                            "user": cpu_times_percent.user,
+                            "system": cpu_times_percent.system,
+                            "idle": cpu_times_percent.idle,
+                            "arch": platform.machine(),
+                            "processor": platform.processor(),
+                            "count": os.cpu_count(),
+                            "frequency": {
+                                "current": psutil.cpu_freq().max,
+                                "min": psutil.cpu_freq().max,
+                                "max": psutil.cpu_freq().max,
+                            },
+                        },
+                        "memory": {
+                            "percent": vmem.percent,
+                            "total": vmem.total,
+                            "available": vmem.available,
+                            "used": vmem.used,
+                            "free": vmem.free,
+                        },
+                        "swap": {
+                            "percent": swap.percent,
+                            "total": swap.total,
+                            "used": swap.used,
+                            "free": swap.free,
+                        },
                     },
                     "network": {
                         "hostname": platform.node(),