forked from M-Labs/artiq
working deferred args system
This commit is contained in:
parent
5fe47129ed
commit
80a366917e
@ -228,20 +228,44 @@ class TraceArgumentManager:
|
|||||||
def get_interactive(self, interactive_arglist, title):
|
def get_interactive(self, interactive_arglist, title):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
|
def defer_processing(self, key):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def get_deferred_arguments(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ProcessArgumentManager:
|
class ProcessArgumentManager:
|
||||||
def __init__(self, unprocessed_arguments):
|
def __init__(self, unprocessed_arguments):
|
||||||
self.unprocessed_arguments = unprocessed_arguments
|
self.unprocessed_arguments = unprocessed_arguments
|
||||||
self._processed_arguments = set()
|
self._processed_arguments = set()
|
||||||
|
self._deferred_arguments = dict()
|
||||||
|
|
||||||
def get(self, key, processor, group, tooltip):
|
def get(self, key, processor, group, tooltip):
|
||||||
if key in self.unprocessed_arguments:
|
unprocessed = key in self.unprocessed_arguments
|
||||||
|
if unprocessed and key in self._deferred_arguments:
|
||||||
|
self._deferred_arguments[key] = processor
|
||||||
|
r = processor.default()
|
||||||
|
elif unprocessed:
|
||||||
r = processor.process(self.unprocessed_arguments[key])
|
r = processor.process(self.unprocessed_arguments[key])
|
||||||
self._processed_arguments.add(key)
|
self._processed_arguments.add(key)
|
||||||
else:
|
else:
|
||||||
r = processor.default()
|
r = processor.default()
|
||||||
return r
|
return r
|
||||||
|
|
||||||
|
def defer_processing(self, key):
|
||||||
|
self._deferred_arguments[key] = None
|
||||||
|
|
||||||
|
def get_deferred_arguments(self):
|
||||||
|
deferred = dict()
|
||||||
|
for key, proc in self._deferred_arguments.items():
|
||||||
|
if proc is None:
|
||||||
|
raise AttributeError("No processor provided for deferred argument: {}".format(key))
|
||||||
|
deferred[key] = proc.process(self.unprocessed_arguments[key])
|
||||||
|
self._processed_arguments.add(key)
|
||||||
|
self._deferred_arguments.clear()
|
||||||
|
return deferred
|
||||||
|
|
||||||
def check_unprocessed_arguments(self):
|
def check_unprocessed_arguments(self):
|
||||||
unprocessed = set(self.unprocessed_arguments.keys()) -\
|
unprocessed = set(self.unprocessed_arguments.keys()) -\
|
||||||
self._processed_arguments
|
self._processed_arguments
|
||||||
@ -342,6 +366,18 @@ class HasEnvironment:
|
|||||||
kernel_invariants = getattr(self, "kernel_invariants", set())
|
kernel_invariants = getattr(self, "kernel_invariants", set())
|
||||||
self.kernel_invariants = kernel_invariants | {key}
|
self.kernel_invariants = kernel_invariants | {key}
|
||||||
|
|
||||||
|
def defer_argument_processing(self, key):
|
||||||
|
self.__argument_mgr.defer_processing(key)
|
||||||
|
|
||||||
|
def set_deferred_arguments(self):
|
||||||
|
deferred = self.__argument_mgr.get_deferred_arguments()
|
||||||
|
if deferred is None:
|
||||||
|
return
|
||||||
|
kernel_invariants = getattr(self, "kernel_invariants", set())
|
||||||
|
for k, v in deferred.items():
|
||||||
|
setattr(self, k, v)
|
||||||
|
self.kernel_invariants = kernel_invariants | {k}
|
||||||
|
|
||||||
@contextmanager
|
@contextmanager
|
||||||
def interactive(self, title=""):
|
def interactive(self, title=""):
|
||||||
"""Request arguments from the user interactively.
|
"""Request arguments from the user interactively.
|
||||||
|
Loading…
Reference in New Issue
Block a user