osbot-utils 1.58.0__py3-none-any.whl → 1.60.0__py3-none-any.whl

osbot_utils/base_classes/Type_Safe.py

@@ -14,10 +14,10 @@ from osbot_utils.helpers.Random_Guid            import Random_Guid
 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
+    convert_dict_to_value_from_obj_annotation, dict_to_obj
 
 # Backport implementations of get_origin and get_args for Python 3.7
 if sys.version_info < (3, 8):                                           # pragma: no cover
@@ -272,6 +272,9 @@ class Type_Safe:
 
         return self
 
+    def obj(self):
+        return dict_to_obj(self.json())
+
     def serialize_to_dict(self):                        # todo: see if we need this method or if the .json() is enough
         return serialize_to_dict(self)
 

osbot_utils/helpers/flows/Flow.py

@@ -32,6 +32,7 @@ class Flow(Type_Safe):
     flow_args          : tuple
     flow_kwargs        : dict
     flow_return_value  : typing.Any
+    flow_run_params    : dict
     logger             : Python_Logger
     cformat            : CFormat
     executed_tasks     : typing.List
@@ -67,8 +68,10 @@ class Flow(Type_Safe):
     def execute(self):
         return self.execute_flow()
 
-    def execute_flow(self):
+    def execute_flow(self, flow_run_params=None):                               # todo: see if it makes more sense to call this start_flow_run
         flow_events.on__flow__start(self)
+        self.set_flow_run_params(flow_run_params)
+
         if self.flow_config.log_to_memory:
             self.logger.add_memory_logger()                                     # todo: move to method that does pre-execute tasks
 
@@ -206,6 +209,13 @@ class Flow(Type_Safe):
                     self.flow_name = self.flow_target.__name__
                 else:
                     self.flow_name = self.random_flow_name()
+
+    def set_flow_run_params(self, flow_run_params=None):
+        if flow_run_params:
+            self.flow_run_params = flow_run_params
+            self.log_info(f"flow_run_params: {flow_run_params}")
+            self.add_flow_artifact(description="Data received via FastAPI's request.json()", key='post-data', data=flow_run_params)
+
     def setup(self):
         with self as _:
             _.cformat.auto_bold = True

osbot_utils/utils/Misc.py

@@ -131,6 +131,8 @@ def date_today():
 def list_set(target: object) -> object:
     if hasattr(target, '__iter__'):
         return sorted(list(set(target)))
+    if hasattr(target, '__dict__'):
+        return list_set(target.__dict__)
     return []
 
 def time_str_milliseconds(datetime_str, datetime_format, milliseconds_numbers=0):

osbot_utils/utils/Objects.py

@@ -122,18 +122,21 @@ def dict_remove(data, target):
                 del data[target]
     return data
 
+class __(SimpleNamespace):
+    pass
 
-def dict_to_obj(target, class_name="_"):
-    DynamicClass = type(class_name, (SimpleNamespace,), {})
+def dict_to_obj(target):
     if isinstance(target, Mapping):
         new_dict = {}
         for key, value in target.items():
-            new_dict[key] = dict_to_obj(value, class_name=class_name)           # Recursively convert elements in the dict
-        return DynamicClass(**new_dict)
+            new_dict[key] = dict_to_obj(value)                                  # Recursively convert elements in the dict
+        return __(**new_dict)
     elif isinstance(target, list):                                              # Recursively convert elements in the list
-        return [dict_to_obj(item, class_name=class_name) for item in target]
+        return [dict_to_obj(item) for item in target]
     elif isinstance(target, tuple):                                             # Recursively convert elements in the tuple
-        return tuple(dict_to_obj(item, class_name=class_name) for item in target)
+        return tuple(dict_to_obj(item) for item in target)
+    # elif hasattr(target, 'json'):                                             # todo: see if we need this. I don't like the idea of adding this extra hidden behaviour to this class
+    #     return dict_to_obj(target.json())
 
     return target
 

osbot_utils/version

@@ -1 +1 @@
-v1.58.0
+v1.60.0

{osbot_utils-1.58.0.dist-info → osbot_utils-1.60.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.58.0
+Version: 1.60.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -22,7 +22,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.58.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.60.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.58.0.dist-info → osbot_utils-1.60.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=xG3peP_hyuUYYi84zR6LhzmgoFYYLBbYwoIQb9XAmpQ,17905
+osbot_utils/base_classes/Type_Safe.py,sha256=SwgDhPKeC2jUWNmihUXwvDoXFhnZPOSrrsu1YnCyyx0,17961
 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
@@ -154,7 +154,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=m5j9OxR_xDgMh2z9u2FVQN_cQTQV_juJjbbNiNS8BuI,9645
+osbot_utils/helpers/flows/Flow.py,sha256=dvNzrOt3hY_MkYjvl4unW9KbANda9np2gB4R0KcEhws,10176
 osbot_utils/helpers/flows/Flow__Events.py,sha256=u9GzVNd08Hr49ZRIpoRDhwJnAHUFB-XzFzmNw-r3_Q0,2535
 osbot_utils/helpers/flows/Task.py,sha256=ifPm0aqUG4sWAUTaYwT7ig-7Y9JmG9YTiNyC3dOX5sw,4887
 osbot_utils/helpers/flows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -289,8 +289,8 @@ osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
 osbot_utils/utils/Json.py,sha256=7COxBlZRnpxtpNqpmzMPYkcKTnCok-s686nT27oiKEQ,6489
 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=nODZT6p44B4xYiIiqfEeKYEErQiKR9SGthhGtZWGhkI,16804
-osbot_utils/utils/Objects.py,sha256=60OFmwQZgqyfmOGS_WtD59-b0lB7rGhqWoh0tgkBKOc,17367
+osbot_utils/utils/Misc.py,sha256=RaAqJp5hgdp513S9odNAHb9ucoHnC53RbB9OevyhrWw,16881
+osbot_utils/utils/Objects.py,sha256=0XKssf_aGarfWI-2Gl-XXUb2tYglTfCBkiKa5zTF0O4,17498
 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
@@ -302,8 +302,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=3zcuCY19oU6Xohxuk7cSp-mCBuuGU7OwYkdC8RVRMgw,8
-osbot_utils-1.58.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.58.0.dist-info/METADATA,sha256=jOtdSqjuFy3-p5D93fRccvYUYdAyQuM3irMTOpltDhw,1266
-osbot_utils-1.58.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.58.0.dist-info/RECORD,,
+osbot_utils/version,sha256=Ar37hQxb9ss3OIUx_Aa9ls0fATVQiRMdEEWpUSlxr6I,8
+osbot_utils-1.60.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.60.0.dist-info/METADATA,sha256=QfHIdbIqSJtqYsGJ07E5myRgmUrEPIgBebNWpzI-7kY,1266
+osbot_utils-1.60.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.60.0.dist-info/RECORD,,