osbot-utils 1.64.0__py3-none-any.whl → 1.66.0__py3-none-any.whl

osbot_utils/base_classes/Type_Safe.py

@@ -16,10 +16,10 @@ 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.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_dict_to_value_from_obj_annotation, dict_to_obj, convert_to_value_from_obj_annotation
 
 # Backport implementations of get_origin and get_args for Python 3.7
 if sys.version_info < (3, 8):                                           # pragma: no cover
@@ -99,6 +99,8 @@ class Type_Safe:
         if value is not None:
             if type(value) is dict:
                 value = convert_dict_to_value_from_obj_annotation(self, name, value)
+            if type(value) in [int, str]:                                                   # for now only a small number of str and int classes are supported (until we understand the full implications of this)
+                value = convert_to_value_from_obj_annotation (self, name, value)
             check_1 = value_type_matches_obj_annotation_for_attr      (self, name, value)
             check_2 = value_type_matches_obj_annotation_for_union_attr(self, name, value)
             if (check_1 is False and check_2 is None  or

osbot_utils/utils/Objects.py

@@ -5,12 +5,15 @@ import pickle
 import sys
 import types
 import typing
-from collections.abc        import Mapping
+from collections.abc                    import Mapping
+from typing                             import Union
+from types                              import SimpleNamespace
+from osbot_utils.helpers.Timestamp_Now  import Timestamp_Now
+from osbot_utils.helpers.Random_Guid    import Random_Guid
+from osbot_utils.utils.Misc             import list_set
+from osbot_utils.utils.Str              import str_unicode_escape, str_max_width
 
-from typing                 import Union
-from types                  import SimpleNamespace
-from osbot_utils.utils.Misc import list_set
-from osbot_utils.utils.Str  import str_unicode_escape, str_max_width
+TYPE_SAFE__CONVERT_VALUE__SUPPORTED_TYPES = [Random_Guid, Timestamp_Now]
 
 # Backport implementations of get_origin and get_args for Python 3.7
 if sys.version_info < (3, 8):
@@ -95,7 +98,7 @@ def class_full_name(target):
         type_name   = type_target.__name__
         return f'{type_module}.{type_name}'
 
-def convert_dict_to_value_from_obj_annotation(target, attr_name, value):
+def convert_dict_to_value_from_obj_annotation(target, attr_name, value):                    # todo: refactor this with code from convert_str_to_value_from_obj_annotation since it is mostly the same
     if target is not None and attr_name is not None:
         if hasattr(target, '__annotations__'):
             obj_annotations  = target.__annotations__
@@ -105,6 +108,17 @@ def convert_dict_to_value_from_obj_annotation(target, attr_name, value):
                     return attribute_annotation(**value)
     return value
 
+def convert_to_value_from_obj_annotation(target, attr_name, value):                             # todo: see the side effects of doing this for all ints and floats
+    if target is not None and attr_name is not None:
+        if hasattr(target, '__annotations__'):
+            obj_annotations  = target.__annotations__
+            if hasattr(obj_annotations,'get'):
+                attribute_annotation = obj_annotations.get(attr_name)
+                if attribute_annotation:
+                    if attribute_annotation in TYPE_SAFE__CONVERT_VALUE__SUPPORTED_TYPES:          # for now hard-coding this to just these types until we understand the side effects
+                        return attribute_annotation(value)
+    return value
+
 
 def default_value(target : type):
     try:
@@ -382,7 +396,6 @@ def value_type_matches_obj_annotation_for_attr(target, attr_name, value):
                     return True
                 if are_types_magic_mock(source_type=value_type, target_type=attr_type):
                     return True
-
                 return value_type is attr_type
     return None
 

osbot_utils/version

@@ -1 +1 @@
-v1.64.0
+v1.66.0

{osbot_utils-1.64.0.dist-info → osbot_utils-1.66.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.64.0
+Version: 1.66.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.64.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.66.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.64.0.dist-info → osbot_utils-1.66.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=eWdLnt-vRqr6bX1TR3tINSqm2KeVXQSzQs6pxq0Ep5I,18476
+osbot_utils/base_classes/Type_Safe.py,sha256=N1RMyDEA9YFI5MciixobxM0ZjbEQpPtj8XzmzTrPTls,18789
 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
@@ -293,7 +293,7 @@ osbot_utils/utils/Json.py,sha256=yIT2hUI23gYd24Uf3LCjqPNV67zS46rYZftcCM3jw-Q,649
 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
-osbot_utils/utils/Objects.py,sha256=_BWr7KA8Xzzxu6fyxHSqDqDM1Pkyr5IZUFo_hMf7oTo,17612
+osbot_utils/utils/Objects.py,sha256=sYBpcKfvG3QRE5NSet_9e9MqOhRvKGowuWkGDtijY1g,18724
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
 osbot_utils/utils/Python_Logger.py,sha256=tx8N6wRKL3RDHboDRKZn8SirSJdSAE9cACyJkxrThZ8,12792
@@ -305,8 +305,8 @@ osbot_utils/utils/Toml.py,sha256=SD6IA4-mrtoBXcI0dIGKV9POMQNd6WYKvmDQq7GQ6ZQ,143
 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=Sb9LIFVVDPJapRKOM9P5OAlLpvoTKm6KXqS8_LOGd3k,8
-osbot_utils-1.64.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.64.0.dist-info/METADATA,sha256=kAPJmBcqPABY3iT_RLZwS5OUbV7PqHKiAvkkCJOZy8c,1317
-osbot_utils-1.64.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-osbot_utils-1.64.0.dist-info/RECORD,,
+osbot_utils/version,sha256=1QcmI8mVRJJdlWulkPzEykBmlNbrD6QZ-4jQHNIZtDc,8
+osbot_utils-1.66.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.66.0.dist-info/METADATA,sha256=IlgcQwbhyJQ9y7RWr1xQVk93pvICSope8bUxaWV2bdM,1317
+osbot_utils-1.66.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+osbot_utils-1.66.0.dist-info/RECORD,,