sciveo 0.1.6__tar.gz → 0.1.8__tar.gz

{sciveo-0.1.6 → sciveo-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.6
+Version: 0.1.8
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
@@ -49,10 +49,12 @@ When have sciveo account:
 ```shell
 export SCIVEO_SECRET_ACCESS_KEY='my_sciveo_user_auth_token'
 ```
+or create a file like ~/.sciveo/some_file_name where put:
+secret_access_key=my_sciveo_user_auth_token
 
 When using sciveo Monitoring just run, using suitable python environment
 ```shell
-python -c "import sciveo; sciveo.monitor(period=120)"
+sciveo monitor --period 120
 ```
 
 Monitoring started along with other python code.

{sciveo-0.1.6 → sciveo-0.1.8}/README.md

@@ -41,10 +41,12 @@ When have sciveo account:
 ```shell
 export SCIVEO_SECRET_ACCESS_KEY='my_sciveo_user_auth_token'
 ```
+or create a file like ~/.sciveo/some_file_name where put:
+secret_access_key=my_sciveo_user_auth_token
 
 When using sciveo Monitoring just run, using suitable python environment
 ```shell
-python -c "import sciveo; sciveo.monitor(period=120)"
+sciveo monitor --period 120
 ```
 
 Monitoring started along with other python code.

{sciveo-0.1.6 → sciveo-0.1.8}/sciveo/api/base.py

@@ -15,14 +15,17 @@ from urllib import request, parse
 from urllib.error import HTTPError
 
 from sciveo.common.tools.logger import *
+from sciveo.common.tools.configuration import GlobalConfiguration
 
 
 class APIRemoteClient:
   def __init__(self, base_url=None, ver=1):
+    self.config = GlobalConfiguration.get()
+    self.auth_token = None
     if base_url is None:
-      base_url = os.environ.get("SCIVEO_API_BASE_URL", "https://sciveo.com")
+      base_url = self.config["api_base_url"]
     self.base_url = f"{base_url}/api/v{ver}/"
-    self.headers = { "Auth-Token": os.environ.get('SCIVEO_SECRET_ACCESS_KEY', "") }
+    self.headers = { "Auth-Token": self.config['secret_access_key'] }
     debug(type(self).__name__, f"base url: {self.base_url}")
 
   def POST_SCI(self, content_type, data, timeout=30):
@@ -44,7 +47,7 @@ class APIRemoteClient:
     return result
 
   def GET(self, url, timeout=30):
-    url = f"{self.base_url}{url}&auth_token={os.environ['SCIVEO_SECRET_ACCESS_KEY']}"
+    url = f"{self.base_url}{url}&auth_token={self.config['secret_access_key']}"
     result = False
     try:
       # debug("GET", url)

sciveo-0.1.8/sciveo/cli.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# 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 argparse
+
+from sciveo.common.tools.logger import *
+from sciveo.monitoring.start import MonitorStart
+from sciveo.common.tools.configuration import GlobalConfiguration
+
+
+def main():
+  config = GlobalConfiguration.get()
+
+  parser = argparse.ArgumentParser(description='sciveo CLI')
+  parser.add_argument('command', choices=['monitor', 'net'], help='Command to execute')
+  parser.add_argument('--period', type=int, default=120, help='Period in seconds')
+  parser.add_argument('--block', type=bool, default=True, help='Block flag')
+  parser.add_argument('--auth', type=str, default=config['secret_access_key'], help='Auth secret access key')
+  args = parser.parse_args()
+
+  if args.command == 'monitor':
+    MonitorStart(period=args.period, block=args.block)()
+  elif args.command == 'net':
+    warning(args.command, "not implemented")
+  else:
+    warning(args.command, "not implemented")
+
+if __name__ == '__main__':
+    main()

sciveo-0.1.8/sciveo/common/tools/configuration.py

@@ -0,0 +1,65 @@
+#
+# 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 threading
+
+
+class GlobalConfiguration:
+  config = None
+  lock_config = threading.Lock()
+
+  def __init__(self) -> None:
+    home = os.path.expanduser('~')
+    self.base_path = os.path.join(home, '.sciveo')
+    self.data = {}
+
+    self.default = {
+      "api_base_url": "https://sciveo.com",
+      "log_min_level": "DEBUG"
+    }
+
+    try:
+      self.read_local_files()
+      self.read_environment()
+    except Exception as e:
+      error(type(self).__name__, "Exception", e)
+
+  @staticmethod
+  def get():
+    with GlobalConfiguration.lock_config:
+      if GlobalConfiguration.config is None:
+        GlobalConfiguration.config = GlobalConfiguration()
+      return GlobalConfiguration.config
+
+  def __getitem__(self, key):
+    key = key.lower()
+    return self.data.get(key, self.default.get(key, ""))
+
+  def read_environment(self):
+    for k, v in os.environ.items():
+      k = k.lower()
+      if k.startswith("sciveo_"):
+        k = k.replace("sciveo_", "")
+        self.data[k] = v
+
+  def read_local_files(self):
+    if os.path.exists(self.base_path):
+      for path, _, files in os.walk(self.base_path):
+        for file_name in files:
+          with open(os.path.join(path, file_name), 'r') as fp:
+            lines = fp.readlines()
+            for line in lines:
+              parts = line.strip().split('=')
+              if len(parts) == 2:
+                key = parts[0].strip().lower().replace("sciveo_", "")
+                value = parts[1].strip()
+                self.data[key] = value

{sciveo-0.1.6 → sciveo-0.1.8}/sciveo/common/tools/logger.py

@@ -13,8 +13,11 @@ import os
 import logging
 import threading
 
+from sciveo.common.tools.configuration import GlobalConfiguration
 
-log_min_level = os.environ.setdefault('SCI_LOG_MIN_LEVEL', "DEBUG")
+
+config = GlobalConfiguration.get()
+log_min_level = config["LOG_MIN_LEVEL"]
 
 def get_logger(name):
   logger = logging.getLogger(name)

{sciveo-0.1.6 → sciveo-0.1.8}/sciveo/monitoring/monitor.py

@@ -46,13 +46,17 @@ class BaseMonitor(DaemonBase):
   def __init__(self, period=5):
     super().__init__(period=period)
 
-    self.data = HardwareInfo()()
-    self.data.setdefault("CPU", {})
-    self.data.setdefault("DISK", {})
-    self.data.setdefault("NET", {})
-    self.data.setdefault("TEMP", {})
-    self.data["RAM"] = {}
-    self.data["LOG"] = {}
+    self.data = {
+      "CPU": {},
+      "RAM": {},
+      "DISK": {},
+      "NET": {},
+      "TEMP": {},
+      "LOG": {},
+      "INFO": {},
+    }
+    self.data["INFO"] = HardwareInfo()()
+    self.data["INFO"].setdefault("CPU", {})
     self.list_logs = []
 
     self.api = APIRemoteClient()
@@ -106,7 +110,7 @@ class BaseMonitor(DaemonBase):
       temperatures = psutil.sensors_temperatures()
       for k, v in temperatures.items():
         self.data["TEMP"][k] = [t.current for t in v]
-    except Exception:
+    except Exception as e:
       pass
 
   def get_memory(self):
@@ -116,7 +120,7 @@ class BaseMonitor(DaemonBase):
       self.data["RAM"]["total"] = memory.total
       self.data["RAM"]["free"] = memory.free
       # self.data["RAM"]["installed"] = format_memory_size(memory.total)
-      self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
+      self.data["INFO"]["RAM"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
     except Exception:
       pass
 
@@ -156,7 +160,7 @@ class BaseMonitor(DaemonBase):
       self.get_io_metrics("DISK", list_metrics, disk_io_counters)
 
       disk_usage = psutil.disk_usage('/')._asdict()
-      self.data["DISK"]["print"] = f"{disk_usage['percent']}% ({round(disk_usage['used'] / (1024 * 1024 * 1024), 1)} GB / {round(disk_usage['total'] / (1024 * 1024 * 1024), 1)} GB)"
+      self.data["INFO"]["DISK"] = f"{disk_usage['percent']}% ({round(disk_usage['used'] / (1024 * 1024 * 1024), 1)} GB / {round(disk_usage['total'] / (1024 * 1024 * 1024), 1)} GB)"
     except Exception as e:
       pass
 

{sciveo-0.1.6 → sciveo-0.1.8}/sciveo/monitoring/network.py

@@ -10,11 +10,41 @@
 #
 
 import socket
+import asyncio
 
 from sciveo.common.tools.logger import *
 from sciveo.common.tools.timers import Timer
 
 
+class NetworkScanner:
+  def __init__(self, timeout=1.0):
+    self.timeout = timeout
+
+  async def scan_port(self, ip, port):
+    try:
+      reader, writer = await asyncio.wait_for(asyncio.open_connection(ip, port), timeout=self.timeout)
+      writer.close()
+      await writer.wait_closed()
+      return (ip, port)
+    except Exception as e:
+      # print("Exception", e)
+      return None
+
+  async def scan_all_ports(self, ip, ports):
+    tasks = [self.scan_port(ip, port) for port in ports]
+    return await asyncio.gather(*tasks)
+
+  async def scan_async(self, ips, ports):
+    results = []
+    for ip in ips:
+      results.extend(await self.scan_all_ports(ip, ports))
+    results = [x for x in results if x is not None]
+    return results
+
+  def scan(self, ips, ports):
+    return asyncio.run(self.scan_async(ips, ports))
+
+
 class NetworkTools:
   def __init__(self, **kwargs):
     self.default_arguments = {
@@ -81,6 +111,20 @@ class NetworkTools:
 
 
 if __name__ == "__main__":
-  net = NetworkTools(timeout=0.01, localhost=True)
-  list_hosts = net.scan_port(port=22)
-  print(list_hosts)
+  t1 = Timer()
+  net = NetworkTools(timeout=0.5, localhost=True)
+  result = net.scan_port(port=22)
+  t1 = t1.stop()
+  print(result, "elapsed", t1)
+
+  t2 = Timer()
+  list_local_ips = net.get_local_nets()
+  list_scan_ips = []
+  for local_ip in list_local_ips:
+    list_scan_ips += net.generate_ip_list(local_ip)
+  # print(list_scan_ips)
+  ns = NetworkScanner(timeout=0.5)
+  result = ns.scan(list_scan_ips, [22])
+  t2 = t2.stop()
+  print(result, "elapsed", t2)
+  print("elapsed", t1, t2, t1 - t2)

sciveo-0.1.8/sciveo/version.py

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

{sciveo-0.1.6 → sciveo-0.1.8}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.6
+Version: 0.1.8
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
@@ -49,10 +49,12 @@ When have sciveo account:
 ```shell
 export SCIVEO_SECRET_ACCESS_KEY='my_sciveo_user_auth_token'
 ```
+or create a file like ~/.sciveo/some_file_name where put:
+secret_access_key=my_sciveo_user_auth_token
 
 When using sciveo Monitoring just run, using suitable python environment
 ```shell
-python -c "import sciveo; sciveo.monitor(period=120)"
+sciveo monitor --period 120
 ```
 
 Monitoring started along with other python code.

{sciveo-0.1.6 → sciveo-0.1.8}/sciveo.egg-info/SOURCES.txt

@@ -1,10 +1,12 @@
 README.md
 setup.py
 sciveo/__init__.py
+sciveo/cli.py
 sciveo/version.py
 sciveo.egg-info/PKG-INFO
 sciveo.egg-info/SOURCES.txt
 sciveo.egg-info/dependency_links.txt
+sciveo.egg-info/entry_points.txt
 sciveo.egg-info/requires.txt
 sciveo.egg-info/top_level.txt
 sciveo/api/__init__.py
@@ -16,6 +18,7 @@ sciveo/common/model.py
 sciveo/common/optimizers.py
 sciveo/common/sampling.py
 sciveo/common/tools/__init__.py
+sciveo/common/tools/configuration.py
 sciveo/common/tools/daemon.py
 sciveo/common/tools/formating.py
 sciveo/common/tools/hardware.py

sciveo-0.1.8/sciveo.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+sciveo = sciveo.cli:main

{sciveo-0.1.6 → sciveo-0.1.8}/setup.py

@@ -34,4 +34,10 @@ setup(
         'netifaces>=0.0.0',
       ]
     },
+    py_modules=['sciveo'],
+    entry_points={
+      'console_scripts': [
+        'sciveo=sciveo.cli:main',
+      ],
+    },
 )

sciveo-0.1.6/sciveo/version.py

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