sciveo 0.0.47__tar.gz → 0.0.49__tar.gz

{sciveo-0.0.47 → sciveo-0.0.49}/PKG-INFO

@@ -1,8 +1,10 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.47
+Version: 0.0.49
 Description-Content-Type: text/markdown
 Provides-Extra: mon
+Provides-Extra: net
+Provides-Extra: all
 
 # SCIVEO - ML/Scientific Experiments Management Client
 

{sciveo-0.0.47 → sciveo-0.0.49}/sciveo/__init__.py

@@ -21,6 +21,7 @@ try:
   from sciveo.content.runner import ProjectRunner
   from sciveo.content.dataset import Dataset
   from sciveo.monitoring.start import MonitorStart
+  from sciveo.monitoring.network import NetworkTools
   from sciveo.version import __version__
 
 
@@ -47,5 +48,9 @@ try:
   def monitor(**kwargs):
     MonitorStart(**kwargs)()
 
+  # Network tools
+  def network(**kwargs):
+    return NetworkTools(**kwargs)
+
 except ImportError as e:
   pass

{sciveo-0.0.47 → sciveo-0.0.49}/sciveo/common/tools/daemon.py

@@ -1,3 +1,14 @@
+#
+# 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.
+#
+# 2023
+#
+
 import threading
 import time
 

{sciveo-0.0.47 → sciveo-0.0.49}/sciveo/common/tools/synchronized.py

@@ -1,3 +1,14 @@
+#
+# 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.
+#
+# 2023
+#
+
 import threading
 import uuid
 import copy

sciveo-0.0.49/sciveo/common/tools/timers.py

@@ -0,0 +1,56 @@
+#
+# 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.
+#
+# 2023
+#
+
+import time
+
+
+class FPSCounter:
+  def __init__(self, period=10, tag=""):
+    self.period = period
+    self.tag = tag
+    self.n = 0
+    self.t1 = time.time()
+
+  def update(self):
+    self.n += 1
+    t2 = time.time()
+    if t2 - self.t1 > self.period:
+      print(type(self).__name__, self.tag, "FPS", self.n / (t2 - self.t1))
+      self.n = 0
+      self.t1 = time.time()
+
+
+class TimerExec:
+  def __init__(self, fn, period=1.0):
+    self.fn = fn
+    self.period = period
+    self.t1 = time.time()
+
+  def run(self):
+    t2 = time.time()
+    if t2 - self.t1 > self.period:
+      self.fn()
+      self.t1 = time.time()
+
+
+class Timer:
+  def __init__(self):
+    self.start()
+
+  def start(self):
+    self.start_at = time.time()
+
+  def stop(self):
+    self.end_at = time.time()
+    return self.elapsed()
+
+  def elapsed(self):
+    return self.end_at - self.start_at

{sciveo-0.0.47 → sciveo-0.0.49}/sciveo/monitoring/monitor.py

@@ -42,8 +42,11 @@ class BaseMonitor(DaemonBase):
     # Warmup the psutil
     psutil.cpu_percent(interval=0.3, percpu=True)
     initial_cpu_usage = psutil.cpu_percent(interval=None, percpu=True)
-    self.previous_disk_io_counters = psutil.disk_io_counters(perdisk=False)
-    self.previous_net_io_counters = psutil.net_io_counters(pernic=False)
+    self.previous_io_counters = {
+      "DISK": psutil.disk_io_counters(perdisk=False),
+      "NET": psutil.net_io_counters(pernic=False)
+    }
+    self.previous_time = {"DISK": time.time(), "NET": time.time()}
     time.sleep(1)
 
     machine_serial = self.getserial()
@@ -137,10 +140,9 @@ class BaseMonitor(DaemonBase):
 
   def get_disk(self):
     try:
-      list_metrics = ["read count", "write count", "read bytes", "write bytes", "read time", "write time"]
+      list_metrics = ["read bytes", "write bytes", "read count", "write count", "read time", "write time"]
       disk_io_counters = psutil.disk_io_counters(perdisk=False)
-      self.get_io_metrics("DISK", list_metrics, disk_io_counters, self.previous_disk_io_counters)
-      self.previous_disk_io_counters = disk_io_counters
+      self.get_io_metrics("DISK", list_metrics, disk_io_counters)
     except Exception as e:
       pass
 
@@ -148,18 +150,23 @@ class BaseMonitor(DaemonBase):
     try:
       list_metrics = ["bytes sent", "bytes recv", "packets sent", "packets recv"]
       net_io_counters = psutil.net_io_counters(pernic=False)
-      self.get_io_metrics("NET", list_metrics, net_io_counters, self.previous_net_io_counters)
-      self.previous_net_io_counters = net_io_counters
+      self.get_io_metrics("NET", list_metrics, net_io_counters)
     except Exception as e:
       pass
 
-  def get_io_metrics(self, name, list_metrics, io_counters, prev_io_counters):
+  def get_io_metrics(self, name, list_metrics, io_counters):
     counters = io_counters._asdict()
-    prev_io_counters = prev_io_counters._asdict()
+    prev_io_counters = self.previous_io_counters[name]._asdict()
+    time_diff = time.time() - self.previous_time[name]
     for metric_name in list_metrics:
       metric_key = metric_name.replace(' ', '_')
       self.data[name][metric_name] = counters[metric_key] - prev_io_counters[metric_key]
 
+      if "bytes" in metric_name:
+        speed_metric = metric_name.replace("bytes", "speed")
+        self.data[name][speed_metric] = self.data[name][metric_name] / time_diff
+    self.previous_time[name] = time.time()
+    self.previous_io_counters[name] = io_counters
 
 if __name__ == "__main__":
   mon = BaseMonitor(period=10)

sciveo-0.0.49/sciveo/monitoring/network.py

@@ -0,0 +1,86 @@
+#
+# 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 socket
+
+from sciveo.common.tools.logger import *
+from sciveo.common.tools.timers import Timer
+
+
+class NetworkTools:
+  def __init__(self, **kwargs):
+    self.default_arguments = {
+      "timeout": 0.1,
+      "localhost": False,
+    }
+
+    self.arguments = {}
+    for k, v in self.default_arguments.items():
+      self.arguments[k] = kwargs.get(k, v)
+
+    self.net_classes = ["192.168.", "10."]
+    for i in range(16, 32):
+      self.net_classes.append(f"172.{i}.")
+
+  def get_local_nets(self):
+    list_local_ips = []
+    try:
+      import netifaces
+      interfaces = netifaces.interfaces()
+      for interface in interfaces:
+        addrs = netifaces.ifaddresses(interface)
+        if netifaces.AF_INET in addrs:
+          ip = addrs[netifaces.AF_INET][0]['addr']
+          for net_class in self.net_classes:
+            if ip.startswith(net_class):
+              list_local_ips.append(ip)
+    except Exception as e:
+      warning(type(self).__name__, "netifaces not installed")
+    return list_local_ips
+
+  def generate_ip_list(self, base_ip):
+    octets = base_ip.split('.')
+    network_prefix = '.'.join(octets[:3])
+    return [f'{network_prefix}.{i}' for i in range(1, 255)]
+
+  def scan_port(self, port=22):
+    t = Timer()
+    result = []
+    list_local_ips = self.get_local_nets()
+    debug(type(self).__name__, "scan_port", "list_local_ips", list_local_ips)
+    for local_ip in list_local_ips:
+      list_ip = self.generate_ip_list(local_ip)
+      result += self.scan_port_hosts(list_ip, port)
+    if self.arguments["localhost"]:
+      result += self.scan_port_hosts(["127.0.0.1"], port)
+    debug(type(self).__name__, "scan_port elapsed time", t.stop(), "result", result)
+    return result
+
+  def scan_port_hosts(self, list_ip, port=22):
+    list_hosts = []
+    timeout = self.arguments["timeout"]
+    for ip in list_ip:
+      try:
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+          sock.settimeout(timeout)
+          result = sock.connect_ex((ip, port))
+          if result == 0:
+            list_hosts.append(ip)
+          # debug(type(self).__name__, "scan_ports", ip, port, result)
+      except socket.error:
+        pass
+    return list_hosts
+
+
+if __name__ == "__main__":
+  net = NetworkTools(timeout=0.01, localhost=True)
+  list_hosts = net.scan_port(port=22)
+  print(list_hosts)

{sciveo-0.0.47 → sciveo-0.0.49}/sciveo/monitoring/start.py

@@ -1,3 +1,14 @@
+#
+# 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 os
 import time
 

sciveo-0.0.49/sciveo/version.py

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

{sciveo-0.0.47 → sciveo-0.0.49}/sciveo.egg-info/PKG-INFO

@@ -1,8 +1,10 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.47
+Version: 0.0.49
 Description-Content-Type: text/markdown
 Provides-Extra: mon
+Provides-Extra: net
+Provides-Extra: all
 
 # SCIVEO - ML/Scientific Experiments Management Client
 

{sciveo-0.0.47 → sciveo-0.0.49}/sciveo.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ sciveo/common/tools/formating.py
 sciveo/common/tools/hardware.py
 sciveo/common/tools/logger.py
 sciveo/common/tools/synchronized.py
+sciveo/common/tools/timers.py
 sciveo/content/__init__.py
 sciveo/content/dataset.py
 sciveo/content/experiment.py
@@ -28,6 +29,7 @@ sciveo/content/project.py
 sciveo/content/runner.py
 sciveo/monitoring/__init__.py
 sciveo/monitoring/monitor.py
+sciveo/monitoring/network.py
 sciveo/monitoring/start.py
 test/test_configuration.py
 test/test_monitoring.py

sciveo-0.0.49/sciveo.egg-info/requires.txt

@@ -0,0 +1,12 @@
+numpy>=0.0.0
+requests>=0.0.0
+
+[all]
+psutil>=0.0.0
+netifaces>=0.0.0
+
+[mon]
+psutil>=0.0.0
+
+[net]
+netifaces>=0.0.0

{sciveo-0.0.47 → sciveo-0.0.49}/setup.py

@@ -1,3 +1,14 @@
+#
+# 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.
+#
+# 2023
+#
+
 from setuptools import setup, find_packages
 from sciveo.version import __version__
 
@@ -14,6 +25,13 @@ setup(
     extras_require={
       'mon': [
         'psutil>=0.0.0',
+      ],
+      'net': [
+        'netifaces>=0.0.0',
+      ],
+      'all': [
+        'psutil>=0.0.0',
+        'netifaces>=0.0.0',
       ]
     },
 )

sciveo-0.0.47/sciveo/version.py

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

sciveo-0.0.47/sciveo.egg-info/requires.txt

@@ -1,5 +0,0 @@
-numpy>=0.0.0
-requests>=0.0.0
-
-[mon]
-psutil>=0.0.0