scalable-pypeline 2.0.3__py2.py3-none-any.whl → 2.0.5__py2.py3-none-any.whl

pypeline/__init__.py

@@ -1 +1 @@
-__version__ = "2.0.3"
+__version__ = "2.0.5"

pypeline/composition.py

@@ -51,9 +51,8 @@ class parallel_pipeline:
 
         self.execution_graph = execution_graph
 
-        for message_group in self.messages:
-            for m in message_group:
-                m.options["execution_graph"] = execution_graph
+        for m in self.messages[0]:
+            m.options["execution_graph"] = execution_graph
 
     def __len__(self):
         """Returns the length of the parallel_pipeline."""

pypeline/constants.py

@@ -1,5 +1,6 @@
 """ Pypeline Constants
 """
+
 import os
 
 # Pypeline configuration defaults
@@ -26,7 +27,15 @@ DEFAULT_TASK_MIN_BACKOFF = int(os.getenv("DEFAULT_TASK_MIN_BACKOFF", 15))  # sec
 DEFAULT_TASK_MAX_BACKOFF = int(
     os.getenv("DEFAULT_TASK_MAX_BACKOFF", 3600)
 )  # seconds (1 hour)
-
+DEFAULT_BROKER_CONNECTION_HEARTBEAT = int(
+    os.getenv("DEFAULT_BROKER_CONNECTION_HEARTBEAT", 5)
+)
+DEFAULT_BROKER_CONNECTION_ATTEMPTS = int(
+    os.getenv("DEFAULT_BROKER_CONNECTION_ATTEMPTS", 5)
+)
+DEFAULT_BROKER_BLOCKED_CONNECTION_TIMEOUT = int(
+    os.getenv("DEFAULT_BROKER_BLOCKED_CONNECTION_TIMEOUT", 30)
+)
 
 MS_IN_SECONDS = 1000
 API_PATH_V1 = "/api/v1"

pypeline/dramatiq.py

@@ -2,7 +2,10 @@ import importlib
 import os.path
 import sys
 import typing
+import pika
 import logging
+from urllib.parse import urlparse
+
 import click
 from pypeline.extensions import pypeline_config
 from warnings import warn
@@ -19,7 +22,7 @@ from dramatiq.cli import (
     make_argument_parser as dramatiq_argument_parser,
     import_object,
 )
-from dramatiq.middleware import default_middleware
+from dramatiq.middleware import default_middleware, CurrentMessage
 from dramatiq.results import Results
 from dramatiq.results.backends.redis import RedisBackend
 from flask import current_app, Flask
@@ -35,6 +38,9 @@ from pypeline.constants import (
     DEFAULT_TASK_MAX_RETRY,
     DEFAULT_TASK_MIN_BACKOFF,
     DEFAULT_TASK_MAX_BACKOFF,
+    DEFAULT_BROKER_CONNECTION_HEARTBEAT,
+    DEFAULT_BROKER_BLOCKED_CONNECTION_TIMEOUT,
+    DEFAULT_BROKER_CONNECTION_ATTEMPTS,
 )
 from pypeline.middleware import ParallelPipeline
 from pypeline.utils.config_utils import (
@@ -50,14 +56,29 @@ else:
     P = TypeVar("P")
 R = TypeVar("R")
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 
 def configure_default_broker(broker: Broker = None):
     redis_backend = RedisBackend(url=REDIS_URL)
-    rabbit_broker = broker if broker is not None else RabbitmqBroker(url=RABBIT_URL)
+    parsed_url = urlparse(RABBIT_URL)
+    credentials = pika.PlainCredentials(parsed_url.username, parsed_url.password)
+    rabbit_broker = (
+        broker
+        if broker is not None
+        else RabbitmqBroker(
+            host=parsed_url.host,
+            port=parsed_url.port,
+            credentials=credentials,
+            heartbeat=DEFAULT_BROKER_CONNECTION_HEARTBEAT,
+            connection_attempts=DEFAULT_BROKER_CONNECTION_ATTEMPTS,
+            blocked_connection_timeout=DEFAULT_BROKER_BLOCKED_CONNECTION_TIMEOUT,
+        )
+    )
     rabbit_broker.add_middleware(Results(backend=redis_backend))
     rabbit_broker.add_middleware(ParallelPipeline(redis_url=REDIS_URL))
+    rabbit_broker.add_middleware(CurrentMessage())
     register_actors_for_workers(rabbit_broker)
     set_broker(rabbit_broker)
 
@@ -129,7 +150,6 @@ def register_actors_for_workers(broker: Broker):
     if not service:
         return
     for task in service.get("registeredTasks", []):
-        print(task)
         pipeline_meta = None
         for pipeline_key, pipeline in pypeline_config["pipelines"].items():
             pipeline_config = pipeline["config"]
@@ -317,9 +337,11 @@ class LazyActor(object):
         return getattr(self.actor, name)
 
     def register(self, broker):
-        self.actor = register_actor(broker=broker, **self.kw)(
-            ensure_return_value(default_value=True)(self.fn)
-        )
+        self.actor = register_actor(
+            actor_name=f"{self.fn.__module__}.{self.fn.__name__}",
+            broker=broker,
+            **self.kw,
+        )(ensure_return_value(default_value=True)(self.fn))
 
     # Next is regular actor API.
     def send(self, *a, **kw):
@@ -463,8 +485,8 @@ def pypeline_worker(
         command += ["--queues"] + queues
     command += verbose * ["-v"]
     args = parser.parse_args(command)
-    current_app.logger.info("Able to execute the following actors:")
+    logger.info("Able to execute the following actors:")
     for actor in list_managed_actors(broker, queues):
-        current_app.logger.info("    %s.", format_actor(actor))
+        logger.info("    %s.", format_actor(actor))
 
     dramatiq_worker(args)

pypeline/middleware.py

@@ -1,6 +1,4 @@
 import copy
-import os
-
 from dramatiq.middleware import Middleware
 
 from pypeline.barrier import LockingParallelBarrier
@@ -29,7 +27,6 @@ class ParallelPipeline(Middleware):
                     remaining_tasks = locking_parallel_barrier.decrement_task_count()
                 finally:
                     locking_parallel_barrier.release_lock()
-
                 if remaining_tasks <= 0:
                     execution_graph = message.options.get("execution_graph")
 
@@ -54,8 +51,10 @@ class ParallelPipeline(Middleware):
                                     lock_key=f"{completion_uuid}-lock",
                                 )
                                 locking_parallel_barrier.set_task_count(len(next_group))
+                                execution_graph_copy = copy.deepcopy(execution_graph)
+
                                 for next_message in next_group:
                                     next_message["options"][
                                         "execution_graph"
-                                    ] = copy.deepcopy(execution_graph)
+                                    ] = execution_graph_copy
                                     broker.enqueue(Message(**next_message))

pypeline/utils/pipeline_utils.py

@@ -79,8 +79,6 @@ def process_non_none_value(value: T) -> None:
     """
     if value is None:
         raise ValueError("None value is not allowed")
-    # Process the value
-    print(f"Processing value: {value}")
 
 
 def topological_sort_with_parallelism(

{scalable_pypeline-2.0.3.dist-info → scalable_pypeline-2.0.5.dist-info}/METADATA

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

{scalable_pypeline-2.0.3.dist-info → scalable_pypeline-2.0.5.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pypeline/__init__.py,sha256=_GEKEa6BYjBV34SZkSlAR87aCM5Y9G0aSI0LXL52iJg,22
+pypeline/__init__.py,sha256=xEb7Z4b8xalXXExBg42XPAhbJKniHzcsEPjp-6S3ppg,22
 pypeline/barrier.py,sha256=dLDaprH5NB-C7MQjZqPpBBhMjmO0VV_kTonlgweznHc,1096
-pypeline/composition.py,sha256=tnSe9CHejayBGI__VMFpQ6NYuebTqoPTWuKiBMnANKc,13025
-pypeline/constants.py,sha256=vi4UZz1xd0ZeIuelp4QgCQsMlIHW65-lVB8l_iA8kBE,2578
-pypeline/dramatiq.py,sha256=jr9WORqtusC1gnbvF59CNXny8ORk2Lmlbmf1qsbiLXo,14799
+pypeline/composition.py,sha256=pTw9Xb9h4JnV4siFc3JStm5lB-i9djUADo3Kh5K3s7g,12976
+pypeline/constants.py,sha256=coiF8dMP25qIwoNYSnS7oy7hCd4-5yqPFmdPsN93Q1A,2892
+pypeline/dramatiq.py,sha256=K633IDydEwO0tfLmRU48B2jhymUbcC3EON3JVKJ74J4,15578
 pypeline/extensions.py,sha256=BzOTnXhNxap3N7uIUUh_hO6dDwx08Vc_RJDE93_K0Lo,610
-pypeline/middleware.py,sha256=6vWNCoRVqnASJ40CAOEpe0JcYRpB6BTkLz8E51q4z2Y,2756
+pypeline/middleware.py,sha256=kTp6niYoe2nXIiN6EGRfdpxrJyioo0GPxDkfefbGlEk,2821
 pypeline/pipeline_config_schema.py,sha256=DQ_RMucnA0AyrndlW6lkb0orGromcO6C9GgLHyG6lJ0,8013
 pypeline/pypeline_yaml.py,sha256=Og08sUKwOjq7JYPnkg-NIcGbHravYCkC5Arz22rZEtA,16981
 pypeline/schedule_config_schema.py,sha256=vtZV-5wpGcAiYcXxdBPRkrjsbR6x_9E-1PC2elrKKbE,3611
@@ -17,11 +17,11 @@ pypeline/flask/api/schedules.py,sha256=31lwoFlGv-S-2ahGUCnD5YbmKws8yddj6_PEzzdBi
 pypeline/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/utils/config_utils.py,sha256=rAIATyoW7kGETZ_Z2DqiXtGd7bJp5uPfcLtfNPOYsNs,2167
 pypeline/utils/module_utils.py,sha256=boEP9IYr4p_ick7HlVUfIxOYHQlEmo7dgvDBCQc-C28,2914
-pypeline/utils/pipeline_utils.py,sha256=dewzkMajs7uyPHyHjJfISA9pc2-1J5A99Hm4XqNw5qM,6031
+pypeline/utils/pipeline_utils.py,sha256=tt71hLEFgPieokJZlC1rP2dmCTctrOPt7K1rGlbnT4o,5967
 tests/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scalable_pypeline-2.0.3.dist-info/LICENSE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
-scalable_pypeline-2.0.3.dist-info/METADATA,sha256=5P802DsrRS3QyRxK07sls35o6P7_gHJBEkuhb8GGPwQ,6239
-scalable_pypeline-2.0.3.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-scalable_pypeline-2.0.3.dist-info/entry_points.txt,sha256=uWs10ODfHSBKo2Cx_QaUjPHQTpZ3e77j9VlAdRRmMyg,119
-scalable_pypeline-2.0.3.dist-info/top_level.txt,sha256=C7dpkEOc_-nnsAQb28BfQknjD6XHRyS9ZrvVeoIbV7s,15
-scalable_pypeline-2.0.3.dist-info/RECORD,,
+scalable_pypeline-2.0.5.dist-info/LICENSE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
+scalable_pypeline-2.0.5.dist-info/METADATA,sha256=-YlluvvoDLhu8q8Ey2lYdynmjPb_MMO2i2pdIVH8z_A,6239
+scalable_pypeline-2.0.5.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+scalable_pypeline-2.0.5.dist-info/entry_points.txt,sha256=uWs10ODfHSBKo2Cx_QaUjPHQTpZ3e77j9VlAdRRmMyg,119
+scalable_pypeline-2.0.5.dist-info/top_level.txt,sha256=C7dpkEOc_-nnsAQb28BfQknjD6XHRyS9ZrvVeoIbV7s,15
+scalable_pypeline-2.0.5.dist-info/RECORD,,