cobweb-launcher 1.2.58__tar.gz → 1.2.59__tar.gz

{cobweb-launcher-1.2.58/cobweb_launcher.egg-info → cobweb-launcher-1.2.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.2.58
+Version: 1.2.59
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.2.58 → cobweb-launcher-1.2.59}/cobweb/db/redis_db.py

@@ -4,7 +4,7 @@ from cobweb import setting
 from redis.exceptions import ConnectionError, TimeoutError
 
 
-class RedisClient:
+class RedisDB:
     def __init__(self, **kwargs):
         redis_config = kwargs or setting.REDIS_CONFIG
         self.host = redis_config['host']
@@ -147,4 +147,69 @@ class RedisClient:
 
     def execute_lua(self, lua_script: str, keys: list, *args):
         execute = self.execute_command("register_script", lua_script)
-        return execute(keys=keys, args=args)
+        return execute(keys=keys, args=args)
+
+    def lock(self, key, t=15) -> bool:
+        lua_script = """
+        local status = redis.call('setnx', KEYS[1], 1)
+        if ( status == 1 ) then
+            redis.call('expire', KEYS[1], ARGV[1])
+        end 
+        return status 
+        """
+        status = self.execute_lua(lua_script, [key], t)
+        return bool(status)
+
+    def members(self, key, score, start=0, count=5000, _min="-inf", _max="+inf") -> list:
+        lua_script = """
+        local min = ARGV[1]
+        local max = ARGV[2]
+        local start = ARGV[3]
+        local count = ARGV[4]
+        local score = ARGV[5]
+        local members = nil
+
+        if ( type(count) == string ) then
+            members = redis.call('zrangebyscore', KEYS[1], min, max, 'WITHSCORES')
+        else
+            members = redis.call('zrangebyscore', KEYS[1], min, max, 'WITHSCORES', 'limit', start, count)
+        end
+
+        local result = {}
+
+        for i = 1, #members, 2 do
+            local priority = nil
+            local member = members[i]
+            local originPriority = nil
+            if ( members[i+1] + 0 < 0 ) then
+                originPriority = math.ceil(members[i+1]) * 1000 - members[i+1] * 1000
+            else
+                originPriority = math.floor(members[i+1])
+            end
+
+            if ( score + 0 >= 1000 ) then
+                priority = -score - originPriority / 1000
+            elseif ( score + 0 == 0 ) then
+                priority = originPriority
+            else
+                originPriority = score 
+                priority = score
+            end
+            redis.call('zadd', KEYS[1], priority, member)
+            table.insert(result, member)
+            table.insert(result, originPriority)
+        end
+
+        return result
+        """
+        members = self.execute_lua(lua_script, [key], _min, _max, start, count, score)
+        return [(members[i].decode(), int(members[i + 1])) for i in range(0, len(members), 2)]
+
+    def done(self, keys: list, *args) -> list:
+        lua_script = """
+        for i, member in ipairs(ARGV) do
+            redis.call("zrem", KEYS[1], member)
+            redis.call("sadd", KEYS[2], member)
+        end
+        """
+        self.execute_lua(lua_script, keys, *args)

{cobweb-launcher-1.2.58 → cobweb-launcher-1.2.59}/cobweb/launchers/launcher_pro.py

@@ -1,7 +1,6 @@
 import time
 import threading
 
-from h5py.h5pl import insert
 
 from cobweb.db import RedisDB
 from cobweb.base import Seed, logger

{cobweb-launcher-1.2.58 → cobweb-launcher-1.2.59/cobweb_launcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.2.58
+Version: 1.2.59
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.2.58 → cobweb-launcher-1.2.59}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="cobweb-launcher",
-    version="1.2.58",
+    version="1.2.59",
     packages=find_packages(),
     url="https://github.com/Juannie-PP/cobweb",
     license="MIT",