vs-queue 0.1.3__tar.gz → 0.1.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {vs_queue-0.1.3/vs_queue.egg-info → vs_queue-0.1.4}/PKG-INFO +2 -2
- {vs_queue-0.1.3 → vs_queue-0.1.4}/pyproject.toml +2 -2
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/provider/vs_redis_queue.py +36 -9
- {vs_queue-0.1.3 → vs_queue-0.1.4/vs_queue.egg-info}/PKG-INFO +2 -2
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue.egg-info/requires.txt +1 -1
- {vs_queue-0.1.3 → vs_queue-0.1.4}/LICENSE.txt +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/README.md +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/setup.cfg +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/base/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/base/vs_base_consumer.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/base/vs_base_queue.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/decorator/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/decorator/vs_queue_listener.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/factory/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/factory/vs_queue_factory.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/manager/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/manager/vs_queue_manager.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/provider/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/provider/vs_rabbitmq_queue.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/py.typed +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/registry/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/registry/vs_queue_registry.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/retry/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/retry/vs_retry_policy.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/schema/__init__.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/schema/vs_message.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue/schema/vs_retention.py +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue.egg-info/SOURCES.txt +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue.egg-info/dependency_links.txt +0 -0
- {vs_queue-0.1.3 → vs_queue-0.1.4}/vs_queue.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: vs-queue
|
|
3
|
-
Version: 0.1.
|
|
3
|
+
Version: 0.1.4
|
|
4
4
|
Summary: Pluggable async message queue library for Viveka Sutra — Redis Streams, RabbitMQ, retry, dead letter, and annotation-based consumers
|
|
5
5
|
License: Apache License
|
|
6
6
|
Version 2.0, January 2004
|
|
@@ -202,7 +202,7 @@ Description-Content-Type: text/markdown
|
|
|
202
202
|
License-File: LICENSE.txt
|
|
203
203
|
Requires-Dist: pydantic>=2.0
|
|
204
204
|
Provides-Extra: redis
|
|
205
|
-
Requires-Dist: redis>=
|
|
205
|
+
Requires-Dist: redis>=8.1; extra == "redis"
|
|
206
206
|
Requires-Dist: hiredis>=2.0; extra == "redis"
|
|
207
207
|
Provides-Extra: rabbitmq
|
|
208
208
|
Requires-Dist: aio-pika>=9.0; extra == "rabbitmq"
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "vs-queue"
|
|
7
|
-
version = "0.1.
|
|
7
|
+
version = "0.1.4"
|
|
8
8
|
description = "Pluggable async message queue library for Viveka Sutra — Redis Streams, RabbitMQ, retry, dead letter, and annotation-based consumers"
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
requires-python = ">=3.11"
|
|
@@ -29,7 +29,7 @@ dependencies = [
|
|
|
29
29
|
|
|
30
30
|
[project.optional-dependencies]
|
|
31
31
|
redis = [
|
|
32
|
-
"redis>=
|
|
32
|
+
"redis>=8.1",
|
|
33
33
|
"hiredis>=2.0",
|
|
34
34
|
]
|
|
35
35
|
rabbitmq = [
|
|
@@ -5,6 +5,9 @@ import time
|
|
|
5
5
|
from typing import Any, Dict, Optional
|
|
6
6
|
|
|
7
7
|
import redis.asyncio as aioredis
|
|
8
|
+
from redis.exceptions import ConnectionError as RedisConnectionError
|
|
9
|
+
from redis.exceptions import ResponseError as RedisResponseError
|
|
10
|
+
from redis.exceptions import TimeoutError as RedisTimeoutError
|
|
8
11
|
|
|
9
12
|
from vs_queue.base.vs_base_consumer import VsBaseConsumer
|
|
10
13
|
from vs_queue.base.vs_base_queue import VsBaseQueue
|
|
@@ -13,6 +16,9 @@ from vs_queue.schema.vs_message import VsMessage
|
|
|
13
16
|
|
|
14
17
|
_logger = logging.getLogger(__name__)
|
|
15
18
|
|
|
19
|
+
_RECONNECT_MIN_BACKOFF = 1
|
|
20
|
+
_RECONNECT_MAX_BACKOFF = 30
|
|
21
|
+
|
|
16
22
|
|
|
17
23
|
class VsRedisQueue(VsBaseQueue):
|
|
18
24
|
|
|
@@ -28,6 +34,11 @@ class VsRedisQueue(VsBaseQueue):
|
|
|
28
34
|
port=self._port,
|
|
29
35
|
password=password,
|
|
30
36
|
decode_responses=True,
|
|
37
|
+
# redis-py 8.1 defaults this to 5s, which kills any blocking read
|
|
38
|
+
# that blocks for longer. Dead connections are caught below instead.
|
|
39
|
+
socket_timeout=None,
|
|
40
|
+
socket_keepalive=True,
|
|
41
|
+
health_check_interval=30,
|
|
31
42
|
)
|
|
32
43
|
await self._client.ping()
|
|
33
44
|
|
|
@@ -86,20 +97,36 @@ class VsRedisQueue(VsBaseQueue):
|
|
|
86
97
|
|
|
87
98
|
try:
|
|
88
99
|
await self._client.xgroup_create(queue, group, id="0", mkstream=True)
|
|
89
|
-
except
|
|
90
|
-
|
|
100
|
+
except RedisResponseError as e:
|
|
101
|
+
if "BUSYGROUP" not in str(e):
|
|
102
|
+
raise # anything other than "already exists" is worth shouting about
|
|
103
|
+
_logger.debug(f"Consumer group already exists | queue={queue} group={group}")
|
|
91
104
|
|
|
92
105
|
await consumer.start()
|
|
93
106
|
_logger.info(f"Subscribed | queue={queue} consumer={type(consumer).__name__}")
|
|
107
|
+
backoff = _RECONNECT_MIN_BACKOFF
|
|
94
108
|
try:
|
|
95
109
|
while True:
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
110
|
+
try:
|
|
111
|
+
results = await self._client.xreadgroup(
|
|
112
|
+
groupname=group,
|
|
113
|
+
consumername=consumer_name,
|
|
114
|
+
streams={queue: ">"},
|
|
115
|
+
count=1,
|
|
116
|
+
block=5000,
|
|
117
|
+
)
|
|
118
|
+
except asyncio.CancelledError:
|
|
119
|
+
raise
|
|
120
|
+
except (RedisConnectionError, RedisTimeoutError, OSError) as e:
|
|
121
|
+
# Redis wandered off. Wait a bit and ask again — the pool reconnects for us.
|
|
122
|
+
_logger.warning(
|
|
123
|
+
f"Queue read failed, retrying in {backoff}s | queue={queue} error={e}"
|
|
124
|
+
)
|
|
125
|
+
await asyncio.sleep(backoff)
|
|
126
|
+
backoff = min(backoff * 2, _RECONNECT_MAX_BACKOFF)
|
|
127
|
+
continue
|
|
128
|
+
|
|
129
|
+
backoff = _RECONNECT_MIN_BACKOFF
|
|
103
130
|
if not results:
|
|
104
131
|
continue
|
|
105
132
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: vs-queue
|
|
3
|
-
Version: 0.1.
|
|
3
|
+
Version: 0.1.4
|
|
4
4
|
Summary: Pluggable async message queue library for Viveka Sutra — Redis Streams, RabbitMQ, retry, dead letter, and annotation-based consumers
|
|
5
5
|
License: Apache License
|
|
6
6
|
Version 2.0, January 2004
|
|
@@ -202,7 +202,7 @@ Description-Content-Type: text/markdown
|
|
|
202
202
|
License-File: LICENSE.txt
|
|
203
203
|
Requires-Dist: pydantic>=2.0
|
|
204
204
|
Provides-Extra: redis
|
|
205
|
-
Requires-Dist: redis>=
|
|
205
|
+
Requires-Dist: redis>=8.1; extra == "redis"
|
|
206
206
|
Requires-Dist: hiredis>=2.0; extra == "redis"
|
|
207
207
|
Provides-Extra: rabbitmq
|
|
208
208
|
Requires-Dist: aio-pika>=9.0; extra == "rabbitmq"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|