sciveo 0.0.41__tar.gz → 0.0.43__tar.gz

{sciveo-0.0.41 → sciveo-0.0.43}/PKG-INFO

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

{sciveo-0.0.41 → sciveo-0.0.43}/sciveo/monitoring/monitor.py

@@ -34,23 +34,6 @@ class BaseMonitor(DaemonBase):
       "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.list_logs = []
 
     self.api = APIRemoteClient()
@@ -74,7 +57,6 @@ 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})
 
@@ -86,13 +68,12 @@ class BaseMonitor(DaemonBase):
 
   def get_cpu_usage(self):
     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()
+    self.data["CPU"]["usage per core"] = usage_per_core
+    self.data["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"]["used"] = memory.used
     self.data["RAM"]["total"] = memory.total
     self.data["RAM"]["free"] = memory.free
     self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
@@ -133,47 +114,15 @@ class BaseMonitor(DaemonBase):
         [
           'nvidia-smi',
           '--query-gpu=gpu_uuid,gpu_name,index,power.draw,fan.speed,memory.total,memory.used,memory.free,utilization.gpu,utilization.memory,temperature.gpu',
-          '--format=csv'
+          '--format=csv,nounits'
         ],
         capture_output=True, text=True, check=True
       )
 
       lines = result.stdout.strip().split('\n')
-      header = lines[0].split(", ")
-
-      keys = []
-      gpu_keys = []
-      for k in header:
-        k_split = k.split(' ')
-        key = k_split[0]
-        keys.append(key)
-        gpu_keys.append(f"GPU {key}")
-
-      self.data.setdefault("GPU", {})
-
-      for i in range(len(keys)):
-        if gpu_keys[i] in self.data["config"]:
-          self.data["sample"][gpu_keys[i]] = []
-        else:
-          self.data["GPU"][keys[i]] = []
-
-      for i in range(1, len(lines)):
-        line_values = lines[i].split(", ")
-        for j, value in enumerate(line_values):
-          value = value.split(' ')[0]
-          try:
-            value = float(value)
-          except ValueError:
-            pass
-          if gpu_keys[j] in self.data["config"]:
-            self.data["sample"][gpu_keys[j]].append(value)
-          else:
-            self.data["GPU"][keys[j]].append(value)
-
-      if "memory.total" in self.data["GPU"]:
-        for k in ["GPU memory.used", "GPU memory.free"]:
-          self.data["config"][k]["ylim"] = [0, max(self.data["GPU"]["memory.total"]) * self.data["config"][k]["ratio"]]
-
+      self.data["GPU"] = {
+        "raw_lines": lines
+      }
     except Exception as e:
       pass
 
@@ -181,7 +130,7 @@ class BaseMonitor(DaemonBase):
 
 
 if __name__ == "__main__":
-  mon = BaseMonitor(period=10)
+  mon = BaseMonitor(period=30)
   mon.start()
 
   while(True):

sciveo-0.0.43/sciveo/version.py

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

{sciveo-0.0.41 → sciveo-0.0.43}/sciveo.egg-info/PKG-INFO

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

sciveo-0.0.41/sciveo/version.py

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