osbot-utils 1.37.0__tar.gz → 1.39.0__tar.gz

{osbot_utils-1.37.0 → osbot_utils-1.39.0}/PKG-INFO

@@ -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 → osbot_utils-1.39.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.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 → osbot_utils-1.39.0}/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-1.39.0/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-1.37.0 → osbot_utils-1.39.0}/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-1.37.0 → osbot_utils-1.39.0}/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-1.37.0 → osbot_utils-1.39.0}/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-1.37.0 → osbot_utils-1.39.0}/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-1.39.0/osbot_utils/version

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

{osbot_utils-1.37.0 → osbot_utils-1.39.0}/pyproject.toml

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

osbot_utils-1.37.0/osbot_utils/version

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