Runtime contract extended to include readRow, applyConditions and responsePolicy

core/runtime/runtimecontract.py

@@ -1,20 +1,25 @@
-from core.runtime import buildSelect, buildOutput, buildSave, loadSave, saveRow, buildLog
+from core.runtime import buildSelect, buildOutput, buildSave, loadSave, saveRow, readRow, buildLog
 from core.runtime.image import buildImage
 #from core.runtime.select import buildSelect3
 from core.runtime.resolver import resolveItem
+from core.runtime.applyconditions import applyConditions
+from core.runtime.responsepolicy import responsePolicy
 
 def buildPreRuntimeAttr(action, outputs):
-    if action.kind == "action":
     outputs = loadSave(action, outputs)
+
     resolved = resolveItem(action, outputs)
-        return outputs, resolved
+
-    elif action.kind == "monitor":
+    resolved, outputs = readRow(action, resolved, outputs)
-        outputs = loadSave(action, outputs)
+
-        resolved = {}
+    match, filter = applyConditions(action, resolved, outputs)
-        return outputs, resolved
+    
+    return outputs, resolved, match, filter
+    
 
 def buildRuntimeAttr(action, outputs, resolved, response):
-    if action.kind == "action":
+    outputs, resolved = responsePolicy(response, action, outputs, resolved)
+
     outputs = buildOutput(response, action, outputs)
 
     outputs = buildImage(response, action, outputs)
@@ -28,7 +33,3 @@ def buildRuntimeAttr(action, outputs, resolved, response):
     buildLog(action, outputs, response)
 
     return outputs, response
-    elif action.kind == "monitor":
-        #readitems = resolveItem(action, response.json())
-        #print(readitems)
-        return outputs, response