Improved response collection across operation items
This commit is contained in:
@@ -6,6 +6,7 @@ def buildAction (action, outputs):
|
|||||||
#outputs, resolved = buildPreRuntimeAttr(action, outputs)
|
#outputs, resolved = buildPreRuntimeAttr(action, outputs)
|
||||||
|
|
||||||
if hasattr(action, "recursive"):
|
if hasattr(action, "recursive"):
|
||||||
|
recursiveresponses = []
|
||||||
items = outputs[action.recursive["source"]]
|
items = outputs[action.recursive["source"]]
|
||||||
reverse = action.recursive.get("reverse", False)
|
reverse = action.recursive.get("reverse", False)
|
||||||
|
|
||||||
@@ -14,10 +15,16 @@ def buildAction (action, outputs):
|
|||||||
|
|
||||||
for item in items:
|
for item in items:
|
||||||
outputs[action.recursive["label"]] = item
|
outputs[action.recursive["label"]] = item
|
||||||
|
|
||||||
outputs, resolved = buildPreRuntimeAttr(action, outputs)
|
outputs, resolved = buildPreRuntimeAttr(action, outputs)
|
||||||
|
|
||||||
response, outputs = executeRequest(action, outputs, resolved)
|
response, outputs = executeRequest(action, outputs, resolved)
|
||||||
|
recursiveresponses.append(response)
|
||||||
|
|
||||||
outputs, response = buildRuntimeAttr(action, outputs, response)
|
outputs, response = buildRuntimeAttr(action, outputs, response)
|
||||||
|
|
||||||
|
return outputs, recursiveresponses
|
||||||
|
|
||||||
else:
|
else:
|
||||||
outputs, resolved = buildPreRuntimeAttr(action, outputs)
|
outputs, resolved = buildPreRuntimeAttr(action, outputs)
|
||||||
response, outputs = executeRequest(action, outputs, resolved)
|
response, outputs = executeRequest(action, outputs, resolved)
|
||||||
|
|||||||
@@ -16,13 +16,17 @@ def buildOperation(definition, outputs):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
if action == "recursiveset":
|
if action == "recursiveset":
|
||||||
outputs = recursiveSet(definition, outputs)
|
outputs, responses = recursiveSet(definition, outputs, responses)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
outputs, response = buildAction(action, outputs)
|
outputs, response = buildAction(action, outputs)
|
||||||
responses.append(response)
|
responses.append(response)
|
||||||
|
|
||||||
|
|
||||||
|
print("DEBUG ID GRAB. CHECK LASTMESSAGES")
|
||||||
|
print(outputs)
|
||||||
|
print(responses)
|
||||||
#except Exception as error:
|
#except Exception as error:
|
||||||
#outputs = manageFailure(error, action, outputs)
|
#outputs = manageFailure(error, action, outputs)
|
||||||
#print(outputs)
|
|
||||||
return outputs
|
return outputs, responses
|
||||||
|
|||||||
@@ -1,17 +1,27 @@
|
|||||||
from core.execution.action.action import buildAction
|
from core.execution.action.action import buildAction
|
||||||
|
from plugins.rmass.actions import synapsenotify
|
||||||
|
|
||||||
def recursiveSet(definition, outputs):
|
def recursiveSet(definition, outputs, responses):
|
||||||
recursiveset = definition.recursiveset["actions"]
|
recursiveset = definition.recursiveset["actions"]
|
||||||
for item in outputs[definition.recursiveset["source"]]:
|
for item in outputs[definition.recursiveset["source"]]:
|
||||||
outputs[definition.recursiveset["outputlabel"]] = item
|
outputs[definition.recursiveset["outputlabel"]] = item
|
||||||
#outputs["recursive"] = item
|
|
||||||
print("DEBUGGING recursiveset item")
|
#print("DEBUGGING recursiveset item")
|
||||||
print(outputs[definition.recursiveset["outputlabel"]])
|
#print(outputs[definition.recursiveset["outputlabel"]])
|
||||||
|
|
||||||
for job in recursiveset:
|
for job in recursiveset:
|
||||||
outputs, response = buildAction(job, outputs)
|
outputs, response = buildAction(job, outputs)
|
||||||
|
responses.append(response)
|
||||||
|
|
||||||
return outputs
|
#response_data = response.json()
|
||||||
|
#print(f"RECURSIVESET {job.name} DEBUG")
|
||||||
|
#print(response_data)
|
||||||
|
|
||||||
|
#if response.status_code != 200:
|
||||||
|
#outputs, response = buildAction(synapsenotify, outputs)
|
||||||
|
#print("GETRMASSMESSAGEIDDEBUG")
|
||||||
|
#print(outputs)
|
||||||
|
return outputs, responses
|
||||||
|
|
||||||
from core.execution.action.action import buildAction
|
from core.execution.action.action import buildAction
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user