From af2817cc1207286fe77992ee32ec49d5052b1569 Mon Sep 17 00:00:00 2001 From: Lyncoln Date: Thu, 29 Oct 2026 02:55:28 -0400 Subject: [PATCH] Stopped returning outputs on buildRequest and executeRequest and switched to usinf executeContract in monitor --- core/apirequest/execute.py | 2 +- core/apirequest/request.py | 2 +- core/execution/monitor.py | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/apirequest/execute.py b/core/apirequest/execute.py index 0be1a55..5fb97fa 100644 --- a/core/apirequest/execute.py +++ b/core/apirequest/execute.py @@ -36,7 +36,7 @@ def executeRequest(action, outputs, resolved): ) for attempt in range(2): - request, outputs = buildRequest(action, outputs, resolved) + request = buildRequest(action, outputs, resolved) try: response = session.request( method=request["method"], diff --git a/core/apirequest/request.py b/core/apirequest/request.py index 6d1ae7c..ef7af52 100644 --- a/core/apirequest/request.py +++ b/core/apirequest/request.py @@ -46,4 +46,4 @@ def buildRequest(definition, outputs, resolved): "image/jpeg", ), } - return request, outputs + return request diff --git a/core/execution/monitor.py b/core/execution/monitor.py index 76a15a5..86dda10 100644 --- a/core/execution/monitor.py +++ b/core/execution/monitor.py @@ -1,8 +1,5 @@ import logging -#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 @@ -17,9 +14,14 @@ def buildMonitor(monitor, outputs): response = executeRequest(monitor, outputs, resolved) + ##Potentially replace response processing with responsePolicy if response is None: return None + if not response.ok: + logging.warning(f"Response with status code {response.status_code} during {monitor.name}") + return response + responsedata = response.json() readitems = resolveItem(monitor, responsedata) @@ -29,13 +31,11 @@ def buildMonitor(monitor, outputs): buildOutput(response, monitor, outputs) if match: + from core.execution.executioncontract import executeContract + logging.info(filter.get("print")) module = filter["execute"] - if module.kind == "action": - response = buildAction(module, outputs, None) - if module.kind == "operation": - responses = buildOperation(module, outputs) - response = responses + response = executeContract(filter["execute"], outputs, None) return response \ No newline at end of file