autoverse-cli 0.16.2__py3-none-any.whl → 0.16.4__py3-none-any.whl

{autoverse_cli-0.16.2.dist-info → autoverse_cli-0.16.4.dist-info}/METADATA

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

@@ -1,17 +1,17 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=eH4JKy1a3c38fSf-PV0j2EJYX75-upb14bgw_A3c21w,856
+avrs/app_version.py,sha256=TCx0wneM1rI5cI2G875TCRlLz6sDG68_IiDyp7wySi0,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
-avrs/avrs.py,sha256=bGF35a72MZU41OVWnFHmchqmgKXBKh9djokzGA_4pL4,4621
+avrs/avrs.py,sha256=DtiZYOpQ5KzbQmf4oigQ34VGefaOkTRpATDeAGkd6UQ,4657
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
 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=8kZ6hR_-GwS2CSW6dLyRk9iDOCgO9XnBU6DJfxz1ppM,19843
+avrs/race_cloud.py,sha256=W6qdevbEeu2k-qaUmvx4cQTbIIcd6qBzX-T-9rqmbgw,20124
 avrs/race_cloud_bridge_can.py,sha256=QXdJxGwkdL9ZNLs4EquHEmF1fU3P8rsjc4uekFPHlw8,2349
 avrs/race_cloud_cfg_util.py,sha256=H3MLxkb-PBwFVXdA5IBGzWGjLeD-uBvPqIgkh7RGjfo,7214
 avrs/race_cloud_fwd_api.py,sha256=HuLE5kfmzVq08aP3tlEh3f8WNjGL5N3K5EbXg9uQomo,1506
-avrs/race_cloud_util.py,sha256=pm18YFr8oKTjOfswiGDJz-Ob9x5hdQiNMHIgTjt1gKE,12566
+avrs/race_cloud_util.py,sha256=WwhmqxKIQJMxf4L4ReAJrW1Reu1A8tLfmYeEwTZDl-k,13184
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
 avrs/simconfig_util.py,sha256=1RmnmhK5C4HlCicTQeqn-1ORz3Xrku_QMt1Fqr9XjZs,4839
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
@@ -25,7 +25,7 @@ avrs/requests/fault_injection.py,sha256=EkpjPCx-UtrNbAR_vQS1zaGKN49UDCyYOoVcdlP1
 avrs/requests/get_object_config.py,sha256=Mkwp32lfskQERsqfmAgHi4vf4C0hfjg6Ru8UjyMt3cw,654
 avrs/requests/list_sim_objects.py,sha256=YWpqHdCHijerPxI5606_KjeFvezcLFN33wO4YOr9G3U,977
 avrs/requests/log_path.py,sha256=Ur24C9VqPVx78MfpicgQu2uOEe-0dXbGoWF_7dzMtZE,1326
-avrs/requests/misc.py,sha256=lejEFt5aB6tbfKXHI1DGwP4fsntFIv16NXO23R6Bfhw,1423
+avrs/requests/misc.py,sha256=995yXxzVS35X3CLqm4OtkJhWvFrqEhV1cPwbWxlFeHs,1779
 avrs/requests/move_to_landmark.py,sha256=cLRBKu9XEDsmCoftBJ8JwoBLqzb0IZsxFMBnus4T-kc,702
 avrs/requests/npc.py,sha256=Y_WovbcLomCCcOLAMMO_DHZtc1crAzWo97qEIGS3SvU,9691
 avrs/requests/request.py,sha256=uUAndVZPbTQgbiXqrd4S3l3TQ0J_3STBtghEFlVr5GA,2058
@@ -38,9 +38,9 @@ avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,3
 avrs/requests/vd.py,sha256=gdt5XCdCCVdECL3qt8y-PKDrlArjeY_lxtT4VpZmAJo,1804
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.16.2.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.16.2.dist-info/METADATA,sha256=arGEfTYVYNme2od7kmX3E1943IAcimqxsVyFZm37oyU,3342
-autoverse_cli-0.16.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autoverse_cli-0.16.2.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.16.2.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.16.2.dist-info/RECORD,,
+autoverse_cli-0.16.4.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.16.4.dist-info/METADATA,sha256=WTipNzL49juTJHXzDeJX7xZ_phmV4IOVbY2uRtFkI3I,3342
+autoverse_cli-0.16.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autoverse_cli-0.16.4.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.16.4.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.16.4.dist-info/RECORD,,

avrs/app_version.py

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

avrs/avrs.py

@@ -125,6 +125,7 @@ def main():
     AvrsToggleHudRequest(sps, cfg)
     AvrsGetObjectConfigRequest(sps, cfg)
     AvrsGetSimVersionRequest(sps, cfg)
+    AvrsGetExitSimRequest(sps, cfg)
     AvrsPingRequest(sps, cfg)
     AvrsConfigureSimLodRequest(sps, cfg)
     AvrsSpawnObjectRequest(sps, cfg)

avrs/race_cloud.py

@@ -331,9 +331,12 @@ class AvrsRaceCloud(AvrsApiRequest):
             logger.info('enabling qos for slot {} with ip {}'.format(slot, args.ip))
             enable_peer_qos(slot, args.ip)
             logger.info('connecting vcans for incoming connection')
-            connect_peer_vcan(slot, args.ip, 0)
-            connect_peer_vcan(slot, args.ip, 1)
-            connect_peer_vcan(slot, args.ip, 2)
+            out = connect_peer_vcan(slot, args.ip, 0)
+            logger.info('connected first vcan result: {} {}'.format(out.out, out.err))
+            out = connect_peer_vcan(slot, args.ip, 1)
+            logger.info('connected second vcan result: {} {}'.format(out.out, out.err))
+            out = connect_peer_vcan(slot, args.ip, 2)
+            logger.info('connected second vcan result: {} {}'.format(out.out, out.err))
 
         # go ahead and restart forwarding script here
         # stop it if its already running

avrs/race_cloud_util.py

@@ -27,6 +27,10 @@ BASH_KILL_PROCESS_SCRIPT = '''
     done
 '''
 
+BASH_KILL_BY_LAUNCH_SCRIPT = '''
+    ps -x | grep "{launch_phrase}" | awk '{{ print $1 }}' | xargs -L1 kill
+'''
+
 DEFAULT_RMW_QOS = '''
 <?xml version="1.0" encoding="UTF-8" ?>
 <profiles xmlns="http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles">
@@ -94,10 +98,10 @@ DISABLE_PEER_QOS_SCRIPT = '''
     sed -i -E "s,(<Peer address=')(.+)('/>)<!--(PEER$PEER_ID-->),<!--\\1PEER$PEER_ID\\3\\4,g" $CYCLONE_PATH
 
     VCAN_NAME=vcan$PEER_ID
-    if [[ -e $VCAN_NAME.lock ]]; then
-        echo "stopping existing cannelloni connection with pid $(cat $VCAN_NAME.lock)"
-        kill $(cat $VCAN_NAME.lock)
-        rm $VCAN_NAME.lock
+    if [[ -e $VCAN_NAME.vcanlock ]]; then
+        echo "stopping existing cannelloni connection with pid $(cat $VCAN_NAME.vcanlock)"
+        kill $(cat $VCAN_NAME.vcanlock)
+        rm $VCAN_NAME.vcanlock
     fi
 '''
 
@@ -120,8 +124,8 @@ CONNECT_PEER_VCAN_SCRIPT = '''
     REMOTE_PORT={remote_port}
     LOCAL_PORT={local_port}
     VCAN_NAME={vcan_name}
-    LOCK_FILE=$HOME/.$VCAN_NAME.lock
-    LOG_FILE="$HOME/.$VCAN_NAME.log"
+    LOCK_FILE="$HOME/.$VCAN_NAME.vcanlock"
+    LOG_FILE="$HOME/.$VCAN_NAME.vcanlog"
     if [[ -z $VCAN_NAME ]]; then
         VCAN_NAME=vcan$PEER_ID
     fi
@@ -177,6 +181,10 @@ def bash_kill_process(pname):
     return run_process(['bash', '-c', 
         BASH_KILL_PROCESS_SCRIPT.format(**{'pname': pname})])
 
+def bash_kill_process_by_launch_command(launch_command):
+    return run_process(['bash', '-c',
+        BASH_KILL_BY_LAUNCH_SCRIPT.format(**{'launch_phrase': launch_command})])
+
 # start an exectuable in the background, sending output to a file
 # stored at root with its name
 def start_exe(exe_path):
@@ -302,11 +310,16 @@ def get_local_instance_ip():
         return '127.0.0.1'
 
 def reset_race_cloud_connection():
+    logger = logging.getLogger('avrs')
+    logger.info('resetting connection')
     reset_rmw_qos()
     reset_rmw_cyclone_qos()
+    logger.info('removing vcanlog and vcanlock files')
     run_process(['bash', '-c', 'rm ~/.simslot*']) # remove slot reservations
-    run_process(['bash', '-c', 'rm ~/.vcan*']) # remove lock files
-    bash_kill_process('cannelloni')
+    run_process(['bash', '-c', 'rm ~/.*.vcanlog*']) # remove slot reservations
+    run_process(['bash', '-c', 'rm ~/.*.vcanlock']) # remove lock files
+    logger.info('stopping race-cloud bridge-can')
+    bash_kill_process_by_launch_command('avrs race-cloud bridge-can')
 
 def try_get_open_slot(team_name, ip):
     logger = logging.getLogger('avrs')

avrs/requests/misc.py

@@ -10,6 +10,16 @@ class AvrsGetSimVersionRequest(AvrsApiRequest):
         return {
         }
 
+class AvrsGetExitSimRequest(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'ExitSim', 0)
+        psr = parser.add_parser('exit-sim', help='exit the currently running simulator')
+        psr.set_defaults(func=self.send_request)
+    
+    def get_request_body(self, args):
+        return {
+        }
+
 class AvrsPingRequest(AvrsApiRequest):
     def __init__(self, parser, cfg):
         AvrsApiRequest.__init__(self, parser, cfg, 'GetVersion', 0)