scalable-pypeline 2.1.10__tar.gz → 2.1.12__tar.gz

{scalable-pypeline-2.1.10/scalable_pypeline.egg-info → scalable-pypeline-2.1.12}/PKG-INFO

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

scalable-pypeline-2.1.12/pypeline/__init__.py

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

{scalable-pypeline-2.1.10 → scalable-pypeline-2.1.12}/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.10 → scalable-pypeline-2.1.12}/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.10 → scalable-pypeline-2.1.12}/pypeline/pipelines/middleware/pypeline_middleware.py

@@ -48,16 +48,16 @@ class PypelineMiddleware(Middleware):
 
         messages = []
         for child in children_tasks:
-            child_ancestors = sorted(nx.ancestors(graph, child))
+            child_ancestors = sorted(graph.predecessors(child))
 
             ancestor_tasks_complete = True
 
             for ancestor in child_ancestors:
-                task_key = f"{execution_id}-{ancestor}"
+                ancestor_task_key = f"{execution_id}-{ancestor}"
 
                 locking_parallel_barrier = LockingParallelBarrier(
                     self.redis_url,
-                    task_key=task_key,
+                    task_key=ancestor_task_key,
                     lock_key=f"{message.options['base_case_execution_id']}-lock",
                 )
                 try:
@@ -75,12 +75,14 @@ class PypelineMiddleware(Middleware):
                 # If the lock didn't exist for the current tasks execution id then it would indicate
                 # that this is the start of a new scenario.  Therefore we need to find the ancestor
                 # that is executed in the base case execution id and make sure it has completed
-                if not remaining_tasks:
-                    task_key = f"{message.options['base_case_execution_id']}-{ancestor}"
+                if remaining_tasks is None:
+                    ancestor_task_key = (
+                        f"{message.options['base_case_execution_id']}-{ancestor}"
+                    )
 
                     locking_parallel_barrier = LockingParallelBarrier(
                         self.redis_url,
-                        task_key=task_key,
+                        task_key=ancestor_task_key,
                         lock_key=f"{message.options['base_case_execution_id']}-lock",
                     )
                     try:

{scalable-pypeline-2.1.10 → scalable-pypeline-2.1.12/scalable_pypeline.egg-info}/PKG-INFO

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

scalable-pypeline-2.1.10/pypeline/__init__.py

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