Udated runtime contract to stop doing unnecessary imports and introduced dedicated process registry. Confirmed working.
This commit is contained in:
@@ -2,7 +2,7 @@ import logging
|
||||
|
||||
from core.runtime.stopsignals import addStopSignal
|
||||
|
||||
def buildPreRuntimeAttr(action, outputs, process):
|
||||
def buildPreRuntimeAttr(action, outputs):
|
||||
from core.runtime import loadSave, readRow
|
||||
from core.runtime.applyconditions import applyConditions
|
||||
from core.runtime.resolver import resolveItem
|
||||
@@ -17,12 +17,12 @@ def buildPreRuntimeAttr(action, outputs, process):
|
||||
|
||||
if match:
|
||||
logging.info(filter.get("print"))
|
||||
addStopSignal(action, outputs, process)
|
||||
addStopSignal(action)
|
||||
|
||||
return resolved, match, filter
|
||||
|
||||
|
||||
def buildRuntimeAttr(action, outputs, resolved, response, process):
|
||||
def buildRuntimeAttr(action, outputs, resolved, response):
|
||||
from core.runtime.resolver import extractItem
|
||||
from core.runtime.responsepolicy import responsePolicy
|
||||
from core.runtime.image import buildImage
|
||||
@@ -33,7 +33,7 @@ def buildRuntimeAttr(action, outputs, resolved, response, process):
|
||||
buildOutput(response, action, outputs)
|
||||
|
||||
if not response.ok:
|
||||
addStopSignal(action, outputs, process)
|
||||
addStopSignal(action)
|
||||
return outputs, response
|
||||
|
||||
extractItem(action, outputs, resolved)
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
#def checkDependency(action, outputs):
|
||||
def checkDependency(action, outputs, operation):
|
||||
#from core.execution.processregistry import registeredOp
|
||||
|
||||
def checkDependency(action):
|
||||
from core.execution.processregistry import registeredOp
|
||||
if hasattr(action, "depends"):
|
||||
stop = any(
|
||||
dependency in outputs["processes"][operation.name]["stopsignals"]
|
||||
#dependency in outputs["stopsignals"]
|
||||
dependency in registeredOp["stopsignals"]
|
||||
for dependency in action.depends
|
||||
)
|
||||
|
||||
@@ -12,9 +13,10 @@ def checkDependency(action, outputs, operation):
|
||||
|
||||
return False
|
||||
|
||||
#def addStopSignal(action, outputs):
|
||||
def addStopSignal(action, outputs, operation):
|
||||
def addStopSignal(action):
|
||||
from core.execution.processregistry import registeredOp
|
||||
|
||||
if hasattr(action, "depends"):
|
||||
outputs["processes"][operation.name]["stopsignals"].append(action.alias)
|
||||
#outputs["stopsignals"].append(action.alias)
|
||||
|
||||
registeredOp["stopsignals"].append(action.alias)
|
||||
return
|
||||
Reference in New Issue
Block a user