sciveo 0.1.10__tar.gz → 0.1.12__tar.gz

{sciveo-0.1.10 → sciveo-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.10
+Version: 0.1.12
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
@@ -47,12 +47,18 @@ The library has local and remote mode. The local one is ready to use, but for th
 
 When have sciveo account:
 ```shell
+sciveo init
+```
+Where ~/.sciveo/ path and ~/.sciveo/default file will be created. Just need to change the secret_access_key value.
+
+or
+```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
+Sciveo Monitoring cli
 ```shell
 sciveo monitor --period 120
 ```
@@ -64,12 +70,17 @@ import sciveo
 # Non blocking monitoring, so continue the code execution after it.
 sciveo.monitor(period=120, block=False)
 
-#rest of your code here
+#rest of your python code here
 
+```
 
+Sciveo Scan hosts port tool available
+```shell
+sciveo scan --port 22 --timeout 0.5
 ```
 
-When using sciveo Experimental projects management
+
+Experimental Projects management
 
 ```python
 

{sciveo-0.1.10 → sciveo-0.1.12}/README.md

@@ -39,12 +39,18 @@ The library has local and remote mode. The local one is ready to use, but for th
 
 When have sciveo account:
 ```shell
+sciveo init
+```
+Where ~/.sciveo/ path and ~/.sciveo/default file will be created. Just need to change the secret_access_key value.
+
+or
+```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
+Sciveo Monitoring cli
 ```shell
 sciveo monitor --period 120
 ```
@@ -56,12 +62,17 @@ import sciveo
 # Non blocking monitoring, so continue the code execution after it.
 sciveo.monitor(period=120, block=False)
 
-#rest of your code here
+#rest of your python code here
 
+```
 
+Sciveo Scan hosts port tool available
+```shell
+sciveo scan --port 22 --timeout 0.5
 ```
 
-When using sciveo Experimental projects management
+
+Experimental Projects management
 
 ```python
 

{sciveo-0.1.10 → sciveo-0.1.12}/sciveo/cli.py

@@ -28,7 +28,7 @@ def main():
   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')
-  parser.add_argument('--timeout', type=float, default=0.5, help='Timeout')
+  parser.add_argument('--timeout', type=float, default=1.0, help='Timeout')
   parser.add_argument('--port', type=int, default=22, help='Host port number, used for network ops')
   parser.add_argument('--localhost', type=bool, default=False, help='Add localhost to list of hosts')
   args = parser.parse_args()
@@ -47,7 +47,7 @@ def main():
         "api_base_url=https://sciveo.com",
         "log_min_level=DEBUG"
       ]
-      with open("default", 'w') as fp:
+      with open(os.path.join(base_path, "default"), 'w') as fp:
         for line in default_lines:
           fp.write(line + '\n')
     else:

sciveo-0.1.12/sciveo/common/tools/logger.py

@@ -0,0 +1,47 @@
+#
+# 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 os
+import logging
+from threading import Lock
+
+from sciveo.common.tools.configuration import GlobalConfiguration
+
+
+SCIVEO_LOGGER_NAME = "sciveo-log"
+
+_sciveo_global_config = GlobalConfiguration.get()
+_sciveo_log_min_level = _sciveo_global_config["LOG_MIN_LEVEL"]
+_sciveo_log_lock = Lock()
+
+def _sciveo_get_logger(name):
+  logger = logging.getLogger(name)
+  if not logger.hasHandlers():
+    with _sciveo_log_lock:
+      if not logger.hasHandlers():
+        logger.setLevel(logging.getLevelName(_sciveo_log_min_level))
+        formatter = logging.Formatter('%(asctime)s [%(thread)d] [%(levelname)s] %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+        ch = logging.StreamHandler()
+        ch.setFormatter(formatter)
+        logger.addHandler(ch)
+        logger.propagate = False
+  return logger
+
+def debug(*args):
+  _sciveo_get_logger(SCIVEO_LOGGER_NAME).debug(args)
+def info(*args):
+  _sciveo_get_logger(SCIVEO_LOGGER_NAME).info(args)
+def warning(*args):
+  _sciveo_get_logger(SCIVEO_LOGGER_NAME).warning(args)
+def error(*args):
+  _sciveo_get_logger(SCIVEO_LOGGER_NAME).error(args)
+def critical(*args):
+  _sciveo_get_logger(SCIVEO_LOGGER_NAME).critical(args)

{sciveo-0.1.10 → sciveo-0.1.12}/sciveo/common/tools/timers.py

@@ -11,6 +11,8 @@
 
 import time
 
+from sciveo.common.tools.logger import *
+
 
 class FPSCounter:
   def __init__(self, period=10, tag=""):
@@ -23,7 +25,7 @@ class FPSCounter:
     self.n += 1
     t2 = time.time()
     if t2 - self.t1 > self.period:
-      print(type(self).__name__, self.tag, "FPS", self.n / (t2 - self.t1))
+      debug(type(self).__name__, self.tag, "FPS", self.n / (t2 - self.t1))
       self.n = 0
       self.t1 = time.time()
 

{sciveo-0.1.10 → sciveo-0.1.12}/sciveo/monitoring/monitor.py

@@ -187,7 +187,7 @@ class BaseMonitor(DaemonBase):
     self.previous_io_counters[name] = io_counters
 
 if __name__ == "__main__":
-  print(MonitorTools.serial())
+  debug(MonitorTools.serial())
 
   mon = BaseMonitor(period=10)
   mon.start()

{sciveo-0.1.10 → sciveo-0.1.12}/sciveo/monitoring/network.py

@@ -19,7 +19,7 @@ from sciveo.common.tools.timers import Timer
 class NetworkTools:
   def __init__(self, **kwargs):
     self.default_arguments = {
-      "timeout": 0.1,
+      "timeout": 1.0,
       "localhost": False,
     }
 
@@ -65,6 +65,7 @@ class NetworkTools:
       self.scan_port_hosts(list_ip, port)
     if self.arguments["localhost"]:
       self.scan_port_hosts(["127.0.0.1"], port)
+    self.data["scan"][port].sort(key=lambda ip: int(ip.split('.')[-1]))
     debug(type(self).__name__, f"scan_port [{port}] elapsed time {t.stop():.1f}s", self.data["scan"][port])
     return self.data["scan"][port]
 
@@ -92,4 +93,4 @@ class NetworkTools:
 
 
 if __name__ == "__main__":
-  print(NetworkTools(timeout=0.5, localhost=False).scan_port(port=9901))
+  debug(NetworkTools(timeout=1.0, localhost=False).scan_port(port=9901))

sciveo-0.1.12/sciveo/version.py

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

{sciveo-0.1.10 → sciveo-0.1.12}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.10
+Version: 0.1.12
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
@@ -47,12 +47,18 @@ The library has local and remote mode. The local one is ready to use, but for th
 
 When have sciveo account:
 ```shell
+sciveo init
+```
+Where ~/.sciveo/ path and ~/.sciveo/default file will be created. Just need to change the secret_access_key value.
+
+or
+```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
+Sciveo Monitoring cli
 ```shell
 sciveo monitor --period 120
 ```
@@ -64,12 +70,17 @@ import sciveo
 # Non blocking monitoring, so continue the code execution after it.
 sciveo.monitor(period=120, block=False)
 
-#rest of your code here
+#rest of your python code here
 
+```
 
+Sciveo Scan hosts port tool available
+```shell
+sciveo scan --port 22 --timeout 0.5
 ```
 
-When using sciveo Experimental projects management
+
+Experimental Projects management
 
 ```python
 

sciveo-0.1.10/sciveo/common/tools/logger.py

@@ -1,47 +0,0 @@
-#
-# 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 os
-import logging
-import threading
-
-from sciveo.common.tools.configuration import GlobalConfiguration
-
-
-config = GlobalConfiguration.get()
-log_min_level = config["LOG_MIN_LEVEL"]
-
-def get_logger(name):
-  logger = logging.getLogger(name)
-
-  if not logger.handlers:
-    logger.setLevel(logging.getLevelName(log_min_level))
-    formatter = logging.Formatter('%(asctime)s [%(thread)d] [%(levelname)s] %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-    ch = logging.StreamHandler()
-    ch.setFormatter(formatter)
-    logger.addHandler(ch)
-
-  return logger
-
-
-
-SCIVEO_LOGGER_NAME = "sciveo-log"
-
-def debug(*args):
-  get_logger(SCIVEO_LOGGER_NAME).debug(args)
-def info(*args):
-  get_logger(SCIVEO_LOGGER_NAME).info(args)
-def warning(*args):
-  get_logger(SCIVEO_LOGGER_NAME).warning(args)
-def error(*args):
-  get_logger(SCIVEO_LOGGER_NAME).error(args)
-def critical(*args):
-  get_logger(SCIVEO_LOGGER_NAME).critical(args)

sciveo-0.1.10/sciveo/version.py

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