forked from M-Labs/artiq
1
0
Fork 0

rpctool: interactive mode

This commit is contained in:
Sebastien Bourdeauducq 2016-03-02 11:45:51 +08:00
parent 946bd84b58
commit d0d50d74eb
1 changed files with 36 additions and 2 deletions

View File

@ -3,10 +3,12 @@
import argparse import argparse
import textwrap import textwrap
import sys import sys
import traceback
import numpy as np # Needed to use numpy in RPC call arguments on cmd line import numpy as np # Needed to use numpy in RPC call arguments on cmd line
import readline # This makes input() nicer
import pprint import pprint
from artiq.protocols.pc_rpc import AutoTarget, Client from artiq.protocols.pc_rpc import AutoTarget, Client, RemoteError
def get_argparser(): def get_argparser():
@ -17,7 +19,6 @@ def get_argparser():
parser.add_argument("port", type=int, parser.add_argument("port", type=int,
help="TCP port to use to connect to the controller") help="TCP port to use to connect to the controller")
subparsers = parser.add_subparsers(dest="action") subparsers = parser.add_subparsers(dest="action")
subparsers.required = True
subparsers.add_parser("list-targets", help="list existing targets") subparsers.add_parser("list-targets", help="list existing targets")
parser_list_methods = subparsers.add_parser("list-methods", parser_list_methods = subparsers.add_parser("list-methods",
help="list target's methods") help="list target's methods")
@ -27,6 +28,10 @@ def get_argparser():
parser_call.add_argument("method", help="method name") parser_call.add_argument("method", help="method name")
parser_call.add_argument("args", nargs=argparse.REMAINDER, parser_call.add_argument("args", nargs=argparse.REMAINDER,
help="arguments") help="arguments")
parser_interactive = subparsers.add_parser("interactive",
help="enter interactive mode "
"(default)")
parser_interactive.add_argument("-t", "--target", help="target name")
return parser return parser
@ -81,8 +86,35 @@ def call_method(remote, method_name, args):
pprint.pprint(ret) pprint.pprint(ret)
def interactive(remote):
while True:
try:
cmd = input("({}) ".format(remote.get_selected_target()))
except EOFError:
return
class RemoteDict:
def __getitem__(self, k):
if k == "np":
return np
else:
return getattr(remote, k)
try:
result = eval(cmd, {}, RemoteDict())
except Exception as e:
if isinstance(e, RemoteError):
print("Remote exception:")
print(str(e))
else:
traceback.print_exc()
else:
if result is not None:
print(result)
def main(): def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
if not args.action:
args.target = None
remote = Client(args.server, args.port, None) remote = Client(args.server, args.port, None)
targets, description = remote.get_rpc_id() targets, description = remote.get_rpc_id()
@ -98,6 +130,8 @@ def main():
list_methods(remote) list_methods(remote)
elif args.action == "call": elif args.action == "call":
call_method(remote, args.method, args.args) call_method(remote, args.method, args.args)
elif args.action == "interactive" or not args.action:
interactive(remote)
else: else:
print("Unrecognized action: {}".format(args.action)) print("Unrecognized action: {}".format(args.action))