osbot-utils 1.32.0__py3-none-any.whl → 1.34.0__py3-none-any.whl

osbot_utils/helpers/Zip_Bytes.py

@@ -1,6 +1,7 @@
 from osbot_utils.base_classes.Type_Safe import Type_Safe
 from osbot_utils.utils.Dev import pprint
 from osbot_utils.utils.Files import files_list, file_create_from_bytes, temp_file, parent_folder, parent_folder_create
+from osbot_utils.utils.Misc import random_text
 from osbot_utils.utils.Regex import list__match_regex, list__match_regexes
 from osbot_utils.utils.Zip import zip_bytes_empty, zip_bytes__files, zip_bytes__add_file, zip_bytes__add_files, \
     zip_bytes__replace_files, zip_bytes__replace_file, zip_bytes__file_list, zip_bytes__file, \
@@ -10,8 +11,8 @@ from osbot_utils.utils.Zip import zip_bytes_empty, zip_bytes__files, zip_bytes__
 class Zip_Bytes(Type_Safe):
     zip_bytes : bytes = None
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
         self.zip_bytes = zip_bytes_empty()
 
     def __enter__(self):
@@ -44,6 +45,12 @@ class Zip_Bytes(Type_Safe):
         files_to_add        = list__match_regexes(all_files_in_folder, *patterns)
         return self.add_files__from_disk(base_path, files_to_add)
 
+    def add_random_file(self):
+        random_file_name     = random_text('file_name'    )
+        random_file_contents = random_text('file_contents')
+        self.add_file(random_file_name, random_file_contents)
+        return self
+
     def add_folder__from_disk__with_prefix(self, folder_to_add, path_prefix, *patterns):
         base_path           = folder_to_add
         all_files_in_folder = files_list(folder_to_add)

osbot_utils/helpers/cache_requests/Cache__Requests__Data.py

@@ -101,5 +101,8 @@ class Cache__Requests__Data(Type_Safe):
 
     def response_data_serialize(self, response_data):
         if self.config.pickle_response:
-            return pickle_save_to_bytes(response_data)
+            try:
+                return pickle_save_to_bytes(response_data)
+            except:                                         # todo: look at a better way to handle this and any possible side effects (saw this with a couple boto3 class)
+                return None
         return response_data

osbot_utils/helpers/cache_requests/Cache__Requests__Invoke.py

@@ -1,3 +1,4 @@
+import threading
 import types
 
 from osbot_utils.base_classes.Type_Safe                                 import Type_Safe
@@ -11,6 +12,14 @@ class Cache__Requests__Invoke(Type_Safe):
     cache_data       : Cache__Requests__Data
     config           : Cache__Requests__Config
     on_invoke_target : types.FunctionType
+    cursor_thread_id : int
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.cursor_thread_id =  threading.get_ident()          # we need to capture this to make sure we are operating on the same thread
+
+    def can_operate_in_this_thread(self):
+        return self.cursor_thread_id == threading.get_ident()
 
     def invoke(self, target, target_args, target_kwargs):
         return self.invoke_with_cache(target, target_args, target_kwargs)
@@ -22,7 +31,11 @@ class Cache__Requests__Invoke(Type_Safe):
             raw_response = target(*target_args, **target_kwargs)
         return self.transform_raw_response(raw_response)
 
+
+
     def invoke_with_cache(self, target, target_args, target_kwargs, request_data=None):
+        if self.can_operate_in_this_thread() is False:                                  # make sure we are in the correct thread
+            return self.invoke_target(target, target_args, target_kwargs)
         if self.config.enabled is False:
             if self.config.cache_only_mode:
                 return None
@@ -43,7 +56,8 @@ class Cache__Requests__Invoke(Type_Safe):
         try:
             response_data_obj = self.invoke_target(target, target_args, target_kwargs)
             response_data     = self.cache_data.response_data_serialize(response_data_obj)
-            self.cache_actions.cache_add(request_data=request_data, response_data=response_data)
+            if response_data:
+                self.cache_actions.cache_add(request_data=request_data, response_data=response_data)
             return response_data_obj
         except Exception as exception:
             if self.config.capture_exceptions:

osbot_utils/utils/Files.py

@@ -270,7 +270,8 @@ class Files:
         if isinstance(target, Path):
             return target.is_file()
         if type(target) is str:
-            return os.path.isfile(target)
+            if len(target) < 4096:                          # max file size in Linux (handle the cases when the file contents was used as target)
+                return os.path.isfile(target)
         return False
 
     @staticmethod

osbot_utils/utils/Zip.py

@@ -235,4 +235,5 @@ zip_bytes__get_file          = zip_bytes__file
 zip_bytes__unzip_to_folder   = zip_bytes__unzip
 
 zip_list_files               = zip_file__list
-zip_file__file_list          = zip_file__list
+zip_file__file_list          = zip_file__list
+zip_file__files_list         = zip_file__list

osbot_utils/version

@@ -1 +1 @@
-v1.32.0
+v1.34.0

{osbot_utils-1.32.0.dist-info → osbot_utils-1.34.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.32.0
+Version: 1.34.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.32.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.34.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.32.0.dist-info → osbot_utils-1.34.0.dist-info}/RECORD

@@ -64,7 +64,7 @@ osbot_utils/helpers/Print_Table.py,sha256=LEXbyqGg_6WSraI4cob4bNNSu18ddqvALp1zGK
 osbot_utils/helpers/Python_Audit.py,sha256=shpZlluJwqJBAlad6xN01FkgC1TsQ48RLvR5ZjmrKa4,1539
 osbot_utils/helpers/Random_Seed.py,sha256=14btja8LDN9cMGWaz4fCNcMRU_eyx49gas-_PQvHgy4,634
 osbot_utils/helpers/Type_Registry.py,sha256=Ajk3SyMSKDi2g9SJYUtTgg7PZkAgydaHcpbGuEN3S94,311
-osbot_utils/helpers/Zip_Bytes.py,sha256=GQAwNEoMXdG7CU1RDhIJ51vkgfbJZnUxjlMUmFGHL1M,3937
+osbot_utils/helpers/Zip_Bytes.py,sha256=d5hYXNOJkOaYa7h2CJ0Y3ojEuGTOvCxPuSic2quwMY4,4236
 osbot_utils/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/ast/Ast.py,sha256=lcPQOSxXI6zgmMnIVF9WM6ISqViWX-sq4d_UC0CDG8s,1155
 osbot_utils/helpers/ast/Ast_Base.py,sha256=5rHMupBlN_n6lOC31UnSW_lWqxqxaE31v0gn-t32OgQ,3708
@@ -144,8 +144,8 @@ osbot_utils/helpers/ast/nodes/Ast_Yield.py,sha256=7ATJnOHekV9XquMTYYSJ6xqyDvgwFc
 osbot_utils/helpers/ast/nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/cache_requests/Cache__Requests__Actions.py,sha256=r1CMR4qHO9is66lexJQ-BNUmBWcEjOSTG_qC0xsoorY,1228
 osbot_utils/helpers/cache_requests/Cache__Requests__Config.py,sha256=KxBjj56YTjZjKsO9TLsRfkcHYJPIGDXZ6rFskaNnh-4,935
-osbot_utils/helpers/cache_requests/Cache__Requests__Data.py,sha256=mx9mVGWwuixPxZmwU49Y4fUTfRaPNZosiX2PStaKBic,5284
-osbot_utils/helpers/cache_requests/Cache__Requests__Invoke.py,sha256=8sLJcLvxaHMnvD2gOL3kF3KR1dD2fIJq371SL9WNpRQ,2751
+osbot_utils/helpers/cache_requests/Cache__Requests__Data.py,sha256=W0t4HyRgTTBbykBf_Ui9o84xLPu5ivreB-jSdOct1lc,5504
+osbot_utils/helpers/cache_requests/Cache__Requests__Invoke.py,sha256=i8OiiA8afOnxVo_w9W8ySkMQygLAMMxDf3NAAmPCaE4,3348
 osbot_utils/helpers/cache_requests/Cache__Requests__Row.py,sha256=h-yc7NkpScbHwwf2km5wwKig-wLi4WuB9P4fVEdFGdM,3182
 osbot_utils/helpers/cache_requests/Cache__Requests__Table.py,sha256=RgxAYhm-FIrXXteQRtD91pOLq8JXhSzxb51Jb6MTUdY,391
 osbot_utils/helpers/cache_requests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -267,7 +267,7 @@ osbot_utils/utils/Csv.py,sha256=oHLVpjRJqrLMz9lubMCNEoThXWju5rNTprcwHc1zq2c,1012
 osbot_utils/utils/Dev.py,sha256=HibpQutYy_iG8gGV8g1GztxNN4l29E4Bi7UZaVL6-L8,1203
 osbot_utils/utils/Env.py,sha256=243O6ENzaRjHXp8DIHUuv4Wfk-zHTE18KZr0cU8uWyo,5474
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
-osbot_utils/utils/Files.py,sha256=RHbxq8AVdGT9S-OrxEWhNEOhbIrHDRU1UbGB1O05Ga8,21615
+osbot_utils/utils/Files.py,sha256=7W0FmxPvxOapUchEVOKDgUx4JBRs9TCesu60uKkvrto,21765
 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
@@ -284,10 +284,10 @@ osbot_utils/utils/Status.py,sha256=Yq4s0TelXgn0i2QjCP9V8mP30GabXp_UL-jjM6Iwiw4,4
 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=t9txUxJzLBEHot6WJwF0iTTUQ1Gf_V2pVwsWzAqw_NU,12163
+osbot_utils/utils/Zip.py,sha256=riPLKkZJxQjVu8lCm19cOTx5uiLPm1HreB9_BzNXi30,12209
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=bXbruCHeH-hb0hIQlj3n7tV2_vXn3ypQsk6TaP1y0Zk,8
-osbot_utils-1.32.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.32.0.dist-info/METADATA,sha256=B4r-4DcyCbnaGO-x7uJIrie537cYmE8Ux4hGFen0Wtc,1266
-osbot_utils-1.32.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.32.0.dist-info/RECORD,,
+osbot_utils/version,sha256=6TnKtA5LdTAs5O7GY4t2C4qn-h6U96yDc0iddfveSQ8,8
+osbot_utils-1.34.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.34.0.dist-info/METADATA,sha256=PcsPtdbnPio1BPKI-PeNDxw91YQ4URN5xP0lOuPrj6g,1266
+osbot_utils-1.34.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.34.0.dist-info/RECORD,,