redis-allocator 0.5.1__tar.gz → 0.6.0__tar.gz

{redis_allocator-0.5.1/redis_allocator.egg-info → redis_allocator-0.6.0}/PKG-INFO

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

{redis_allocator-0.5.1 → redis_allocator-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.5.1"
+version = "0.6.0"
 tag_format = "v$version"
 
 [tool.commitizen.version_files]

redis_allocator-0.6.0/redis_allocator/_version.py

@@ -0,0 +1 @@
+__version__ = '0.6.0'

{redis_allocator-0.5.1 → redis_allocator-0.6.0}/redis_allocator/allocator.py

@@ -17,17 +17,16 @@ Key features:
 4. Support for an updater to refresh the pool's keys periodically
 5. Policy-based control of allocation behavior through RedisAllocatorPolicy
 """
+import random
 import atexit
 import logging
 import weakref
 import contextlib
 from abc import ABC, abstractmethod
-from typing import Any, Callable
+from typing import Any, Callable, Optional, TypeVar, Generic, Sequence, Iterable
 from functools import cached_property
 from threading import current_thread
 from concurrent.futures import ThreadPoolExecutor
-from typing import (Optional, TypeVar, Generic,
-                    Sequence, Iterable)
 from redis import StrictRedis as Redis
 from cachetools import cached, TTLCache
 from .lock import RedisLockPool, Timeout
@@ -412,8 +411,7 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy[U]):
 
     def refresh_pool_all(self, allocator: 'RedisAllocator[U]'):
         allocator.clear()
-        for _ in range(self.updater.params):
-            self.refresh_pool(allocator)
+        self.refresh_pool(allocator, n=len(self.updater.params))
 
     def malloc(self, allocator: 'RedisAllocator[U]', timeout: Timeout = 120,
                obj: Optional[U] = None, params: Optional[dict] = None,
@@ -469,7 +467,7 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy[U]):
             # If we got here, we acquired the lock, so we can update the pool
             self.refresh_pool(allocator)
 
-    def refresh_pool(self, allocator: 'RedisAllocator[U]'):
+    def refresh_pool(self, allocator: 'RedisAllocator[U]', shuffle=True, n=1):
         """Refresh the allocation pool using the updater.
 
         Args:
@@ -478,12 +476,17 @@ class DefaultRedisAllocatorPolicy(RedisAllocatorPolicy[U]):
         if self.updater is None:
             return
 
-        keys = self.updater()
+        keys = []
+        for _ in range(n):
+            keys.extend(self.updater())
 
         if len(keys) == 0:
             logger.warning("No keys to update to the pool")
             return
 
+        if shuffle:
+            random.shuffle(keys)
+
         # Update the pool based on the number of keys
         if len(self.updater) == 1:
             allocator.assign(keys, timeout=self.expiry_duration)

{redis_allocator-0.5.1 → redis_allocator-0.6.0}/redis_allocator/lock.py

@@ -62,7 +62,6 @@ class BaseLock(ABC):
         Returns:
             The current status of the key.
         """
-        pass
 
     @abstractmethod
     def update(self, key: str, value='1', timeout: Timeout = 120):
@@ -73,7 +72,6 @@ class BaseLock(ABC):
             value: The value to set for the key.
             timeout: The lock timeout in seconds.
         """
-        pass
 
     @abstractmethod
     def lock(self, key: str, value: str = '1', timeout: Timeout = 120) -> bool:
@@ -87,7 +85,6 @@ class BaseLock(ABC):
         Returns:
             True if the ownership of the key is successfully acquired, False otherwise.
         """
-        pass
 
     @abstractmethod
     def is_locked(self, key: str) -> bool:
@@ -99,7 +96,6 @@ class BaseLock(ABC):
         Returns:
             True if the key is locked, False otherwise.
         """
-        pass
 
     @abstractmethod
     def lock_value(self, key: str) -> Optional[str]:
@@ -111,7 +107,6 @@ class BaseLock(ABC):
         Returns:
             The value of the key if the key is locked, None otherwise.
         """
-        pass
 
     @abstractmethod
     def rlock(self, key: str, value: str = '1', timeout=120) -> bool:
@@ -127,7 +122,6 @@ class BaseLock(ABC):
         Returns:
             True if the ownership of the key is successfully acquired, False otherwise.
         """
-        pass
 
     @abstractmethod
     def unlock(self, key: str) -> bool:
@@ -139,7 +133,6 @@ class BaseLock(ABC):
         Returns:
             True if the key is successfully released, False if the key is not locked.
         """
-        pass
 
     @abstractmethod
     def _conditional_setdel(self, op: str, key: str, value: float, set_value: Optional[float] = None,
@@ -157,7 +150,6 @@ class BaseLock(ABC):
         Returns:
             Whether the operation was successful.
         """
-        pass
 
     def setgt(self, key: str, value: float, set_value: Optional[float] = None, ex: Optional[int] = None) -> bool:
         """Sets a new value when the comparison value is greater than the current value."""
@@ -229,32 +221,26 @@ class BaseLockPool(BaseLock, metaclass=ABCMeta):
     @abstractmethod
     def extend(self, keys: Optional[Sequence[str]] = None):
         """Extend the pool with the specified keys."""
-        pass
 
     @abstractmethod
     def shrink(self, keys: Sequence[str]):
         """Shrink the pool by removing the specified keys."""
-        pass
 
     @abstractmethod
     def assign(self, keys: Optional[Sequence[str]] = None):
         """Assign keys to the pool, replacing any existing keys."""
-        pass
 
     @abstractmethod
     def clear(self):
         """Empty the pool."""
-        pass
 
     @abstractmethod
     def keys(self) -> Iterable[str]:
         """Get the keys in the pool."""
-        pass
 
     @abstractmethod
     def _get_key_lock_status(self, keys: Iterable[str]) -> Iterable[bool]:
         """Get the lock status of the specified keys."""
-        pass
 
     def values_lock_status(self) -> Iterable[bool]:
         """Get the lock status of all keys in the pool."""

{redis_allocator-0.5.1 → redis_allocator-0.6.0/redis_allocator.egg-info}/PKG-INFO

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

{redis_allocator-0.5.1 → redis_allocator-0.6.0}/tests/test_allocator.py

@@ -434,7 +434,7 @@ class TestRedisAllocator:
             allocator_with_policy.gc()  # some times should be called twice to remove the expired items
             redis_client.register_script("print('-------------------------------')")()
             print(self.get_redis_pool_state(allocator_with_policy, redis_client))
-            allocator_with_policy.policy.refresh_pool(allocator_with_policy)
+            allocator_with_policy.policy.refresh_pool(allocator_with_policy, shuffle=False)
             assert len(allocator_with_policy) == 4
             allocator_with_policy.gc()
             assert self.get_redis_pool_state(allocator_with_policy, redis_client) == self.generate_pool_state(

redis_allocator-0.5.1/redis_allocator/_version.py

@@ -1 +0,0 @@
-__version__ = '0.5.1'