scalable-pypeline 2.0.7__py2.py3-none-any.whl → 2.0.9__py2.py3-none-any.whl

pypeline/__init__.py

@@ -1 +1 @@
-__version__ = "2.0.7"
+__version__ = "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()
 

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.dist-info → scalable_pypeline-2.0.9.dist-info}/METADATA

@@ -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
@@ -8,30 +8,24 @@ License: Apache License 2.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML (<7,>=6.0.1)
-Requires-Dist: click (==8.0.4)
 Requires-Dist: marshmallow (<4,>=3.2.1)
 Requires-Dist: redis (<5,>=4.5.4)
-Requires-Dist: db-medley[redis] (<2,>=1.0.2)
 Requires-Dist: croniter (<2,>=1.0.15)
+Requires-Dist: db-medley[redis] (<2,>=1.0.2)
 Provides-Extra: build
 Requires-Dist: wheel ; extra == 'build'
 Requires-Dist: twine ; extra == 'build'
 Provides-Extra: dev
-Requires-Dist: blackd ; extra == 'dev'
+Requires-Dist: black ; extra == 'dev'
 Provides-Extra: flask
-Requires-Dist: Werkzeug (==2.0.3) ; extra == 'flask'
-Requires-Dist: itsdangerous (==2.0.1) ; extra == 'flask'
-Requires-Dist: Flask (<2,>=1.1.2) ; extra == 'flask'
-Requires-Dist: flask-smorest (<0.29,>=0.23.0) ; extra == 'flask'
-Requires-Dist: Jinja2 (==3.0.3) ; extra == 'flask'
+Requires-Dist: markupsafe (==2.0.1) ; extra == 'flask'
+Requires-Dist: flask-smorest (<1,>=0.23.0) ; extra == 'flask'
 Provides-Extra: test
 Requires-Dist: pytest-cov (<3,>=2.6.1) ; extra == 'test'
 Requires-Dist: tox (<4,>=3.14.1) ; extra == 'test'
 Requires-Dist: mock (<2,>=1) ; extra == 'test'
-Requires-Dist: moto (<4,>=1.3.16) ; extra == 'test'
 Requires-Dist: responses (<0.11,>=0.10.16) ; extra == 'test'
 Requires-Dist: fakeredis (<3,>=2.10.3) ; extra == 'test'
-Requires-Dist: importlib-metadata (<5,>=4.12) ; extra == 'test'
 Provides-Extra: web
 Requires-Dist: gunicorn ; extra == 'web'
 Requires-Dist: gevent (<22,>=21.12.0) ; extra == 'web'

{scalable_pypeline-2.0.7.dist-info → scalable_pypeline-2.0.9.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pypeline/__init__.py,sha256=L4aOgvDE9n_eqL_mM_j5bO3bQ73q6ulNpnVuG8OmqWE,22
+pypeline/__init__.py,sha256=pZib55qStLeBfZabni1F1OCNxdT02xP-5e34LjIBswQ,22
 pypeline/barrier.py,sha256=dLDaprH5NB-C7MQjZqPpBBhMjmO0VV_kTonlgweznHc,1096
 pypeline/composition.py,sha256=pTw9Xb9h4JnV4siFc3JStm5lB-i9djUADo3Kh5K3s7g,12976
 pypeline/constants.py,sha256=coiF8dMP25qIwoNYSnS7oy7hCd4-5yqPFmdPsN93Q1A,2892
-pypeline/dramatiq.py,sha256=jghG2F57Z3NSxHvHz1yyYvdLwje0KdhcWQQEhBGOTf4,15583
+pypeline/dramatiq.py,sha256=Y909HoNhH5Berd61N6nHrpE1dTU-zmvimH91SldP-SI,15912
 pypeline/extensions.py,sha256=BzOTnXhNxap3N7uIUUh_hO6dDwx08Vc_RJDE93_K0Lo,610
 pypeline/middleware.py,sha256=kTp6niYoe2nXIiN6EGRfdpxrJyioo0GPxDkfefbGlEk,2821
 pypeline/pipeline_config_schema.py,sha256=DQ_RMucnA0AyrndlW6lkb0orGromcO6C9GgLHyG6lJ0,8013
@@ -12,16 +12,16 @@ pypeline/flask/__init__.py,sha256=AdljRh0lMiS8ExgDmgzObwVs8jW7hqQuf83Ml8kn8GQ,49
 pypeline/flask/decorators.py,sha256=ki6jkjZwbDbCWuj7ET7N-ncZwrASp4Fy7257WIYiAAQ,1102
 pypeline/flask/flask_pypeline.py,sha256=Uqyu3PnSP3DoVZUJPqV9chjT4xdRgvcL3OMXxkbdTEg,5490
 pypeline/flask/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypeline/flask/api/pipelines.py,sha256=sPvEoNwmnJPSA96lZHYS2fwKqZlVyE2OSjUmOPFi91o,7267
+pypeline/flask/api/pipelines.py,sha256=RzRmSL5Zaia7ftXmXyDAC0ZAkPoFsvyefzHfIyWhRqk,8118
 pypeline/flask/api/schedules.py,sha256=31lwoFlGv-S-2ahGUCnD5YbmKws8yddj6_PEzzdBi9s,1321
 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=tt71hLEFgPieokJZlC1rP2dmCTctrOPt7K1rGlbnT4o,5967
 tests/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scalable_pypeline-2.0.7.dist-info/LICENSE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
-scalable_pypeline-2.0.7.dist-info/METADATA,sha256=5FZyD2MeoKgb1XFTswjO8MTP5RfVuoOXz33mdVHa0dc,6239
-scalable_pypeline-2.0.7.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-scalable_pypeline-2.0.7.dist-info/entry_points.txt,sha256=uWs10ODfHSBKo2Cx_QaUjPHQTpZ3e77j9VlAdRRmMyg,119
-scalable_pypeline-2.0.7.dist-info/top_level.txt,sha256=C7dpkEOc_-nnsAQb28BfQknjD6XHRyS9ZrvVeoIbV7s,15
-scalable_pypeline-2.0.7.dist-info/RECORD,,
+scalable_pypeline-2.0.9.dist-info/LICENSE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
+scalable_pypeline-2.0.9.dist-info/METADATA,sha256=Kw2kj-CbTmuRdM8FJALTtgfg-JlW-DG87GQ0HLGMzd4,5929
+scalable_pypeline-2.0.9.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+scalable_pypeline-2.0.9.dist-info/entry_points.txt,sha256=uWs10ODfHSBKo2Cx_QaUjPHQTpZ3e77j9VlAdRRmMyg,119
+scalable_pypeline-2.0.9.dist-info/top_level.txt,sha256=C7dpkEOc_-nnsAQb28BfQknjD6XHRyS9ZrvVeoIbV7s,15
+scalable_pypeline-2.0.9.dist-info/RECORD,,