osbot-utils 2.17.0__py3-none-any.whl → 2.19.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/helpers/xml/rss/RSS__Feed__Parser.py

@@ -58,11 +58,12 @@ class RSS__Feed__Parser:
         # Process channel image if present
         if 'image' in channel_data:
             img_data = channel_data['image']
-            channel.image = RSS__Image( url     = img_data.get('url'       , '' ),
-                                        title   = img_data.get('title'     , '' ),
-                                        link    = img_data.get('link'      , '' ),
-                                        width   = int(img_data.get('width' , 0 )),
-                                        height  = int(img_data.get('height', 0 )))
+            if img_data:
+                channel.image = RSS__Image( url     = img_data.get('url'       , '' ),
+                                            title   = img_data.get('title'     , '' ),
+                                            link    = img_data.get('link'      , '' ),
+                                            width   = int(img_data.get('width' , 0 )),
+                                            height  = int(img_data.get('height', 0 )))
 
         known_channel_fields = {'title', 'link', 'description', 'language',         # Move non-standard channel elements to extensions
                                'lastBuildDate', 'image', 'item', 'updateFrequency', 'updatePeriod'}

osbot_utils/type_safe/Type_Safe__Set.py

@@ -29,4 +29,9 @@ class Type_Safe__Set(Type_Safe__Base, set):
                 result.append({k: v.json() if isinstance(v, Type_Safe) else v for k, v in item.items()})
             else:
                 result.append(item)
-        return result
+        return result
+
+    def __eq__(self, other):                                        # todo: see if this is needed
+        if isinstance(other, (set, Type_Safe__Set)):
+            return set(self) == set(other)
+        return False

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

@@ -1,3 +1,5 @@
+from typing import Any
+
 
 def bytes_to_json_loads(data):
     import json
@@ -21,6 +23,38 @@ def json_dumps(python_object, indent=4, pretty=True, sort_keys=False, default=st
 def json_dumps_to_bytes(*args, **kwargs):
     return json_dumps(*args, **kwargs).encode()
 
+def json__type_key(obj: Any) -> tuple:
+    if obj is None                        : return (0, None)
+    if isinstance(obj, bool)              : return (1, obj)
+    if isinstance(obj, int)               : return (2, obj)
+    if isinstance(obj, float)             : return (3, obj)
+    if isinstance(obj, str)               : return (4, obj)
+    if isinstance(obj, (list, set, tuple)): return (5, tuple(sorted(json__type_key(x) for x in obj)))
+    if isinstance(obj, dict)              : return (6, tuple(sorted((k, json__type_key(v)) for k,v in obj.items())))
+    return (7, str(obj))                                                               # Fallback for unknown types
+
+def json__equals__list_and_set(value_1: Any, value_2: Any) -> bool:
+    if isinstance(value_1, (list, set)) or isinstance(value_2, (list, set)):
+        list_1 = list(value_1)
+        list_2 = list(value_2)
+
+        if len(list_1) != len(list_2):                                                  # Quick length check
+            return False
+
+        sorted_1 = sorted(list_1, key=json__type_key)
+        sorted_2 = sorted(list_2, key=json__type_key)
+
+        return all(json__equals__list_and_set(a, b)
+                  for a, b in zip(sorted_1, sorted_2))
+
+    if isinstance(value_1, dict) and isinstance(value_2, dict):
+        if value_1.keys() != value_2.keys():                                            # Check keys match
+            return False
+        return all(json__equals__list_and_set(value_1[key], value_2[key])             # Recursively compare values
+                  for key in value_1.keys())
+
+    return value_1 == value_2
+
 def json_lines_file_load(target_path):
     from osbot_utils.utils.Files import file_lines
 

osbot_utils/version

@@ -1 +1 @@
-v2.17.0
+v2.19.0

{osbot_utils-2.17.0.dist-info → osbot_utils-2.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.17.0
+Version: 2.19.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.17.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.19.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.17.0.dist-info → osbot_utils-2.19.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
@@ -253,7 +253,7 @@ osbot_utils/helpers/xml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 osbot_utils/helpers/xml/rss/RSS__Channel.py,sha256=BpkP4OMV_H6usvXhdQ8ahJFxYbtwfkRuoP37_gcIP-A,605
 osbot_utils/helpers/xml/rss/RSS__Enclosure.py,sha256=9lUsIVJ4TkR_mBFDc6-ISMg7fPXe8FiKFSWjpnlWIMY,139
 osbot_utils/helpers/xml/rss/RSS__Feed.py,sha256=W4T2rmJoZr4kfOPSkZXkkKPnOk5bPlZfLzOf7pah9LQ,422
-osbot_utils/helpers/xml/rss/RSS__Feed__Parser.py,sha256=7sub6zcWqGz8FORXFYRyopTswboUkCU5uGEXAZ6BZDw,5380
+osbot_utils/helpers/xml/rss/RSS__Feed__Parser.py,sha256=1pFzZeN50bUNW-w7p9cDXiwezkqVyx9BvSS2bGXfnVc,5425
 osbot_utils/helpers/xml/rss/RSS__Image.py,sha256=13k8K03VTZbP0efeDL07oZF7Lg0CQccXBd1Qk965mHY,168
 osbot_utils/helpers/xml/rss/RSS__Item.py,sha256=K6YF3EVUu6E-_ISke98QXgnJlfOI5YAIO4pBzUZq7gE,608
 osbot_utils/testing/Catch.py,sha256=HdNoKnrPBjvVj87XYN-Wa1zpo5z3oByURT6TKbd5QpQ,2229
@@ -288,7 +288,7 @@ osbot_utils/type_safe/Type_Safe__Base.py,sha256=Bzrh8TxFglB0FEUAQTlgovlnFHnBN4lO
 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
-osbot_utils/type_safe/Type_Safe__Set.py,sha256=hNpAokK9nldwAXVDarJ3DXdf8sDrxog7GOMwciPLxg0,1216
+osbot_utils/type_safe/Type_Safe__Set.py,sha256=j12fc8cbd9-s_a13ysaz723rNEW4Dt6hObCd0S-AjIg,1432
 osbot_utils/type_safe/Type_Safe__Tuple.py,sha256=A7CuAy_Hz1iUMSojumReOG-OwPQqEO7MSiCHL2sJRKU,1709
 osbot_utils/type_safe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -306,7 +306,7 @@ osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 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=Ux9lXFAjr51etPpzG3J4phlTnY78_4iA-l0uphWTCEY,7183
+osbot_utils/utils/Json.py,sha256=TvfDoXwOkWzWH-9KMnme5C7iFsMZOleAeue92qmkH6g,8831
 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=ZHBqd_qW1PoBoW3OWG9plgM2aZqI6Nk0w_6jIgeVD8k,8
-osbot_utils-2.17.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.17.0.dist-info/METADATA,sha256=tErQvlAQMNNnFWmAWdtStwvyVOhF2kNJveDfuEPTWsI,1329
-osbot_utils-2.17.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-osbot_utils-2.17.0.dist-info/RECORD,,
+osbot_utils/version,sha256=hbeqtbi8RIMokGpKAmMqNAICgvpA3Y-S_xwhTeV3xe4,8
+osbot_utils-2.19.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.19.0.dist-info/METADATA,sha256=WYQTD91KhagCwgDDzjbB32ljZa4yP_UIZDz2UIthUZ4,1329
+osbot_utils-2.19.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+osbot_utils-2.19.0.dist-info/RECORD,,