Included monitor in execution contract and hardened its functions

core/execution/executioncontract.py

@@ -1,18 +1,26 @@
 from core.execution.action import buildAction
 from core.execution.operation import buildOperation
+from core.execution.monitor import buildMonitor
 from core.runtime import manageFailure
 
 def executeContract(module, outputs):
     
     if module.kind == "operation":
+
         outputs, responses = buildOperation(module, outputs)
         
         return outputs, responses
 
     elif module.kind == "action":
+
         outputs, response = buildAction(module, outputs)
 
         return outputs, response
 
+    elif module.kind == "monitor":
+        outputs, response= buildMonitor(module, outputs)
+
+        return outputs, response
+
     #except Exception as error:
         #outputs = manageFailure(error, module)

core/execution/monitor.py

@@ -1,25 +1,37 @@
-from core.execution.executioncontract import executeContract
+#from core.execution.executioncontract import executeContract
 from core.execution.action import buildAction
+from core.execution.operation import buildOperation
 from core.apirequest import executeRequest
 from core.runtime.resolver import resolveItem
 from core.runtime.applyconditions import applyConditions
-from plugins.rmass.actions import login, refresh_tokens
+#from plugins.rmass.actions import login, refresh_tokens
 from core.runtime import buildOutput
+from core.runtime.savedata import loadSave
 
 outputs = {}
 resolved = {}
+
 def buildMonitor(monitor, outputs):
+    outputs = loadSave(monitor, outputs)
 
-    outputs, response = buildAction(refresh_tokens, outputs)    
-    outputs, response = buildAction(monitor, outputs)
+    response, outputs = executeRequest(monitor, outputs, resolved)
+
+    responsedata = response.json()
+    
+    readitems = resolveItem(monitor, responsedata)
 
-    readitems = resolveItem(monitor, response.json())
     match, filter = applyConditions(monitor, readitems, outputs)
+    
     outputs = buildOutput(response, monitor, outputs)
     
-    if match:
-        #print("FILTERING")
-        outputs = executeContract(filter["execute"], outputs)
-        response, outputs = executeRequest(monitor, outputs, outputs)
 
-    return outputs
+    if match:
+        module = filter["execute"]
+
+        if module.kind == "action":
+            outputs, response = buildAction(module, outputs)
+        if module.kind == "operation":
+            outputs, responses = buildOperation(module, outputs)
+            response = responses 
+
+    return outputs, response