osbot-utils 2.57.0__py3-none-any.whl → 2.59.0__py3-none-any.whl

osbot_utils/helpers/ast/Ast_Base.py

@@ -1,11 +1,11 @@
 import ast
 import inspect
 
-from osbot_utils.utils.Dev import pprint, jprint
-from osbot_utils.utils.Exceptions import syntax_error
-from osbot_utils.utils.Files import is_file, file_contents
-from osbot_utils.utils.Objects import obj_data, obj_info
-from osbot_utils.utils.Str import str_dedent
+from osbot_utils.utils.Dev          import pprint, jprint
+from osbot_utils.utils.Exceptions   import syntax_error
+from osbot_utils.utils.Files        import is_file, file_contents
+from osbot_utils.utils.Objects      import obj_data, obj_info
+from osbot_utils.utils.Str          import str_dedent
 
 
 class Ast_Base:

osbot_utils/helpers/safe_str/Safe_Str.py

@@ -37,6 +37,9 @@ class Safe_Str(str):
         elif not cls.exact_length and len(value) > cls.max_length:                                                      # Check max length
             raise ValueError(f"Value exceeds maximum length of {cls.max_length} characters (was {len(value)})")
 
+        if cls.allow_empty and value =='':
+            return str.__new__(cls, '')
+
         if cls.strict_validation:                                                                                       # If using strict validation, check if the value matches the regex pattern exactly
             if not cls.regex.search(value) is None:                                                                     # If there are non-matching characters
                 raise ValueError(f"Value contains invalid characters (must match pattern: {cls.regex.pattern})")

osbot_utils/helpers/safe_str/http/Safe_Str__Http__Content_Type.py

@@ -0,0 +1,12 @@
+import re
+from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
+
+TYPE_SAFE_STR__HTTP__CONTENT_TYPE__REGEX = re.compile(r'[^a-zA-Z0-9/\-+.;= ]')
+TYPE_SAFE_STR__HTTP__CONTENT_TYPE__MAX_LENGTH = 256
+
+class Safe_Str__Http__Content_Type(Safe_Str):
+    regex                      = TYPE_SAFE_STR__HTTP__CONTENT_TYPE__REGEX
+    max_length                 = TYPE_SAFE_STR__HTTP__CONTENT_TYPE__MAX_LENGTH
+    allow_empty                = False
+    trim_whitespace            = True
+    allow_all_replacement_char = False

osbot_utils/helpers/safe_str/http/Safe_Str__Http__ETag.py

@@ -0,0 +1,10 @@
+import re
+from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
+
+TYPE_SAFE_STR__HTTP__ETAG__REGEX = re.compile(r'[^a-zA-Z0-9"\/\-_.:]')  # Allow alphanumerics, quotes, slashes, hyphens, underscores, periods, colons
+TYPE_SAFE_STR__HTTP__ETAG__MAX_LENGTH = 128
+
+class Safe_Str__Http__ETag(Safe_Str):
+    regex                      = TYPE_SAFE_STR__HTTP__ETAG__REGEX
+    max_length                 = TYPE_SAFE_STR__HTTP__ETAG__MAX_LENGTH
+    trim_whitespace            = True

osbot_utils/helpers/safe_str/http/Safe_Str__Http__Last_Modified.py

@@ -0,0 +1,10 @@
+import re
+from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
+
+TYPE_SAFE_STR__HTTP__LAST_MODIFIED__REGEX = re.compile(r'[^a-zA-Z0-9:, -]')
+TYPE_SAFE_STR__HTTP__LAST_MODIFIED__MAX_LENGTH = 64
+
+class Safe_Str__Http__Last_Modified(Safe_Str):
+    regex                      = TYPE_SAFE_STR__HTTP__LAST_MODIFIED__REGEX
+    max_length                 = TYPE_SAFE_STR__HTTP__LAST_MODIFIED__MAX_LENGTH
+    trim_whitespace            = True

osbot_utils/helpers/safe_str/http/Safe_Str__Http__Text.py

@@ -0,0 +1,35 @@
+import re
+from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
+
+
+TYPE_SAFE_STR__TEXT__MAX_LENGTH = 1048576           # Define the size constant - 1 megabyte in bytes
+
+# A more permissive regex that primarily filters out:
+# - NULL byte (U+0000)
+# - Control characters (U+0001 to U+0008, U+000B to U+000C, U+000E to U+001F)
+# - Some potentially problematic characters in various contexts
+# But allows:
+# - All standard printable ASCII characters
+# - Tab (U+0009), Line Feed (U+000A), and Carriage Return (U+000D)
+# - A wide range of punctuation, symbols, and Unicode characters for international text
+
+TYPE_SAFE_STR__HTTP__TEXT__REGEX = re.compile(r'[\x00\x01-\x08\x0B\x0C\x0E-\x1F\x7F]')
+
+class Safe_Str__Http__Text(Safe_Str):
+    """
+    Safe string class for general text content with a 1MB limit.
+    Allows a wide range of characters suitable for natural language text,
+    including international characters, while filtering out control characters
+    and other potentially problematic sequences.
+    """
+    max_length                  = TYPE_SAFE_STR__TEXT__MAX_LENGTH
+    regex                       = TYPE_SAFE_STR__HTTP__TEXT__REGEX
+    trim_whitespace             = True              # Trim leading/trailing whitespace
+    normalize_newlines          = True              # Option to normalize different newline styles
+
+    def __new__(cls, value=None):
+
+        if cls.normalize_newlines and value is not None and isinstance(value, str):         # Handle newline normalization before passing to parent class
+            value = value.replace('\r\n', '\n').replace('\r', '\n')                         # Normalize different newline styles to \n
+
+        return super().__new__(cls, value)                                                  # Now call the parent implementation

osbot_utils/utils/Functions.py

@@ -25,13 +25,13 @@ def function_name(function):
     if isinstance(function, types.FunctionType):
         return function.__name__
 
-def function_source_code(function):
-    if isinstance(function, types.FunctionType):
-        source_code = inspect.getsource(function)
+def function_source_code(target):
+    if isinstance(target, (types.FunctionType, types.MethodType)):
+        source_code = inspect.getsource(target)
         source_code = textwrap.dedent(source_code).strip()
         return source_code
-    elif isinstance(function, str):
-        return function
+    elif isinstance(target, str):                               # todo: see if we really need this logic (or we just return none when "target" is a str)
+        return target
     return None
 
 def get_line_number(function):
@@ -110,4 +110,5 @@ def type_file(target):
 
 
 function_line_number = get_line_number
-method_line_number   = get_line_number
+method_line_number   = get_line_number
+method_source_code   = function_source_code

osbot_utils/version

@@ -1 +1 @@
-v2.57.0
+v2.59.0

{osbot_utils-2.57.0.dist-info → osbot_utils-2.59.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.57.0
+Version: 2.59.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -23,7 +23,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-v2.57.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.59.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-2.57.0.dist-info → osbot_utils-2.59.0.dist-info}/RECORD

@@ -51,7 +51,7 @@ osbot_utils/helpers/Type_Registry.py,sha256=Ajk3SyMSKDi2g9SJYUtTgg7PZkAgydaHcpbG
 osbot_utils/helpers/Zip_Bytes.py,sha256=Bf17NPS_yxrzI_4FsCxkjlhS9ELJK3kisY-jHQPQVgw,4287
 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
+osbot_utils/helpers/ast/Ast_Base.py,sha256=x3UGJsxkIkMlkzt59eZYZG9NmvvODO5jaRBEeiqSaSA,3740
 osbot_utils/helpers/ast/Ast_Data.py,sha256=EL-6lkNDMe_BKBwFP1sJW-Y8t6TXYYv0uGdlxix4Tyg,697
 osbot_utils/helpers/ast/Ast_Load.py,sha256=ZO2QjhQ13j1m4MwAVbbdAoQ4UoUfzuU6E_RobkhZVpI,2100
 osbot_utils/helpers/ast/Ast_Merge.py,sha256=An_u2E906DrMlAl83VyTNLKBSc0uEm25RWLRZsci2rk,848
@@ -241,15 +241,19 @@ 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/python_compatibility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/python_compatibility/python_3_8.py,sha256=kh846vs3ir8xD0RSARJBOL0xufnt3L_Td3K45lDfqng,161
-osbot_utils/helpers/safe_str/Safe_Str.py,sha256=BKyS0hTRvP-f0uLFtT8KCE9rVQBzhWKNoSxlttEjrEE,3261
+osbot_utils/helpers/safe_str/Safe_Str.py,sha256=xkc0XhDWcln-3-yENqpQcPgiDewq-l4sAiqW1a2MRyU,3345
 osbot_utils/helpers/safe_str/Safe_Str__File__Name.py,sha256=ncjkQ2hAhw0a3UulrCuQsA9ytrFwg5CT1XRJIGChMpY,289
 osbot_utils/helpers/safe_str/Safe_Str__File__Path.py,sha256=K0yBcvH_Ncqiw7tMqjGqaNyWQh1Zs9qxZ-TR8nEIAow,550
 osbot_utils/helpers/safe_str/Safe_Str__Hash.py,sha256=Tb2QeVpVDNWpCJGHNFjZPCQ_ZTaI7Z5BDzi19LiO_cI,952
-osbot_utils/helpers/safe_str/Safe_Str__Html.py,sha256=4_UxGEIkqV_Zeh77nXoO2OUy5SS6gvN3xSwA32DyWs0,662
 osbot_utils/helpers/safe_str/Safe_Str__Text.py,sha256=QxuWqF8hNYdOPDn3Yac86h_1ZaX-THbTBDakberiJcs,313
 osbot_utils/helpers/safe_str/Safe_Str__Text__Dangerous.py,sha256=6-fkXBuWgjz70eQicD07f38eEuKqNzJzaFFY6hozhNQ,388
 osbot_utils/helpers/safe_str/Safe_Str__Url.py,sha256=4l46AAe5Dy_P_W6d-_3pwtXuehG_Wczq1dC5sOOzg_g,549
 osbot_utils/helpers/safe_str/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/helpers/safe_str/http/Safe_Str__Html.py,sha256=4_UxGEIkqV_Zeh77nXoO2OUy5SS6gvN3xSwA32DyWs0,662
+osbot_utils/helpers/safe_str/http/Safe_Str__Http__Content_Type.py,sha256=HURT4n17LmKbcqODsNwhu_D0lI5LpUL8I5t9aqGAZhQ,516
+osbot_utils/helpers/safe_str/http/Safe_Str__Http__ETag.py,sha256=5cAfIqebraUnVKZJq3CzXzsFdHGy06TznO36Dc6b5A0,477
+osbot_utils/helpers/safe_str/http/Safe_Str__Http__Last_Modified.py,sha256=FBcPM4h3ldN0F_cSISGZgdidWpjKLCOOPq9sWVGUCzg,438
+osbot_utils/helpers/safe_str/http/Safe_Str__Http__Text.py,sha256=w0UPkVnQz41BN9asgDUZ4q6pSQUtzNa-4Sjcl56WTCM,1788
 osbot_utils/helpers/sqlite/Capture_Sqlite_Error.py,sha256=GSuRYgs1yKQjxMszPoaI7fsfMfuUqhb64AaIysRE6Cs,1747
 osbot_utils/helpers/sqlite/Sqlite__Cursor.py,sha256=4Im0pCOiERX6Nnf6iagRlSvTR3CPjyPVkdx4NMQV0P0,3342
 osbot_utils/helpers/sqlite/Sqlite__Database.py,sha256=ORjRUD-xSvf89kDMQ70q7wBlbV5pdKtDerjE6gDN_fg,5616
@@ -389,7 +393,7 @@ osbot_utils/utils/Dev.py,sha256=eaQ87ZcMRRcxgzA-f7OO8HjjWhbE6L_edwvXiwFZvIQ,1291
 osbot_utils/utils/Env.py,sha256=rBksAy6k-J5oAJp-S_JedVlcj1b2VK8V3zsQbacopMc,6076
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
 osbot_utils/utils/Files.py,sha256=YwfXMeU1jfDzYvZJGy0bWHvvduTuTnftBNlAnpsXDzw,23013
-osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
+osbot_utils/utils/Functions.py,sha256=VoTrAbCHt6hulz6hVz3co8w2xoOS8wE04wyHc5_cC1c,3671
 osbot_utils/utils/Http.py,sha256=pLDwq0Jd4Zmpps0gEzXTbeycSFRXMN8W-DprNpYq9A0,8189
 osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
 osbot_utils/utils/Json.py,sha256=TvfDoXwOkWzWH-9KMnme5C7iFsMZOleAeue92qmkH6g,8831
@@ -408,8 +412,8 @@ osbot_utils/utils/Toml.py,sha256=Rxl8gx7mni5CvBAK-Ai02EKw-GwtJdd3yeHT2kMloik,166
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=pR6sKliUY0KZXmqNzKY2frfW-YVQEVbLKiyqQX_lc-8,14052
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=rnUYLifkb9jBHMZOM-Abl6mF_HqX63oSHoMAJ18yzZw,8
-osbot_utils-2.57.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.57.0.dist-info/METADATA,sha256=VFD1MaHlBF2yyZfpe1QDE8tl4IQxIWhvCCiLIuTuAF4,1329
-osbot_utils-2.57.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-osbot_utils-2.57.0.dist-info/RECORD,,
+osbot_utils/version,sha256=40FnRbd_Wb-10Zx2X8DLs9eqcz8E66OXD5yjt1qxfG8,8
+osbot_utils-2.59.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.59.0.dist-info/METADATA,sha256=ht0TSoKubcj9hMOYaCrTcph1ORn7om7wZW5ZLsM_nn4,1329
+osbot_utils-2.59.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+osbot_utils-2.59.0.dist-info/RECORD,,