redis-allocator 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

redis_allocator/_version.py

@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.4.2'

redis_allocator/allocator.py

@@ -199,6 +199,8 @@ class RedisAllocatorObject(Generic[U]):
             self.key = new_obj.key
             self.params = new_obj.params
             self.open()
+        elif self.obj is not None:
+            logger.error("Failed to refresh the object %s", self.key)
 
     def refresh_until_healthy(self, timeout: Timeout = 120, max_attempts: int = 10, lock_duration: Timeout = 3600, cache_timeout: Timeout = 3600):
         """Refresh the object until it is healthy."""
@@ -226,9 +228,9 @@ class RedisAllocatorObject(Generic[U]):
             return None
         return self.obj.name
 
-    def __del__(self):
-        """Delete the object."""
-        self.close()
+    # def __del__(self):
+    #     """Delete the object."""
+    #     self.close()
 
 
 class RedisAllocatorUpdater:
@@ -257,14 +259,14 @@ class RedisAllocatorUpdater:
         return len(self.params)
 
 
-class RedisAllocatorPolicy(ABC):
+class RedisAllocatorPolicy(ABC, Generic[U]):
     """Abstract base class for Redis allocator policies.
 
     This class defines the interface for allocation policies that can be used
     with RedisAllocator to control allocation behavior.
     """
 
-    def initialize(self, allocator: 'RedisAllocator'):
+    def initialize(self, allocator: 'RedisAllocator[U]'):
         """Initialize the policy with an allocator instance.
 
         Args:
@@ -273,9 +275,9 @@ class RedisAllocatorPolicy(ABC):
         pass
 
     @abstractmethod
-    def malloc(self, allocator: 'RedisAllocator', timeout: Timeout = 120,
-               obj: Optional[Any] = None, params: Optional[dict] = None,
-               cache_timeout: Timeout = 3600) -> Optional[RedisAllocatorObject]:
+    def malloc(self, allocator: 'RedisAllocator[U]', timeout: Timeout = 120,
+               obj: Optional[U] = None, params: Optional[dict] = None,
+               cache_timeout: Timeout = 3600) -> Optional[RedisAllocatorObject[U]]:
         """Allocate a resource according to the policy.
 
         Args:
@@ -292,7 +294,7 @@ class RedisAllocatorPolicy(ABC):
         pass
 
     @abstractmethod
-    def refresh_pool(self, allocator: 'RedisAllocator'):
+    def refresh_pool(self, allocator: 'RedisAllocator[U]'):
         """Refresh the allocation pool.
 
         This method is called periodically to update the pool with new resources.
@@ -302,7 +304,7 @@ class RedisAllocatorPolicy(ABC):
         """
         pass
 
-    def check_health_once(self, r_obj: RedisAllocatorObject, duration: int = 3600) -> bool:
+    def check_health_once(self, r_obj: RedisAllocatorObject[U], duration: int = 3600) -> bool:
         """Check the health of the object."""
         with contextlib.closing(r_obj.open()):
             try:
@@ -318,8 +320,8 @@ class RedisAllocatorPolicy(ABC):
                 r_obj.set_unhealthy(duration)
                 raise
 
-    def check_health(self, allocator: 'RedisAllocator', lock_duration: Timeout = 3600, max_threads: int = 8,
-                     obj_fn: Optional[Callable[[str], Any]] = None,
+    def check_health(self, allocator: 'RedisAllocator[U]', lock_duration: Timeout = 3600, max_threads: int = 8,
+                     obj_fn: Optional[Callable[[str], U]] = None,
                      params_fn: Optional[Callable[[str], dict]] = None) -> tuple[int, int]:
         """Check the health of the allocator.
 
@@ -349,7 +351,7 @@ class RedisAllocatorPolicy(ABC):
             return healthy, unhealthy
 
 
-class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy):
+class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy[U]):
     """Default implementation of RedisAllocatorPolicy.
 
     This policy provides the following features:
@@ -393,7 +395,7 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy):
         self.objects: weakref.WeakValueDictionary[str, RedisAllocatorObject] = weakref.WeakValueDictionary()
         self.auto_close = auto_close
 
-    def initialize(self, allocator: 'RedisAllocator'):
+    def initialize(self, allocator: 'RedisAllocator[U]'):
         """Initialize the policy with an allocator instance.
 
         Args:
@@ -403,9 +405,9 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy):
         self._update_lock_key = f"{allocator._pool_str()}|policy_update_lock"
         atexit.register(lambda: self.finalize(self._allocator()))
 
-    def malloc(self, allocator: 'RedisAllocator', timeout: Timeout = 120,
-               obj: Optional[Any] = None, params: Optional[dict] = None,
-               cache_timeout: Timeout = 3600) -> Optional[RedisAllocatorObject]:
+    def malloc(self, allocator: 'RedisAllocator[U]', timeout: Timeout = 120,
+               obj: Optional[U] = None, params: Optional[dict] = None,
+               cache_timeout: Timeout = 3600) -> Optional[RedisAllocatorObject[U]]:
         """Allocate a resource according to the policy.
 
         This implementation:
@@ -445,7 +447,7 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy):
         return alloc_obj
 
     @cached(TTLCache(maxsize=64, ttl=5))
-    def _try_refresh_pool(self, allocator: 'RedisAllocator'):
+    def _try_refresh_pool(self, allocator: 'RedisAllocator[U]'):
         """Try to refresh the pool if necessary and if we can acquire the lock.
 
         Args:
@@ -457,7 +459,7 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy):
             # If we got here, we acquired the lock, so we can update the pool
             self.refresh_pool(allocator)
 
-    def refresh_pool(self, allocator: 'RedisAllocator'):
+    def refresh_pool(self, allocator: 'RedisAllocator[U]'):
         """Refresh the allocation pool using the updater.
 
         Args:
@@ -478,7 +480,7 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy):
         else:
             allocator.extend(keys, timeout=self.expiry_duration)
 
-    def finalize(self, allocator: 'RedisAllocator'):
+    def finalize(self, allocator: 'RedisAllocator[U]'):
         """Finalize the policy."""
         for obj in self.objects.values():
             obj.close()
@@ -521,7 +523,7 @@ class RedisAllocator(RedisLockPool, Generic[U]):
     """
 
     def __init__(self, redis: Redis, prefix: str, suffix='allocator', eps=1e-6,
-                 shared=False, policy: Optional[RedisAllocatorPolicy] = None):
+                 shared=False, policy: Optional[RedisAllocatorPolicy[U]] = None):
         """Initializes the RedisAllocator.
 
         Args:

{redis_allocator-0.4.0.dist-info → redis_allocator-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redis-allocator
-Version: 0.4.0
+Version: 0.4.2
 Summary: Redis-based resource allocation system.
 Home-page: https://github.com/invoker-bot/RedisAllocator-python
 Author: Invoker Bot

{redis_allocator-0.4.0.dist-info → redis_allocator-0.4.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
 redis_allocator/__init__.py,sha256=TVjUm-8YEu_MQD_PkfeIKiVknpCJBrUY9cWN1LlaZcU,1016
-redis_allocator/_version.py,sha256=2eiWQI55fd-roDdkt4Hvl9WzrTJ4xQo33VzFud6D03U,22
-redis_allocator/allocator.py,sha256=Bo4Ck7mqg-Z8KdQH-iqeHfdEbyhMqBD0c2g5T3E5sBU,48730
+redis_allocator/_version.py,sha256=zrcTwxP3SA3F1Js78afrfeaZeJr8w2hLtFtEZoUqUmg,22
+redis_allocator/allocator.py,sha256=RL1opmUfi5OFDmCe43O_aK--st0Wfi55t4rK7YzT2S4,48889
 redis_allocator/lock.py,sha256=fqf6WUWHKYenEArWopMIF6kWEnDfADC-bZvnQImsQVo,27400
 redis_allocator/task_queue.py,sha256=8DjNr2uxhzCsHatV_CHOeGh7_K9pqQZFApSbe2blRO0,14989
-redis_allocator-0.4.0.dist-info/licenses/LICENSE,sha256=Wt4X1rHpffQfEiyWcDUx8BMLjXxfPqaiYZ7Lgsj7L4c,1068
+redis_allocator-0.4.2.dist-info/licenses/LICENSE,sha256=Wt4X1rHpffQfEiyWcDUx8BMLjXxfPqaiYZ7Lgsj7L4c,1068
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=Ts82uylQSzP_GcaN0E02o3xcFdjw20cXNzh3RAdYKW4,3967
-tests/test_allocator.py,sha256=hFKgLe_yONtEjjm6zssUnhK0tzihG_1xZMziztHmqqA,22404
+tests/test_allocator.py,sha256=_aoSDkzyjiUyzw6WoO2bMV1Ow9ymLOOMSJrp7TENU70,22139
 tests/test_lock.py,sha256=MDMRNN46VhWqkHUIhYOMEDgZkFFCW_WjwRLTOjkFF-Q,46952
 tests/test_task_queue.py,sha256=Fh5naikFajfOvL6GngEy_TPfOYCYZolZfVwtR6T4dTY,31710
-redis_allocator-0.4.0.dist-info/METADATA,sha256=rXeA3Nsb6eie8H5G10HXLlLI8jCRs45I1C06seN-Sgs,21727
-redis_allocator-0.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-redis_allocator-0.4.0.dist-info/top_level.txt,sha256=0hXzU7sK5FCeSolTEYxThOt3HOybnwaXv1FLRJvHVgI,22
-redis_allocator-0.4.0.dist-info/RECORD,,
+redis_allocator-0.4.2.dist-info/METADATA,sha256=2i_PpL_MD-TCX1yVddl9YObBPtatBrRQQNYImBAeB5M,21727
+redis_allocator-0.4.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+redis_allocator-0.4.2.dist-info/top_level.txt,sha256=0hXzU7sK5FCeSolTEYxThOt3HOybnwaXv1FLRJvHVgI,22
+redis_allocator-0.4.2.dist-info/RECORD,,

tests/test_allocator.py

@@ -214,13 +214,8 @@ class TestRedisAllocatorObject:
         obj.close()
         assert test_object.closed
         obj.close()  # Should not raise
-
-    def test_del(self, redis_allocator: RedisAllocator, test_object: _TestObject, mocker: MockFixture):
-        """Test the __del__ method."""
-        obj = RedisAllocatorObject(redis_allocator, "test_key", test_object, {})
-        obj.close = mocker.MagicMock()
-        obj.__del__()
-        obj.close.assert_called_once()
+        obj.refresh()
+        assert not test_object.closed
 
 
 class TestRedisAllocator: