autoverse-cli 0.15.0__py3-none-any.whl → 0.15.2__py3-none-any.whl

{autoverse_cli-0.15.0.dist-info → autoverse_cli-0.15.2.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=59Na2yuqMGePrUbQYBadd_1kANo4tl9ULmjNC8g2WQg,856
+avrs/app_version.py,sha256=zch6t3zwjlpQ6D4xpDRHK_MIF80vDkncCaUJg1iZbJs,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=XwwSfrSMaCxOaBSmxqDeC7Jlg5mRZnVBUo7cFFaKcso,18863
-avrs/race_cloud_cfg_util.py,sha256=IV_bKylgfAj5g8aRf817pP-0x55A_jIX-rZYgRJlzxQ,6059
+avrs/race_cloud.py,sha256=hJRqinF6bRogJYYprIXKx6txFGWT6fqEHIhHAryc_gw,18961
+avrs/race_cloud_cfg_util.py,sha256=PlHhW0PWhxRIA1X9CPMu9HqFcfu14--JwLR6DYr7qX0,6061
 avrs/race_cloud_fwd_api.py,sha256=HuLE5kfmzVq08aP3tlEh3f8WNjGL5N3K5EbXg9uQomo,1506
-avrs/race_cloud_util.py,sha256=ykTFSk9AVDEFAAS7wXBz-By4RnEp_kJKRvvACruv8Sk,10709
+avrs/race_cloud_util.py,sha256=AW2GMvM9DOWJ5cdahlbWZz9ltwEh-2fNeFenKVUGcxw,10708
 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=gdt5XCdCCVdECL3qt8y-PKDrlArjeY_lxtT4VpZmAJo,1804
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.15.0.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.15.0.dist-info/METADATA,sha256=eD4w4cQQ9WKA4CkW-_17sgEQkzK8ibJeOdaPZ4Q5Avk,3342
-autoverse_cli-0.15.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autoverse_cli-0.15.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.15.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.15.0.dist-info/RECORD,,
+autoverse_cli-0.15.2.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.15.2.dist-info/METADATA,sha256=5_Hn0sXeQ81j-o9LhhMCXd_5KpcnrVUu1gaF4tWPaGM,3342
+autoverse_cli-0.15.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autoverse_cli-0.15.2.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.15.2.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.15.2.dist-info/RECORD,,

avrs/app_version.py

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

avrs/race_cloud.py

@@ -187,6 +187,11 @@ class AvrsRaceCloud(AvrsApiRequest):
             print('error reading config file: {}'.format(vcfg_data))
             return
 
+        print('creating vcan interfaces found in config locally: {}, {}, {} (if they do not exist)'.format(
+            bsu_vcan, kistler_vcan, badenia_vcan))
+
+        setup_vcans(bsu_vcan, kistler_vcan, badenia_vcan)
+
         vcan_ok = True
         if not check_vcan_exists(bsu_vcan) and not args.no_check_cans:
             print('bsu vcan {} does not appear to exist'.format(bsu_vcan))
@@ -208,7 +213,7 @@ class AvrsRaceCloud(AvrsApiRequest):
             'team_name': args.team_name,
             'sim_id_override': args.instance_id,
             'ensure_instance_is_running': False,
-            'should_restart_sim_program': args.no_restart_sim,
+            'should_restart_sim_program': not args.no_restart_sim,
             'config_data': vcfg_data
         }
 
@@ -243,11 +248,6 @@ class AvrsRaceCloud(AvrsApiRequest):
         # enable first peer since this is on a client (only will ever have 1, the sim)
         enable_peer_qos(sim_slot, sim_ip)
 
-        print('creating vcan interfaces found in config locally: {}, {}, {} (if they do not exist)'.format(
-            bsu_vcan, kistler_vcan, badenia_vcan))
-
-        setup_vcans(bsu_vcan, kistler_vcan, badenia_vcan)
-
         # will need to get port from received slot id to connect peer vcans
         connect_peer_vcan(sim_slot, sim_ip, 0, bsu_vcan)
         connect_peer_vcan(sim_slot, sim_ip, 1, kistler_vcan)
@@ -339,7 +339,7 @@ class AvrsRaceCloud(AvrsApiRequest):
         start_result = start_fwd_api(30333, 30313)
         logger.info('started fwd-api: {}'.format(start_result))
 
-        if args.should_restart_sim_program:
+        if args.restart:
             logger.info('restarting sim program for new connection')
             print('stopping sim program on sim instance')
             bash_kill_process('Autoverse')
@@ -348,6 +348,8 @@ class AvrsRaceCloud(AvrsApiRequest):
             start_exe(exe_path)
             extra_msg += '\n' if len(extra_msg) > 0 else ''
             extra_msg += 'automatically restarting sim program on sim instance'
+        else:
+            logger.info('--restart not specified, not restarting sim program for this connection')
 
         print(json.dumps(response)) # print this so that when called from the ssh lambda we can get the result
 

avrs/race_cloud_cfg_util.py

@@ -28,7 +28,7 @@ def clear_autospawns():
         return
 
     # also remove all configs from Objects dir
-    files = glob.glob(os.path.join(sim_saved, 'Objects'))
+    files = glob.glob(os.path.join(sim_saved, 'Objects/*'))
     for f in files:
         logger.info('removing object config: {}'.format(f))
         os.remove(f)

avrs/race_cloud_util.py

@@ -119,7 +119,7 @@ CREATE_VCANS_SCRIPT = '''
     sudo ip link add name "{a}" type vcan
     sudo ip link set dev "{a}" up
     sudo ip link add name "{b}" type vcan
-    sudo ip link set dev "{b}"" up
+    sudo ip link set dev "{b}" up
     sudo ip link add name "{c}" type vcan
     sudo ip link set dev "{c}" up
 '''
@@ -203,8 +203,8 @@ def setup_vcans(vcan0, vcan1, vcan2):
         'b': vcan1,
         'c': vcan2
     }
-    pres = run_process(['bash'], '-c',
-        CREATE_VCANS_SCRIPT.format(**pargs))
+    pres = run_process(['bash', '-c',
+        CREATE_VCANS_SCRIPT.format(**pargs)])
     return pres.out + ' ' + pres.err
 
 def start_fwd_api(source_port, target_port):