osbot-utils 1.61.0__py3-none-any.whl → 1.63.0__py3-none-any.whl

osbot_utils/base_classes/Type_Safe.py

@@ -11,10 +11,12 @@ 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.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.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
@@ -264,10 +266,16 @@ class Type_Safe:
                         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
-                    elif obj_is_attribute_annotation_of_type(self, key, Decimal):           # handle Decimals  # todo: refactor these special cases into a separate method to class
+
+                    # todo: refactor these special cases into a separate method to class
+                    elif obj_is_attribute_annotation_of_type(self, key, Decimal):           # handle Decimals
                         value = Decimal(value)
-                    elif obj_is_attribute_annotation_of_type(self, key, Random_Guid):       # handle Random_Guid objects
+                    elif obj_is_attribute_annotation_of_type(self, key, Random_Guid):       # handle Random_Guid
                         value = Random_Guid(value)
+                    elif obj_is_attribute_annotation_of_type(self, key, Random_Guid_Short): # handle Random_Guid_Short
+                        value = Random_Guid_Short(value)
+                    elif obj_is_attribute_annotation_of_type(self, key, Timestamp_Now):     # handle Timestamp_Now
+                        value = Timestamp_Now(value)
                 setattr(self, key, value)                                                   # Direct assignment for primitive types and other structures
 
         return self

osbot_utils/helpers/Random_Guid_Short.py

@@ -0,0 +1,15 @@
+# todo add to osbot utils
+from osbot_utils.utils.Misc import random_guid_short
+
+
+class Random_Guid_Short(str):
+    def __new__(cls, value=None):
+        if value is None:
+            value = random_guid_short()
+        return str.__new__(cls, value)
+
+    def __init__(self, value=None):
+        self.value = value if value is not None else random_guid_short()
+
+    def __str__(self):
+        return self

osbot_utils/helpers/flows/Flow.py

@@ -9,7 +9,7 @@ from osbot_utils.helpers.flows.models.Flow_Run__Config  import Flow_Run__Config
 from osbot_utils.helpers.flows.Flow__Events             import flow_events
 from osbot_utils.helpers.flows.models.Flow_Run__Event_Data import Flow_Run__Event_Data
 from osbot_utils.testing.Stdout                         import Stdout
-from osbot_utils.utils.Misc                             import random_id, lower
+from osbot_utils.utils.Misc import random_id, lower, time_now
 from osbot_utils.utils.Python_Logger                    import Python_Logger
 from osbot_utils.utils.Str                              import ansis_to_texts
 from osbot_utils.utils.Threads                          import invoke_in_new_event_loop
@@ -24,7 +24,7 @@ FLOW__LOGGING__DATE_FORMAT = '%H:%M:%S'
 class Flow(Type_Safe):
     captured_exec_logs : list
     data               : dict                   # dict available to the tasks to add and collect data
-    flow_id            : str
+    flow_id            : str                    # rename to flow_run_id (or also capture the flow_run_id)
     flow_name          : str
     flow_config        : Flow_Run__Config
     flow_error         : Exception           = None
@@ -198,6 +198,9 @@ class Flow(Type_Safe):
                                                                                            *self.flow_args,
                                                                                            **self.flow_kwargs)
 
+    def set_flow_id__time_now(self):
+        self.flow_id = time_now(milliseconds_numbers=1)
+
     def set_flow_target(self, target, *args, **kwargs):
         self.flow_target = target
         self.flow_args   = args

osbot_utils/helpers/flows/models/Flow_Run__Event_Data.py

@@ -6,7 +6,7 @@ from osbot_utils.base_classes.Type_Safe import Type_Safe
 class Flow_Run__Event_Data(Type_Safe):
     data        : dict
     event_source: str
-    flow_id     : str = None
+    #flow_id     : str = None           # todo: add support for capturing the actual flow_idq
     flow_name   : str = None
     flow_run_id : str = None
     log_level   : int = logging.INFO

osbot_utils/helpers/trace/Trace_Call.py

@@ -9,8 +9,8 @@ from osbot_utils.helpers.trace.Trace_Call__Handler          import Trace_Call__H
 from osbot_utils.helpers.trace.Trace_Call__Print_Lines      import Trace_Call__Print_Lines
 from osbot_utils.helpers.trace.Trace_Call__Print_Traces     import Trace_Call__Print_Traces
 from osbot_utils.helpers.trace.Trace_Call__View_Model       import Trace_Call__View_Model
-from osbot_utils.testing.Stdout import Stdout
-from osbot_utils.utils.Str import ansi_to_text
+from osbot_utils.testing.Stdout                             import Stdout
+from osbot_utils.utils.Str                                  import ansi_to_text
 
 
 def trace_calls(title         = None , print_traces = True , show_locals    = False, source_code          = False ,

osbot_utils/utils/Misc.py

@@ -510,6 +510,7 @@ str_remove          = remove
 random_id           = random_string
 random_int          = random_number
 random_guid         = random_uuid
+random_guid_short   = random_uuid_short
 random_value        = random_string
 
 time_utc            = time_now

osbot_utils/version

@@ -1 +1 @@
-v1.61.0
+v1.63.0

{osbot_utils-1.61.0.dist-info → osbot_utils-1.63.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.61.0
+Version: 1.63.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.61.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.63.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.61.0.dist-info → osbot_utils-1.63.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=SwgDhPKeC2jUWNmihUXwvDoXFhnZPOSrrsu1YnCyyx0,17961
+osbot_utils/base_classes/Type_Safe.py,sha256=eWdLnt-vRqr6bX1TR3tINSqm2KeVXQSzQs6pxq0Ep5I,18476
 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
@@ -66,6 +66,7 @@ osbot_utils/helpers/Local_Caches.py,sha256=aQmi1HSM0TH6WQPedG2fbz4KCCJ3DQTU9d18r
 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=_wlyM17SIr-FeYESwnVt4cfkEtRRf-dbYh_lTnrKVG0,379
+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
 osbot_utils/helpers/Type_Registry.py,sha256=Ajk3SyMSKDi2g9SJYUtTgg7PZkAgydaHcpbGuEN3S94,311
@@ -155,7 +156,7 @@ osbot_utils/helpers/cache_requests/Cache__Requests__Row.py,sha256=h-yc7NkpScbHww
 osbot_utils/helpers/cache_requests/Cache__Requests__Table.py,sha256=RgxAYhm-FIrXXteQRtD91pOLq8JXhSzxb51Jb6MTUdY,391
 osbot_utils/helpers/cache_requests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/cache_requests/flows/flow__Cache__Requests.py,sha256=xgx_oExxkcvRwQN1UCobimECIMUKGoIX5oGdCmp8Nyw,243
-osbot_utils/helpers/flows/Flow.py,sha256=2oUlvX5wyTZT1K5hkNn8owwCLb84nTUXelpRH1E0IPE,10812
+osbot_utils/helpers/flows/Flow.py,sha256=oaNYmCxqYC8DxX7egZDVo7Id4pqqcRymKTTlDmy8pGs,10965
 osbot_utils/helpers/flows/Flow__Events.py,sha256=_BHXh9v1GfvTI7hGx7eJDkCGeo9VjqDoCTMDeL09Ujc,2843
 osbot_utils/helpers/flows/Task.py,sha256=3PiU1GCWhnDcgYxYRldo0CWcCcnQDvWvU2cXPCmpSTc,5336
 osbot_utils/helpers/flows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -164,7 +165,7 @@ osbot_utils/helpers/flows/decorators/flow.py,sha256=7wj5TtUO_ffbACnagZtZ6LfFgclm
 osbot_utils/helpers/flows/decorators/task.py,sha256=9bhQBPJU1dO-J4FAsFkmxqQMBNtay4FT_b1BdpHJ9sA,734
 osbot_utils/helpers/flows/models/Flow_Run__Config.py,sha256=3JSPSG3vjM7mdnI-3wgLCc7Nc_3Xjqxn34_A6yUp-4Q,386
 osbot_utils/helpers/flows/models/Flow_Run__Event.py,sha256=-F_H_Tq119qa9tk8IoX5U36h_f8AE1VueL0olhjH24g,569
-osbot_utils/helpers/flows/models/Flow_Run__Event_Data.py,sha256=FlL1MifonjzHnHYtiVTMeZWu2WxjCNU5-D9VrF18Ces,340
+osbot_utils/helpers/flows/models/Flow_Run__Event_Data.py,sha256=Xvv_vtOL-siSdt5nkRCLA7uHxlsA3bTm7ZD_EOkCVAU,405
 osbot_utils/helpers/flows/models/Flow_Run__Event_Type.py,sha256=-iHKNQ-Ar2UfiCraFYQNHdBQ9fNcTTRoh3kRpXRS_Gc,375
 osbot_utils/helpers/flows/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/html/Dict_To_Css.py,sha256=u6B4Mx7PXr-gDrTrs1hgknnvsZVK4Fic5LqedKjo-lk,1097
@@ -244,7 +245,7 @@ osbot_utils/helpers/ssh/SSH__Linux__Amazon.py,sha256=ZJFb7LFTvclAuhH5OoOtJ361NoX
 osbot_utils/helpers/ssh/SSH__Python.py,sha256=O2DAwkbXzwkis8lffoqIL2NPSfYcN44Mr8i9Ey2iMKk,2066
 osbot_utils/helpers/ssh/TestCase__SSH.py,sha256=MD8sq0_kI4f6pEmEO0cLq2mQOhIqbP45ZxFJNG44Jg4,1773
 osbot_utils/helpers/ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/trace/Trace_Call.py,sha256=SNaYju1KA6UKaCZcaDoPadvSahdl0vOX27unGl0-ZEM,8825
+osbot_utils/helpers/trace/Trace_Call.py,sha256=O_y6cncgneYrj3ARDMz-o9Yi1LjsESibUqkGFAg0Jk0,8886
 osbot_utils/helpers/trace/Trace_Call__Config.py,sha256=qd6HpF1olvlQ9BU3-gvxRdnP0l7w7noCXpF561gkyUk,3305
 osbot_utils/helpers/trace/Trace_Call__Graph.py,sha256=HCrXRKQI42DIQxxyFLcaosWiOcUyoITbeV17ICdXcXM,1156
 osbot_utils/helpers/trace/Trace_Call__Handler.py,sha256=hdgiawoC4K2DrMAHbz2706SfEcxPdX9kK0gjyWqjSzQ,12400
@@ -291,7 +292,7 @@ osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
 osbot_utils/utils/Json.py,sha256=yIT2hUI23gYd24Uf3LCjqPNV67zS46rYZftcCM3jw-Q,6492
 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=Z362HW7nUiGd7mj0QKW7ifNR1opUYNlQM7YmEyz_qHw,16921
+osbot_utils/utils/Misc.py,sha256=4MkG2BE1VzZfV4KPzYZ4jVAoUwoA3pTTVPi609ldLGA,16961
 osbot_utils/utils/Objects.py,sha256=_BWr7KA8Xzzxu6fyxHSqDqDM1Pkyr5IZUFo_hMf7oTo,17612
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
@@ -304,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=AxhppEeDw-7cq3HMr0l7OrPCdy5R5eZ7MF-27O2MVqs,8
-osbot_utils-1.61.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.61.0.dist-info/METADATA,sha256=yiavdHaHNU9h8VejBNAUqWYEl8itBbWeIfWhRIFngRU,1317
-osbot_utils-1.61.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-osbot_utils-1.61.0.dist-info/RECORD,,
+osbot_utils/version,sha256=2IflaXKoRpTJA1_I8a84R90o-JFwLcsc7YlBVt7zn4o,8
+osbot_utils-1.63.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.63.0.dist-info/METADATA,sha256=ow3SezUF70n12L-FywN1kJe8qAJy4c3u7kHT4HZVBp0,1317
+osbot_utils-1.63.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+osbot_utils-1.63.0.dist-info/RECORD,,