Apply conditions included in action runtime. Actions now decide their own execution conditions

core/execution/action/action.py

@@ -3,7 +3,6 @@ from core.runtime.runtimecontract import buildRuntimeAttr, buildPreRuntimeAttr
 
 
 def buildAction (action, outputs):
-    #outputs, resolved = buildPreRuntimeAttr(action, outputs)
 
     if hasattr(action, "recursive"):
         recursiveresponses = []
@@ -15,19 +14,24 @@ def buildAction (action, outputs):
 
         for item in items:
             outputs[action.recursive["label"]] = item
+            outputs, resolved, match, filter = buildPreRuntimeAttr(action, outputs)
 
-            outputs, resolved = buildPreRuntimeAttr(action, outputs)
-
+            if match:
+                continue
+            
             response, outputs = executeRequest(action, outputs, resolved)
             recursiveresponses.append(response)
-    
             outputs, response = buildRuntimeAttr(action, outputs, resolved, response)
 
-        return outputs, recursiveresponses
+        return outputs, recursiveresponses, match, filter
 
     else:
-        outputs, resolved = buildPreRuntimeAttr(action, outputs)
+        outputs, resolved, match, filter = buildPreRuntimeAttr(action, outputs)
+
+        if match:
+            return outputs, resolved, match, filter
+
         response, outputs = executeRequest(action, outputs, resolved)    
         outputs, response = buildRuntimeAttr(action, outputs, resolved, response)
 
-    return outputs, response
+    return outputs, response, match, filter

core/execution/operation/operation.py

@@ -8,24 +8,18 @@ outputs = {}
 def buildOperation(definition, outputs):
     actions = definition.actions
     responses = []
-    #outputs = {}
 
     for action in actions:
 
-        if skipStep(definition, action, outputs):
-            continue
 
         if action == "recursiveset":
             outputs, responses = recursiveSet(definition, outputs, responses)
 
         else:
-            outputs, response = buildAction(action, outputs)
+            outputs, response, match, filter = buildAction(action, outputs)
+
             responses.append(response)
 
-        
-        #print("DEBUG ID GRAB. CHECK LASTMESSAGES")
-        #print(outputs)
-        #print(responses)
 
         #except Exception as error:
             #outputs = manageFailure(error, action, outputs)