autoverse-cli 0.13.2__tar.gz → 0.13.4__tar.gz

{autoverse_cli-0.13.2 → autoverse_cli-0.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: autoverse-cli
-Version: 0.13.2
+Version: 0.13.4
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI

{autoverse_cli-0.13.2 → autoverse_cli-0.13.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autoverse-cli"
-version = "0.13.2"
+version = "0.13.4"
 dependencies = [
   "boto3",
   "cantools"

{autoverse_cli-0.13.2 → autoverse_cli-0.13.4}/src/autoverse_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: autoverse-cli
-Version: 0.13.2
+Version: 0.13.4
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI

{autoverse_cli-0.13.2 → autoverse_cli-0.13.4}/src/avrs/app_version.py

@@ -2,7 +2,7 @@ import http.client
 import json
 
 def get_app_version():
-    return '0.13.2'
+    return '0.13.4'
 
 def check_app_is_latest():
     pass

{autoverse_cli-0.13.2 → autoverse_cli-0.13.4}/src/avrs/race_cloud.py

@@ -131,6 +131,23 @@ class AvrsRaceCloud(AvrsApiRequest):
             help='if true, will run the server in the background')
         fwd_server_parser.set_defaults(func=self.fwd_api)
 
+        fwd_server_parser = sps.add_parser(
+            'fwd-api',
+            help='forwards incoming external api requests to the simulator api')
+        fwd_server_parser.add_argument(
+            'mode',
+            choices=['bg', 'fg'],
+            help='whether to run in forground or background')
+        fwd_server_parser.add_argument(
+            'source_port',
+            type=int,
+            help='the external port to listen to external api requests on')
+        fwd_server_parser.add_argument(
+            'target_port',
+            type=int,
+            help='the local port to forward api requests too')
+        fwd_server_parser.set_defaults(func=self.fwd_api)
+
     def race_connect(self, args):
         logger = logging.getLogger('avrs')
         logger.info('starting race-cloud connect for team {} to instance {}'.format(
@@ -270,6 +287,14 @@ class AvrsRaceCloud(AvrsApiRequest):
             'slot': slot
         }
 
+        # go ahead and restart forwarding script here
+        # stop it if its already running
+        stop_result = stop_fwd_api()
+        logger.info('stopped fwd-api: {}'.format(stop_result))
+        start_result = start_fwd_api(args.source_port, args.target_port)
+        logger.info('started fwd-api: {}'.format(start_result))
+
+
         print(json.dumps(response)) # print this so that when called from the ssh lambda we can get the result
 
     def sim_ctrl(self, args):
@@ -346,12 +371,19 @@ class AvrsRaceCloud(AvrsApiRequest):
     def fwd_api(self, args):
         # start a server that listens for http on some port and forwards
         # to the simulator on 30313
+        logger = logging.getLogger('avrs')
 
-        if args.background:
+        if args.mode == 'bg':
             # call the cli so that it starts the forwarding server in the background
-            start_exe('avrs race-cloud fwd-api {} {}'.format(
-                args.source_port, args.target_port))
+            
+            # stop it if its already running
+            stop_result = stop_fwd_api()
+            logger.info('stopped fwd-api: {}'.format(stop_result))
+            start_result = start_fwd_api(args.source_port, args.target_port)
+            logger.info('started fwd-api: {}'.format(start_result))
+
         else:
+            logger.info('starting fwd-api in forground')
             handler = ApiForwardHandler(args.target_port)
             server = HTTPServer(('0.0.0.0', args.source_port), handler)
             server.serve_forever()

{autoverse_cli-0.13.2 → autoverse_cli-0.13.4}/src/avrs/race_cloud_fwd_api.py

@@ -31,7 +31,7 @@ class ApiForwardHandler(BaseHTTPRequestHandler):
         headers = {
             'Content-type': 'application/json',
         }
-        body = json.dumps(body).encode('utf-8')
+        #body = json.dumps(body).encode('utf-8') # already a string here
         connection.request('POST', '/post', body, headers)
         response = connection.getresponse()
         response_string = ''

{autoverse_cli-0.13.2 → autoverse_cli-0.13.4}/src/avrs/race_cloud_util.py

@@ -114,6 +114,18 @@ CHECK_VCAN_EXISTS_SCRIPT = '''
     fi
 '''
 
+START_FWD_API_SCRIPT = '''
+    nohup python3 -m avrs.avrs race-cloud fwd-api fg {source_port} {target_port} > ~/fwd_api.log 2>&1 < /dev/null &
+    echo "$!" > ~/fwd_api_pid
+'''
+
+STOP_FWD_API_SCRIPT = '''
+    if [[ -e ~/fwd_api_pid ]]; then
+        kill $(cat ~/fwd_api_pid)
+    fi
+    rm ~/fwd_api_pid
+'''
+
 GET_EC2_LOCAL_IP_SCRIPT = '''
     echo -n $(ec2metadata --local-ipv4)
 '''
@@ -126,8 +138,9 @@ def bash_kill_process(pname):
 # start an exectuable in the background, sending output to a file
 # stored at root with its name
 def start_exe(exe_path):
+    print('running {} and saving under {}'.format(exe_path, os.path.basename(exe_path).replace(' ', '')))
     return run_process(['bash', '-c',
-        'nohup {} > ~/{}_output.log 2>&1 < /dev/null &'.format(exe_path, os.path.basename(exe_path))])
+        'nohup {} > ~/{}_output.log 2>&1 < /dev/null &'.format(exe_path, os.path.basename(exe_path).replace(' ', ''))])
 
 def get_sim_install_path():
     sim_path = os.environ.get('AVRS_INSTALL_PATH', 
@@ -174,12 +187,28 @@ def check_vcan_exists(vcan_name):
         CHECK_VCAN_EXISTS_SCRIPT.format(**pargs)])
     return pres.out == 'yes'
 
+def start_fwd_api(source_port, target_port):
+    pargs = {
+        'source_port': source_port,
+        'target_port': target_port
+    }
+    pres = run_process(['bash', '-c', START_FWD_API_SCRIPT.format(**pargs)])
+    return pres.out
+
+def stop_fwd_api():
+    pres = run_process(['bash', '-c', STOP_FWD_API_SCRIPT])
+    return pres.out
+
+def check_fwd_api_is_running():
+    pres = run_process(['bash', '-c', CHECK_FWD_API_IS_RUNNING])
+    print(pres.out)
+    return pres.out == 'yes'
+
 def get_auto_vcan_name(peer_id, vcan_id):
     return 'vcan{}_{}'.format(peer_id, vcan_id)
 
 def connect_peer_vcan(peer_id, peer_ip, vcan_id, vcan_name=''):
     logger = logging.getLogger('avrs')
-    vcan_id = 0
     pargs = {
         'peer_id': peer_id,
         'peer_ip': peer_ip,