osbot-utils 2.16.0__py3-none-any.whl → 2.18.0__py3-none-any.whl

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/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/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/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/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/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/version

@@ -1 +1 @@
-v2.16.0
+v2.18.0

{osbot_utils-2.16.0.dist-info → osbot_utils-2.18.0.dist-info}/METADATA

@@ -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.dist-info → osbot_utils-2.18.0.dist-info}/RECORD

@@ -136,9 +136,9 @@ osbot_utils/helpers/cache_requests/Cache__Requests__Row.py,sha256=Sb7E_zDB-LPlWI
 osbot_utils/helpers/cache_requests/Cache__Requests__Table.py,sha256=BW7tXM0TFYma3Db4M-58IKpx0vevLuFsH7QQeiggPaI,388
 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=V4yVmnXB4oFwq3UtGF_7SPU5PmvNlowcQnqwAArP828,10962
+osbot_utils/helpers/flows/Flow.py,sha256=75Ld9rYHpKIPGFpAexg3oKdBslonkjf9KlUGwyJuzgQ,11059
 osbot_utils/helpers/flows/Flow__Events.py,sha256=g7KBafFeA7tV-v31v_m3MT__cZEX63gh8CehnZwRYU0,2840
-osbot_utils/helpers/flows/Task.py,sha256=tnO1q4nNnWYmcb66tMcKCOIgipAV-TCNO4xEtrnGDBc,5333
+osbot_utils/helpers/flows/Task.py,sha256=VUDTz8zy5fSMSWdwAJXpuE0ewdhYSNMAgFyEKXpTIpI,5461
 osbot_utils/helpers/flows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/decorators/flow.py,sha256=7wj5TtUO_ffbACnagZtZ6LfFgclmbQSfn2lKkMMrnJI,670
@@ -284,7 +284,7 @@ osbot_utils/testing/performance/models/Model__Performance_Measure__Measurement.p
 osbot_utils/testing/performance/models/Model__Performance_Measure__Result.py,sha256=k9HJYNLmW6sjRVsfpduSxHFiVANc1zmYtO_Oz9azpW8,755
 osbot_utils/testing/performance/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/Type_Safe.py,sha256=Yd6s60Ykgke8YuIone-69Ozc4uzEq2fGHu97HTmhydU,5514
-osbot_utils/type_safe/Type_Safe__Base.py,sha256=MD9Peg_nI1X0Z_eaEYfxUkCLgu_jFNAMq3KoUvI_wrw,4945
+osbot_utils/type_safe/Type_Safe__Base.py,sha256=Bzrh8TxFglB0FEUAQTlgovlnFHnBN4lOX1Vu327r1Vc,5223
 osbot_utils/type_safe/Type_Safe__Dict.py,sha256=vE_Ut7MabBjOq5Hpr3vdFO5RNf-M-cL83S76CvxD-9g,2488
 osbot_utils/type_safe/Type_Safe__List.py,sha256=SzSIBkwSOAEpW_V2qh4-f0YHzmgB0T8PczBLbDgZGvg,1340
 osbot_utils/type_safe/Type_Safe__Method.py,sha256=LOG2sqQyKBNNEiJxk_jngH6IWvpyVueouAzNTlj-_pY,12676
@@ -301,12 +301,12 @@ osbot_utils/type_safe/shared/Type_Safe__Convert.py,sha256=mS92_sKjKM_aNSB3ERMEgv
 osbot_utils/type_safe/shared/Type_Safe__Not_Cached.py,sha256=25FAl6SOLxdStco_rm9tgOYLfuKyBWheGdl7vVa56UU,800
 osbot_utils/type_safe/shared/Type_Safe__Raise_Exception.py,sha256=pbru8k8CTQMNUfmFBndiJhg2KkqEYzFvJAPcNZHeHfQ,829
 osbot_utils/type_safe/shared/Type_Safe__Shared__Variables.py,sha256=SuZGl9LryQX6IpOE0I_lbzClT-h17UNylC__-M8ltTY,129
-osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=LW0vqaW1ugOMuMmuofstC_DRr2QCtRvhtaK2IC2N7KA,16301
+osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=CNGuTlfGCwm35d_MQ1ssiNFr2OxsbgI_MczqH_-EK6g,16315
 osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/steps/Type_Safe__Step__Class_Kwargs.py,sha256=snoyJKvZ1crgF2fp0zexwNPnV_E63RfyRIsMAZdrKNY,6995
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Kwargs.py,sha256=tzKXDUc0HVP5QvCWsmcPuuZodNvQZ9FeMDNI2x00Ngw,1943
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Value.py,sha256=K_tkVQyLUbbWYzDnzoPLCgDBAFYyUjAG4VdLsvjzL1g,4485
-osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=BO1WNfudAP9PqyXQZkRDTldeL2InxHhgU_6q_27MH3M,11890
+osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=VAIZNqsmkBFta-mW8JzhKJpxG0i1G1boj3cZlbKToms,12154
 osbot_utils/type_safe/steps/Type_Safe__Step__Init.py,sha256=v4FD7zxQiOFLiOF1Ma8wZMP8aLgRlXwJZnsIfBu2zeg,1266
 osbot_utils/type_safe/steps/Type_Safe__Step__Set_Attr.py,sha256=VuKHH9QEYlbAL9R4zwQ5dwexx2sFY6wMx52QmF7eqcg,5219
 osbot_utils/type_safe/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -326,7 +326,7 @@ osbot_utils/utils/Files.py,sha256=yxteAcyhDcUy1_r9Eihx80V16lV_UAE6cvoOe2Dc7DU,23
 osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
 osbot_utils/utils/Http.py,sha256=Cm_-b2EgxKoQJ47ThZp-dgHCdeGv4UcCNLfTOH94-7s,7790
 osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
-osbot_utils/utils/Json.py,sha256=0t7Hwefx8bg4JiZVr-xIbWP3BAk6_ZsnY7iV5pnRLDQ,7137
+osbot_utils/utils/Json.py,sha256=Ux9lXFAjr51etPpzG3J4phlTnY78_4iA-l0uphWTCEY,7183
 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=H_xexJgiTxB3jDeDiW8efGQbO0Zuy8MM0iQ7qXC92JI,17363
@@ -342,8 +342,8 @@ osbot_utils/utils/Toml.py,sha256=Rxl8gx7mni5CvBAK-Ai02EKw-GwtJdd3yeHT2kMloik,166
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=pR6sKliUY0KZXmqNzKY2frfW-YVQEVbLKiyqQX_lc-8,14052
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=kbPgKTSrHcTYIQSNpjw5655sd1n45CbPrdcXIS_fj5I,8
-osbot_utils-2.16.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.16.0.dist-info/METADATA,sha256=rZqC0khpO-fwhN6NfHb27LuW5r5rCgL98vOF_yn2pYA,1329
-osbot_utils-2.16.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-osbot_utils-2.16.0.dist-info/RECORD,,
+osbot_utils/version,sha256=yvU2Z3SdepC8XR54yIqlis54HN4rMdVZtZIYQGakkME,8
+osbot_utils-2.18.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.18.0.dist-info/METADATA,sha256=lLFPYDtIGosRSw9Kt7AtS3D8ubb2WDN6QrI9A0lyiRM,1329
+osbot_utils-2.18.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+osbot_utils-2.18.0.dist-info/RECORD,,