From dd42d4bdcd43d2e27fc96663fb58a58890768542 Mon Sep 17 00:00:00 2001 From: Lyncoln Date: Wed, 21 Oct 2026 15:42:22 -0400 Subject: [PATCH] Minor changes and general cleanupo of extra lines, returns and debugging prints --- core/execution/action/action.py | 8 ++++---- core/execution/executioncontract.py | 12 +++++++----- core/execution/operation/operation.py | 3 +-- core/runtime/recursive.py | 4 +--- core/runtime/responsepolicy.py | 3 ++- core/runtime/select.py | 6 +++--- monitor.py | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/core/execution/action/action.py b/core/execution/action/action.py index 9f5851a..f284dcf 100644 --- a/core/execution/action/action.py +++ b/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 diff --git a/core/execution/executioncontract.py b/core/execution/executioncontract.py index 2b3a550..3a5291a 100644 --- a/core/execution/executioncontract.py +++ b/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 diff --git a/core/execution/operation/operation.py b/core/execution/operation/operation.py index 0430432..89e73ac 100644 --- a/core/execution/operation/operation.py +++ b/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) diff --git a/core/runtime/recursive.py b/core/runtime/recursive.py index 96fc117..5d08762 100644 --- a/core/runtime/recursive.py +++ b/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"]] diff --git a/core/runtime/responsepolicy.py b/core/runtime/responsepolicy.py index 61a4f64..6742fce 100644 --- a/core/runtime/responsepolicy.py +++ b/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 diff --git a/core/runtime/select.py b/core/runtime/select.py index 4d419a2..6c47e3b 100644 --- a/core/runtime/select.py +++ b/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(outputs[action.alias]) + #print("DEBUGGING", action.alias) + #print(outputs[f"{action.alias}_select"]) return select_data, action, outputs except (KeyError, TypeError): diff --git a/monitor.py b/monitor.py index d37914d..dd1c5df 100644 --- a/monitor.py +++ b/monitor.py @@ -8,4 +8,4 @@ resolved = {} while True: outputs = buildMonitor(rmassmonitor, outputs) - time.sleep(10) \ No newline at end of file + time.sleep(30) \ No newline at end of file