aury-boot 0.0.42__tar.gz → 0.0.43__tar.gz

{aury_boot-0.0.42 → aury_boot-0.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aury-boot
-Version: 0.0.42
+Version: 0.0.43
 Summary: Aury Boot - 基于 FastAPI 生态的企业级 API 开发框架
 Requires-Python: >=3.13
 Requires-Dist: aiohttp>=3.11.0

{aury_boot-0.0.42 → aury_boot-0.0.43}/aury/boot/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.42'
-__version_tuple__ = version_tuple = (0, 0, 42)
+__version__ = version = '0.0.43'
+__version_tuple__ = version_tuple = (0, 0, 43)
 
 __commit_id__ = commit_id = None

{aury_boot-0.0.42 → aury_boot-0.0.43}/aury/boot/infrastructure/cache/redis.py

@@ -105,6 +105,8 @@ class RedisCache(ICache):
         """
         try:
             from coredis import RedisCluster
+            from coredis.retry import ConstantRetryPolicy
+            from coredis.exceptions import ConnectionError as CoredisConnectionError
         except ImportError as exc:
             raise ImportError(
                 "Redis Cluster 需要安装 coredis: pip install coredis"
@@ -123,11 +125,21 @@ class RedisCache(ICache):
             password = username
             username = None
         
+        # 配置更快的重试策略
+        retry_policy = ConstantRetryPolicy(
+            retries=3,
+            delay=1,
+            retryable_exceptions=(CoredisConnectionError, TimeoutError, OSError),
+        )
+        
         # 构建连接参数
         cluster_kwargs: dict = {
             "host": parsed.hostname or "localhost",
             "port": parsed.port or 6379,
             "decode_responses": False,
+            "connect_timeout": 5,
+            "stream_timeout": 5,
+            "retry_policy": retry_policy,
         }
         
         if username:

{aury_boot-0.0.42 → aury_boot-0.0.43}/aury/boot/infrastructure/channel/backends/redis_cluster.py

@@ -18,6 +18,8 @@ from aury.boot.common.logging import logger
 
 try:
     from coredis import RedisCluster
+    from coredis.retry import ConstantRetryPolicy
+    from coredis.exceptions import ConnectionError as CoredisConnectionError
 except ImportError as exc:
     raise ImportError(
         "Redis Cluster Channel 需要安装 coredis: pip install coredis"
@@ -41,11 +43,21 @@ class RedisClusterBackend:
     def __init__(self, url: str) -> None:
         host, port, password = self._parse_url(url)
         
+        # 配置更快的重试策略
+        retry_policy = ConstantRetryPolicy(
+            retries=3,
+            delay=1,
+            retryable_exceptions=(CoredisConnectionError, TimeoutError, OSError),
+        )
+        
         self._client: RedisCluster = RedisCluster(
             host=host,
             port=port,
             password=password,
             decode_responses=True,
+            connect_timeout=5,
+            stream_timeout=5,
+            retry_policy=retry_policy,
         )
         self._pubsub: Any = None
         self._queue: asyncio.Queue[Event] = asyncio.Queue()

{aury_boot-0.0.42 → aury_boot-0.0.43}/aury/boot/infrastructure/clients/redis/manager.py

@@ -211,6 +211,8 @@ class RedisClient:
         """
         try:
             from coredis import RedisCluster
+            from coredis.retry import ConstantRetryPolicy
+            from coredis.exceptions import ConnectionError as CoredisConnectionError
         except ImportError as exc:
             raise ImportError(
                 "Redis Cluster 需要安装 coredis: pip install coredis"
@@ -229,11 +231,21 @@ class RedisClient:
             password = username
             username = None
         
+        # 配置更快的重试策略（默认间隔太长）
+        retry_policy = ConstantRetryPolicy(
+            retries=3,
+            delay=1,  # 1 秒重试间隔
+            retryable_exceptions=(CoredisConnectionError, TimeoutError, OSError),
+        )
+        
         # 构建连接参数
         cluster_kwargs: dict = {
             "host": parsed.hostname or "localhost",
             "port": parsed.port or 6379,
             "decode_responses": self._config.decode_responses,
+            "connect_timeout": self._config.socket_connect_timeout or 5,
+            "stream_timeout": self._config.socket_timeout or 5,
+            "retry_policy": retry_policy,
         }
         
         if username:

{aury_boot-0.0.42 → aury_boot-0.0.43}/aury/boot/infrastructure/mq/backends/redis_stream.py

@@ -309,12 +309,23 @@ class RedisStreamMQ(IMQ):
         await self._ensure_client()
         stream_key = self._stream_key(queue)
         
-        result = await self._client.connection.xrange(
-            stream_key,
-            min=start,
-            max=end,
-            count=count,
-        )
+        # coredis 使用 start/end，redis-py 使用 min/max
+        if hasattr(self._client, 'is_cluster') and self._client.is_cluster:
+            # coredis API
+            result = await self._client.connection.xrange(
+                stream_key,
+                start=start,
+                end=end,
+                count=count,
+            )
+        else:
+            # redis-py API
+            result = await self._client.connection.xrange(
+                stream_key,
+                min=start,
+                max=end,
+                count=count,
+            )
         
         messages = []
         for msg_id, data in result: