osbot-utils 1.33.0__tar.gz → 1.34.0__tar.gz

{osbot_utils-1.33.0 → osbot_utils-1.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.33.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.33.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.33.0 → osbot_utils-1.34.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.33.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.33.0 → osbot_utils-1.34.0}/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-1.33.0 → osbot_utils-1.34.0}/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-1.33.0 → osbot_utils-1.34.0}/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-1.33.0 → osbot_utils-1.34.0}/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-1.34.0/osbot_utils/version

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

{osbot_utils-1.33.0 → osbot_utils-1.34.0}/pyproject.toml

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

osbot_utils-1.33.0/osbot_utils/version

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