osbot-utils 1.37.0__py3-none-any.whl → 1.39.0__py3-none-any.whl

osbot_utils/decorators/methods/cache_on_self.py

@@ -26,6 +26,7 @@ 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
         if 'reload_cache' in kwargs:                                        # if the reload parameter is set to True
             reload_cache = True                                             # set reload to True
             del kwargs['reload_cache']                                      # remove the reload parameter from the kwargs

osbot_utils/helpers/Random_Guid.py

@@ -0,0 +1,14 @@
+# todo add to osbot utils
+from osbot_utils.utils.Misc import random_guid
+
+class Random_Guid(str):
+    def __new__(cls, value=None):
+        if value is None:
+            value = random_guid()
+        return str.__new__(cls, value)
+
+    def __init__(self, value=None):
+        self.value = value if value is not None else random_guid()
+
+    def __str__(self):
+        return self

osbot_utils/testing/Temp_Env_Vars.py

@@ -8,11 +8,18 @@ class Temp_Env_Vars(Type_Safe):
     original_env_vars: dict
 
     def __enter__(self):
+        return self.set_vars()
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.restore_vars()
+
+    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
+        return self
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    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]

osbot_utils/utils/Files.py

@@ -489,6 +489,22 @@ 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_in_folder(target, with_extension=False):
+    if with_extension:
+        return files_names(files_in_folder(target))
+    else:
+        return files_names_without_extension(files_in_folder(target))
+
+def files_in_folder(path,pattern='*', only_files=True):
+    result = []
+    for file in Path(path).glob(pattern):
+        if only_files and is_not_file(file):
+            continue
+        result.append(str(file))                                  # todo: see if there is a better way to do this conversion to string
+    return sorted(result)
 
 def folders_names_in_folder(target):
     folders = folders_in_folder(target)

osbot_utils/utils/Lists.py

@@ -93,6 +93,9 @@ def list_index_by(values, index_by):
 def list_lower(input_list):
     return [item.lower() for item in input_list]
 
+def list_minus_list(list_a, list_b):
+    return [item for item in list_a if item not in list_b]
+
 def list_not_empty(list):
     if list and type(list).__name__ == 'list' and len(list) >0:
         return True

osbot_utils/utils/Misc.py

@@ -8,6 +8,7 @@ import string
 import sys
 import textwrap
 import re
+import threading
 import uuid
 import warnings
 from datetime       import datetime, timedelta
@@ -67,6 +68,10 @@ def convert_to_number(value):
     else:
         return 0
 
+def current_thread_id():
+    return threading.current_thread().native_id
+
+
 def date_time_from_to_str(date_time_str, format_from, format_to, print_conversion_error=False):
     try:
         date_time = datetime.strptime(date_time_str, format_from)
@@ -119,6 +124,9 @@ def date_time_now_less_time_delta(days=0,hours=0, minutes=0, seconds=0, date_tim
 def date_to_str(date, date_format='%Y-%m-%d'):
     return date.strftime(date_format)
 
+def date_today():
+    return date_time_now(date_time_format='%Y-%m-%d')
+
 #note: this is here at the moment due to a circular dependency with lists and objects
 def list_set(target: object) -> object:
     if hasattr(target, '__iter__'):

osbot_utils/version

@@ -1 +1 @@
-v1.37.0
+v1.39.0

{osbot_utils-1.37.0.dist-info → osbot_utils-1.39.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.37.0
+Version: 1.39.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.37.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.39.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.37.0.dist-info → osbot_utils-1.39.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=zhE1YoYma8eyx9i7dpTmpdrVzf5CkBJRe9aYok9xlgs,3527
+osbot_utils/decorators/methods/cache_on_self.py,sha256=FODnv36jAwNPs11j2fGg6u-4A7MdaeRd1ES6fyPgP78,3611
 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
@@ -62,6 +62,7 @@ osbot_utils/helpers/Local_Cache.py,sha256=0JZZX3fFImcwtbBvxAQl-EbBegSNJRhRMYF6ov
 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_Guid.py,sha256=_wlyM17SIr-FeYESwnVt4cfkEtRRf-dbYh_lTnrKVG0,379
 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=d5hYXNOJkOaYa7h2CJ0Y3ojEuGTOvCxPuSic2quwMY4,4236
@@ -252,7 +253,7 @@ osbot_utils/testing/Profiler.py,sha256=4em6Lpp0ONRDoDDCZsc_CdAOi_QolKOp4eA7KHN96
 osbot_utils/testing/Pytest.py,sha256=R3qdsIXGcNQcu7iobz0RB8AhbbHhc6t757tZoSZRrxA,730
 osbot_utils/testing/Stderr.py,sha256=ynf0Wle9NvgneLChzAxFBQ0QlE5sbri_fzJ8bEJMNkc,718
 osbot_utils/testing/Stdout.py,sha256=Gmxd_dOplXlucdSbOhYhka9sWP-Hmqb7ZuLs_JjtW7Y,592
-osbot_utils/testing/Temp_Env_Vars.py,sha256=oFuaegBlaV0aySkPe1Nzf-mdIKN03oTUKNfKijGz__M,751
+osbot_utils/testing/Temp_Env_Vars.py,sha256=CE_lk54QcibkQVtIj2DrQPS3k2LgQZUctU5b-WwWvbo,884
 osbot_utils/testing/Temp_File.py,sha256=yZBL9MmcNU4PCQ4xlF4rSss4GylKoX3T_AJF-BlQhdI,1693
 osbot_utils/testing/Temp_Folder.py,sha256=Dbcohr2ciex6w-kB79R41Nuoa0pgpDbKtPGnlMmJ73k,5194
 osbot_utils/testing/Temp_Sys_Path.py,sha256=gOMD-7dQYQlejoDYUqsrmuZQ9DLC07ymPZB3zYuNmG4,256
@@ -268,14 +269,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=9r1xxCDszX1UUOu0dy3Kf_djaU3I39xgB_QdC80Szdo,5669
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
-osbot_utils/utils/Files.py,sha256=7W0FmxPvxOapUchEVOKDgUx4JBRs9TCesu60uKkvrto,21765
+osbot_utils/utils/Files.py,sha256=z-egRBPDYp6AJkZxK-JnXOwz1OezgzEDG_fgSHVcCCM,22427
 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=AN-JTs9-Em2jVyoQ6Kd7dCA0eiqVQSlXajKjKxRAhyY,16639
+osbot_utils/utils/Lists.py,sha256=tPz5x5s3sRO97WZ_nsxREBPC5cwaHrhgaYBhsrffTT8,5599
+osbot_utils/utils/Misc.py,sha256=nODZT6p44B4xYiIiqfEeKYEErQiKR9SGthhGtZWGhkI,16804
 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
@@ -287,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=riPLKkZJxQjVu8lCm19cOTx5uiLPm1HreB9_BzNXi30,12209
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=2lsyLVdcS9K9UON7nV7FJNEMLVIqIhp0nDRL0qX80gE,8
-osbot_utils-1.37.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.37.0.dist-info/METADATA,sha256=9xLglgYIN1kPnaGfr0hMSIVtvm7e_F9h9xEC-cttwAQ,1266
-osbot_utils-1.37.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.37.0.dist-info/RECORD,,
+osbot_utils/version,sha256=fWfv3M5aLzIMdVIWJcenCiN596BO4a0gEyF73y5p_xY,8
+osbot_utils-1.39.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.39.0.dist-info/METADATA,sha256=SY4oAlcFR6WCUnCBX1Zq20PQ2sqLHpL2uQeTA3PuwuY,1266
+osbot_utils-1.39.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.39.0.dist-info/RECORD,,