scalable-pypeline 2.1.24__tar.gz → 2.1.26__tar.gz

{scalable-pypeline-2.1.24/scalable_pypeline.egg-info → scalable-pypeline-2.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scalable-pypeline
-Version: 2.1.24
+Version: 2.1.26
 Summary: PypeLine - Python pipelines for the Real World
 Home-page: https://gitlab.com/bravos2/pypeline
 Author: Bravos Power Corporation

scalable-pypeline-2.1.26/pypeline/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.1.26"

{scalable-pypeline-2.1.24 → scalable-pypeline-2.1.26}/pypeline/barrier.py

@@ -2,7 +2,7 @@ import time
 import redis
 from redis.sentinel import Sentinel
 from urllib.parse import urlparse
-from constants import (
+from pypeline.constants import (
     REDIS_SENTINEL_MASTER_NAME,
     DEFAULT_REDIS_SOCKET_CONNECT_TIMEOUT,
     DEFAULT_REDIS_SOCKET_TIMEOUT,

{scalable-pypeline-2.1.24 → scalable-pypeline-2.1.26}/pypeline/pipelines/composition/parallel_pipeline_composition.py

@@ -5,12 +5,22 @@ import json
 import time
 import typing
 from uuid import uuid4
+from urllib.parse import urlparse
 
 from dramatiq.broker import get_broker
 from dramatiq.results import ResultMissing
 from db_medley.redis_conf import RedisConnector
 from redis.exceptions import RedisError
-
+from redis.sentinel import Sentinel
+from pypeline.constants import (
+    REDIS_URL,
+    REDIS_SENTINEL_MASTER_NAME,
+    DEFAULT_REDIS_SOCKET_CONNECT_TIMEOUT,
+    DEFAULT_REDIS_SOCKET_TIMEOUT,
+    DEFAULT_REDIS_RETRY_ON_TIMEOUT,
+    DEFAULT_REDIS_SOCKET_KEEPALIVE,
+    DEFAULT_REDIS_HEALTH_CHECK_INTERVAL,
+)
 from pypeline.barrier import LockingParallelBarrier
 from pypeline.constants import DEFAULT_RESULT_TTL
 from pypeline.dramatiq import REDIS_URL
@@ -240,9 +250,26 @@ class PipelineResult:
         self.pipeline: parallel_pipeline = None
         self.execution_id = execution_id
         self.redis_key = f"{execution_id}-results-key"
-        self.redis_conn = RedisConnector().get_connection()
         self.result_ttl = result_ttl
 
+        if REDIS_SENTINEL_MASTER_NAME is not None:
+            parsed_redis_url = urlparse(REDIS_URL)
+            redis_sentinel = Sentinel(
+                sentinels=[(parsed_redis_url.hostname, parsed_redis_url.port)],
+            )
+            self.redis_conn = redis_sentinel.master_for(
+                REDIS_SENTINEL_MASTER_NAME,
+                db=int(parsed_redis_url.path[1]) if parsed_redis_url.path else 0,
+                password=parsed_redis_url.password,
+                socket_connect_timeout=DEFAULT_REDIS_SOCKET_CONNECT_TIMEOUT,
+                socket_timeout=DEFAULT_REDIS_SOCKET_TIMEOUT,
+                retry_on_timeout=DEFAULT_REDIS_RETRY_ON_TIMEOUT,
+                socket_keepalive=DEFAULT_REDIS_SOCKET_KEEPALIVE,
+                health_check_interval=DEFAULT_REDIS_HEALTH_CHECK_INTERVAL,
+            )
+        else:
+            self.redis_conn = RedisConnector().get_connection()
+
     def create_result_entry(self, pipeline_json_str: str):
         """
         Store the serialized pipeline data in Redis with a specified TTL.

{scalable-pypeline-2.1.24 → scalable-pypeline-2.1.26/scalable_pypeline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scalable-pypeline
-Version: 2.1.24
+Version: 2.1.26
 Summary: PypeLine - Python pipelines for the Real World
 Home-page: https://gitlab.com/bravos2/pypeline
 Author: Bravos Power Corporation

scalable-pypeline-2.1.24/pypeline/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.1.24"