RedisServer-Queue 0.0.3__tar.gz → 0.0.5__tar.gz

{redisserver_queue-0.0.3 → redisserver_queue-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: RedisServer-Queue
-Version: 0.0.3
+Version: 0.0.5
 Summary: RedisServer-Queue is a simple redis server
 Author-email: NelsonLongXiang <1169207670@qq.com>
 Project-URL: Homepage, https://github.com/NelsonLongxiang/RedisServer
@@ -13,3 +13,26 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 
 RedisServer-Queue is a simple redis server
+
+## Installation
+
+```bash
+pip install -i https://pypi.org/simple RedisServer-Queue
+```
+
+```commandline
+pip install --upgrade -i https://pypi.org/simple RedisServer-Queue
+```
+
+## Usage
+
+#### 请参考test目录下test.py文件
+
+## License
+
+[MIT](https://choosealicense.com/licenses/mit/)
+
+### 作者联系方式
+
+1. 作者邮箱：`1169207670@qq.com`
+2. Wechat: `1169207670`

redisserver_queue-0.0.5/README.md

@@ -0,0 +1,24 @@
+RedisServer-Queue is a simple redis server
+
+## Installation
+
+```bash
+pip install -i https://pypi.org/simple RedisServer-Queue
+```
+
+```commandline
+pip install --upgrade -i https://pypi.org/simple RedisServer-Queue
+```
+
+## Usage
+
+#### 请参考test目录下test.py文件
+
+## License
+
+[MIT](https://choosealicense.com/licenses/mit/)
+
+### 作者联系方式
+
+1. 作者邮箱：`1169207670@qq.com`
+2. Wechat: `1169207670`

{redisserver_queue-0.0.3 → redisserver_queue-0.0.5}/RedisServer_Queue/RedisServer.py

@@ -9,52 +9,30 @@ import os
 import sys
 import time
 import uuid
-
 import redis
 
-# 将当前文件夹添加到环境变量
-if os.path.basename(__file__) in ['run.py', 'main.py', '__main__.py']:
-    if '.py' in __file__:
-        sys.path.append(os.path.abspath(os.path.dirname(__file__)))
-    else:
-        sys.path.append(os.path.abspath(__file__))
-
-r = redis.Redis
-
-
-def init(rids_boj=None):
-    '''
-    初始化redis
-    :param rids_boj:
-    :return:
-    '''
-    global r
-    if rids_boj:
-        r = rids_boj
-    else:
-        r = r(host='localhost', port=6379, db=0)
-
 
 class RedisQueue:
-    def __init__(self, topic=None):
+    def __init__(self, r: redis.Redis, topic: str = 'test_queue'):
         self.topic = topic
+        self.r = r
 
     def get(self):
         # 弹出指定数量的数据
-        data = r.rpop(self.topic)
+        data = self.r.rpop(self.topic)
         return data if data else None
 
     def put(self, value):
         if isinstance(value, list):
-            r.lpush(self.topic, *value)
+            self.r.lpush(self.topic, *value)
         else:
-            r.lpush(self.topic, *[value])
+            self.r.lpush(self.topic, *[value])
 
     def clear(self):
-        r.delete(self.topic)
+        self.r.delete(self.topic)
 
     def size(self):
-        return r.llen(self.topic)
+        return self.r.llen(self.topic)
 
     def qsize(self):
         return self.size()
@@ -63,29 +41,29 @@ class RedisQueue:
         return [self.get() for _ in range(num)]
 
     def re_data(self):
-        ch_keys = r.keys(f"ack_{self.topic}_*")
+        ch_keys = self.r.keys(f"ack_{self.topic}_*")
         for key in ch_keys:
-            data = r.get(key)
+            data = self.r.get(key)
             if data:
-                q = RedisQueue(self.topic)
+                q = RedisQueue(self.r, self.topic)
                 t, _data = json.loads(data)
-                r.delete(key)
+                self.r.delete(key)
                 q.put(_data)
         return len(ch_keys)
 
     def get_all(self):
-        return r.lrange(self.topic, 0, -1)
+        return self.r.lrange(self.topic, 0, -1)
 
 
 class RedisMQ:
     def __init__(self):
         self.switch = 1
 
-    def start_receive(self, topic, callback, count=-1):
+    def start_receive(self, r, topic, callback, count=-1):
         while self.switch:
             data = r.rpop(topic)
             if data:
-                ch = RedisCh(topic, data)
+                ch = RedisCh(r, topic, data)
                 callback(ch, data)
                 if count == 1:
                     return
@@ -94,7 +72,7 @@ class RedisMQ:
             for key in ch_keys:
                 data = r.get(key)
                 if data:
-                    q = RedisQueue(topic)
+                    q = RedisQueue(r, topic)
                     t, _data = json.loads(data)
                     if time.time() - t > 10 * 60:
                         r.delete(key)
@@ -109,17 +87,19 @@ class RedisMQ:
 
 
 class RedisCh:
-    def __init__(self, topic, data):
+    def __init__(self, r, topic, data):
+        self.r = r
         self.topic = topic
         self.id = uuid.uuid4()
         r.set(f"ack_{topic}_{self.id}", json.dumps([time.time(), data.decode()]))
 
     def basic_ack(self):
-        r.delete(f"ack_{self.topic}_{self.id}")
+        self.r.delete(f"ack_{self.topic}_{self.id}")
 
 
 if __name__ == '__main__':
-    r.delete('test')
+    r1 = redis.Redis()
+    r1.delete('test')
     # a = RedisQueue("test")
     # a.put(1)
     # print(type(a.get()))

{redisserver_queue-0.0.3 → redisserver_queue-0.0.5}/RedisServer_Queue.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: RedisServer-Queue
-Version: 0.0.3
+Version: 0.0.5
 Summary: RedisServer-Queue is a simple redis server
 Author-email: NelsonLongXiang <1169207670@qq.com>
 Project-URL: Homepage, https://github.com/NelsonLongxiang/RedisServer
@@ -13,3 +13,26 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 
 RedisServer-Queue is a simple redis server
+
+## Installation
+
+```bash
+pip install -i https://pypi.org/simple RedisServer-Queue
+```
+
+```commandline
+pip install --upgrade -i https://pypi.org/simple RedisServer-Queue
+```
+
+## Usage
+
+#### 请参考test目录下test.py文件
+
+## License
+
+[MIT](https://choosealicense.com/licenses/mit/)
+
+### 作者联系方式
+
+1. 作者邮箱：`1169207670@qq.com`
+2. Wechat: `1169207670`

{redisserver_queue-0.0.3 → redisserver_queue-0.0.5}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "RedisServer-Queue"
-version = "0.0.3"
+version = "0.0.5"
 authors = [
     { name = "NelsonLongXiang", email = "1169207670@qq.com" },
 ]

redisserver_queue-0.0.5/test/test.py

@@ -0,0 +1,84 @@
+#!/user/bin/env python3
+# -*- coding: UTF-8 -*-
+# @Time : 2024/6/15 下午5:02
+# @Author : 龙翔
+# @File    :test.py.py
+# @Software: PyCharm
+
+import os
+import sys
+
+import redis
+
+# 将当前文件夹添加到环境变量
+if os.path.basename(__file__) in ['run.py', 'main.py', '__main__.py']:
+    if '.py' in __file__:
+        sys.path.append(os.path.abspath(os.path.dirname(__file__)))
+    else:
+        sys.path.append(os.path.abspath(__file__))
+
+# 导入模块
+from RedisServer_Queue.RedisServer import RedisQueue, RedisMQ
+
+# 初始化Redis服务
+# 默认使用本地Redis服务 6379端口 如果您使用的是远程Redis服务 请修改将实例化后的r对象传入RedisServer.init(r)
+# 使用本地Redis服务端口是6379 默认db是0 则不需要传入参数
+'''
+r = redis.Redis(host='localhost', port=6379, db=0)
+'''
+r = redis.Redis(host='localhost', port=6379, db=0)
+
+
+def hello_world():
+    '''
+    get 数据返回类型为bytes类型
+    :return:
+    '''
+    msg_queue = RedisQueue(r, topic='msg_queue')
+    if msg_queue.qsize() == 0:
+        msg_queue.put('hello world')
+
+    print(msg_queue.get())
+
+
+def ack_test():
+    '''
+    ack_test
+    :return:
+    '''
+    msg_queue = RedisQueue(r, topic='msg_queue')
+    print("重置数据,初始化时运行,返回值为重置数据量！", msg_queue.re_data())
+    msg_queue.put('hello world')
+
+    class ThreadAck(RedisQueue, RedisMQ):
+        def __init__(self, topic):
+            RedisQueue.__init__(self, r, topic)
+            RedisMQ.__init__(self)
+            self.ch = None
+
+        def run(self):
+            '''count 默认为-1；当count=1时，表示只获取一个数据，当count>1时，表示获取count个数据
+                根据需要自行修改
+            '''
+            self.start_receive(self.r, topic=self.topic, callback=self.callback)
+
+        def callback(self, ch, body):
+            self.ch = ch
+            self.work(body)
+            print("剩余队列长度：", self.qsize())
+
+        def work(self, data):
+            if data:
+                print(data)
+                '''
+                ack 注释 可以通过re_data()方法重新将数据放入队列
+                '''
+                self.ch.basic_ack()
+
+    thread_ack = ThreadAck(topic='msg_queue')
+    thread_ack.run()
+
+
+if __name__ == '__main__':
+    # hello_world()
+    ack_test()

redisserver_queue-0.0.3/README.md

@@ -1 +0,0 @@
-RedisServer-Queue is a simple redis server

redisserver_queue-0.0.3/test/test.py

@@ -1,19 +0,0 @@
-#!/user/bin/env python3
-# -*- coding: UTF-8 -*-
-# @Time : 2024/6/15 下午5:02
-# @Author : 龙翔
-# @File    :test.py.py
-# @Software: PyCharm
-
-import os
-import sys
-
-# 将当前文件夹添加到环境变量
-if os.path.basename(__file__) in ['run.py', 'main.py', '__main__.py']:
-    if '.py' in __file__:
-        sys.path.append(os.path.abspath(os.path.dirname(__file__)))
-    else:
-        sys.path.append(os.path.abspath(__file__))
-from RedisServer_Queue import RedisServer
-
-RedisServer.init()