autoverse-cli 0.16.2__tar.gz → 0.16.4__tar.gz

{autoverse_cli-0.16.2 → autoverse_cli-0.16.4}/PKG-INFO

@@ -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 → autoverse_cli-0.16.4}/pyproject.toml

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

{autoverse_cli-0.16.2 → autoverse_cli-0.16.4}/src/autoverse_cli.egg-info/PKG-INFO

@@ -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 → autoverse_cli-0.16.4}/src/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

{autoverse_cli-0.16.2 → autoverse_cli-0.16.4}/src/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)

{autoverse_cli-0.16.2 → autoverse_cli-0.16.4}/src/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

{autoverse_cli-0.16.2 → autoverse_cli-0.16.4}/src/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')

{autoverse_cli-0.16.2 → autoverse_cli-0.16.4}/src/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)