autoverse-cli 0.19.6__tar.gz → 0.20.1__tar.gz

{autoverse_cli-0.19.6 → autoverse_cli-0.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.19.6
+Version: 0.20.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.19.6 → autoverse_cli-0.20.1}/pyproject.toml

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

{autoverse_cli-0.19.6 → autoverse_cli-0.20.1}/src/autoverse_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.19.6
+Version: 0.20.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.19.6 → autoverse_cli-0.20.1}/src/avrs/app_version.py

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

{autoverse_cli-0.19.6 → autoverse_cli-0.20.1}/src/avrs/avrs.py

@@ -132,6 +132,7 @@ def main():
     AvrsSpawnObjectRequest(sps, cfg)
     AvrsDumpSimConfigRequest(sps, cfg)
     AvrsRaceControlRequest(sps, cfg)
+    AvrsSetEnvironmentRequest(sps, cfg)
 
     # new api requests
     AvrsDescribeSimRestRequest(sps, cfg)

{autoverse_cli-0.19.6 → autoverse_cli-0.20.1}/src/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
 

{autoverse_cli-0.19.6 → autoverse_cli-0.20.1}/src/avrs/requests/environment.py

@@ -30,4 +30,17 @@ class AvrsGetEnvironmentMetaRequets(AvrsApiRequest):
     def get_request_body(self, args):
             self.target_object_id = ''
             return {
-            }
+            }
+
+class AvrsSetEnvironmentRequest(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'SetEnvironment', '')
+        psr = parser.add_parser('set-environment', help='changes to a new environment')
+        psr.add_argument('new_environment_name', help='name of desired environment')
+        psr.set_defaults(func=self.send_request)
+
+    def get_request_body(self, args):
+        self.target_object_id = ''
+        return {
+            'newEnvironmentName': args.new_environment_name
+        }

{autoverse_cli-0.19.6 → autoverse_cli-0.20.1}/src/avrs/requests/vehicle_replay.py

@@ -309,12 +309,25 @@ class SpawnVehicleReplayGroup(AvrsApiRequest):
             default="",
             help="if specified, all vehicles will begin recording with the given group name")
 
+        psr.add_argument(
+            '--start-time',
+            type=float,
+            default=-1.0,
+            help="start the replay this many seconds in")
+
+        psr.add_argument(
+            '--rate',
+            type=float,
+            default=-1.0,
+            help="")
+
         psr.set_defaults(func=self.send_request)
 
     def get_request_body(self, args):
 
         return {
-            'PlayRate': -1.0,
+            'PlayRate': args.rate,
+            'startTime': args.start_time,
             'profile': '',
             'replayAction': 'start',
             #'teleportLocation': '',

{autoverse_cli-0.19.6 → autoverse_cli-0.20.1}/src/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 = {}