sciveo 0.0.34__tar.gz → 0.0.35__tar.gz

{sciveo-0.0.34 → sciveo-0.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.34
+Version: 0.0.35
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

{sciveo-0.0.34 → sciveo-0.0.35}/sciveo/monitoring/monitor.py

@@ -33,8 +33,24 @@ class BaseMonitor(DaemonBase):
     self.data["RAM"] = {
       "installed": self.data["RAM"]
     }
+    self.data["LOG"] = {}
+    self.data["sample"] = {}
+
+    self.data["config"] = {
+      "CPU usage":              {"ratio": 1.0, "metric": "%", "ylim": [0.0, 100.0]},
+      "CPU usage per core":     {"ratio": 1.0, "metric": "%", "ylim": [0.0, 100.0]},
+
+      "RAM used":               {"ratio": 1.0 / (1024 * 1024 * 1024), "metric": "GB"},
+
+      "GPU fan.speed":          {"ratio": 1.0, "metric": "%", "ylim": [0.0, 100.0]},
+      "GPU power.draw":         {"ratio": 1.0, "metric": "W", "ylim": [0.0, 200.0]},
+      "GPU memory.free":        {"ratio": 1.0 / 1024, "metric": "GB"},
+      "GPU memory.used":        {"ratio": 1.0 / 1024, "metric": "GB"},
+      "GPU temperature.gpu":    {"ratio": 1.0, "metric": "°C"},
+      "GPU utilization.gpu":    {"ratio": 1.0, "metric": "%", "ylim": [0.0, 100.0]},
+      "GPU utilization.memory": {"ratio": 1.0, "metric": "%", "ylim": [0.0, 100.0]},
+    }
 
-    self.data["logs"] = {}
     self.list_logs = []
 
     self.api = APIRemoteClient()
@@ -44,9 +60,9 @@ class BaseMonitor(DaemonBase):
     initial_cpu_usage = psutil.cpu_percent(interval=None, percpu=True)
     time.sleep(1)
 
-    cpuserial = self.getserial()
+    machine_serial = self.getserial()
 
-    debug(type(self).__name__, "init", cpuserial, "initial_cpu_usage", initial_cpu_usage)
+    debug(type(self).__name__, "init", machine_serial, "initial_cpu_usage", initial_cpu_usage)
 
   def __call__(self):
     return self.data
@@ -58,6 +74,7 @@ class BaseMonitor(DaemonBase):
 
     self.tail_logs()
     self.data["local_time"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    self.data["sample"]["time"] = self.data["local_time"]
 
     api_result = self.api.POST_SCI("monitor", {"data": self.data})
 
@@ -65,38 +82,39 @@ class BaseMonitor(DaemonBase):
 
   def tail_logs(self):
     for log_name, log_path in self.list_logs:
-      self.data["logs"][log_name] = self.tail_file(log_path)[-3:]
+      self.data["LOG"][log_name] = self.tail_file(log_path)[-3:]
 
   def get_cpu_usage(self):
-    self.data["CPU"]["usage_per_core"] = psutil.cpu_percent(interval=None, percpu=True)
-    # self.data["CPU"]["usage_per_core"] = (np.array(self.data["CPU"]["usage_per_core"]) / 100.0).tolist()
-    self.data["CPU"]["usage"] = np.array(self.data["CPU"]["usage_per_core"]).mean()
+    usage_per_core = psutil.cpu_percent(interval=None, percpu=True)
+    self.data["sample"]["CPU usage per core"] = usage_per_core
+    self.data["sample"]["CPU usage"] = np.array(usage_per_core).mean()
 
   def get_memory(self):
     memory = psutil.virtual_memory()
+    self.data["sample"]["RAM used"] = memory.used
+    self.data["config"]["RAM used"]["ylim"] = [0, memory.total * self.data["config"]["RAM used"]["ratio"]]
     self.data["RAM"]["total"] = memory.total
-    self.data["RAM"]["used"] = memory.used
     self.data["RAM"]["free"] = memory.free
     self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
 
   def getserial(self):
-    cpuserial = None
+    machine_serial = None
     try:
       with open('/proc/cpuinfo','r') as fp:
         for line in fp:
           if line.startswith('Serial'):
-            cpuserial = line[10:26]
+            machine_serial = line[10:26]
     except Exception:
       pass
-    if cpuserial is None:
+    if machine_serial is None:
       try:
-        cpuserial = socket.gethostname()
+        machine_serial = socket.gethostname()
       except Exception:
         pass
-    if cpuserial is None:
-      cpuserial = f"RND-{random_token(8)}"
-    self.data["serial"] = cpuserial
-    return cpuserial
+    if machine_serial is None:
+      machine_serial = f"RND-{random_token(8)}"
+    self.data["serial"] = machine_serial
+    return machine_serial
 
   def tail_file(self, file_path, block_size=1024):
     result = ["EMPTY"]
@@ -124,28 +142,29 @@ class BaseMonitor(DaemonBase):
       header = lines[0].split(", ")
 
       keys = []
-      units = {}
+      gpu_keys = []
       for k in header:
         k_split = k.split(' ')
         key = k_split[0]
         keys.append(key)
-        if len(k_split) >= 2:
-          units[key] = k_split[1].replace('[', '').replace(']', '')
+        gpu_keys.append(f"GPU {key}")
+
+      self.data.setdefault("GPU", {})
 
-      data = []
       for i in range(1, len(lines)):
         line_values = lines[i].split(", ")
-        line_data = {}
         for j, value in enumerate(line_values):
           value = value.split(' ')[0]
-          line_data[keys[j]] = value
-        data.append(line_data)
+          if gpu_keys[j] in self.data["config"]:
+            self.data["sample"][gpu_keys[j]] = value
+          else:
+            self.data["GPU"][keys[j]] = value
 
-      self.data.setdefault("GPU", {})
-      self.data["GPU"]["units"] = units
-      self.data["GPU"]["data"] = data
+      if "memory.total" in self.data["GPU"]:
+        for k in ["GPU memory.used", "GPU memory.free"]:
+          self.data["config"][k]["ylim"] = [0, self.data["GPU"]["memory.total"] * self.data["config"][k]["ratio"]]
 
-    except subprocess.CalledProcessError as e:
+    except Exception as e:
       pass
 
 

sciveo-0.0.35/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.0.35'

{sciveo-0.0.34 → sciveo-0.0.35}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.34
+Version: 0.0.35
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

{sciveo-0.0.34 → sciveo-0.0.35}/sciveo.egg-info/SOURCES.txt

@@ -29,5 +29,6 @@ sciveo/content/runner.py
 sciveo/monitoring/__init__.py
 sciveo/monitoring/monitor.py
 test/test_configuration.py
+test/test_monitoring.py
 test/test_runner.py
 test/test_sampling.py

sciveo-0.0.35/test/test_monitoring.py

@@ -0,0 +1,26 @@
+#
+# Pavlin Georgiev, Softel Labs
+#
+# This is a proprietary file and may not be copied,
+# distributed, or modified without express permission
+# from the owner. For licensing inquiries, please
+# contact pavlin@softel.bg.
+#
+# 2024
+#
+
+import unittest
+import numpy as np
+
+from sciveo.common.tools.logger import *
+from sciveo.monitoring.monitor import *
+
+
+class TestMonitoring(unittest.TestCase):
+  def test_cpu(self):
+    m = BaseMonitor()
+    m.get_cpu_usage()
+    print(m.data)
+
+    self.assertTrue("usage_per_core" in m.data["CPU"])
+    self.assertTrue("usage" in m.data["CPU"])

sciveo-0.0.34/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.0.34'