osbot-utils 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

osbot_utils/helpers/sqlite/Sqlite__Table__Create.py

@@ -1,6 +1,5 @@
 import inspect
-from typing import List
-
+from typing                                                 import List
 from osbot_utils.base_classes.Kwargs_To_Self                import Kwargs_To_Self
 from osbot_utils.decorators.lists.filter_list               import filter_list
 from osbot_utils.helpers.sqlite.Sqlite__Field               import Sqlite__Field
@@ -17,8 +16,8 @@ class Sqlite__Table__Create(Kwargs_To_Self):
         self.set_default_fields()
 
     def add_field(self, field_data: dict):
-        sqlite_field = Sqlite__Field.from_json(field_data)
-        if sqlite_field:
+        if field_data and isinstance(field_data, dict):
+            sqlite_field = Sqlite__Field.from_json(field_data)
             self.fields.append(sqlite_field)
             return True
         return False

osbot_utils/helpers/sqlite/sample_data/Sqlite__Sample_Data__Chinook.py

@@ -1,16 +1,10 @@
-from osbot_utils.base_classes.Kwargs_To_Self import Kwargs_To_Self
-from osbot_utils.decorators.methods.cache_on_self import cache_on_self
-from osbot_utils.helpers.sqlite.Sqlite__Database import Sqlite__Database
-from osbot_utils.helpers.sqlite.Sqlite__Table import Sqlite__Table
-from osbot_utils.helpers.sqlite.Sqlite__Table__Create import Sqlite__Table__Create
-from osbot_utils.helpers.sqlite.domains.Sqlite__DB__Json import Sqlite__DB__Json
-from osbot_utils.testing.Duration import duration, Duration
-from osbot_utils.utils.Dev import pprint
-from osbot_utils.utils.Files import current_temp_folder, path_combine, folder_create, file_exists, file_not_exists, \
-    file_contents
-from osbot_utils.utils.Http import GET, GET_to_file
-from osbot_utils.utils.Json import json_loads, json_from_file, json_dump, json_file_create, json_file_load
-from osbot_utils.utils.Objects import obj_info
+from osbot_utils.base_classes.Kwargs_To_Self                import Kwargs_To_Self
+from osbot_utils.decorators.methods.cache_on_self           import cache_on_self
+from osbot_utils.helpers.sqlite.Sqlite__Database            import Sqlite__Database
+from osbot_utils.helpers.sqlite.domains.Sqlite__DB__Json    import Sqlite__DB__Json
+from osbot_utils.utils.Files                                import current_temp_folder, path_combine, folder_create, file_not_exists
+from osbot_utils.utils.Http                                 import GET_to_file
+from osbot_utils.utils.Json                                 import  json_from_file, json_file_create, json_file_load
 
 URL__CHINOOK_JSON                = 'https://github.com/lerocha/chinook-database/releases/download/v1.4.5/ChinookData.json'
 FILE_NAME__CHINOOK_DATA_JSON     = 'ChinookData.json'

osbot_utils/helpers/xml/rss/RSS__Channel.py

@@ -1,5 +1,5 @@
 from typing                                     import Any, Dict, List
-from osbot_utils.type_safe.Type_Safe         import Type_Safe
+from osbot_utils.type_safe.Type_Safe            import Type_Safe
 from osbot_utils.helpers.xml.rss.RSS__Image     import RSS__Image
 from osbot_utils.helpers.xml.rss.RSS__Item      import RSS__Item
 

osbot_utils/type_safe/Type_Safe.py

@@ -24,7 +24,7 @@ if sys.version_info < (3, 8):                                           # pragma
         else:
             return ()
 else:
-    from typing import get_origin, get_args, ForwardRef
+    from typing import get_origin, get_args, ForwardRef, Any
     from osbot_utils.helpers.python_compatibility.python_3_8 import Annotated
 
 if sys.version_info >= (3, 10):
@@ -117,12 +117,16 @@ class Type_Safe:
         # todo: refactor this to separate method
         if hasattr(annotations, 'get'):
             annotation = annotations.get(name)
-            if annotation and get_origin(annotation) is Annotated:
-                annotation_args = get_args(annotation)
-                target_type = annotation_args[0]
-                for attribute in annotation_args[1:]:
-                    if isinstance(attribute, Type_Safe__Validator):
-                        attribute.validate(value=value, field_name=name, target_type=target_type)
+            if annotation:
+                annotation_origin = get_origin(annotation)
+                if annotation_origin is Annotated:
+                    annotation_args = get_args(annotation)
+                    target_type = annotation_args[0]
+                    for attribute in annotation_args[1:]:
+                        if isinstance(attribute, Type_Safe__Validator):
+                            attribute.validate(value=value, field_name=name, target_type=target_type)
+                elif annotation_origin is dict:
+                    value = self.deserialize_dict__using_key_value_annotations(name, value)
 
         super().__setattr__(name, value)
 
@@ -341,8 +345,12 @@ class Type_Safe:
             else:
                 new__dict_key = key_class(dict_key)
 
-            if issubclass(value_class, Type_Safe):
+            if type(dict_value) == value_class:                                        # if the value is already the target, then just use it
+                new__dict_value = dict_value
+            elif issubclass(value_class, Type_Safe):
                 new__dict_value = value_class().deserialize_from_dict(dict_value)
+            elif value_class is Any:
+                new__dict_value = dict_value
             else:
                 new__dict_value = value_class(dict_value)
             new_value[new__dict_key] = new__dict_value
@@ -353,7 +361,7 @@ class Type_Safe:
     def deserialize_from_dict(self, data, raise_on_not_found=False):
         from decimal                                    import Decimal
         from enum                                       import EnumMeta
-        from osbot_utils.type_safe.Type_Safe__List   import Type_Safe__List
+        from osbot_utils.type_safe.Type_Safe__List      import Type_Safe__List
         from osbot_utils.helpers.Random_Guid            import Random_Guid
         from osbot_utils.helpers.Random_Guid_Short      import Random_Guid_Short
         from osbot_utils.utils.Objects                  import obj_is_attribute_annotation_of_type
@@ -362,6 +370,9 @@ class Type_Safe:
         from osbot_utils.helpers.Safe_Id                import Safe_Id
         from osbot_utils.helpers.Timestamp_Now          import Timestamp_Now
 
+        if hasattr(data, 'items') is False:
+            raise ValueError(f"Expected a dictionary, but got '{type(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)                                             # if the attribute is a Type_Safe object, then also deserialize it
@@ -432,7 +443,7 @@ class Type_Safe:
             json_data = json_parse(json_data)
         if json_data:                                           # if there is no data or is {} then don't create an object (since this could be caused by bad data being provided)
             return cls().deserialize_from_dict(json_data,raise_on_not_found=raise_on_not_found)
-        return None
+        return cls()
 
 # todo: see if it is possible to add recursive protection to this logic
 def serialize_to_dict(obj):

osbot_utils/version

@@ -1 +1 @@
-v2.1.0
+v2.2.0

{osbot_utils-2.1.0.dist-info → osbot_utils-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.1.0
+Version: 2.2.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-v2.1.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.2.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.1.0.dist-info → osbot_utils-2.2.0.dist-info}/RECORD

@@ -191,7 +191,7 @@ osbot_utils/helpers/sqlite/Sqlite__Database.py,sha256=Ts0qM3Nakot5o9wbFaaW3iq2pD
 osbot_utils/helpers/sqlite/Sqlite__Field.py,sha256=oBWglAOKN0EWVtaRwiQFxmR1FQ61lQ35yKkWXjSiihs,2911
 osbot_utils/helpers/sqlite/Sqlite__Globals.py,sha256=aP6uIy_y4xzl2soTUCFIJRjsb8JyfxfL6qIEZKIWy_4,230
 osbot_utils/helpers/sqlite/Sqlite__Table.py,sha256=FsFSolFN2N5V8DfZPp4gZL9xmCXaOhmG38wQmgRrvp8,15145
-osbot_utils/helpers/sqlite/Sqlite__Table__Create.py,sha256=dkzv-H4WCu2yt9Hx7ANuK0dhzWcpbs-Sb4GNKhRTTEo,3850
+osbot_utils/helpers/sqlite/Sqlite__Table__Create.py,sha256=Kkp0KbAF9mYOMz6LCmo10aa1n3rci0fFDlV7DPA-gxs,3932
 osbot_utils/helpers/sqlite/Temp_Sqlite__Database__Disk.py,sha256=-BhK0_3lSJPWDt-QS8IQDfrw2K_drjtn-yXyf9GbER4,520
 osbot_utils/helpers/sqlite/Temp_Sqlite__Table.py,sha256=Na2dOHlYSVUKK7STHwdzBYbQgvW2a6cEhUnlC0-T8wk,729
 osbot_utils/helpers/sqlite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -212,7 +212,7 @@ osbot_utils/helpers/sqlite/domains/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 osbot_utils/helpers/sqlite/domains/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/models/Sqlite__Field__Type.py,sha256=4xsnRLrU13ZT1GisVQZYFn3m7sw6DbY6pg3cg3Ug2cI,1114
 osbot_utils/helpers/sqlite/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/sqlite/sample_data/Sqlite__Sample_Data__Chinook.py,sha256=Y_2tZuW0il_iOktmztszg6T6HlOnFCY5xJR8xub77cQ,5415
+osbot_utils/helpers/sqlite/sample_data/Sqlite__Sample_Data__Chinook.py,sha256=ouymaJaaWLP6ZVWOj-OmkeSyDQQadsPQT0B_S9fodD4,5190
 osbot_utils/helpers/sqlite/sample_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/sqlite/sql_builder/SQL_Builder.py,sha256=VPI1Fu3RjVJoXhwcVI3_fa9IiWY4b2uTjKx6yw4pfQM,10782
 osbot_utils/helpers/sqlite/sql_builder/SQL_Builder__Select.py,sha256=_5fszoWTknE0r93hS4zuqikbB0L4bnYKRxSFNVSxx2s,360
@@ -250,7 +250,7 @@ osbot_utils/helpers/xml/Xml__File__Load.py,sha256=zvs5yGLk5wf16zadWcTD97R4ltn_Hl
 osbot_utils/helpers/xml/Xml__File__To_Dict.py,sha256=YqOOZ_YYSFteCG-oJu3V2Sg9Rr4w2cARv52G3BnfbIY,2058
 osbot_utils/helpers/xml/Xml__File__To_Xml.py,sha256=j_JyEsjKGp1TUxAKECHKRo_mlyO0wjR3x_rGb_dn52M,2881
 osbot_utils/helpers/xml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/xml/rss/RSS__Channel.py,sha256=iAlAqeoHVEhaHqUgQ9DK7xPZwikQS34z0pgXfE7qQeM,602
+osbot_utils/helpers/xml/rss/RSS__Channel.py,sha256=BpkP4OMV_H6usvXhdQ8ahJFxYbtwfkRuoP37_gcIP-A,605
 osbot_utils/helpers/xml/rss/RSS__Enclosure.py,sha256=9lUsIVJ4TkR_mBFDc6-ISMg7fPXe8FiKFSWjpnlWIMY,139
 osbot_utils/helpers/xml/rss/RSS__Feed.py,sha256=W4T2rmJoZr4kfOPSkZXkkKPnOk5bPlZfLzOf7pah9LQ,422
 osbot_utils/helpers/xml/rss/RSS__Feed__Parser.py,sha256=7sub6zcWqGz8FORXFYRyopTswboUkCU5uGEXAZ6BZDw,5380
@@ -278,7 +278,7 @@ osbot_utils/testing/Temp_Zip_In_Memory.py,sha256=ibDIWt3K4CX558PbkLbX3InHyWYZcwQ
 osbot_utils/testing/Unit_Test.py,sha256=MReR_wDGbbXFDPz7cmuGflcTxRB6TBnO9mYqRpSq8Pk,1304
 osbot_utils/testing/Unzip_File.py,sha256=V5H97XO9rlvG5EYOSzAH4kTtAH1ohZ8R8ImvJh46ZNg,1177
 osbot_utils/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/type_safe/Type_Safe.py,sha256=8FsDdYsfoCgnev5GZdzuuZxxTYDY4RvkyNrp_kZ6QZY,29024
+osbot_utils/type_safe/Type_Safe.py,sha256=irrNiwWQHV4eP2dq9aKYDIETsG375U9U055YPZX1uQw,29658
 osbot_utils/type_safe/Type_Safe_Method.py,sha256=8E88of__An9_ZhJKz6Kp22C1mb9WLED0jWNLOII3fJs,10489
 osbot_utils/type_safe/Type_Safe__Base.py,sha256=mL8GMaR9tsaUfwk8d-8zp2g-A8kNKiN6kroEFaNvMOk,5518
 osbot_utils/type_safe/Type_Safe__Dict.py,sha256=I_Ac0JH-ahmQrkADFVyiobTlH1JI31MKHaNszQW4PBo,2396
@@ -316,8 +316,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=-3MMyLuBjmK9ygVGlyvQ_Mc51URgnLeD4U4j_MbsNV8,7
-osbot_utils-2.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.1.0.dist-info/METADATA,sha256=0z546iiaOhdptx11H5Rkku5U7OqeThn6I_J6Fa4dGiY,1315
-osbot_utils-2.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-osbot_utils-2.1.0.dist-info/RECORD,,
+osbot_utils/version,sha256=uVurYQGLXTbYEagaxFAAZWDtcu72lhVJSfloDcK8tAU,7
+osbot_utils-2.2.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.2.0.dist-info/METADATA,sha256=k3jcHtdqYaJdLQDq7UJ_l2cIy0O3V6yj7rDUwkz54KE,1315
+osbot_utils-2.2.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+osbot_utils-2.2.0.dist-info/RECORD,,

{osbot_utils-2.1.0.dist-info → osbot_utils-2.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.0
 Root-Is-Purelib: true
 Tag: py3-none-any