osbot-utils 1.33.0__py3-none-any.whl → 1.35.0__py3-none-any.whl

osbot_utils/helpers/Local_Caches.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Dict, List
 from osbot_utils.helpers.Local_Cache import Local_Cache
-from osbot_utils.utils.Files         import current_temp_folder, path_combine,folder_exists, folder_delete
+from osbot_utils.utils.Files import current_temp_folder, path_combine, folder_exists, folder_delete, file_extension
 from osbot_utils.utils.Misc          import random_text
 
 
@@ -41,8 +41,9 @@ class Local_Caches:
         cache_names = []
         for f in self.path_local_caches().iterdir():
             if f.is_file():
-                cache_name = f.name.replace('.json', '')
-                cache_names.append(cache_name)
+                if file_extension(f.name) == '.json':
+                    cache_name = f.name.replace('.json', '')
+                    cache_names.append(cache_name)
         return cache_names
 
     #@cache_on_self

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/helpers/sqlite/Sqlite__Database.py

@@ -124,10 +124,12 @@ class Sqlite__Database(Kwargs_To_Self):
     def tables_raw(self):
         return self.cursor().tables()
 
-    def tables_names(self, include_sqlite_master=False):
+    def tables_names(self, include_sqlite_master=False, include_indexes=True):
         table_names = self.table__sqlite_master().select_field_values('name')
         if include_sqlite_master:
             table_names.append('sqlite_master')
+        if include_indexes is False:
+            return [table_name for table_name in table_names if table_name.startswith('idx') is False]
         return table_names
 
     def purge_database(self):       # this fells like a better name than vacuum :)

osbot_utils/helpers/sqlite/domains/Sqlite__DB.py

@@ -0,0 +1,34 @@
+from typing import Dict, Type
+
+from osbot_utils.decorators.methods.cache_on_self import cache_on_self
+from osbot_utils.helpers.sqlite.Sqlite__Database import Sqlite__Database
+from osbot_utils.helpers.sqlite.tables.Sqlite__Table__Config import Sqlite__Table__Config, SQLITE__TABLE_NAME__CONFIG, \
+    Schema__Table__Config
+
+
+class Sqlite__DB(Sqlite__Database):
+
+    # methods to override
+    def tables_to_add(self):            # use this to define the tables that should be automatically created on setup
+        return {}
+
+    def db_not_configured(self):
+        return self.tables_names() == []
+
+    @cache_on_self
+    def table_config(self):
+        return Sqlite__Table__Config(database=self)
+
+
+
+    def tables_names(self, include_sqlite_master=False, include_indexes=False):
+        return super().tables_names(include_sqlite_master=include_sqlite_master, include_indexes=include_indexes)
+
+    def setup(self):
+        if self.db_not_configured():
+            self.table_config().setup()
+            for table_name, row_schema in self.tables_to_add().items():
+                table = self.table(table_name)
+                table.row_schema = row_schema
+                table.create()
+        return self

osbot_utils/helpers/sqlite/domains/Sqlite__DB__Files.py

@@ -21,11 +21,18 @@ class Sqlite__DB__Files(Sqlite__DB__Local):
     def file(self, path, include_contents=False):
         return self.table_files().file(path, include_contents=include_contents)
 
+    def file_contents(self, path):
+        return self.table_files().file_contents(path)
+
+    def file__with_content(self, path):
+        return self.file(path, include_contents=True)
+
     def file_exists(self, path):
         return self.table_files().file_exists(path)
 
     def file_names(self):
         return self.table_files().select_field_values('path')
+
     @cache_on_self
     def table_files(self):
         return Sqlite__Table__Files(database=self).setup()

osbot_utils/helpers/sqlite/tables/Sqlite__Table__Files.py

@@ -67,6 +67,12 @@ class Sqlite__Table__Files(Sqlite__Table):
             fields = self.field_names_without_content()
         return self.row(where=dict(path=path), fields = fields)
 
+    def file_contents(self, path):
+        fields = ['contents']
+        row    = self.row(where=dict(path=path), fields = fields)
+        if row:
+            return row.get('contents')
+
     def file_without_contents(self, path):
         return self.file(path, include_contents=False)
 

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/Misc.py

@@ -174,7 +174,7 @@ def is_guid(value):
     try:
         uuid_obj = uuid.UUID(value)
         return str(uuid_obj) == value.lower()
-    except ValueError:
+    except Exception:
         return False
 
 

osbot_utils/version

@@ -1 +1 @@
-v1.33.0
+v1.35.0

{osbot_utils-1.33.0.dist-info → osbot_utils-1.35.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.33.0
+Version: 1.35.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.35.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.dist-info → osbot_utils-1.35.0.dist-info}/RECORD

@@ -59,12 +59,12 @@ osbot_utils/helpers/CPrint.py,sha256=ztKPNmT8BGxeyPXSQKRs63PqqbgxKDz_BiZmzFMup9g
 osbot_utils/helpers/Dict_To_Attr.py,sha256=NdhXl5mJH7-NaBk213amzc5Nfy3tJgW-N_uYIRE4hoc,208
 osbot_utils/helpers/Hashicorp_Secrets.py,sha256=zjXa_dQvfR9L1uoulWJ8nYYaDvznV6o_QPPS4zmb6mo,4235
 osbot_utils/helpers/Local_Cache.py,sha256=0JZZX3fFImcwtbBvxAQl-EbBegSNJRhRMYF6ovTH6zY,3141
-osbot_utils/helpers/Local_Caches.py,sha256=HvuP5CURyVm_fVvJX-S4dml2bhRauzgA3be237yTaeY,1814
+osbot_utils/helpers/Local_Caches.py,sha256=aQmi1HSM0TH6WQPedG2fbz4KCCJ3DQTU9d18rB1jR0M,1885
 osbot_utils/helpers/Print_Table.py,sha256=LEXbyqGg_6WSraI4cob4bNNSu18ddqvALp1zGK7bPhs,19126
 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
@@ -184,7 +184,7 @@ osbot_utils/helpers/pubsub/schemas/Schema__PubSub__Client.py,sha256=yOQSn4o1bIsE
 osbot_utils/helpers/pubsub/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/Capture_Sqlite_Error.py,sha256=GSuRYgs1yKQjxMszPoaI7fsfMfuUqhb64AaIysRE6Cs,1747
 osbot_utils/helpers/sqlite/Sqlite__Cursor.py,sha256=k5G9Tkk3nx6nHoSanLmpuJG_TceAmN7uRBCt0bo6sIc,3364
-osbot_utils/helpers/sqlite/Sqlite__Database.py,sha256=XcyZ7sqXQeV0dAyERiE3kYFeMubfhKidLbrlrZXLzQI,5432
+osbot_utils/helpers/sqlite/Sqlite__Database.py,sha256=AAUaUXABiL1GE7urg20YpwbFGbRvRxqvv4D7IgCgvYw,5594
 osbot_utils/helpers/sqlite/Sqlite__Field.py,sha256=oBWglAOKN0EWVtaRwiQFxmR1FQ61lQ35yKkWXjSiihs,2911
 osbot_utils/helpers/sqlite/Sqlite__Globals.py,sha256=aP6uIy_y4xzl2soTUCFIJRjsb8JyfxfL6qIEZKIWy_4,230
 osbot_utils/helpers/sqlite/Sqlite__Table.py,sha256=FsFSolFN2N5V8DfZPp4gZL9xmCXaOhmG38wQmgRrvp8,15145
@@ -200,7 +200,8 @@ osbot_utils/helpers/sqlite/cache/Sqlite__Cache__Requests__Table.py,sha256=77uO-8
 osbot_utils/helpers/sqlite/cache/Sqlite__DB__Requests.py,sha256=CWB-hTcgly2T_7HOZM5gUgfdsvgMus5nX2M_wpjVLZs,1643
 osbot_utils/helpers/sqlite/cache/TestCase__Sqlite__Cache__Requests.py,sha256=TLUdQC6vsf5BcDP15CCeoYkipVG30bzqFcqEJpH4dWg,1645
 osbot_utils/helpers/sqlite/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/sqlite/domains/Sqlite__DB__Files.py,sha256=tirQs4VjnjzGagaT17NigqprMuQiELHm5FwAE5PJT1U,1510
+osbot_utils/helpers/sqlite/domains/Sqlite__DB.py,sha256=xyXnt4-GLYqMEPBZrNPI0dZnkl61KwLEIuYjebO20Jc,1210
+osbot_utils/helpers/sqlite/domains/Sqlite__DB__Files.py,sha256=IyAbtHrpovNkIXaJKQ2vcg3yqF70XLQ-5mdIiN3vSK0,1696
 osbot_utils/helpers/sqlite/domains/Sqlite__DB__Graph.py,sha256=aGykK4Qll5Rn0xJR4RvF5bN6llNEjx-Vst52XTVSNio,1751
 osbot_utils/helpers/sqlite/domains/Sqlite__DB__Json.py,sha256=ILx1wOsmwmvV2yb_fMzLzo18uGNub8cxhBrRfYxCCqA,3808
 osbot_utils/helpers/sqlite/domains/Sqlite__DB__Local.py,sha256=liN_0gyXmQyqnsmiz0RYanSCRI0VoIbwSBf4buM0l-w,1093
@@ -215,7 +216,7 @@ osbot_utils/helpers/sqlite/sql_builder/SQL_Builder__Select.py,sha256=_5fszoWTknE
 osbot_utils/helpers/sqlite/sql_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/tables/Sqlite__Table__Config.py,sha256=M-h6fYQgmX7Yaq3cSmpePutajLVeVy_IDUrDk97EH6U,2061
 osbot_utils/helpers/sqlite/tables/Sqlite__Table__Edges.py,sha256=YwlWj9GYBDeotqDFdjMOb6MyuHhPZKasndAtuHiLrkQ,1635
-osbot_utils/helpers/sqlite/tables/Sqlite__Table__Files.py,sha256=ZlhTqroHd9T8vqNwYpRv5cYHw7Fi-F6fxANh_Fr0nt4,3613
+osbot_utils/helpers/sqlite/tables/Sqlite__Table__Files.py,sha256=4YguiuqzcfTadPWV67lN4IU_8xJzJF--ZRMqbEyzXqw,3800
 osbot_utils/helpers/sqlite/tables/Sqlite__Table__Nodes.py,sha256=GT8h3wD4hGvEtqQuBs0sBbcu2ydktRHTi95PEL2ffHQ,1721
 osbot_utils/helpers/sqlite/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/ssh/SCP.py,sha256=9PgJbyWKfxJj00Ijaj7o6ffxPXuNoureb6JlHMPbHww,3330
@@ -267,14 +268,14 @@ 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
 osbot_utils/utils/Json.py,sha256=UNaBazuH1R40fsHjpjuK8kmAANmUHoK9Q0PUeYmgPeY,6254
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
 osbot_utils/utils/Lists.py,sha256=CLEjgZwAixJAFlubWEKjnUUhUN85oqvR7UqExVW7rdY,5502
-osbot_utils/utils/Misc.py,sha256=ljscBemI5wOhfkl1BVpsqshacTOCKkOisV4er9xPCWM,16640
+osbot_utils/utils/Misc.py,sha256=AN-JTs9-Em2jVyoQ6Kd7dCA0eiqVQSlXajKjKxRAhyY,16639
 osbot_utils/utils/Objects.py,sha256=qAWNLISL-gYTl1Ihj4fBSZ9I6n-p-YPUhRZu9YQwqWQ,15235
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
@@ -286,8 +287,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=riPLKkZJxQjVu8lCm19cOTx5uiLPm1HreB9_BzNXi30,12209
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=LCHXHeXIoHB1IgQDcSOJ29BabvcFBInoVwjSZgNksPM,8
-osbot_utils-1.33.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.33.0.dist-info/METADATA,sha256=vumTlsU8JohmHajKceW_AGCamDQTNLgaXf6cjupa21w,1266
-osbot_utils-1.33.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.33.0.dist-info/RECORD,,
+osbot_utils/version,sha256=g15kdH8ycbHrZuIBu1hKNt7B2bEznkpLT_dQR-2S77M,8
+osbot_utils-1.35.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.35.0.dist-info/METADATA,sha256=eW9-c4dTVc2xI7Tf-sqOrYpQOJwHw6hMUAAGRLdbWkQ,1266
+osbot_utils-1.35.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.35.0.dist-info/RECORD,,