Merge dev into main

Author: DinisCruz

README.md

@@ -1,6 +1,6 @@
 # OSBot-Utils
 
-![Current Release](https://img.shields.io/badge/release-v3.49.0-blue)
+![Current Release](https://img.shields.io/badge/release-v3.49.1-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/helpers/cache_on_self/Cache_On_Self.py

@@ -37,10 +37,11 @@ def handle_call(self, args: tuple, kwargs: dict) -> Any:
             return self.execute(args, kwargs)
 
         if not kwargs and len(args) == 1:                                           # Fast path for common case: no kwargs, single arg (self)
-            target_self = args[0]
-            cache_key   = self.no_args_key
-
-            if self.cache_storage.has_cached_value(target_self, cache_key):         # Use cache_storage
+            target_self   = args[0]
+            cache_key     = self.no_args_key
+            if self.reload_next:
+                self.reload_next = False
+            elif self.cache_storage.has_cached_value(target_self, cache_key):       # Use cache_storage
                 self.metrics.hits += 1                                              # Increment cache Hit
                 return self.cache_storage.get_cached_value(target_self, cache_key)  # Use cache_storage
 

osbot_utils/version

@@ -1 +1 @@
-v3.49.0
+v3.49.1

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v3.49.0"
+version     = "v3.49.1"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <[email protected]>"]
 license     = "MIT"

tests/unit/helpers/cache_on_self/test_Cache_Controller.py

@@ -1,4 +1,4 @@
-from unittest                                             import TestCase
+from unittest                                            import TestCase
 from osbot_utils.helpers.cache_on_self.Cache_Controller  import Cache_Controller
 from osbot_utils.testing.Catch                           import Catch
 

tests/unit/helpers/cache_on_self/test__bugs__cache_on_self.py

@@ -29,38 +29,4 @@ def method(self, value):
         gc.collect()
         assert len(cache_manager.cache_storage.cache_data) == 1             # BUG: reference is still there
 
-    def test__bug__reload_next_flag_isolation_between_instances(self):
-        """Test that reload_next flag is properly isolated between instances"""
-        class Reload_Flag_Class:
-            def __init__(self, name):
-                self.name = name
-                self.call_count = 0
-
-            @cache_on_self
-            def method(self):
-                self.call_count += 1
-                return f"{self.name} call {self.call_count}"
-
-        obj1 = Reload_Flag_Class("obj1")
-        obj2 = Reload_Flag_Class("obj2")
-
-        # Initial calls
-        assert obj1.method() == "obj1 call 1"
-        assert obj2.method() == "obj2 call 1"
-
-        # Set reload_next on obj1's cache manager
-        cache1 = obj1.method(__return__='cache_on_self')
-        cache2 = obj2.method(__return__='cache_on_self')
-
-        cache1.reload_next = True
-
-        # Verify isolation - obj2 uses cache, obj1 reloads
-        assert obj2.method() == "obj2 call 1"   # Cache hit - correct!
-        assert obj1.method() != "obj1 call 2"   # Reload triggered          # BUG should be equal
-        assert obj1.method() == "obj1 call 1"   # Reload triggered
-
-
-        # Verify flags
-        assert cache1.reload_next is True  # Reset after use            # BUG should be False
-        assert cache2.reload_next is False  # Reset after use
 

tests/unit/helpers/cache_on_self/test__regression__cache_on_self.py

@@ -543,4 +543,42 @@ def get_sensitive_data(self, resource_id):
         # 2. Access the shared cache storage that contains admin's cached data
         for instance, cache_dict in cache_mgr.cache_storage.cache_data.items():
             assert instance.user_token       ==  'user_token'
-            assert list(cache_dict.values()) == ['Access denied for secret_file']
+            assert list(cache_dict.values()) == ['Access denied for secret_file']
+
+
+    def test__regression__reload_next_flag_isolation_between_instances(self):       # Test that reload_next flag is properly isolated between instances
+        class Reload_Flag_Class:
+            def __init__(self, name):
+                self.name = name
+                self.call_count = 0
+
+            @cache_on_self
+            def method(self):
+                self.call_count += 1
+                return f"{self.name} call {self.call_count}"
+
+        obj1 = Reload_Flag_Class("obj1")
+        obj2 = Reload_Flag_Class("obj2")
+
+        # Initial calls
+        assert obj1.method() == "obj1 call 1"
+        assert obj2.method() == "obj2 call 1"
+
+        # Set reload_next on obj1's cache manager
+        cache1 = obj1.method(__return__='cache_on_self')
+        cache2 = obj2.method(__return__='cache_on_self')
+
+        cache1.reload_next = True
+
+        # Verify isolation - obj2 uses cache, obj1 reloads
+        assert obj2.method() == "obj2 call 1"   # Cache hit - correct!
+        #assert obj1.method() != "obj1 call 2"   # Reload triggered         # BUG should be "obj1 call 2"
+        assert obj1.method() == "obj1 call 2"   # Reload triggered          # FIXED
+        #assert obj1.method() == "obj1 call 1"   # Reload triggered         # BUG should be "obj1 call 2"
+        assert obj1.method() == "obj1 call 2"   # Reload triggered         # FIXED
+
+
+        # Verify flags
+        #assert cache1.reload_next is True  # Reset after use            # BUG should be False
+        assert cache1.reload_next is False  # Reset after use            # FIXED
+        assert cache2.reload_next is False  # Reset after use