Stopped returning lifecycles on lifecycleregistry

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"],
@@ -47,7 +47,7 @@ def executeRequest(action, outputs, resolved):
                 files=request.get("files"),
                 timeout=(10, 30)
             )
-            return response, outputs
+            return response
 
         except (requests.Timeout, requests.ConnectionError) as error:
             #print(f"{type(error).__name__} during {action.name}: {error}")
@@ -57,4 +57,4 @@ def executeRequest(action, outputs, resolved):
             if attempt == 0:
                 logging.warning(f"Retrying {action.name}")
 
-    return None, outputs
+    return None

core/apirequest/request.py

@@ -46,4 +46,4 @@ def buildRequest(definition, outputs, resolved):
                 "image/jpeg",
             ),
         }
-    return request, outputs
+    return request

core/execution/action/action.py

@@ -16,11 +16,11 @@ def buildAction (action, outputs, process):
 
     if match:
         if filter.get("execute", False):
-            response, outputs = executeRequest(filter["execute"], outputs, resolved)
+            response = executeRequest(filter["execute"], outputs, resolved)
 
         return None
     
-    response, outputs = executeRequest(action, outputs, resolved)
+    response = executeRequest(action, outputs, resolved)
 
     if response is None:
         return outputs, None

core/execution/lifecyclemanager/lifecycleregistry.py

@@ -36,4 +36,4 @@ def registerLifecycle(module, lifecycles):
 
     
 
-    return lifecycles
+    return

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
@@ -15,11 +12,16 @@ resolved = {}
 def buildMonitor(monitor, outputs):
     loadSave(monitor, outputs)
 
-    response, outputs = executeRequest(monitor, outputs, resolved)
+    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 

core/runtime/responsepolicy.py

@@ -11,7 +11,7 @@ def responsePolicy(response, action, outputs, resolved):
                 if policy["statuscode"] == response.status_code:
                     logging.warning(policy["print"])
 
-                    newresponse, outputs = executeRequest(policy["execute"], outputs, resolved)
+                    newresponse = executeRequest(policy["execute"], outputs, resolved)
 
                     if policy["response_update"]:
                         logging.info("Updating response")