Minor changes and general cleanupo of extra lines, returns and debugging prints

core/execution/action/action.py

@@ -23,15 +23,15 @@ def buildAction (action, outputs):
             recursiveresponses.append(response)
             outputs, response = buildRuntimeAttr(action, outputs, resolved, response)
 
-        return outputs, recursiveresponses, match, filter
+        return outputs, recursiveresponses
 
     else:
         outputs, resolved, match, filter = buildPreRuntimeAttr(action, outputs)
 
         if match:
-            return outputs, resolved, match, filter
+            return outputs, resolved
         
         response, outputs = executeRequest(action, outputs, resolved)    
         outputs, response = buildRuntimeAttr(action, outputs, resolved, response)
 
-    return outputs, response, match, filter
+    return outputs, response

core/execution/executioncontract.py

@@ -3,14 +3,16 @@ from core.execution.operation import buildOperation
 from core.runtime import manageFailure
 
 def executeContract(module, outputs):
-    #try:
+    
     if module.kind == "operation":
-        outputs = buildOperation(module, outputs)
+        outputs, responses = buildOperation(module, outputs)
+        
+        return outputs, responses
 
     elif module.kind == "action":
-        outputs = buildAction(module, outputs)
+        outputs, response = buildAction(module, outputs)
+
+        return outputs, response
     
     #except Exception as error:
         #outputs = manageFailure(error, module)
-
-    return outputs

core/execution/operation/operation.py

@@ -11,12 +11,11 @@ def buildOperation(definition, outputs):
 
     for action in actions:
 
-
         if action == "recursiveset":
             outputs, responses = recursiveSet(definition, outputs, responses)
 
         else:
-            outputs, response, match, filter = buildAction(action, outputs)
+            outputs, response = buildAction(action, outputs)
 
             responses.append(response)
 

core/runtime/recursive.py

@@ -8,13 +8,11 @@ def recursiveSet(definition, outputs, responses):
         outputs[definition.recursiveset["outputlabel"]] = item
 
         for job in recursiveset:
-            outputs, response, match, filter = buildAction(job, outputs)
+            outputs, response = buildAction(job, outputs)
             responses.append(response)
 
     return outputs, responses
 
-#from core.execution.action.action import buildAction
-
 def recursiveAction(action, outputs):
     recursiveresponses = []
     items = outputs[action.recursive["source"]]

core/runtime/responsepolicy.py

@@ -4,11 +4,12 @@ from core.apirequest import executeRequest
 def responsePolicy(response, action, outputs, resolved):
     if hasattr(action, "responsepolicy"):
         if not response.ok:
+            print(response)
+
             for policy in action.responsepolicy:
                 if policy["statuscode"] == response.status_code:
                     print(policy["print"])
 
-                    #outputs, response, match, filter = buildAction(policy["execute"], outputs)
                     response, outputs = executeRequest(policy["execute"], outputs, resolved)
 
                     return outputs, resolved

core/runtime/select.py

@@ -25,10 +25,10 @@ def buildSelect(action, outputs):
                     select_data.append(item)
 
             #outputs[{action.select["source"]}] = select_data
-            outputs[action.alias] = select_data
+            outputs[f"{action.alias}_select"] = select_data
 
-            print("DEBUGGING", action.alias)
+            #print("DEBUGGING", action.alias)
-            print(outputs[action.alias])            
+            #print(outputs[f"{action.alias}_select"])            
 
             return select_data, action, outputs
         except (KeyError, TypeError):

monitor.py

@@ -8,4 +8,4 @@ resolved = {}
 while True:
     outputs = buildMonitor(rmassmonitor, outputs)
 
-    time.sleep(10)
+    time.sleep(30)