Reestablished working state

core/execution/action/action.py

@@ -2,24 +2,17 @@ from core.apirequest import executeRequest
 from core.runtime.savedata import loadSave, buildSave
 from core.runtime.outputs import buildOutput
 from core.runtime.logs import buildLog
+from core.runtime.runtimecontract import buildRuntimeAttr
 
 def buildAction (action, outputs):
 
     if hasattr(action, "loaddata"):
         outputs = loadSave(outputs, action)
 
-    response = executeRequest(action, outputs)
+    response, outputs = executeRequest(action, outputs)
 
-    if hasattr(action, "outputs"):
-        outputs = buildOutput(response, action, outputs)
+    #print("DEBUG:", outputs)
 
-    if hasattr(action, "savedata"):
-        save_file = buildSave(outputs, action)
-
-    if hasattr(action, "prints"):
-        logs = buildLog(action, outputs)
-
-    if action.showstatus is True and response.status_code == 200:
-        print(f"{action.name} successful")
+    outputs, response = buildRuntimeAttr(action, outputs, response)
 
     return outputs, response

core/execution/createthread.py

@@ -1,6 +1,6 @@
 import threading
-from lifecycleregistry import registerLifecycle
-from lifecyclemanager import manageLifecycle
+from .lifecyclemanager import registerLifecycle
+from .lifecyclemanager import manageLifecycle
 
 threadlist = []
 threadnum = 0
@@ -27,4 +27,4 @@ def buildThread(module, lifecycles):
     print(threadlist)
     print(lifecycles)
 
-    return threadnum, threadname, lifecycles, threadlist
+    return thread, lifecycles

core/execution/executioncontract.py

@@ -1,11 +1,16 @@
 from core.execution.action import buildAction
 from core.execution.operation import buildOperation
+from core.runtime import manageFailure
 
 def executeContract(module):
+    #try:
     if module.kind == "operation":
         outputs = buildOperation(module)
 
     elif module.kind == "action":
         outputs = buildAction(module)
 
+    #except Exception as error:
+        #outputs = manageFailure(error, module)
+
     return outputs

core/execution/lifecyclemanager/lifecyclemanager.py

@@ -1,8 +1,11 @@
 import time
+import os
 
 from core.execution.operation import buildOperation
 from core.execution.action import buildAction
-from core import executeContract
+from core.execution.executioncontract import executeContract
+
+sleeptime = int(os.environ.get("REFRESH_INTERVAL", 180))
 
 def manageLifecycle(module, lifecycles): #lifecycles, state):
     #print(lifecycles[module.name]["mode"])
@@ -15,7 +18,7 @@ def manageLifecycle(module, lifecycles): #lifecycles, state):
 
             #print(lifecycles)
 
-            time.sleep(module.sleeptime)
+            time.sleep(sleeptime)
 
     elif lifecycles[module.name]["mode"] == "oneshot":
         print(lifecycles)

core/execution/operation/operation.py

@@ -9,33 +9,19 @@ from .skipstep import skipStep
 
 def buildOperation(definition):
     actions = definition.actions
-
-#    responses = []
+    #print("DEBUG", actions)
+    responses = []
     outputs = {}
 
     for action in actions:
-        try:
-            if hasattr(definition, "skipstep"):
-                if skipStep(definition, action, outputs):
-                    continue
+        #try:
+        if hasattr(definition, "skipstep"):
+            if skipStep(definition, action, outputs):
+                continue
 
-            outputs, response = buildAction(action, outputs)
-#            responses.append(response)
-
-        except Exception as error:
-            outputs = manageFailure(error, action, outputs)
-
-#        if hasattr(action, "cookies"):
-#            for cookiename, cookie, in cookies:
-
-#                session.cookies.set(
-#                    cookiename,
-#                    outputs[cookie],
-#                    domain=domainname
-#                )
-
-#            print(
-#                {outputs[cookie]},
-#                domain,
-#                cookiename,
-#            )
+        outputs, response = buildAction(action, outputs)
+        responses.append(response)
+            
+        #except Exception as error:
+            #outputs = manageFailure(error, action, outputs)
+    return outputs

core/execution/operation/skipstep.py

@@ -2,13 +2,19 @@ def skipStep(definition, action, outputs):
     try:
         if action in definition.skipstep:
             condition = definition.skipstep[action]
-
+        
+            #if outputs.get([condition["output"]]) is None:
+                #return False
+                #current_value = 1
+            #else:
             current_value = outputs[condition["output"]]
+                #current_value = 1
 
             if condition["operator"] == ">=":
                 if current_value >= condition["value"]:
                     print(f"Skipping {action.name}")
                     return True
 
-    except TypeError, KeyError:
+    except KeyError:
+        #outputs = manageFailure(error)
         return False