osbot-utils 2.83.0__py3-none-any.whl → 2.84.0__py3-none-any.whl

osbot_utils/testing/__.py

@@ -0,0 +1,76 @@
+from types import SimpleNamespace
+
+__SKIP__    = object()
+__MISSING__ = object()
+
+class __(SimpleNamespace):
+    def __enter__(self)                          : return self
+    def __exit__(self, exc_type, exc_val, exc_tb): return False
+
+    def __contains__(self, item):                                                           # Allow 'subset in superset' syntax
+        return self.contains(item)
+
+    def __eq__(self, other):                                                                # Enhanced equality that handles SKIP markers for dynamic values
+        if not isinstance(other, __):
+            return super().__eq__(other)
+
+        for key in set(self.__dict__.keys()) | set(other.__dict__.keys()):
+            self_val = getattr(self, key, None)
+            other_val = getattr(other, key, None)
+
+            if self_val is __SKIP__ or other_val is __SKIP__:                              # Skip comparison if either value is a skip marker
+                continue
+
+            if isinstance(self_val, __) and isinstance(other_val, __):                      # Handle nested __ objects recursively
+                if self_val.__eq__(other_val) is False:                                     # Explicit recursive comparison
+                    return False
+            elif self_val != other_val:
+                return False
+        return True
+
+    def contains(self, other):
+        other_dict = getattr(other, '__dict__', other) if hasattr(other, '__dict__') else other if isinstance(other, dict) else None
+        if other_dict is None:
+            return False
+
+        for key, expected_value in other_dict.items():
+            if expected_value is __SKIP__:                                                  # Skip this field
+                continue
+            if not hasattr(self, key):
+                return False
+            actual_value = getattr(self, key)
+
+            if isinstance(expected_value, __) and isinstance(actual_value, __):
+                if not actual_value.contains(expected_value):
+                    return False
+            elif actual_value != expected_value:
+                return False
+        return True
+
+    def diff(self, other):                  # Return differences between objects for better test failure messages
+        differences = {}
+        all_keys = set(self.__dict__.keys()) | set(other.__dict__.keys() if hasattr(other, '__dict__') else other.keys() if isinstance(other, dict) else [])
+
+        for key in all_keys:
+            self_val = getattr(self, key, __MISSING__)
+            other_val = getattr(other, key, __MISSING__) if hasattr(other, '__dict__') else other.get(key, __MISSING__) if isinstance(other, dict) else __MISSING__
+
+            if self_val != other_val:
+                differences[key] = {'actual': self_val, 'expected': other_val}
+
+        return differences if differences else None
+
+    def excluding(self, *fields):           # Return copy without specified fields for comparison"
+        result = __(**self.__dict__)
+        for field in fields:
+            delattr(result, field) if hasattr(result, field) else None
+        return result
+
+    def merge(self, **updates): # Create new instance with updates, handling nested __ objects
+        result = __(**self.__dict__)
+        for key, value in updates.items():
+            if isinstance(value, __) and hasattr(result, key) and isinstance(getattr(result, key), __):
+                setattr(result, key, getattr(result, key).merge(**value.__dict__))
+            else:
+                setattr(result, key, value)
+        return result

osbot_utils/utils/Objects.py

@@ -1,10 +1,6 @@
-# todo add tests
-from types  import SimpleNamespace
+from types import SimpleNamespace
 
-class __(SimpleNamespace):
-
-    def __enter__(self)                          : return self
-    def __exit__(self, exc_type, exc_val, exc_tb): return False
+from osbot_utils.testing.__ import __
 
 def base_classes(cls):
     if type(cls) is type:

osbot_utils/version

@@ -1 +1 @@
-v2.83.0
+v2.84.0

{osbot_utils-2.83.0.dist-info → osbot_utils-2.84.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.83.0
+Version: 2.84.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -21,7 +21,7 @@ Description-Content-Type: text/markdown
 
 # OSBot-Utils
 
-![Current Release](https://img.shields.io/badge/release-v2.83.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.84.0-blue)
 ![Python](https://img.shields.io/badge/python-3.8+-green)
 ![Type-Safe](https://img.shields.io/badge/Type--Safe-✓-brightgreen)
 ![Caching](https://img.shields.io/badge/Caching-Built--In-orange)

{osbot_utils-2.83.0.dist-info → osbot_utils-2.84.0.dist-info}/RECORD

@@ -340,6 +340,7 @@ osbot_utils/testing/Temp_Zip.py,sha256=gppbJchk4tw_bu-7Vt6iJS9mGxeCvNNMMDzeVKHqR
 osbot_utils/testing/Temp_Zip_In_Memory.py,sha256=ibDIWt3K4CX558PbkLbX3InHyWYZcwQwajFm1kAPW5U,3284
 osbot_utils/testing/Unit_Test.py,sha256=MReR_wDGbbXFDPz7cmuGflcTxRB6TBnO9mYqRpSq8Pk,1304
 osbot_utils/testing/Unzip_File.py,sha256=V5H97XO9rlvG5EYOSzAH4kTtAH1ohZ8R8ImvJh46ZNg,1177
+osbot_utils/testing/__.py,sha256=7eKP4vgV7pPbk5bSSufdvAEXy2eYh5bq36Ez8eC2SoQ,3579
 osbot_utils/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/testing/performance/Performance_Measure__Session.py,sha256=CWce0vJAZH_PDbIgK5bNcNFr1qsB37FQJKd05K-63kk,9108
 osbot_utils/testing/performance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -457,7 +458,7 @@ osbot_utils/utils/Json.py,sha256=TvfDoXwOkWzWH-9KMnme5C7iFsMZOleAeue92qmkH6g,883
 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
-osbot_utils/utils/Objects.py,sha256=iyQ6RojK87iQRoGbh1twNHHy7wSrAro_l4jduly9Do0,13706
+osbot_utils/utils/Objects.py,sha256=ZgAwAI8DM8MhFe37WAr2Di5f9-ig3hgayMEinLCF5tc,13571
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
 osbot_utils/utils/Python_Logger.py,sha256=M9Oi62LxfnRSlCN8GhaiwiBINvcSdGy39FCWjyDD-Xg,12792
@@ -469,8 +470,8 @@ osbot_utils/utils/Toml.py,sha256=grjWkVPIMVkawJ499FVIJKxQp8FJ2wcsd0Z3YIR4drM,114
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=mG42lgTY0tnm14T3P1-DSAIZKkTiYoO3odZ1aOUdc1I,14394
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=qwiNjSxD3OqsUSFY0ezoeNZIUfvD-vn0S4zNzFmoc50,8
-osbot_utils-2.83.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.83.0.dist-info/METADATA,sha256=sKYHVqnqbtD8rlM8ZOCZTXN5ddMjIOM1TtneLGfAlcg,7918
-osbot_utils-2.83.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-osbot_utils-2.83.0.dist-info/RECORD,,
+osbot_utils/version,sha256=ESwW1ZvlyVyIbR4QPkYcAvo5MLsWHFvHuLuDhW9Qi6I,8
+osbot_utils-2.84.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.84.0.dist-info/METADATA,sha256=CnE2-oGdX31QV4nRgKaiaHUOf9aG7xZrh-8Rz_vHutk,7918
+osbot_utils-2.84.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+osbot_utils-2.84.0.dist-info/RECORD,,