osbot-utils 1.61.0__tar.gz → 1.63.0__tar.gz

{osbot_utils-1.61.0 → osbot_utils-1.63.0}/PKG-INFO

@@ -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 → osbot_utils-1.63.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.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 → osbot_utils-1.63.0}/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-1.63.0/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-1.61.0 → osbot_utils-1.63.0}/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-1.61.0 → osbot_utils-1.63.0}/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-1.61.0 → osbot_utils-1.63.0}/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-1.61.0 → osbot_utils-1.63.0}/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-1.63.0/osbot_utils/version

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

{osbot_utils-1.61.0 → osbot_utils-1.63.0}/pyproject.toml

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

osbot_utils-1.61.0/osbot_utils/version

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