osbot-utils 1.41.0__tar.gz → 1.43.0__tar.gz

{osbot_utils-1.41.0 → osbot_utils-1.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.41.0
+Version: 1.43.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.41.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.43.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.41.0 → osbot_utils-1.43.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.41.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.43.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.41.0 → osbot_utils-1.43.0}/osbot_utils/decorators/methods/cache_on_self.py

@@ -26,17 +26,19 @@ def cache_on_self(function: T) -> T:
     def wrapper(*args, **kwargs):
         if len(args) == 0 or inspect.isclass(type(args[0])) is False:
             raise Exception("In Method_Wrappers.cache_on_self could not find self")
-        # todo: fix bug that happens when the value of reload_cache is set to False
+
+        reload_cache = False                                                # default is not to reload cache
         if 'reload_cache' in kwargs:                                        # if the reload parameter is set to True
-            reload_cache = True                                             # set reload to True
+            if kwargs['reload_cache'] is True:                              # only if the reload is explicitly set to True
+                reload_cache = True                                         # set reload value to True
             del kwargs['reload_cache']                                      # remove the reload parameter from the kwargs
-        else:
-            reload_cache = False                                            # otherwise set reload to False
-        self = args[0]                                                      # get self
-        cache_id = cache_on_self__get_cache_in_key(function, args, kwargs)
+
+        self     = args[0]                                                  # get self
+        cache_id = cache_on_self__get_cache_in_key(function, args, kwargs)  # get cache_id value
+
         if reload_cache is True or hasattr(self, cache_id) is False:        # check if return_value has been set or if reload is True
             return_value = function(*args, **kwargs)                        # invoke function and capture the return value
-            setattr(self, cache_id,return_value)                            # set the return value
+            setattr(self, cache_id,return_value)                            # set the return value in the cache
         return getattr(self, cache_id)                                      # return the return value
     return wrapper
 

{osbot_utils-1.41.0 → osbot_utils-1.43.0}/osbot_utils/testing/Hook_Method.py

@@ -5,9 +5,10 @@ from osbot_utils.testing.Duration import Duration
 
 class Hook_Method:
 
-    def __init__(self, target_module, target_method):
+    def __init__(self, target_module, target_method, raise_exception=True):
         self.target_module   = target_module
         self.target_method   = target_method
+        self.raise_exception = raise_exception                              # todo: figure out the impact of raising this by default
         self.target          = getattr(target_module, target_method)
         self.wrapper_method  = None
         self.calls           = []
@@ -15,6 +16,7 @@ class Hook_Method:
         self.on_after_call   = []
         self.mock_call       = None
 
+
     def __enter__(self):
         self.wrap()
         return self
@@ -107,6 +109,8 @@ class Hook_Method:
                         'duration'    : int(duration.seconds()*1000)
                     }
             self.calls.append(call)
+            if self.raise_exception and exception:
+                raise exception
             return call['return_value']
 
         self.wrapper_method = wrapper_method

{osbot_utils-1.41.0 → osbot_utils-1.43.0}/osbot_utils/testing/Temp_Env_Vars.py

@@ -1,6 +1,6 @@
 import os
-
 from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.utils.Env              import del_env, set_env
 
 
 class Temp_Env_Vars(Type_Safe):
@@ -16,12 +16,12 @@ class Temp_Env_Vars(Type_Safe):
     def set_vars(self):
         for key, value in self.env_vars.items():
             self.original_env_vars[key] = os.environ.get(key)                   # Backup original environment variables and set new ones
-            os.environ[key] = value
+            set_env(key, value)
         return self
 
     def restore_vars(self):
         for key in self.env_vars:                                               # Restore original environment variables
             if self.original_env_vars[key] is None:
-                del os.environ[key]
+                del_env(key)
             else:
-                os.environ[key] = self.original_env_vars[key]
+                set_env(key, self.original_env_vars[key])

{osbot_utils-1.41.0 → osbot_utils-1.43.0}/osbot_utils/utils/Env.py

@@ -6,6 +6,9 @@ from osbot_utils.utils.Files    import all_parent_folders, file_exists
 from osbot_utils.utils.Misc     import list_set
 from osbot_utils.utils.Str      import strip_quotes
 
+def del_env(key):
+    if key in os.environ:
+        del os.environ[key]
 
 def env__home():
     return get_env('HOME', '')

{osbot_utils-1.41.0 → osbot_utils-1.43.0}/osbot_utils/utils/Files.py

@@ -112,9 +112,9 @@ class Files:
             return os.path.basename(path)
 
     @staticmethod
-    def file_name_without_extension(path):
+    def file_name_without_extension(path, check_if_exists=False):
         if path:
-            path_file_name = file_name(path)
+            path_file_name = file_name(path,check_if_exists=check_if_exists)
             extension = file_extension(path_file_name)
             if extension:
                 return path_file_name.replace(extension, '')
@@ -489,8 +489,8 @@ def file_move_to_folder(source_file, target_folder):
             if file_move(source_file, target_file):
                 return target_file
 
-def files_names_without_extension(files):
-    return [file_name_without_extension(file) for file in files]
+def files_names_without_extension(files, check_if_exists=False):
+    return [file_name_without_extension(file, check_if_exists) for file in files]
 
 def files_names_in_folder(target, with_extension=False):
     if with_extension:

osbot_utils-1.43.0/osbot_utils/version

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

{osbot_utils-1.41.0 → osbot_utils-1.43.0}/pyproject.toml

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

osbot_utils-1.41.0/osbot_utils/version

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