autoverse-cli 0.20.0__py3-none-any.whl → 0.21.1__py3-none-any.whl

{autoverse_cli-0.20.0.dist-info → autoverse_cli-0.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.20.0
+Version: 0.21.1
 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.20.0.dist-info → autoverse_cli-0.21.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-autoverse_cli-0.20.0.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.21.1.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=juLL0pG2XZuGHi-3yC-kKzXH6_f_nj90CaPutf7Y_k8,856
+avrs/app_version.py,sha256=B6MBJ7JPZ3PN3bGfypi0aRGQNaXnBNFRWnEkc0dTHLI,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=IZ24LIB-nxs6rmi-LGkWtYoyJZPP8n9thmK9EmLFpUM,4795
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
@@ -10,11 +10,11 @@ avrs/launcher.py,sha256=1xew4ZPZtbKE2364ZRlT-TnWabRVKBESk8ZKSpxs8rU,9539
 avrs/launcher_util.py,sha256=oWsFBqqDgaLBvqe9m0ahTviXLZvOHKP_8mebKYzQF3Q,5384
 avrs/race_cloud.py,sha256=0m7BdclKhTrqdAA2kLIobwfoYA8X_PRDCFWoizHtPIQ,20124
 avrs/race_cloud_bridge_can.py,sha256=K3is7GFzWo2KBojr6V65kz138UfkVFXXofVxSAziArY,2888
-avrs/race_cloud_cfg_util.py,sha256=D00lLCTF0_Wr4_bwOhsmYabyw2RfWLLGXOrh3DzfNOc,11530
+avrs/race_cloud_cfg_util.py,sha256=WabTQGAviUI08TU2k-8lMZwKkFJlUsq_j9kV0_tLB68,11914
 avrs/race_cloud_fwd_api.py,sha256=jB4kt6Shu9Pj96WPVjK790PZjucYxmuHjjVKczQfyZI,1620
 avrs/race_cloud_util.py,sha256=g1gCxmK-8n32aNj0NWEiZr79s1rB0EYbGmNLabsIW0U,14297
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
-avrs/simconfig_util.py,sha256=1RmnmhK5C4HlCicTQeqn-1ORz3Xrku_QMt1Fqr9XjZs,4839
+avrs/simconfig_util.py,sha256=2tNh-pU-Mbmc7SnGdRQ4UN43YAH0cpnyeCVTh1VHGHc,4922
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
 avrs/util.py,sha256=SB8Jgsh8IpFdpy3pWPuEoYExLed9XimEAMtYn4gU42g,301
 avrs/requests/change_camera.py,sha256=p7S5C2KtSBuknj4-0jkAJtTQcdlSQ5Mwm0lmZIk3QTI,857
@@ -41,8 +41,8 @@ avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,3
 avrs/requests/vd.py,sha256=Rd0mCc89m2yKjftVf0cMHMFbJG4iFd09KzrI-DsCLgI,2606
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=7HPfVLjSLNbOyzU77Bz29qpHqRsMUAIWvnwvnNiw2nk,15026
-autoverse_cli-0.20.0.dist-info/METADATA,sha256=1zcqwusdRwqf4R-UnziSw1qmhZEqONo1cWj3XWhyIBM,3364
-autoverse_cli-0.20.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-autoverse_cli-0.20.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.20.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.20.0.dist-info/RECORD,,
+autoverse_cli-0.21.1.dist-info/METADATA,sha256=LQtlk0NSEx42GDuYEXPeCDMcf1_7qPR7Yf7eos5mx-s,3364
+autoverse_cli-0.21.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+autoverse_cli-0.21.1.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.21.1.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.21.1.dist-info/RECORD,,

avrs/app_version.py

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

avrs/race_cloud_cfg_util.py

@@ -7,6 +7,15 @@ import datetime
 
 from avrs.simconfig_util import *
 
+# these corresond to what SimConfigFiles sets in its init
+# and should autospawns configured
+# todo: we could parse these from simconfig.json's environments
+# inside SimConfigFiles instead of doing it manually
+EXPECTED_ENV_NAMES = [
+    "yas",
+    "adrome"
+]
+
 def get_payload(cfg_object, payload_name):
     for p in cfg_object['payloads']:
         if p['typeName'].lower() == payload_name.lower():
@@ -39,7 +48,9 @@ def clear_autospawns():
             os.remove(f)
 
 
-    cfg_files.files['yas']['autoSpawnObjects'] = []
+    for ee in EXPECTED_ENV_NAMES:
+        cfg_files.files[ee]['autoSpawnObjects'] = []
+    
     # keep the default!
     cfg_files.files['main']['objectTemplatePaths'] = ['Objects/Eav24_default.json']
     cfg_files.save()
@@ -213,21 +224,22 @@ def register_received_vehicle(team_name, slot, cfg_data, bsu_vcan, kistler_vcan,
 
     start_landmark = 'PitsSlot{}'.format(slot + 1)
 
-    entry_exists = False
-    for i in cfg_files.files['yas']['autoSpawnObjects']:
-        if 'objectSpec' in i and i['objectSpec'] == cfg_object['specName']:
-            entry_exists = True
-            logger.info('config is already in auto spawn list')
-
-    if not entry_exists:
-        logger.info('config is not in auto spawn list. adding')
-        cfg_files.files['yas']['autoSpawnObjects'].append({
-                'bShouldSpawn': True,
-                'objectType': 'Eav24',
-                'objectSpec': cfg_object['specName'],
-                'bSpawnAtLandmark': True,
-                'spawnLandmarkName': start_landmark
-            })
+    for ee in EXPECTED_ENV_NAMES:
+        entry_exists = False
+        for i in cfg_files.files[ee]['autoSpawnObjects']:
+            if 'objectSpec' in i and i['objectSpec'] == cfg_object['specName']:
+                entry_exists = True
+                logger.info('config is already in auto spawn list')
+
+        if not entry_exists:
+            logger.info('config is not in auto spawn list. adding')
+            cfg_files.files[ee]['autoSpawnObjects'].append({
+                    'bShouldSpawn': True,
+                    'objectType': 'Eav24',
+                    'objectSpec': cfg_object['specName'],
+                    'bSpawnAtLandmark': True,
+                    'spawnLandmarkName': start_landmark
+                })
 
     # also need to add the object template to main sim config
 

avrs/simconfig_util.py

@@ -7,7 +7,8 @@ class SimConfigFiles():
         self.required_files = {
             'main': os.path.join(saved_dir, 'simconfig.json'),
             'eav24': os.path.join(saved_dir, 'Objects', 'Eav24_default.json'),
-            'yas': os.path.join(saved_dir, 'Environments', 'yasmarina_env.json')
+            'yas': os.path.join(saved_dir, 'Environments', 'yasmarina_env.json'),
+            'adrome': os.path.join(saved_dir, 'Environments', 'autonodrome.json')
         }
         self.files = {}