osbot-utils 1.24.0__py3-none-any.whl → 1.26.0__py3-none-any.whl

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/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/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/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/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/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/version

@@ -1 +1 @@
-v1.24.0
+v1.26.0

{osbot_utils-1.24.0.dist-info → osbot_utils-1.26.0.dist-info}/METADATA

@@ -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.dist-info → osbot_utils-1.26.0.dist-info}/RECORD

@@ -219,17 +219,17 @@ osbot_utils/helpers/sqlite/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 osbot_utils/helpers/ssh/SCP.py,sha256=9PgJbyWKfxJj00Ijaj7o6ffxPXuNoureb6JlHMPbHww,3330
 osbot_utils/helpers/ssh/SSH.py,sha256=jyRZIL8rif1Fn76i0ZJWSkY0VyQuB1J2LAWIvu4jKpU,1545
 osbot_utils/helpers/ssh/SSH__Cache__Requests.py,sha256=Dqh4biVcuaXbQVvn3Tx-kSGBGHiF-2wVsgu96EhD6gU,3359
-osbot_utils/helpers/ssh/SSH__Execute.py,sha256=D5tQGbSPaNsrMvhTVT0sZIHpqF1rIYXYiaWzGExcwm4,6849
+osbot_utils/helpers/ssh/SSH__Execute.py,sha256=YSZEsS_j2PWyfGQNYNv2lvvo2tZlT3pGIwx0YLRqZ4w,6969
 osbot_utils/helpers/ssh/SSH__Health_Check.py,sha256=WDmBD6ejNcBeicXfjpsiNzH-WR3Jejx0re3WfwjSWyQ,2083
 osbot_utils/helpers/ssh/SSH__Linux.py,sha256=O1uyKcklaj2tHqQZln7dVinzjl9-EI52KzP8ojQr244,4330
 osbot_utils/helpers/ssh/SSH__Linux__Amazon.py,sha256=ZJFb7LFTvclAuhH5OoOtJ361NoX9ecHTaFX-iSmnzmk,596
 osbot_utils/helpers/ssh/SSH__Python.py,sha256=O2DAwkbXzwkis8lffoqIL2NPSfYcN44Mr8i9Ey2iMKk,2066
-osbot_utils/helpers/ssh/TestCase__SSH.py,sha256=rlhkiVr1OR_3uiwqK2dVZ-yBwZZpUhMq6BPT2p21H1s,1598
+osbot_utils/helpers/ssh/TestCase__SSH.py,sha256=MD8sq0_kI4f6pEmEO0cLq2mQOhIqbP45ZxFJNG44Jg4,1773
 osbot_utils/helpers/ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/trace/Trace_Call.py,sha256=xTmR5U2u0vKnIgMSu-4NAibWKIV4-Eql3vACwOr1lkw,6329
+osbot_utils/helpers/trace/Trace_Call.py,sha256=WXw1QyHxVrkKk24NlMbrsLQdbQTgN2ocwEFqkfB6n2E,6408
 osbot_utils/helpers/trace/Trace_Call__Config.py,sha256=6nJplzrY1adz3WcwTIuwEhBCk1P0U0NbyWRzDyIox_Q,3250
 osbot_utils/helpers/trace/Trace_Call__Graph.py,sha256=HCrXRKQI42DIQxxyFLcaosWiOcUyoITbeV17ICdXcXM,1156
-osbot_utils/helpers/trace/Trace_Call__Handler.py,sha256=Ay5YEmwr8ZCK7YfFWCkOTys5zmiM3qrS0ebwGFx9-hc,11533
+osbot_utils/helpers/trace/Trace_Call__Handler.py,sha256=3gEX-DykEFixfBmD0jBdMhnTujxhNbXkjOhqxNTc9ac,11563
 osbot_utils/helpers/trace/Trace_Call__Print_Lines.py,sha256=cy7zLv0_JNxdOIQPfZk6J9bv6AkIW6O643w0ykClXbw,4820
 osbot_utils/helpers/trace/Trace_Call__Print_Traces.py,sha256=2LGeWMGP1uhSojGMmJmL3bH2B5LFIlfYEqEPNqoyKJw,8628
 osbot_utils/helpers/trace/Trace_Call__Stack.py,sha256=pIvZ2yP4tymOQraUR2N5R-qlmg5QijyLxt85zmMajUs,7462
@@ -263,7 +263,7 @@ osbot_utils/utils/Assert.py,sha256=u9XLgYn91QvNWZGyPi29SjPJSXRHlm9andIn3NJEVog,1
 osbot_utils/utils/Call_Stack.py,sha256=MAq_0vMxnbeLfCe9qQz7GwJYaOuXpt3qtQwN6wiXsU0,6595
 osbot_utils/utils/Csv.py,sha256=oHLVpjRJqrLMz9lubMCNEoThXWju5rNTprcwHc1zq2c,1012
 osbot_utils/utils/Dev.py,sha256=HibpQutYy_iG8gGV8g1GztxNN4l29E4Bi7UZaVL6-L8,1203
-osbot_utils/utils/Env.py,sha256=CrvDcpY9NEuvyvG_QHcv1oSfw8BKXN6MqVEbPF_OqFU,5008
+osbot_utils/utils/Env.py,sha256=uYLhqVXqqgfh03Zmf9Vdy9zFdFf0rasW6lteh_VM1xQ,5078
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
 osbot_utils/utils/Files.py,sha256=q4_JeNWZygM8T0_frpTGvZjtISC1ZyJTOr3bD9pCKUE,19599
 osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
@@ -276,15 +276,15 @@ osbot_utils/utils/Misc.py,sha256=ljscBemI5wOhfkl1BVpsqshacTOCKkOisV4er9xPCWM,166
 osbot_utils/utils/Objects.py,sha256=WFH3oeXR1CU03oyzXfcIlktcoXQuKw9cIJn8xTs02AE,14654
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
-osbot_utils/utils/Python_Logger.py,sha256=7IPB6gMw-G9HWdgyG_k6d7CE71P55-SAudKgDVxraMs,12756
+osbot_utils/utils/Python_Logger.py,sha256=tx8N6wRKL3RDHboDRKZn8SirSJdSAE9cACyJkxrThZ8,12792
 osbot_utils/utils/Status.py,sha256=Yq4s0TelXgn0i2QjCP9V8mP30GabXp_UL-jjM6Iwiw4,4305
 osbot_utils/utils/Str.py,sha256=kxdY8ROX4FdJtCaMTfOc8fK_xcDICprNkefHu2MMNU4,2585
 osbot_utils/utils/Toml.py,sha256=dqiegndCJF7V1YT1Tc-b0-Bl6QWyL5q30urmQwMXfMQ,1402
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=YFahdBguVK71mLdYy4m7mqVAQ5al-60QnTmYK-txCfY,6784
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=ZD3YCx9CcqVfYvN3EZrH5YNt6_M4up_qb295gQk6gwg,8
-osbot_utils-1.24.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.24.0.dist-info/METADATA,sha256=E-QECitRSsPhAR9aTUqtH7_7eM2y2PIG3ezGzStkr2Q,1266
-osbot_utils-1.24.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.24.0.dist-info/RECORD,,
+osbot_utils/version,sha256=U6XfqJy3uErITQwIljLFrmcd6bNbxgAaOZBn2N10FzA,8
+osbot_utils-1.26.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.26.0.dist-info/METADATA,sha256=v-yB6jau74HW-32x-u-GKJrage3pT0FS-URSEdPR0_U,1266
+osbot_utils-1.26.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.26.0.dist-info/RECORD,,