osbot-utils 1.67.0__py3-none-any.whl → 1.69.0__py3-none-any.whl

osbot_utils/base_classes/Type_Safe.py

@@ -14,9 +14,9 @@ from osbot_utils.helpers.Random_Guid            import Random_Guid
 from osbot_utils.helpers.Random_Guid_Short      import Random_Guid_Short
 from osbot_utils.helpers.Timestamp_Now          import Timestamp_Now
 from osbot_utils.utils.Dev                      import pprint
-from osbot_utils.utils.Json                     import json_parse
+from osbot_utils.utils.Json                     import json_parse, json_to_bytes, json_to_gz
 from osbot_utils.utils.Misc                     import list_set
-from osbot_utils.utils.Objects import default_value, value_type_matches_obj_annotation_for_attr, \
+from osbot_utils.utils.Objects                  import default_value, value_type_matches_obj_annotation_for_attr, \
     raise_exception_on_obj_type_annotation_mismatch, obj_is_attribute_annotation_of_type, enum_from_value, \
     obj_is_type_union_compatible, value_type_matches_obj_annotation_for_union_attr, \
     convert_dict_to_value_from_obj_annotation, dict_to_obj, convert_to_value_from_obj_annotation
@@ -230,9 +230,16 @@ class Type_Safe:
     # global methods added to any class that base classes this
     # todo: see if there should be a prefix on these methods, to make it easier to spot them
     #       of if these are actually that useful that they should be added like this
+    def bytes(self):
+        return json_to_bytes(self.json())
+
+    def bytes_gz(self):
+        return json_to_gz(self.json())
+
     def json(self):
         return self.serialize_to_dict()
 
+
     def merge_with(self, target):
         original_attrs = {k: v for k, v in self.__dict__.items() if k not in target.__dict__}       # Store the original attributes of self that should be retained.
         self.__dict__ = target.__dict__                                                             # Set the target's __dict__ to self, now self and target share the same __dict__.

osbot_utils/utils/Http.py

@@ -4,9 +4,10 @@ import re
 import socket
 import ssl
 import unicodedata
-from time import sleep
-from urllib.parse import quote, urljoin, urlparse, urlunparse
-from   urllib.request import Request, urlopen
+from http.cookies       import SimpleCookie
+from time               import sleep
+from urllib.parse       import quote, urljoin, urlparse, urlunparse
+from   urllib.request   import Request, urlopen
 
 from osbot_utils.utils.Str import html_decode
 
@@ -78,6 +79,24 @@ def http_request(url, data=None, headers=None, method='GET', encoding ='utf-8',
             return result.decode(encoding)
         return result
 
+
+def parse_cookies(cookie_header, include_empty=True):
+    cookie = SimpleCookie()
+    cookie.load(cookie_header)
+    parsed_cookies = {}
+    for key, morsel in cookie.items():
+        cookie_attrs = {"value": morsel.value}
+        for attr, value in morsel.items():
+            if attr.lower() in ["secure", "httponly"]:
+                cookie_attrs[attr] = (value == True)
+            else:
+                if value or include_empty:
+                    cookie_attrs[attr] = value.strip(', ')      # we need to strip for the cases when there are multiple cookies split by , (as seen in FastAPI Test Client)
+        parsed_cookies[key] = cookie_attrs
+
+    return parsed_cookies
+
+
 def port_is_not_open(port, host='0.0.0.0', timeout=1.0):
     return port_is_open(port, host,timeout) is False
 

osbot_utils/utils/Json.py

@@ -5,6 +5,8 @@ from osbot_utils.utils.Misc  import str_lines, str_md5, str_sha256
 from osbot_utils.utils.Files import file_create_gz, file_create, load_file_gz, file_contents, file_lines, file_lines_gz
 from osbot_utils.utils.Zip   import str_to_gz, gz_to_str
 
+def bytes_to_json_loads(data):
+    return json.loads(data.decode())
 
 def json_dumps(python_object, indent=4, pretty=True, sort_keys=False, default=str, raise_exception=False):
     if python_object:
@@ -135,6 +137,7 @@ class Json:
     def json_save_tmp_file(python_object, pretty=True):
         return Json.save_file(python_object=python_object, pretty=pretty, path=None)
 
+bytes_to_json                = bytes_to_json_loads
 file_create_json             = Json.save_file_pretty
 file_contents_json           = Json.load_file
 
@@ -158,6 +161,7 @@ json_md5                     = Json.md5
 json_lines_loads             = Json.loads_json_lines
 json_parse                   = Json.loads
 json_lines_parse             = Json.loads_json_lines
+json_to_bytes                = json_dumps_to_bytes
 json_to_str                  = json_dumps
 json_round_trip              = Json.round_trip
 json_save                    = Json.save_file

osbot_utils/utils/Toml.py

@@ -1,6 +1,6 @@
 import sys
-
-from osbot_utils.utils.Files import file_create, file_contents
+from osbot_utils.utils.Files   import file_create, file_contents
+from osbot_utils.utils.Objects import dict_to_obj
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -43,5 +43,11 @@ def toml_to_dict(str_toml):
         raise NotImplementedError("TOML parsing is not supported in Python versions earlier than 3.11")
     return tomllib.loads(str_toml)
 
+def toml_obj_from_file(toml_file):
+    data = toml_dict_from_file(toml_file)
+    return dict_to_obj(data)
+
 json_load_file = toml_dict_from_file
-toml_file_load = toml_dict_from_file
+toml_file_load = toml_dict_from_file
+toml_load      = toml_dict_from_file
+toml_load_obj  = toml_obj_from_file

osbot_utils/version

@@ -1 +1 @@
-v1.67.0
+v1.69.0

{osbot_utils-1.67.0.dist-info → osbot_utils-1.69.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.67.0
+Version: 1.69.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -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-v1.67.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.69.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.67.0.dist-info → osbot_utils-1.69.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ osbot_utils/__init__.py,sha256=DdJDmQc9zbQUlPVyTJOww6Ixrn9n4bD3ami5ItQfzJI,16
 osbot_utils/base_classes/Cache_Pickle.py,sha256=kPCwrgUbf_dEdxUz7vW1GuvIPwlNXxuRhb-H3AbSpII,5884
 osbot_utils/base_classes/Kwargs_To_Disk.py,sha256=HHoy05NC_w35WcT-OnSKoSIV_cLqaU9rdjH0_KNTM0E,1096
 osbot_utils/base_classes/Kwargs_To_Self.py,sha256=weFNsBfBNV9W_qBkN-IdBD4yYcJV_zgTxBRO-ZlcPS4,141
-osbot_utils/base_classes/Type_Safe.py,sha256=N1RMyDEA9YFI5MciixobxM0ZjbEQpPtj8XzmzTrPTls,18789
+osbot_utils/base_classes/Type_Safe.py,sha256=D8hxrU8LhuzZCuvijfYsLZzOWkQvIP5bxWtDjx-KB20,18962
 osbot_utils/base_classes/Type_Safe__List.py,sha256=-80C9OhsK6iDR2dAG8yNLAZV0qg5x3faqvSUigFCMJw,517
 osbot_utils/base_classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/context_managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -287,9 +287,9 @@ osbot_utils/utils/Env.py,sha256=XMwF5BrtpoPJdOraswAFPrcQ3tRTocjqvA8I61eOCJw,5741
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
 osbot_utils/utils/Files.py,sha256=7fdqbfFyo6Ow5Repi_dZAzHqGb0XYh6tDALYAy42pBY,22522
 osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
-osbot_utils/utils/Http.py,sha256=vFvD-xLkkXLTJvmYGourMLoUOfkZx_KBSLmo1RX73jM,7043
+osbot_utils/utils/Http.py,sha256=Cm_-b2EgxKoQJ47ThZp-dgHCdeGv4UcCNLfTOH94-7s,7790
 osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
-osbot_utils/utils/Json.py,sha256=yIT2hUI23gYd24Uf3LCjqPNV67zS46rYZftcCM3jw-Q,6492
+osbot_utils/utils/Json.py,sha256=8fpYFXzNPSrwYfXMt3eGKpe-lhxh1kEaCRae1X1943A,6662
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
 osbot_utils/utils/Lists.py,sha256=tPz5x5s3sRO97WZ_nsxREBPC5cwaHrhgaYBhsrffTT8,5599
 osbot_utils/utils/Misc.py,sha256=4MkG2BE1VzZfV4KPzYZ4jVAoUwoA3pTTVPi609ldLGA,16961
@@ -301,12 +301,12 @@ osbot_utils/utils/Regex.py,sha256=0ubgp8HKsS3PNe2H6XlzMIcUuV7jhga3VkQVDNOJWuA,86
 osbot_utils/utils/Status.py,sha256=Yq4s0TelXgn0i2QjCP9V8mP30GabXp_UL-jjM6Iwiw4,4305
 osbot_utils/utils/Str.py,sha256=kxdY8ROX4FdJtCaMTfOc8fK_xcDICprNkefHu2MMNU4,2585
 osbot_utils/utils/Threads.py,sha256=lnh4doZWYUIoWBZRU_780QPeAIKGDh7INuqmU8Fzmdc,3042
-osbot_utils/utils/Toml.py,sha256=SD6IA4-mrtoBXcI0dIGKV9POMQNd6WYKvmDQq7GQ6ZQ,1438
+osbot_utils/utils/Toml.py,sha256=-_Yv5T8ZhGGoDSSoNEdFhSsXiK_JPjGkPijm4JoeHSk,1669
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=G6Hk_hDcm9yvWzhTKzhT0R_6f0NBIAchHqMxGb3kfh4,14037
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=zEYoXcLqYMMeBwLqI0fFRz3qocsd0oEVjcyEHe-v6Hs,8
-osbot_utils-1.67.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.67.0.dist-info/METADATA,sha256=vuHI4ctcabSC0_5MA-3_NoSvc8Bd8TNXRoZoutsRYCk,1317
-osbot_utils-1.67.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-osbot_utils-1.67.0.dist-info/RECORD,,
+osbot_utils/version,sha256=uFIGtf3R9DfyFN5OlM7YUkWOP1gOA1X0TI8thjX5L24,8
+osbot_utils-1.69.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.69.0.dist-info/METADATA,sha256=Anbjvy6tfA7jEncTOegpC9l05QWOsbiQxFtKm6gLJAg,1317
+osbot_utils-1.69.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+osbot_utils-1.69.0.dist-info/RECORD,,