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

osbot_utils/base_classes/Type_Safe.py

@@ -19,7 +19,7 @@ from osbot_utils.utils.Misc                     import list_set
 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_str_to_value_from_obj_annotation
+    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,8 +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) is str:
-                value = convert_str_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/helpers/Random_Guid.py

@@ -1,7 +1,5 @@
-# todo add to osbot utils
 from osbot_utils.utils.Misc import random_guid, is_guid
 
-
 class Random_Guid(str):
     def __new__(cls, value=None):
         if value is None:

osbot_utils/utils/Objects.py

@@ -8,10 +8,13 @@ import typing
 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
 
+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):
     def get_origin(tp):
@@ -105,14 +108,14 @@ def convert_dict_to_value_from_obj_annotation(target, attr_name, value):
                     return attribute_annotation(**value)
     return value
 
-def convert_str_to_value_from_obj_annotation(target, attr_name, value):                     # todo: see the side effects of doing this for all strings
+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 'str' in base_classes_names(attribute_annotation):                       # todo: figure out a better way to handle these special type casting (used for example by Random_Guid)
-                    if attribute_annotation == Random_Guid:                                 #       and add support for other types like int (which is used my Timestamp_Now)
+                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
 
@@ -164,6 +167,8 @@ def obj_to_dict(target):
     return target                                                                   # Return non-object types as is
 
 def str_to_obj(target):
+    if hasattr(target, 'json'):
+        return dict_to_obj(target.json())
     return dict_to_obj(json.loads(target))
 
 def enum_from_value(enum_type, value):

osbot_utils/version

@@ -1 +1 @@
-v1.65.0
+v1.67.0

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.65.0
+Version: 1.67.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.65.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.67.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.65.0.dist-info → osbot_utils-1.67.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=FH_q3PJb_Fa4FAjG1fzuaEAt-lv7Ila-2ZNPd_Ohors,18621
+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
@@ -65,7 +65,7 @@ osbot_utils/helpers/Local_Cache.py,sha256=0JZZX3fFImcwtbBvxAQl-EbBegSNJRhRMYF6ov
 osbot_utils/helpers/Local_Caches.py,sha256=aQmi1HSM0TH6WQPedG2fbz4KCCJ3DQTU9d18rB1jR0M,1885
 osbot_utils/helpers/Print_Table.py,sha256=LEXbyqGg_6WSraI4cob4bNNSu18ddqvALp1zGK7bPhs,19126
 osbot_utils/helpers/Python_Audit.py,sha256=shpZlluJwqJBAlad6xN01FkgC1TsQ48RLvR5ZjmrKa4,1539
-osbot_utils/helpers/Random_Guid.py,sha256=JvAFxbF8XUE0l1Jg6CmdaKxuYFIfYJGd49cOZJdmZ4Y,400
+osbot_utils/helpers/Random_Guid.py,sha256=hBBcjetZMYgdagWbkS1j7AYAQ5k6JFbDpbPBi9gTj1A,373
 osbot_utils/helpers/Random_Guid_Short.py,sha256=YP_k5OLuYvXWGU2OEnQHk_OGViBQofTWKm3pUdQaJao,404
 osbot_utils/helpers/Random_Seed.py,sha256=14btja8LDN9cMGWaz4fCNcMRU_eyx49gas-_PQvHgy4,634
 osbot_utils/helpers/Timestamp_Now.py,sha256=Vmdsm-pgvxkkQ_Qj_9Watr8rXXSvc-aBxWMPFGQx8Z0,371
@@ -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=vPJdfpzwSRykcVkVT-ztaCC_52AWPVey9uWrJ9rAvZ8,18722
+osbot_utils/utils/Objects.py,sha256=6Gdph2A6cv1mVrADLjaCopDQIHxqZf8p1yfnXuDU6iQ,18798
 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=6rsAH6KPsBZcwclONfSWT6iY8kMQH684ZSqdZ73t7m0,8
-osbot_utils-1.65.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.65.0.dist-info/METADATA,sha256=DdYjLZWifnhmxlOX4Bl9jcJqZg4qY82E-7km6kF279g,1317
-osbot_utils-1.65.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-osbot_utils-1.65.0.dist-info/RECORD,,
+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,,