osbot-utils 1.41.0__py3-none-any.whl → 1.42.0__py3-none-any.whl

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

@@ -1 +1 @@
-v1.41.0
+v1.42.0

{osbot_utils-1.41.0.dist-info → osbot_utils-1.42.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.41.0
+Version: 1.42.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.42.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.dist-info → osbot_utils-1.42.0.dist-info}/RECORD

@@ -18,7 +18,7 @@ osbot_utils/decorators/lists/index_by.py,sha256=BEbfd13l11zROhXAb0vkB_aZi9P2Zt4p
 osbot_utils/decorators/methods/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/decorators/methods/cache.py,sha256=IMmHBeR6qtaOfBNgZUeI1SVLoexQQy6vk1LDW-20_5w,1062
 osbot_utils/decorators/methods/cache_on_function.py,sha256=sDebxWjJnusb_w4R26OTYcmTF6CCeWrpesn-dgzEu8g,2694
-osbot_utils/decorators/methods/cache_on_self.py,sha256=FODnv36jAwNPs11j2fGg6u-4A7MdaeRd1ES6fyPgP78,3611
+osbot_utils/decorators/methods/cache_on_self.py,sha256=bVSOBXcKVR-ITotq9sReUP1RY3TmnvROfl90564miJY,3681
 osbot_utils/decorators/methods/cache_on_tmp.py,sha256=8wLnRAUUkHobu6-B2Q8aAE8jLeIu3b-CQuMtXcnIN9w,3102
 osbot_utils/decorators/methods/capture_exception.py,sha256=mTfjqIS_qvZLhX6_NF_fkD_EnMLZRXkUHqUaiAbqZkU,1160
 osbot_utils/decorators/methods/capture_status.py,sha256=5xklG0usO3hGTjedhrmIucXtUjPd2pkuvA5jsty0a5E,659
@@ -244,7 +244,7 @@ osbot_utils/helpers/trace/Trace_Files.py,sha256=SNpAmuBlSUS9NyVocgZ5vevzqVaIqoh6
 osbot_utils/helpers/trace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/testing/Catch.py,sha256=HdNoKnrPBjvVj87XYN-Wa1zpo5z3oByURT6TKbd5QpQ,2229
 osbot_utils/testing/Duration.py,sha256=iBrczAuw6j3jXtG7ZPraT0PXbCILEcCplJbqei96deA,2217
-osbot_utils/testing/Hook_Method.py,sha256=A1t6WQzeR9hv5ddaz7ILtvKyJpRrRBRnftB-zgcIQpA,4126
+osbot_utils/testing/Hook_Method.py,sha256=uCpc89ZhMCfWiyt3tFhIGIInXiY6wTuwAZ1I8UQVRuw,4365
 osbot_utils/testing/Log_To_Queue.py,sha256=pZQ7I1ne-H365a4WLS60oAD-B16pxIZO4suvCdaTW8U,1703
 osbot_utils/testing/Log_To_String.py,sha256=hkjWsJfV68uqgX9nvVqUN3mVPxZQDb-6UBwsSEbQnkA,1216
 osbot_utils/testing/Logging.py,sha256=rzO1cCwty1oTucbV1q6U2QBIF87oOcvZoAY_R8SQB8A,3300
@@ -267,9 +267,9 @@ 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=9r1xxCDszX1UUOu0dy3Kf_djaU3I39xgB_QdC80Szdo,5669
+osbot_utils/utils/Env.py,sha256=XMwF5BrtpoPJdOraswAFPrcQ3tRTocjqvA8I61eOCJw,5741
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
-osbot_utils/utils/Files.py,sha256=z-egRBPDYp6AJkZxK-JnXOwz1OezgzEDG_fgSHVcCCM,22427
+osbot_utils/utils/Files.py,sha256=7fdqbfFyo6Ow5Repi_dZAzHqGb0XYh6tDALYAy42pBY,22522
 osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
 osbot_utils/utils/Http.py,sha256=WlXEfgT_NaiDVD7vCDUxy_nOm5Qf8x_L0A3zd8B5tX8,4706
 osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
@@ -288,8 +288,8 @@ osbot_utils/utils/Toml.py,sha256=dqiegndCJF7V1YT1Tc-b0-Bl6QWyL5q30urmQwMXfMQ,140
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=Gt4K7Q9LlYeRxOVv8aYpaBLKxrYriCAEUa_R6YWEbMg,13903
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=yjQ1Y3Y8Is1y8OCYYIKbpD5nxgESlUaT8Bw1tHNnaM8,8
-osbot_utils-1.41.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.41.0.dist-info/METADATA,sha256=azUxA2mC1p3Q2Kb4IHSdOzXc4PpOYW6BUk1kxEwifb0,1266
-osbot_utils-1.41.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.41.0.dist-info/RECORD,,
+osbot_utils/version,sha256=XEDmF2gY0SXKEjwvdngDk1U0o2yRWMAxnldMBdQDSOM,8
+osbot_utils-1.42.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.42.0.dist-info/METADATA,sha256=A5I-YaoHJocPTRXNoGBep9eP3FhVTSndWFE9TcAGCLE,1266
+osbot_utils-1.42.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.42.0.dist-info/RECORD,,