oe-python-template 0.16.8__py3-none-any.whl → 0.16.12__py3-none-any.whl

oe_python_template/system/_service.py

@@ -49,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]]
 
 
@@ -131,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,8 +152,14 @@ class Service(BaseService):
             dict[str, Any]: Service configuration.
         """
         from uptime import boottime, uptime  # noqa: PLC0415
+        import psutil  # 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__,
@@ -178,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(),

{oe_python_template-0.16.8.dist-info → oe_python_template-0.16.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oe-python-template
-Version: 0.16.8
+Version: 0.16.12
 Summary: 🧠 Copier template to scaffold Python projects compliant with best practices and modern tooling.
 Project-URL: Homepage, https://oe-python-template.readthedocs.io/en/latest/
 Project-URL: Documentation, https://oe-python-template.readthedocs.io/en/latest/

{oe_python_template-0.16.8.dist-info → oe_python_template-0.16.12.dist-info}/RECORD

@@ -14,7 +14,7 @@ oe_python_template/system/__init__.py,sha256=7e2z8HATzy3dAIBXy5PM9rlCC7Rbu8m8Nap
 oe_python_template/system/_api.py,sha256=pBBCL1gXM7W5dgJqBLKuNFWES0pQF8mbUgQ7H7oHwh8,3714
 oe_python_template/system/_cli.py,sha256=fVO_TSIyiaMJ2ACeQ4gPy4QQZjmeBVnsxxsViuNGe8I,6990
 oe_python_template/system/_gui.py,sha256=9U4QMkl1mVJargg_gQ7U8tMlvec4b1cqkTgRcmmyTTc,678
-oe_python_template/system/_service.py,sha256=_Bj82UmU7dNRW_ufq1wew796KVfIhAGgfuA0LZdBU1k,8884
+oe_python_template/system/_service.py,sha256=EDw4byGRO7uxSNW1zyAmTcbJUlOecayV7wXgk7_zP4I,10276
 oe_python_template/system/_settings.py,sha256=MwMAJYifJ6jGImeSh4e9shmIXmiUSuQGHXz_Ts0mSdk,901
 oe_python_template/utils/__init__.py,sha256=oM8v1ozMOeBQG-EbBtEGbnuGk52mYNDAmNoR7vNQ7MY,2050
 oe_python_template/utils/_api.py,sha256=GSI-HPtSdTFv0qP5aTDPa2WS3ewVa1slusG6dvxSu0Y,2474
@@ -33,8 +33,8 @@ oe_python_template/utils/_service.py,sha256=atHAejvBucKXjzhsMSdOBBFa7rRD74zcV70P
 oe_python_template/utils/_settings.py,sha256=owFoaHEzJnVD3EVyOWF4rfIY7g6eLnU6rN0m4VHhCbA,2464
 oe_python_template/utils/boot.py,sha256=Qgq1sjT8d3fcfibnMyx5CVUJ_KKXgFI3ozZUIJbhh4I,2921
 oe_python_template/utils/.vendored/bottle.py,sha256=kZAZmh3nRzCUf-9IKGpv0yqlMciZMA_DNaaMDdcQmt0,175437
-oe_python_template-0.16.8.dist-info/METADATA,sha256=FK59oLIJ2JbdSiDzpHMmUzJvlJtp5hiWO0p2dD2LAas,34606
-oe_python_template-0.16.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oe_python_template-0.16.8.dist-info/entry_points.txt,sha256=IroSSWhLGxus9rxcashkYQda39TTvf7LbUMYtOKXUBE,66
-oe_python_template-0.16.8.dist-info/licenses/LICENSE,sha256=5H409K6xzz9U5eUaoAHQExNkoWJRlU0LEj6wL2QJ34s,1113
-oe_python_template-0.16.8.dist-info/RECORD,,
+oe_python_template-0.16.12.dist-info/METADATA,sha256=fV8DwQW12DIBUwEkqxFKo7qkyWaSOaKsfkoHAd-VFfE,34607
+oe_python_template-0.16.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oe_python_template-0.16.12.dist-info/entry_points.txt,sha256=IroSSWhLGxus9rxcashkYQda39TTvf7LbUMYtOKXUBE,66
+oe_python_template-0.16.12.dist-info/licenses/LICENSE,sha256=5H409K6xzz9U5eUaoAHQExNkoWJRlU0LEj6wL2QJ34s,1113
+oe_python_template-0.16.12.dist-info/RECORD,,