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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.39.0
+Version: 1.40.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.39.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.40.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.39.0 → osbot_utils-1.40.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.39.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.40.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.39.0 → osbot_utils-1.40.0}/osbot_utils/base_classes/Type_Safe.py

@@ -10,6 +10,7 @@ from decimal                                    import Decimal
 from enum                                       import Enum, EnumMeta
 from typing                                     import List
 from osbot_utils.base_classes.Type_Safe__List   import Type_Safe__List
+from osbot_utils.helpers.Random_Guid import Random_Guid
 from osbot_utils.utils.Dev                      import pprint
 from osbot_utils.utils.Json                     import json_parse
 from osbot_utils.utils.Misc                     import list_set
@@ -256,15 +257,18 @@ class Type_Safe:
     def deserialize_from_dict(self, data):
         for key, value in data.items():
             if hasattr(self, key) and isinstance(getattr(self, key), Type_Safe):
-                getattr(self, key).deserialize_from_dict(value)                         # Recursive call for complex nested objects
+                getattr(self, key).deserialize_from_dict(value)                             # Recursive call for complex nested objects
             else:
-                if hasattr(self, '__annotations__'):  # can only do type safety checks if the class does not have annotations
+                if hasattr(self, '__annotations__'):                                        # can only do type safety checks if the class does not have annotations
                     if obj_is_attribute_annotation_of_type(self, key, EnumMeta):            # Handle the case when the value is an Enum
                         enum_type = getattr(self, '__annotations__').get(key)
                         if type(value) is not enum_type:                                    # If the value is not already of the target type
                             value = enum_from_value(enum_type, value)                       # Try to resolve the value into the enum
-
-                setattr(self, key, value)                                               # Direct assignment for primitive types and other structures
+                    elif obj_is_attribute_annotation_of_type(self, key, Decimal):           # handle Decimals  # todo: refactor these special cases into a separate method to class
+                        value = Decimal(value)
+                    elif obj_is_attribute_annotation_of_type(self, key, Random_Guid):       # handle Random_Guid objects
+                        value = Random_Guid(value)
+                setattr(self, key, value)                                                   # Direct assignment for primitive types and other structures
 
         return self
 

{osbot_utils-1.39.0 → osbot_utils-1.40.0}/osbot_utils/utils/Json.py

@@ -3,6 +3,8 @@ import os
 
 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 json_dumps(python_object, indent=4, pretty=True, sort_keys=False, default=str, raise_exception=False):
     if python_object:
@@ -39,6 +41,15 @@ def json_sha_256(target):
     return str_sha256(json_dumps(target))
 
 
+def json_to_gz(data):
+    value = json_dumps(data, pretty=False)
+    return str_to_gz(value)
+
+def gz_to_json(gz_data):
+    data = gz_to_str(gz_data)
+    return json.loads(data)
+
+
 
 class Json:
 

{osbot_utils-1.39.0 → osbot_utils-1.40.0}/osbot_utils/utils/Objects.py

@@ -295,8 +295,13 @@ def obj_attribute_annotation(target, attr_name):
 
 def obj_is_attribute_annotation_of_type(target, attr_name, expected_type):
     attribute_annotation = obj_attribute_annotation(target, attr_name)
-    attribute_type       = type(attribute_annotation)
-    return attribute_type is expected_type
+    #attribute_type       = type(attribute_annotation)
+    #return attribute_type is expected_type
+    if expected_type is attribute_annotation:
+        return True
+    if expected_type is type(attribute_annotation):
+        return True
+    return False
 
 def obj_is_type_union_compatible(var_type, compatible_types):
     origin = get_origin(var_type)

{osbot_utils-1.39.0 → osbot_utils-1.40.0}/osbot_utils/utils/Zip.py

@@ -221,6 +221,30 @@ def zip_files(base_folder, file_pattern="*.*", target_file=None):
 
         return target_file
 
+# actions on strings
+
+def bytes_to_gz(input_bytes):
+    buf = io.BytesIO()                                          # Create an in-memory bytes buffer
+    with gzip.GzipFile(fileobj=buf, mode='wb') as gz_file:      # Create a gzip file object that writes to the buffer
+        gz_file.write(input_bytes)                              # Write the input bytes to the gzip file object
+    return buf.getvalue()                                       # Get the compressed data from the buffer
+
+def str_to_gz(value):
+    buf = io.BytesIO()                                          # Create an in-memory bytes buffer
+    with gzip.GzipFile(fileobj=buf, mode='wb') as gz_file:      # Create a gzip file object that writes to the buffer
+        gz_file.write(value.encode('utf-8'))                    # Write the input string to the gzip file object
+    return buf.getvalue()                                       # Get the compressed data from the buffer
+
+def gz_to_bytes(gz_data):
+    buf = io.BytesIO(gz_data)                                   # Create an in-memory bytes buffer with the gzip data
+    with gzip.GzipFile(fileobj=buf, mode='rb') as gz_file:      # Create a gzip file object that reads from the buffer
+        return gz_file.read()                                   # Read the decompressed data as bytes
+
+def gz_to_str(gz_data):
+    buf = io.BytesIO(gz_data)                                   # Create an in-memory bytes buffer with the gzip data
+    with gzip.GzipFile(fileobj=buf, mode='rb') as gz_file:      # Create a gzip file object that reads from the buffer
+        return gz_file.read().decode('utf-8')                   # Read the decompressed data and decode it to a string
+
 ###########################
 # extra function's mappings
 

osbot_utils-1.40.0/osbot_utils/version

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

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

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

osbot_utils-1.39.0/osbot_utils/version

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