autoverse-cli 0.13.3__py3-none-any.whl → 0.13.4__py3-none-any.whl

{autoverse_cli-0.13.3.dist-info → autoverse_cli-0.13.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: autoverse-cli
-Version: 0.13.3
+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.3.dist-info → autoverse_cli-0.13.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=lpV5lfBXDvsACYBfA-PzMX0m4LKRhoBaCXV_gd50zcE,856
+avrs/app_version.py,sha256=qYVFbKD-sn2cMrj4yzEYbhEq233EryEavoJCnX2iXAc,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=bGF35a72MZU41OVWnFHmchqmgKXBKh9djokzGA_4pL4,4621
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
@@ -7,10 +7,10 @@ avrs/can_tool_util.py,sha256=G3q21dTGMLc09SDq_RieoW7kSn-kXPkXxPDjavPh4hQ,7710
 avrs/cfg.py,sha256=kMn08Z4Ms1PAu2-U1QI8weEJeIVEppP4A4_tFfwnjtg,2924
 avrs/launcher.py,sha256=kk1lyHHLgFZ4zsFfa_zV5f1kYbUODT6wEILJ8TZ16rQ,9353
 avrs/launcher_util.py,sha256=sO3k_z3A-HIQdJVkVXNXUAE_MGFwAYiZUqQBoFwOqew,5325
-avrs/race_cloud.py,sha256=QlD-lDYTk3pBHpd_mwtS-OGjpXONhVkPWojYQr8x5lU,13883
+avrs/race_cloud.py,sha256=KOfa-fJefKoaaxPC74nvPXBj03XbrDsSaQo7bLuudj4,15196
 avrs/race_cloud_cfg_util.py,sha256=gcHyUY0m5zc_9zZatKLaSIC_oFGc-6Vs8UlcX5yry9o,5158
 avrs/race_cloud_fwd_api.py,sha256=vwzGK1bq3th5tU3drTI46dr3f15Uv2N5BgGZDBShWcQ,1415
-avrs/race_cloud_util.py,sha256=lznLx5zYar3ScDHUg81IlgmQeTy-YRbPJqvHTVs8COA,9291
+avrs/race_cloud_util.py,sha256=uCA-WxqPbKlJwchIEL1fw0dMR-FQSOUjnuWRyZpBxao,10203
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
 avrs/simconfig_util.py,sha256=1RmnmhK5C4HlCicTQeqn-1ORz3Xrku_QMt1Fqr9XjZs,4839
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
@@ -37,9 +37,9 @@ avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,3
 avrs/requests/vd.py,sha256=at6oUAGY2h0OxYU6MLOi1gnxyUn6i24vL9DUAj0L880,1600
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.13.3.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.13.3.dist-info/METADATA,sha256=qRZbslf0KYu1rnxhPBkycWhT2n0tQljMYdrN5PLOrZo,3342
-autoverse_cli-0.13.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autoverse_cli-0.13.3.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.13.3.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.13.3.dist-info/RECORD,,
+autoverse_cli-0.13.4.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.13.4.dist-info/METADATA,sha256=00MSmVddXCts4MKJ-nJtfF7rlDt9URGc2rXi9mTrSXM,3342
+autoverse_cli-0.13.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autoverse_cli-0.13.4.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.13.4.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.13.4.dist-info/RECORD,,

avrs/app_version.py

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

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()

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,6 +187,23 @@ 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)