scalable-pypeline 2.0.4__tar.gz → 3.0.1__tar.gz

{scalable-pypeline-2.0.4/scalable_pypeline.egg-info → scalable-pypeline-3.0.1}/PKG-INFO

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

scalable-pypeline-3.0.1/pypeline/__init__.py

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

{scalable-pypeline-2.0.4 → scalable-pypeline-3.0.1}/pypeline/constants.py

@@ -1,5 +1,6 @@
 """ Pypeline Constants
 """
+
 import os
 
 # Pypeline configuration defaults
@@ -26,6 +27,11 @@ 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_HEARTBEAT = int(os.getenv("DEFAULT_BROKER_HEARTBEAT", 5))
+DEFAULT_CONNECTION_ATTEMPTS = int(os.getenv("DEFAULT_CONNECTION_ATTEMPTS", 5))
+DEFAULT_BLOCKED_CONNECTION_TIMEOUT = int(
+    os.getenv("DEFAULT_BLOCKED_CONNECTION_TIMEOUT", 30)
+)
 
 
 MS_IN_SECONDS = 1000

{scalable-pypeline-2.0.4 → scalable-pypeline-3.0.1}/pypeline/dramatiq.py

@@ -1,15 +1,15 @@
 import importlib
+import logging
 import os.path
 import sys
 import typing
-import logging
-import click
-from pypeline.extensions import pypeline_config
-from warnings import warn
 from functools import wraps
+from typing import Awaitable, Callable, Optional, Union, TYPE_CHECKING, TypeVar
+from warnings import warn
+
+import click
 from apscheduler.schedulers.blocking import BlockingScheduler
 from apscheduler.triggers.cron import CronTrigger
-from typing import Awaitable, Callable, Optional, Union, TYPE_CHECKING, TypeVar
 from dramatiq import Broker, Middleware, actor as register_actor, set_broker, get_broker
 from dramatiq.brokers.rabbitmq import RabbitmqBroker
 from dramatiq.cli import (
@@ -35,7 +35,11 @@ from pypeline.constants import (
     DEFAULT_TASK_MAX_RETRY,
     DEFAULT_TASK_MIN_BACKOFF,
     DEFAULT_TASK_MAX_BACKOFF,
+    DEFAULT_BROKER_HEARTBEAT,
+    DEFAULT_CONNECTION_ATTEMPTS,
+    DEFAULT_BLOCKED_CONNECTION_TIMEOUT,
 )
+from pypeline.extensions import pypeline_config
 from pypeline.middleware import ParallelPipeline
 from pypeline.utils.config_utils import (
     retrieve_latest_schedule_config,
@@ -56,7 +60,16 @@ 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)
+    rabbit_broker = (
+        broker
+        if broker is not None
+        else RabbitmqBroker(
+            url=RABBIT_URL,
+            heartbeat=DEFAULT_BROKER_HEARTBEAT,
+            connection_attempts=DEFAULT_CONNECTION_ATTEMPTS,
+            blocked_connection_timeout=DEFAULT_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())
@@ -257,6 +270,7 @@ class Dramatiq:
         :param kw: Keywords argument passed to :func:`dramatiq.actor`.
 
         """
+
         # Substitute dramatiq.actor decorator to return a lazy wrapper. This
         # allows to register actors in extension before the broker is
         # effectively configured by init_app.

{scalable-pypeline-2.0.4 → scalable-pypeline-3.0.1}/pypeline/flask/api/pipelines.py

@@ -135,7 +135,7 @@ class PipelineInvoke(MethodView):
         tags=["Pipelines"],
     )
     @bp.arguments(InvokePipelineSchema)
-    @bp.response(InvokePipelineResponseSchema)
+    @bp.response(200, InvokePipelineResponseSchema)
     def post(self, payload: dict, pipeline_id: str):
         """Invoke a pipeline by it's ID; optionally provide pipeline arguments."""
         pipeline_config = retrieve_latest_pipeline_config(pipeline_id=pipeline_id)
@@ -191,7 +191,7 @@ class PipelineResults(MethodView):
         ],
         tags=["Pipelines"],
     )
-    @bp.response(GetPipelineResultResponseSchema)
+    @bp.response(200, GetPipelineResultResponseSchema)
     def get(self, execution_id: str):
         """Retrieve results of a pipeline's execution based on execution_id
 

{scalable-pypeline-2.0.4 → scalable-pypeline-3.0.1}/requirements.txt

@@ -1,6 +1,4 @@
 PyYAML>=6.0.1,<7
-click==8.0.4
-marshmallow>=3.2.1,<4
 redis>=4.5.4,<5
 db-medley[redis]>=1.0.2,<2
 croniter>=1.0.15,<2

{scalable-pypeline-2.0.4 → scalable-pypeline-3.0.1/scalable_pypeline.egg-info}/PKG-INFO

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

{scalable-pypeline-2.0.4 → scalable-pypeline-3.0.1}/scalable_pypeline.egg-info/requires.txt

@@ -1,6 +1,4 @@
 PyYAML<7,>=6.0.1
-click==8.0.4
-marshmallow<4,>=3.2.1
 redis<5,>=4.5.4
 db-medley[redis]<2,>=1.0.2
 croniter<2,>=1.0.15
@@ -10,20 +8,17 @@ wheel
 twine
 
 [dev]
-blackd
+black
 
 [flask]
-Werkzeug==2.0.3
-itsdangerous==2.0.1
-Flask<2,>=1.1.2
-flask-smorest<0.29,>=0.23.0
-Jinja2==3.0.3
+flask-smorest<0.45,>=0.44.0
+werkzeug<4,>=3.0.1
+flask<4,>=3.0.2
 
 [test]
 pytest-cov<3,>=2.6.1
 tox<4,>=3.14.1
 mock<2,>=1
-moto<4,>=1.3.16
 responses<0.11,>=0.10.16
 fakeredis<3,>=2.10.3
 importlib-metadata<5,>=4.12

{scalable-pypeline-2.0.4 → scalable-pypeline-3.0.1}/setup.py

@@ -174,11 +174,9 @@ setup(
     extras_require={
         "build": ["wheel", "twine"],
         "flask": [
-            "Werkzeug==2.0.3",
-            "itsdangerous==2.0.1",
-            "Flask>=1.1.2,<2",
-            "flask-smorest>=0.23.0,<0.29",
-            "Jinja2==3.0.3",
+            "flask-smorest>=0.44.0,<0.45",
+            "werkzeug>=3.0.1,<4",
+            "flask>=3.0.2,<4",
         ],
         "web": ["gunicorn", "gevent>=21.12.0,<22"],
         "workers": [
@@ -186,12 +184,11 @@ setup(
             "dramatiq[rabbitmq]>=1.17.0,<2",
             "apscheduler>=3.10.4,<4",
         ],
-        "dev": ["blackd"],
+        "dev": ["black"],
         "test": [
             "pytest-cov>=2.6.1,<3",
             "tox>=3.14.1,<4",
             "mock>=1,<2",
-            "moto>=1.3.16,<4",
             "responses>=0.10.16,<0.11",
             "fakeredis>=2.10.3,<3",
             "importlib-metadata>=4.12,<5",

scalable-pypeline-2.0.4/pypeline/__init__.py

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