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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.18.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.18.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.18.0 → osbot_utils-2.19.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.18.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.18.0 → osbot_utils-2.19.0}/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-2.18.0 → osbot_utils-2.19.0}/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-2.18.0 → osbot_utils-2.19.0}/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-2.19.0/osbot_utils/version

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

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

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

osbot_utils-2.18.0/osbot_utils/version

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