scalable-pypeline 2.1.11__tar.gz → 2.1.13__tar.gz

{scalable-pypeline-2.1.11/scalable_pypeline.egg-info → scalable-pypeline-2.1.13}/PKG-INFO

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

scalable-pypeline-2.1.13/pypeline/__init__.py

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

{scalable-pypeline-2.1.11 → scalable-pypeline-2.1.13}/pypeline/pipeline_config_schema.py

@@ -120,8 +120,8 @@ class TaskDefinitionsSchemaV1(ExcludeUnknownSchema):
     serverType = fields.String(
         required=False,
         validate=OneOf(
-            ["xs", "s", "m", "l", "xl", "xxl", "xxxl"],
-            error="Invalid serverType. Available options: 'xs', 's', 'm', 'l', 'xl', 'xxl', 'xxxl'.",
+            ["xs", "s", "m", "l", "xl", "xxl", "xxxl", "cpu-xl"],
+            error="Invalid serverType. Available options: 'xs', 's', 'm', 'l', 'xl', 'xxl', 'xxxl', 'cpu-xl'.",
         ),
     )
 
@@ -152,8 +152,8 @@ class TaskDefinitionsSchemaV2(ExcludeUnknownSchema):
     serverType = fields.String(
         required=False,
         validate=OneOf(
-            ["xs", "s", "m", "l", "xl", "xxl", "xxxl"],
-            error="Invalid serverType. Available options: 'xs', 's', 'm', 'l', 'xl', 'xxl', 'xxxl'.",
+            ["xs", "s", "m", "l", "xl", "xxl", "xxxl", "cpu-xl"],
+            error="Invalid serverType. Available options: 'xs', 's', 'm', 'l', 'xl', 'xxl', 'xxxl', 'cpu-xl'.",
         ),
     )
 

{scalable-pypeline-2.1.11 → scalable-pypeline-2.1.13}/pypeline/pipeline_settings_schema.py

@@ -1,4 +1,4 @@
-from marshmallow import Schema, fields, validate, ValidationError, validates_schema
+from marshmallow import Schema, fields, validate, ValidationError, validates_schema, INCLUDE
 
 
 class MissingSettingsException(Exception):
@@ -178,6 +178,9 @@ def create_pipeline_settings_schema(pipeline_settings_schema_data):
         else:
             schema_fields[key] = field_type(**field_args)
 
+    schema_fields["Meta"] = type(
+        "Meta", (), {"unknown": INCLUDE}
+    )
     # Dynamically create a schema class with the generated fields
     DynamicPipelineSettingsSchema = type(
         "DynamicPipelineSettingsSchema", (Schema,), schema_fields

{scalable-pypeline-2.1.11 → scalable-pypeline-2.1.13}/pypeline/pipelines/composition/pypeline_composition.py

@@ -86,6 +86,10 @@ class Pypeline:
                 )
                 message = lazy_actor.message()
                 message.options["pipeline"] = pipeline
+                if pipeline_config["metadata"].get("maxRetry", None) is not None:
+                    message.options["max_retries"] = pipeline_config["metadata"][
+                        "maxRetry"
+                    ]
                 message.options["task_replacements"] = copy(
                     scenario["taskReplacements"]
                 )
@@ -121,6 +125,8 @@ class Pypeline:
         )
         message = lazy_actor.message()
         message.options["pipeline"] = pipeline
+        if pipeline_config["metadata"].get("maxRetry", None) is not None:
+            message.options["max_retries"] = pipeline_config["metadata"]["maxRetry"]
         message.options["task_replacements"] = first_scenario_task_replacements
         message.options["execution_id"] = base_case_execution_id
         message.options["task_name"] = first_task

{scalable-pypeline-2.1.11 → scalable-pypeline-2.1.13}/pypeline/pipelines/middleware/pypeline_middleware.py

@@ -24,6 +24,7 @@ class PypelineMiddleware(Middleware):
             return
 
         pipeline = message.options["pipeline"]
+        max_retries = message.options.get("max_retries", None)
         pipeline_config = pipeline["config"]
         task_replacements = message.options["task_replacements"]
         execution_id = message.options["execution_id"]
@@ -138,6 +139,8 @@ class PypelineMiddleware(Middleware):
                         )
                         scenario_message = lazy_actor.message()
                         scenario_message.options["pipeline"] = pipeline
+                        if max_retries is not None:
+                            scenario_message.options["max_retries"] = max_retries
                         scenario_message.options["task_replacements"] = (
                             task_replacements
                         )
@@ -182,6 +185,8 @@ class PypelineMiddleware(Middleware):
 
             child_message = lazy_actor.message()
             child_message.options["pipeline"] = pipeline
+            if max_retries is not None:
+                child_message.options["max_retries"] = max_retries
             child_message.options["task_replacements"] = task_replacements
             child_message.options["execution_id"] = execution_id
             child_message.options["task_name"] = child

{scalable-pypeline-2.1.11 → scalable-pypeline-2.1.13/scalable_pypeline.egg-info}/PKG-INFO

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

scalable-pypeline-2.1.11/pypeline/__init__.py

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