osbot-utils 2.52.0__py3-none-any.whl → 2.54.0__py3-none-any.whl

osbot_utils/helpers/html/Html_To_Dict.py

@@ -1,4 +1,6 @@
-from html.parser import HTMLParser
+from html.parser                        import HTMLParser
+from osbot_utils.helpers.html.Tag__Html import Tag__Html
+
 
 class Html_To_Dict(HTMLParser):
     def __init__(self, html):
@@ -72,4 +74,12 @@ class Html_To_Dict(HTMLParser):
 
     def print__lines(self, lines):
         for line in lines:
-            print(line)
+            print(line)
+
+def html_to_dict(html_code:str) -> dict:
+    try:
+        html_to_dict = Html_To_Dict(html_code)
+        html_dict     = html_to_dict.convert()
+        return html_dict
+    except:                                                 # todo: see if there is a better Exception to capture
+        return None                                         # if we couldn't part the html, just return None

osbot_utils/helpers/safe_str/Safe_Str__Text__Dangerous.py

@@ -6,4 +6,7 @@ TYPE_SAFE_STR__TEXT__DANGEROUS__REGEX      = r'[^a-zA-Z0-9_\s!@#$%^&*()\[\]{}\-+
 
 class Safe_Str__Text__Dangerous(Safe_Str):
     regex      = re.compile(TYPE_SAFE_STR__TEXT__DANGEROUS__REGEX)
-    max_length = TYPE_SAFE_STR__TEXT__DANGEROUS__MAX_LENGTH
+    max_length = TYPE_SAFE_STR__TEXT__DANGEROUS__MAX_LENGTH
+
+
+Safe_Str__HTML = Safe_Str__Text__Dangerous          # we can reuse this class for Safe_Str__HTML since the regex and size are the same

osbot_utils/helpers/safe_str/Safe_Str__Url.py

@@ -0,0 +1,12 @@
+
+import re
+from osbot_utils.helpers.safe_str.Safe_Str import Safe_Str
+
+TYPE_SAFE_STR__URL__MAX_LENGTH = 2048                                                        # Common maximum URL length
+TYPE_SAFE_STR__URL__REGEX      = re.compile(r'^(?!https?://).*|[^a-zA-Z0-9:/\-._~&=?#+%@]')  # Allow characters valid in URLs
+
+class Safe_Str__Url(Safe_Str):
+    regex                      = TYPE_SAFE_STR__URL__REGEX
+    max_length                 = TYPE_SAFE_STR__URL__MAX_LENGTH
+    trim_whitespace            = True
+    allow_all_replacement_char = False

osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py

@@ -33,7 +33,8 @@ class Type_Safe__Step__From_Json:
 
     # todo: this needs refactoring, since the logic and code is getting quite complex (to be inside methods like this)
     def deserialize_from_dict(self, _self, data, raise_on_not_found=False):
-
+        if data is None:
+            return
         if hasattr(data, 'items') is False:
             raise ValueError(f"Expected a dictionary, but got '{type(data)}'")
 
@@ -81,12 +82,13 @@ class Type_Safe__Step__From_Json:
                         if attribute_annotation_args:
                             expected_type        = get_args(attribute_annotation)[0]                            # get the first arg (which is the type)
                             type_safe_list       = Type_Safe__List(expected_type)                               # create a new instance of Type_Safe__List
-                            for item in value:                                                                  # next we need to convert all items (to make sure they all match the type)
-                                if type(item) is dict:
-                                    new_item = expected_type(**item)                                                # create new object
-                                else:
-                                    new_item = expected_type(item)
-                                type_safe_list.append(new_item)                                                 # and add it to the new type_safe_list obejct
+                            if value:
+                                for item in value:                                                                  # next we need to convert all items (to make sure they all match the type)
+                                    if type(item) is dict:
+                                        new_item = expected_type(**item)                                                # create new object
+                                    else:
+                                        new_item = expected_type(item)
+                                    type_safe_list.append(new_item)                                                 # and add it to the new type_safe_list obejct
                             value = type_safe_list                                                              # todo: refactor out this create list code, maybe to an deserialize_from_list method
                     else:
                         if value is not None:

osbot_utils/version

@@ -1 +1 @@
-v2.52.0
+v2.54.0

{osbot_utils-2.52.0.dist-info → osbot_utils-2.54.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.52.0
+Version: 2.54.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.52.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.54.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.52.0.dist-info → osbot_utils-2.54.0.dist-info}/RECORD

@@ -177,7 +177,7 @@ osbot_utils/helpers/generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 osbot_utils/helpers/html/Dict_To_Css.py,sha256=u6B4Mx7PXr-gDrTrs1hgknnvsZVK4Fic5LqedKjo-lk,1097
 osbot_utils/helpers/html/Dict_To_Html.py,sha256=OlRSaDGOeseBNTxRB2ho5whqEacMXeAXWOfeVSEYqC4,3355
 osbot_utils/helpers/html/Dict_To_Tags.py,sha256=L8O8c0RPzP92EfeACk3pjXJfnlz-Rg38o2Gf9tS2UfM,3745
-osbot_utils/helpers/html/Html_To_Dict.py,sha256=6VvPp4RrXxRzPpCTn0HTa6Ywt_-4CBH4sj3aoPBZWIc,2623
+osbot_utils/helpers/html/Html_To_Dict.py,sha256=-dWWz7iDAYvF_pjO7xnio_qRWkDFfRCOiuGNEfqpdQ4,3098
 osbot_utils/helpers/html/Html_To_Tag.py,sha256=WDdXF0Q9siVwN0OIgZluCu-dXJa8bDrL9-6TidlKUeQ,498
 osbot_utils/helpers/html/Tag__Base.py,sha256=eAO4SdoKdHe9DRSzf9zpfBhDWDbvv-CGrxjekBHXm8k,3128
 osbot_utils/helpers/html/Tag__Body.py,sha256=U3UNVs1mNBsJ_kG_-OtwYPi-YzFb4Y2w4vIsvAn0W3g,109
@@ -238,7 +238,8 @@ osbot_utils/helpers/safe_str/Safe_Str__File__Name.py,sha256=ncjkQ2hAhw0a3UulrCuQ
 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__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__Text__Dangerous.py,sha256=_wxnDiGfYN6CEMn7ZZpWdasBuPU_YvX5MuhEvdUqyrQ,525
+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/sqlite/Capture_Sqlite_Error.py,sha256=GSuRYgs1yKQjxMszPoaI7fsfMfuUqhb64AaIysRE6Cs,1747
 osbot_utils/helpers/sqlite/Sqlite__Cursor.py,sha256=4Im0pCOiERX6Nnf6iagRlSvTR3CPjyPVkdx4NMQV0P0,3342
@@ -362,7 +363,7 @@ osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 osbot_utils/type_safe/steps/Type_Safe__Step__Class_Kwargs.py,sha256=snoyJKvZ1crgF2fp0zexwNPnV_E63RfyRIsMAZdrKNY,6995
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Kwargs.py,sha256=tzKXDUc0HVP5QvCWsmcPuuZodNvQZ9FeMDNI2x00Ngw,1943
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Value.py,sha256=b5vsgM8eg9yq2KM0wRMntVHma6OhN_HnU76LxhEIpoA,4483
-osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=33nlJC9WymFHf5JQzbpCF5sUpfsAcziyhNXkKC9YAPk,14517
+osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=AguNcZwKKnyNY87bSAF1xLwYW5h_IDfUad70QqIiK3I,14622
 osbot_utils/type_safe/steps/Type_Safe__Step__Init.py,sha256=dQRwFxEMdmoW2ogmYZ6ZxLOvt1XnALx41LPpIB6yp3s,4473
 osbot_utils/type_safe/steps/Type_Safe__Step__Set_Attr.py,sha256=VuKHH9QEYlbAL9R4zwQ5dwexx2sFY6wMx52QmF7eqcg,5219
 osbot_utils/type_safe/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -398,8 +399,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=VLmATzvZT8nTzSJP7kcyiYXB9BTWTxg6JEzliDx3PL0,8
-osbot_utils-2.52.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.52.0.dist-info/METADATA,sha256=fHoUBP2b0NKJ6ZhzXK287N0SDRoZrulhNbwwOInBQ7w,1329
-osbot_utils-2.52.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-osbot_utils-2.52.0.dist-info/RECORD,,
+osbot_utils/version,sha256=MHHXtY6fkV6Vpw2VBjof5e9rKL2m_er0M3gBGxN-2z8,8
+osbot_utils-2.54.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.54.0.dist-info/METADATA,sha256=Vdq0aqhnkpEcMi9EHe8Z_Jav31Ha5kpfTam57SUC_kU,1329
+osbot_utils-2.54.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+osbot_utils-2.54.0.dist-info/RECORD,,