scalable-pypeline 2.0.7__tar.gz → 2.0.9__tar.gz

{scalable-pypeline-2.0.7/scalable_pypeline.egg-info → scalable-pypeline-2.0.9}/PKG-INFO

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

scalable-pypeline-2.0.9/pypeline/__init__.py

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

{scalable-pypeline-2.0.7 → scalable-pypeline-2.0.9}/pypeline/dramatiq.py

@@ -179,8 +179,7 @@ def register_actors_for_workers(broker: Broker):
                 pipeline_meta["store_results"] = True
                 _ = register_lazy_actor(broker, tmp_handler, pipeline_meta)
         except Exception as e:
-            print(e)
-            print(f"Unable to add a task to dramatiq: {e}")
+            logger.exception(f"Unable to add a task to dramatiq: {e}")
 
 
 class Dramatiq:
@@ -260,7 +259,7 @@ class Dramatiq:
 
         # Callable function is expected to setBroker()
         if callable(broker_or_callable):
-            print(f"Configuring broker via {DEFAULT_BROKER_CALLABLE}")
+            logger.info(f"Configuring broker via {DEFAULT_BROKER_CALLABLE}")
             broker_or_callable()
         else:
             raise TypeError("DEFAULT_BROKER_CALLABLE must point to a callable function")
@@ -368,7 +367,15 @@ def list_managed_actors(broker, queues):
 def cron_scheduler():  # pragma: no cover
     # Configure our broker that we will schedule registered tasks for
     scheduler = BlockingScheduler()
-    configure_default_broker()
+    module_name, broker_or_callable = import_object(DEFAULT_BROKER_CALLABLE)
+
+    # Callable function is expected to setBroker()
+    if callable(broker_or_callable):
+        logger.info(f"Configuring broker via {DEFAULT_BROKER_CALLABLE}")
+        broker_or_callable()
+    else:
+        raise TypeError("DEFAULT_BROKER_CALLABLE must point to a callable function")
+
     broker = get_broker()
     jobs = retrieve_latest_schedule_config()
 

{scalable-pypeline-2.0.7 → scalable-pypeline-2.0.9}/pypeline/flask/api/pipelines.py

@@ -1,25 +1,46 @@
 """ Pipeline APIs
 """
+
+import importlib.metadata
 import logging
 
 from flask import jsonify
-from flask_smorest import Blueprint
 from flask.views import MethodView
+from flask_smorest import Blueprint
 from marshmallow import Schema, fields
 from marshmallow.exceptions import ValidationError
 from webargs.flaskparser import abort
-
+from packaging import version
 from pypeline.composition import PipelineResult
 from pypeline.constants import API_DOC_RESPONSES, API_DOC_PARAMS, API_PATH_V1
-from pypeline.utils.pipeline_utils import dag_generator
 from pypeline.flask.decorators import require_accesskey
-from pypeline.utils.config_utils import retrieve_latest_pipeline_config
 from pypeline.pipeline_config_schema import BasePipelineSchema, PipelineSchemaV1
+from pypeline.utils.config_utils import retrieve_latest_pipeline_config
+from pypeline.utils.pipeline_utils import dag_generator
 
 logger = logging.getLogger(__name__)
 bp = Blueprint("pipelines", __name__, url_prefix=API_PATH_V1 + "/pipelines")
 
 
+try:
+    flask_smorest_version = importlib.metadata.version("flask-smorest")
+    flask_smorest_version_parsed = version.parse(flask_smorest_version)
+except importlib.metadata.PackageNotFoundError:
+    flask_smorest_version_parsed = None
+
+
+def get_response_decorator(bp, status_code, *args, **kwargs):
+    if flask_smorest_version is None:
+        # Handle the case where flask-smorest is not installed
+        raise ImportError("flask-smorest is not installed.")
+    elif flask_smorest_version_parsed < version.parse("0.29"):
+        # Adjust arguments for older versions if needed
+        return bp.response(*args, **kwargs)
+    else:
+        # Adjust arguments for newer versions if needed
+        return bp.response(status_code, *args, **kwargs)
+
+
 class InvokePipelineSchema(Schema):
     """Incoming schema for invoking a pipeline"""
 
@@ -135,7 +156,7 @@ class PipelineInvoke(MethodView):
         tags=["Pipelines"],
     )
     @bp.arguments(InvokePipelineSchema)
-    @bp.response(InvokePipelineResponseSchema)
+    @get_response_decorator(bp, "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 +212,7 @@ class PipelineResults(MethodView):
         ],
         tags=["Pipelines"],
     )
-    @bp.response(GetPipelineResultResponseSchema)
+    @get_response_decorator(bp, "200", GetPipelineResultResponseSchema)
     def get(self, execution_id: str):
         """Retrieve results of a pipeline's execution based on execution_id
 

{scalable-pypeline-2.0.7 → scalable-pypeline-2.0.9}/requirements.txt

@@ -1,6 +1,5 @@
 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
+db-medley[redis]>=1.0.2,<2

{scalable-pypeline-2.0.7 → scalable-pypeline-2.0.9/scalable_pypeline.egg-info}/PKG-INFO

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

{scalable-pypeline-2.0.7 → scalable-pypeline-2.0.9}/scalable_pypeline.egg-info/requires.txt

@@ -1,32 +1,26 @@
 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
+db-medley[redis]<2,>=1.0.2
 
 [build]
 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
+markupsafe==2.0.1
+flask-smorest<1,>=0.23.0
 
 [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
 
 [web]
 gunicorn

{scalable-pypeline-2.0.7 → scalable-pypeline-2.0.9}/setup.py

@@ -1,5 +1,6 @@
 """ PypeLine Library Setup
 """
+
 import re
 import ast
 import sys
@@ -174,11 +175,8 @@ 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",
+            "markupsafe==2.0.1",
+            "flask-smorest>=0.23.0,<1",
         ],
         "web": ["gunicorn", "gevent>=21.12.0,<22"],
         "workers": [
@@ -186,15 +184,13 @@ 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",
         ],
     },
     entry_points={

scalable-pypeline-2.0.7/pypeline/__init__.py

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