srenblad/artiq
1
0
Fork 0
forked from M-Labs/artiq
Code Pull Requests Activity

fix interactive args cancellation

Browse Source
This commit is contained in:
Simon Renblad 2024-03-22 17:30:56 +08:00
parent 13a36bf911
commit 3ed21a3b60
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/language/environment.py
View File

@ -350,8 +350,9 @@ class HasEnvironment:
yield namespace yield namespace
del namespace.setattr_argument del namespace.setattr_argument
argdict = self.__argument_mgr.get_interactive(interactive_arglist, title) argdict = self.__argument_mgr.get_interactive(interactive_arglist, title)
for key, value in argdict.items(): if argdict is not None:
setattr(namespace, key, value) for key, value in argdict.items():
setattr(namespace, key, value)
def get_device_db(self): def get_device_db(self):
"""Returns the full contents of the device database.""" """Returns the full contents of the device database."""

2
artiq/master/databases.py
View File

@ -144,4 +144,4 @@ class InteractiveArgDB:
if rid not in self.futures: if rid not in self.futures:
raise ValueError("no experiment with this RID is " raise ValueError("no experiment with this RID is "
"waiting for interactive arguments") "waiting for interactive arguments")
self.futures[rid].cancel() self.futures[rid].set_result(None)

5
artiq/master/worker_impl.py
View File

@ -222,8 +222,9 @@ class ArgumentManager(ProcessArgumentManager):
arglist_desc = [(k, p.describe(), g, t) arglist_desc = [(k, p.describe(), g, t)
for k, p, g, t in interactive_arglist] for k, p, g, t in interactive_arglist]
arguments = ArgumentManager._get_interactive(arglist_desc, title) arguments = ArgumentManager._get_interactive(arglist_desc, title)
for key, processor, _, _ in interactive_arglist: if arguments is not None:
arguments[key] = processor.process(arguments[key]) for key, processor, _, _ in interactive_arglist:
arguments[key] = processor.process(arguments[key])
return arguments return arguments