Updated deploy script to usb mdt to deploy over USB (#37)

* Updated deploy script to usb mdt to deploy over USB

Author: SwapnilPande

learn_ml/deploy/deploy.py

@@ -15,7 +15,17 @@
 from scp import SCPClient
 import argparse
 import os
+from mdt.discoverer import Discoverer
+from learn_ml.utils.log_configurator import LogConfigurator
 
+DEFAULT_USERNAME = "mendel"
+DEFAULT_PASSWORD = "mendel"
+
+# Instantiate LogConfigurator
+log_config = LogConfigurator()
+
+# Get the logger for module
+logger = log_config.get_logger(__name__)
 
 def deploy(address, model, identity_file=None, password=None):
     """ Deploys the a model to the Coral Board.
@@ -41,46 +51,65 @@ def deploy(address, model, identity_file=None, password=None):
     use_key = False
     if(identity_file is not None):
         use_key = True
-    elif(password is None):  # This condition means that neither identity file nor password was passed
+    elif(password is None):
         raise Exception("Must pass identity file OR password")
 
     ssh = SSHClient()
     ssh.load_system_host_keys()
 
     # Connect to coral
-    print("Connecting...")
+    logger.info("Connecting to Anything Sensor...")
     if(use_key):  # Connect using private key
-        ssh.connect(hostname=address, username="mendel", key_filename=identity_file)
+        ssh.connect(hostname=address, username=DEFAULT_USERNAME, key_filename=identity_file)
     else:  # Connect using password
-        ssh.connect(hostname=address, username="mendel", password=password)
-    print("Successfully connected to Anything Sensor v1!")
+        ssh.connect(hostname=address, username=DEFAULT_USERNAME, password=password)
+    logger.info("Successfully connected to Anything Sensor v1!")
 
     # Transfer model to coral
-    print("Transferring model to Anything Sensor...")
+    logger.info("Transferring model to Anything Sensor...")
     # SCPCLient takes a paramiko transport as an argument
     with SCPClient(ssh.get_transport()) as scp:
         scp.put(model, "/home/mendel/learn_ml/coral_inference/classification/" + os.path.basename(model))
-    print("Transfer Successful!")
+    logger.info("Transfer Successful!")
 
     # Start model execution
     ssh.exec_command("pkill screen")
     ssh.exec_command("cd /home/mendel/learn_ml/coral_inference/classification && screen -d -m python3 "
                      + "app.py --mnist -m " + os.path.basename(model))
 
-    print("Started execution!")
-    print("Stream accessible at {}:5000".format(address))
+    logger.info("Started execution!")
+    logger.info("Stream accessible at {}:5000".format(address))
 
     ssh.close()
 
+def deploy_usb(model):
+    # Import a discoverer object from mendel development tools
+    discoverer = Discoverer()
+
+    # Discover available objects and get available devices
+    discoverer.discover()
+    discoveries = discoverer.discoveries
+
+    # TODO Update this to allow for selecting between multiple available devices
+    if(list(discoveries) != []):
+        # Just select the first element in the dictionary
+        ip = discoveries[list(discoveries)[0]]
+        logger.info("Found Anything Sensor at {}!".format(ip))
+        deploy(ip, model, password = DEFAULT_PASSWORD)
+
 
 if __name__ == "__main__":
     # Parse arguments
     parser = argparse.ArgumentParser()
     parser.add_argument('-m', '--model', help='Path to .tflite model file', required=True)
-    parser.add_argument('-a', '--address', help='Address of the coral device', required=True)
+    parser.add_argument('-a', '--address', help='Address of the coral device', required=False)
     parser.add_argument('-i', '--identity-file',
                         help='Identity file to authenticate with', required=False)
     parser.add_argument('-p', '--password', help='Password to login with', required=False)
+    parser.add_argument('-u', '--usb', help='Deploy over USB', required=False, action = 'store_true')
     args = parser.parse_args()
 
-    deploy(args.address, args.model, identity_file=args.identity_file, password=args.password)
+    if(args.usb):
+        deploy_usb(args.model)
+    else:
+        deploy(args.address, args.model, identity_file=args.identity_file, password=args.password)

requirements.txt

@@ -11,3 +11,6 @@ PySide2
 Qt.py
 nine
 singleton-decorator
+mendel-development-tool
+typing
+zeroconf