redis-allocator 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

redis_allocator/_version.py

@@ -1 +1 @@
-__version__ = '0.3.1'
+__version__ = '0.3.3'

redis_allocator/allocator.py

@@ -97,7 +97,7 @@ class RedisAllocatableClass(ABC):
 
     def open(self):
         """Open the object."""
-        pass
+        return self
 
     def close(self):
         """close the object."""
@@ -162,6 +162,7 @@ class RedisAllocatorObject(Generic[U]):
         """Open the object."""
         if self.obj is not None:
             self.obj.open()
+        return self
 
     def close(self):
         """Kill the object."""
@@ -282,9 +283,11 @@ class RedisAllocatorPolicy(ABC):
 
     def check_health_once(self, r_obj: RedisAllocatorObject, duration: int = 3600) -> bool:
         """Check the health of the object."""
-        with contextlib.closing(r_obj):
+        with contextlib.closing(r_obj.open()):
             try:
                 if r_obj.is_healthy():
+                    if r_obj.allocator.shared:
+                        r_obj.allocator.unlock(r_obj.key)  # set the key as free
                     return True
                 else:
                     r_obj.set_unhealthy(duration)
@@ -550,6 +553,9 @@ class RedisAllocator(RedisLockPool, Generic[U]):
         """
         return f'''
         {super()._lua_required_string}
+        local function time()
+            return tonumber(redis.call("TIME")[1])
+        end
         local function pool_pointer_str(head)
             local pointer_type = 'head'
             if not head then
@@ -584,10 +590,10 @@ class RedisAllocator(RedisLockPool, Generic[U]):
             if timeout == nil or timeout <= 0 then
                 return -1
             end
-            return os.time() + timeout
+            return time() + timeout
         end
         local function is_expiry_invalid(expiry)
-            return expiry ~= nil and expiry > 0 and expiry <= os.time()
+            return expiry ~= nil and expiry > 0 and expiry <= time()
         end
         local function is_expired(value)
             local _, _, expiry = split_pool_value(value)

{redis_allocator-0.3.1.dist-info → redis_allocator-0.3.3.dist-info}/METADATA

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

{redis_allocator-0.3.1.dist-info → redis_allocator-0.3.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 redis_allocator/__init__.py,sha256=TVjUm-8YEu_MQD_PkfeIKiVknpCJBrUY9cWN1LlaZcU,1016
-redis_allocator/_version.py,sha256=TZkGuMIRSRmUY3XCIs5owt2o60vXyqYMHWIkhx65uYE,22
-redis_allocator/allocator.py,sha256=5JXqjH2PS5Pi_DJF9iq8b8AMWYQVSJp6SYsm4-eZ0s0,47033
+redis_allocator/_version.py,sha256=on4Bj4mGEjEjyUkQExxprhOoEopcv_sPapsEnNxyelE,22
+redis_allocator/allocator.py,sha256=oFJSRAhFJsBbeho5TibY81_3Vy07glrAuEhpIOYfeJI,47282
 redis_allocator/lock.py,sha256=fqf6WUWHKYenEArWopMIF6kWEnDfADC-bZvnQImsQVo,27400
 redis_allocator/task_queue.py,sha256=8DjNr2uxhzCsHatV_CHOeGh7_K9pqQZFApSbe2blRO0,14989
-redis_allocator-0.3.1.dist-info/licenses/LICENSE,sha256=Wt4X1rHpffQfEiyWcDUx8BMLjXxfPqaiYZ7Lgsj7L4c,1068
+redis_allocator-0.3.3.dist-info/licenses/LICENSE,sha256=Wt4X1rHpffQfEiyWcDUx8BMLjXxfPqaiYZ7Lgsj7L4c,1068
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=cXvJZDTUqWKaxAZfE7GWUk_cixTpMRKJd420j3vZSVs,4191
+tests/conftest.py,sha256=Ts82uylQSzP_GcaN0E02o3xcFdjw20cXNzh3RAdYKW4,3967
 tests/test_allocator.py,sha256=hFKgLe_yONtEjjm6zssUnhK0tzihG_1xZMziztHmqqA,22404
 tests/test_lock.py,sha256=MDMRNN46VhWqkHUIhYOMEDgZkFFCW_WjwRLTOjkFF-Q,46952
 tests/test_task_queue.py,sha256=Fh5naikFajfOvL6GngEy_TPfOYCYZolZfVwtR6T4dTY,31710
-redis_allocator-0.3.1.dist-info/METADATA,sha256=AGGUZXrJ8PPTrU2PftdpHHv8M1vCF1GQbstKD7ozcmo,21653
-redis_allocator-0.3.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-redis_allocator-0.3.1.dist-info/top_level.txt,sha256=0hXzU7sK5FCeSolTEYxThOt3HOybnwaXv1FLRJvHVgI,22
-redis_allocator-0.3.1.dist-info/RECORD,,
+redis_allocator-0.3.3.dist-info/METADATA,sha256=oEPcsqP1oiKP_HaZgIgfEEqIxuY6c9aoapC5ecLrP8w,21653
+redis_allocator-0.3.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+redis_allocator-0.3.3.dist-info/top_level.txt,sha256=0hXzU7sK5FCeSolTEYxThOt3HOybnwaXv1FLRJvHVgI,22
+redis_allocator-0.3.3.dist-info/RECORD,,

tests/conftest.py

@@ -66,6 +66,7 @@ class _TestObject(RedisAllocatableClass):
     def open(self):
         """Open the object."""
         self.closed = False
+        return self
 
     def close(self):
         """Mark the object as closed."""
@@ -127,16 +128,6 @@ def test_updater() -> _TestUpdater:
     return _TestUpdater([["key1", "key2"], ["key4", "key5", "key6"], ["key7", "key8", "key9"]])
 
 
-class _TestRedisAllocator(RedisAllocator):
-
-    @property
-    def _lua_required_string(self):
-        return f'''
-        os.time = function() return tonumber(redis.call("TIME")[1]) end
-        {super()._lua_required_string}
-        '''
-
-
 @pytest.fixture(params=[False, True])
 def allocator_with_policy(redis_client: Redis, test_updater: _TestUpdater, request: pytest.FixtureRequest) -> RedisAllocator:
     """Create a RedisAllocator with a default policy."""
@@ -147,7 +138,7 @@ def allocator_with_policy(redis_client: Redis, test_updater: _TestUpdater, reque
         updater=test_updater
     )
 
-    alloc = _TestRedisAllocator(
+    alloc = RedisAllocator(
         redis_client,
         'test-policy',
         'alloc-lock',