sciveo 0.1.0__tar.gz → 0.1.2__tar.gz

{sciveo-0.1.0 → sciveo-0.1.2}/PKG-INFO

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

{sciveo-0.1.0 → sciveo-0.1.2}/sciveo/monitoring/monitor.py

@@ -15,6 +15,7 @@ import time
 import datetime
 import socket
 import psutil
+import platform
 import uuid
 import numpy as np
 
@@ -25,6 +26,21 @@ from sciveo.common.tools.formating import format_memory_size
 from sciveo.api.base import APIRemoteClient
 
 
+class MonitorTools:
+  @staticmethod
+  def serial():
+    machine_serial = ""
+    s = "-"
+    list_uid_calls = [socket.gethostname, psutil.cpu_count, platform.processor]
+    for uid_call in list_uid_calls:
+      try:
+        machine_serial += f"{uid_call()}{s}"
+        s = ""
+      except Exception:
+        pass
+    return machine_serial
+
+
 class BaseMonitor(DaemonBase):
   def __init__(self, period=5):
     super().__init__(period=period)
@@ -50,9 +66,9 @@ class BaseMonitor(DaemonBase):
     self.previous_time = {"DISK": time.time(), "NET": time.time()}
     time.sleep(1)
 
-    machine_serial = self.getserial()
+    self.data["serial"] = MonitorTools.serial()
 
-    debug(type(self).__name__, f"init monitor with period={period}", machine_serial, "initial_cpu_usage", initial_cpu_usage)
+    debug(type(self).__name__, f"init monitor with period={period}", self.data["serial"], "initial_cpu_usage", initial_cpu_usage)
 
   def __call__(self):
     return self.data
@@ -103,22 +119,6 @@ class BaseMonitor(DaemonBase):
     except Exception:
       pass
 
-  def getserial(self):
-    machine_serial = None
-    try:
-      machine_serial = f"{socket.gethostname()}-{uuid.getnode()}"
-    except Exception:
-      pass
-    if machine_serial is None:
-      try:
-        machine_serial = f"UUID-{uuid.getnode()}"
-      except Exception:
-        pass
-    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"]
     try:
@@ -182,6 +182,8 @@ class BaseMonitor(DaemonBase):
     self.previous_io_counters[name] = io_counters
 
 if __name__ == "__main__":
+  print(MonitorTools.serial())
+
   mon = BaseMonitor(period=10)
   mon.start()
 

sciveo-0.1.2/sciveo/version.py

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

{sciveo-0.1.0 → sciveo-0.1.2}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.0/sciveo/version.py

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