osbot-utils 1.24.0__tar.gz → 1.26.0__tar.gz

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.24.0
+Version: 1.26.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v1.24.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.26.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/README.md

@@ -2,7 +2,7 @@
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v1.24.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.26.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/osbot_utils/helpers/ssh/SSH__Execute.py

@@ -4,6 +4,7 @@ from osbot_utils.decorators.lists.group_by                  import group_by
 from osbot_utils.decorators.lists.index_by                  import index_by
 from osbot_utils.utils.Dev                                  import pprint
 from osbot_utils.utils.Env                                  import get_env
+from osbot_utils.utils.Http import is_port_open
 from osbot_utils.utils.Misc                                 import str_to_int, str_to_bool
 from osbot_utils.utils.Process import start_process, run_process
 from osbot_utils.utils.Status                               import status_error
@@ -140,10 +141,11 @@ class SSH__Execute(Type_Safe):
     def ssh_not__setup_ok(self):
         return self.ssh_setup_ok() is False
 
-    # print helpers
-    # def print_ls(self, path=''):
-    #     pprint(self.ls(path))
-    #     return self
+    def ssh_host_available(self):
+        return is_port_open(self.ssh_host, self.ssh_port)
+
+    def ssh_host_not_available(self):
+        return self.ssh_host_available() is False
 
     def print_status__stderr__stdout(self, result):
         print()

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/osbot_utils/helpers/ssh/TestCase__SSH.py

@@ -21,6 +21,10 @@ class TestCase__SSH(TestCase):
             import pytest                           # we can only import this locally since this dependency doesn't exist in the main osbot_utils codebase
             pytest.skip("SSH host not set")
 
+        with cls.ssh.ssh_execute() as _:
+            if _.ssh_not__setup_ok() or _.ssh_host_not_available():
+                cls.skipTest(cls, 'ssh is not setup or enabled')
+
         cls.cache = SSH__Cache__Requests()
         cls.cache.patch_apply()
 

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/osbot_utils/helpers/trace/Trace_Call.py

@@ -11,7 +11,7 @@ from osbot_utils.helpers.trace.Trace_Call__View_Model       import Trace_Call__V
 
 
 def trace_calls(title         = None , print_traces = True , show_locals    = False, source_code          = False ,
-                ignore        = None , include      = None , show_path      = False, duration_bigger_than = 0     ,
+                ignore        = None , include      = None , show_path      = False, duration_bigger_than = 0     , trace_depth=0,
                 max_string    = None , show_types   = False, show_duration  = False ,# show_caller    = False     ,         # todo: add back when show_caller is working again
                 show_class    = False, contains     = None , show_internals = False, enabled              = True  ,
                 extra_data    = False, show_lines   = False, print_lines    = False, show_types_padding   = None  , duration_padding=None):
@@ -30,7 +30,8 @@ def trace_calls(title         = None , print_traces = True , show_locals    = Fa
                                  capture_extra_data=extra_data,
                                  print_padding_parent_info= show_types_padding, print_padding_duration=duration_padding,
                                  print_lines_on_exit=print_lines, trace_enabled=enabled,
-                                 trace_capture_lines=show_lines or print_lines)
+                                 trace_capture_lines=show_lines or print_lines,
+                                 trace_up_to_depth=trace_depth)
 
             config = (Trace_Call__Config().update_from_kwargs (**config_kwargs))
 

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/osbot_utils/helpers/trace/Trace_Call__Handler.py

@@ -168,7 +168,7 @@ class Trace_Call__Handler(Kwargs_To_Self):
                     capture = False
 
                 for item in self.config.trace_ignore_start_with:                                       # Check if the module should be ignored
-                    if module.startswith(item):
+                    if module.startswith(item) or func_name.startswith(item):
                         capture = False
                         break
         return capture

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/osbot_utils/utils/Env.py

@@ -94,6 +94,9 @@ def load_dotenv(dotenv_path=None, override=False):              # todo: add dete
 def not_in_github_action():
     return in_github_action() is False
 
+def set_env(key, value):
+    os.environ[key] = value
+    return value
 
 def unload_dotenv(dotenv_path=None):
     if dotenv_path:                                                 # If a specific dotenv path is provided, unload from it

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/osbot_utils/utils/Python_Logger.py

@@ -99,7 +99,8 @@ class Python_Logger(Type_Safe):
     def setup(self, logger_name=None, log_level=None,add_console_logger=False, add_memory_logger=True):
         if logger_name:
             self.logger_name = logger_name
-        self.logger =  logging.getLogger(self.logger_name)
+        if self.logger is None:
+            self.logger =  logging.getLogger(self.logger_name)
         self.setup_log_methods()
         self.set_log_level(log_level)
         if add_console_logger:

osbot_utils-1.26.0/osbot_utils/version

@@ -0,0 +1 @@
+v1.26.0

{osbot_utils-1.24.0 → osbot_utils-1.26.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v1.24.0"
+version     = "v1.26.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"

osbot_utils-1.24.0/osbot_utils/version

@@ -1 +0,0 @@
-v1.24.0