osbot-utils 2.16.0__tar.gz → 2.18.0__tar.gz

{osbot_utils-2.16.0 → osbot_utils-2.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.16.0
+Version: 2.18.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -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.16.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.18.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.16.0 → osbot_utils-2.18.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-v2.16.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.18.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.16.0 → osbot_utils-2.18.0}/osbot_utils/helpers/flows/Flow.py

@@ -2,17 +2,17 @@ import asyncio
 import logging
 import typing
 
-from osbot_utils.helpers.Dependency_Manager             import Dependency_Manager
-from osbot_utils.type_safe.Type_Safe                 import Type_Safe
-from osbot_utils.helpers.CFormat                        import CFormat, f_dark_grey, f_magenta, f_bold
-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, 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
+from osbot_utils.helpers.Dependency_Manager                 import Dependency_Manager
+from osbot_utils.type_safe.Type_Safe                        import Type_Safe
+from osbot_utils.helpers.CFormat                            import CFormat, f_dark_grey, f_magenta, f_bold
+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, 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
 
 FLOW__RANDOM_ID__PREFIX    = 'flow_id__'
 FLOW__RANDOM_NAME__PREFIX  = 'flow_name__'
@@ -20,7 +20,7 @@ FLOW__LOGGING__LOG_FORMAT  = '%(asctime)s.%(msecs)03d | %(levelname)-8s | %(mess
 FLOW__LOGGING__DATE_FORMAT = '%H:%M:%S'
 
 
-
+# todo: add flow duration
 class Flow(Type_Safe):
     captured_exec_logs : list
     data               : dict                   # dict available to the tasks to add and collect data

{osbot_utils-2.16.0 → osbot_utils-2.18.0}/osbot_utils/helpers/flows/Task.py

@@ -1,18 +1,19 @@
-import asyncio
 import inspect
 import typing
 
-from osbot_utils.helpers.flows.models.Flow_Run__Event_Data import Flow_Run__Event_Data
-from osbot_utils.utils.Misc                 import random_id, lower
-from osbot_utils.helpers.Dependency_Manager import Dependency_Manager
-from osbot_utils.helpers.flows.Flow__Events import flow_events
-from osbot_utils.testing.Stdout             import Stdout
-from osbot_utils.helpers.CFormat            import CFormat, f_dark_grey, f_red, f_blue, f_bold
-from osbot_utils.type_safe.Type_Safe     import Type_Safe
-from osbot_utils.helpers.flows.Flow         import Flow
+from osbot_utils.helpers.flows.models.Flow_Run__Event_Data  import Flow_Run__Event_Data
+from osbot_utils.utils.Misc                                 import random_id, lower
+from osbot_utils.helpers.Dependency_Manager                 import Dependency_Manager
+from osbot_utils.helpers.flows.Flow__Events                 import flow_events
+from osbot_utils.testing.Stdout                             import Stdout
+from osbot_utils.helpers.CFormat                            import CFormat, f_dark_grey, f_red, f_blue, f_bold
+from osbot_utils.type_safe.Type_Safe                        import Type_Safe
+from osbot_utils.helpers.flows.Flow                         import Flow
 
 TASK__RANDOM_ID__PREFIX    = 'task_id__'
 
+# todo: add task duration
+
 class Task(Type_Safe):
     data                : dict                          # dict available to the task to add and collect data
     task_id             : str

{osbot_utils-2.16.0 → osbot_utils-2.18.0}/osbot_utils/type_safe/Type_Safe__Base.py

@@ -1,4 +1,5 @@
 from typing                                         import get_args, Union, Optional, Any, ForwardRef
+from osbot_utils.helpers.Obj_Id                     import Obj_Id
 from osbot_utils.type_safe.shared.Type_Safe__Cache  import type_safe_cache
 
 EXACT_TYPE_MATCH = (int, float, str, bytes, bool, complex)
@@ -63,6 +64,8 @@ class Type_Safe__Base:
             if len(args) != len(item):
                 raise TypeError(f"Expected tuple of length {len(args)}, but got {len(item)}")
             for idx, (elem, elem_type) in enumerate(zip(item, args)):
+                if elem_type is Obj_Id:                                     # todo: refactor this out, and figure out better way to handle this kind of de-serialisation
+                    elem = elem_type(elem)
                 try:
                     self.is_instance_of_type(elem, elem_type)
                 except TypeError as e:

{osbot_utils-2.16.0 → osbot_utils-2.18.0}/osbot_utils/type_safe/shared/Type_Safe__Validation.py

@@ -246,7 +246,7 @@ class Type_Safe__Validation:
                         type_safe_raise_exception.immutable_type_error(var_name, var_type)
 
     def validate_variable_type(self, var_name, var_type, var_value):                                # Validate type compatibility
-        if var_type and not isinstance(var_value, var_type):
+        if type(var_type) is type and not isinstance(var_value, var_type):
             type_safe_raise_exception.type_mismatch_error(var_name, var_type, type(var_value))
 
 type_safe_validation = Type_Safe__Validation()

{osbot_utils-2.16.0 → osbot_utils-2.18.0}/osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py

@@ -2,6 +2,7 @@ import sys
 import types
 from decimal                                             import Decimal
 from enum                                                import EnumMeta
+from osbot_utils.helpers.Obj_Id                          import Obj_Id
 from osbot_utils.type_safe.Type_Safe                     import Type_Safe
 from osbot_utils.type_safe.Type_Safe__List               import Type_Safe__List
 from osbot_utils.helpers.Random_Guid                     import Random_Guid
@@ -100,8 +101,10 @@ class Type_Safe__Step__From_Json:
                                 value = Random_Guid(value)
                             elif type_safe_annotations.obj_is_attribute_annotation_of_type(_self, key, Random_Guid_Short): # handle Random_Guid_Short
                                 value = Random_Guid_Short(value)
-                            elif type_safe_annotations.obj_is_attribute_annotation_of_type(_self, key, Timestamp_Now):     # handle Timestamp_Now
+                            elif type_safe_annotations.obj_is_attribute_annotation_of_type(_self, key, Timestamp_Now    ): # handle Timestamp_Now
                                 value = Timestamp_Now(value)
+                            elif type_safe_annotations.obj_is_attribute_annotation_of_type(_self, key, Obj_Id           ): # handle Obj_Id
+                                value = Obj_Id(value)
 
                     setattr(_self, key, value)                                                   # Direct assignment for primitive types and other structures
 

{osbot_utils-2.16.0 → osbot_utils-2.18.0}/osbot_utils/utils/Json.py

@@ -170,7 +170,7 @@ json_file_create_gz          = Json.save_file_gz
 json_file_contents           = Json.load_file
 json_file_contents_gz        = Json.load_file_gz
 json_file_load               = Json.load_file
-json_file_safe               = Json.save_file
+json_file_save               = Json.save_file
 json_from_file               = Json.load_file
 json_load_file               = Json.load_file
 json_load_file_and_delete    = Json.load_file_and_delete
@@ -184,6 +184,7 @@ json_lines_loads             = Json.loads_json_lines
 json_parse                   = Json.loads
 json_lines_parse             = Json.loads_json_lines
 json_to_bytes                = json_dumps_to_bytes
+json_to_file                 = json_file_save
 json_to_str                  = json_dumps
 json_round_trip              = Json.round_trip
 json_save                    = Json.save_file

osbot_utils-2.18.0/osbot_utils/version

@@ -0,0 +1 @@
+v2.18.0

{osbot_utils-2.16.0 → osbot_utils-2.18.0}/pyproject.toml

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

osbot_utils-2.16.0/osbot_utils/version

@@ -1 +0,0 @@
-v2.16.0