Added logging based on applyConditions returned filter. Stopped accepting returned outputs where its modified in place
This commit is contained in:
@@ -1,13 +1,12 @@
|
|||||||
from core.execution.action import action
|
import logging
|
||||||
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, extractItem
|
|
||||||
from core.runtime.applyconditions import applyConditions
|
|
||||||
from core.runtime.responsepolicy import responsePolicy
|
|
||||||
from core.runtime.stopsignals import addStopSignal
|
from core.runtime.stopsignals import addStopSignal
|
||||||
|
|
||||||
def buildPreRuntimeAttr(action, outputs, process):
|
def buildPreRuntimeAttr(action, outputs, process):
|
||||||
|
from core.runtime import loadSave, readRow
|
||||||
|
from core.runtime.applyconditions import applyConditions
|
||||||
|
from core.runtime.resolver import resolveItem
|
||||||
|
|
||||||
outputs = loadSave(action, outputs)
|
outputs = loadSave(action, outputs)
|
||||||
|
|
||||||
resolved = resolveItem(action, outputs)
|
resolved = resolveItem(action, outputs)
|
||||||
@@ -17,28 +16,31 @@ def buildPreRuntimeAttr(action, outputs, process):
|
|||||||
match, filter = applyConditions(action, resolved, outputs)
|
match, filter = applyConditions(action, resolved, outputs)
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
outputs = addStopSignal(action, outputs, process)
|
logging.info(filter.get("print"))
|
||||||
|
addStopSignal(action, outputs, process)
|
||||||
|
|
||||||
return outputs, resolved, match, filter
|
return outputs, resolved, match, filter
|
||||||
|
|
||||||
|
|
||||||
def buildRuntimeAttr(action, outputs, resolved, response, process):
|
def buildRuntimeAttr(action, outputs, resolved, response, process):
|
||||||
outputs = responsePolicy(response, action, outputs, resolved)
|
from core.runtime.resolver import extractItem
|
||||||
|
from core.runtime.responsepolicy import responsePolicy
|
||||||
|
from core.runtime.image import buildImage
|
||||||
|
from core.runtime import buildSelect, buildOutput, buildSave, saveRow, buildLog
|
||||||
|
|
||||||
#print(f"Response status code: {response.status_code} during {action.name}")
|
response = responsePolicy(response, action, outputs, resolved)
|
||||||
#print(f"Response content: {response.content} during {action.name}")
|
|
||||||
|
|
||||||
outputs = buildOutput(response, action, outputs)
|
buildOutput(response, action, outputs)
|
||||||
|
|
||||||
if not response.ok:
|
if not response.ok:
|
||||||
outputs = addStopSignal(action, outputs, process)
|
addStopSignal(action, outputs, process)
|
||||||
return outputs, response
|
return outputs, response
|
||||||
|
|
||||||
resolved = extractItem(action, outputs, resolved)
|
extractItem(action, outputs, resolved)
|
||||||
|
|
||||||
outputs = buildImage(response, action, outputs)
|
buildImage(response, action, outputs)
|
||||||
|
|
||||||
action, outputs = buildSelect(action, outputs)
|
buildSelect(action, outputs)
|
||||||
|
|
||||||
buildSave(action, outputs)
|
buildSave(action, outputs)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user