autoverse-cli 0.8.0__tar.gz → 0.10.0__tar.gz

{autoverse_cli-0.8.0 → autoverse_cli-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autoverse-cli
-Version: 0.8.0
+Version: 0.10.0
 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.8.0 → autoverse_cli-0.10.0}/pyproject.toml

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

{autoverse_cli-0.8.0 → autoverse_cli-0.10.0}/src/autoverse_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autoverse-cli
-Version: 0.8.0
+Version: 0.10.0
 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.8.0 → autoverse_cli-0.10.0}/src/autoverse_cli.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ src/avrs/requests/reserve_mv_slot.py
 src/avrs/requests/reset_to_track.py
 src/avrs/requests/restart.py
 src/avrs/requests/scenario_control.py
+src/avrs/requests/spawn_object.py
 src/avrs/requests/teleport.py
 src/avrs/requests/toggle_hud.py
 src/avrs/requests/vd.py

{autoverse_cli-0.8.0 → autoverse_cli-0.10.0}/src/avrs/app_version.py

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

{autoverse_cli-0.8.0 → autoverse_cli-0.10.0}/src/avrs/avrs.py

@@ -30,6 +30,7 @@ from avrs.requests.toggle_hud import *
 from avrs.simconfig import *
 from avrs.requests.get_object_config import *
 from avrs.requests.misc import *
+from avrs.requests.spawn_object import *
 
 
 def get_version():
@@ -66,7 +67,7 @@ def main():
     ResetToTrack(sps, cfg)
     Teleport(sps, cfg)
     #Npc(sps, cfg)
-    ReserveMvSlot(sps, cfg)
+    #ReserveMvSlot(sps, cfg)
     Vd(sps, cfg)
     AvrsConfigureVehicleInputRequest(sps, cfg)
     LogPath(sps, cfg)
@@ -84,6 +85,7 @@ def main():
     AvrsGetSimVersionRequest(sps, cfg)
     AvrsPingRequest(sps, cfg)
     AvrsConfigureSimLodRequest(sps, cfg)
+    AvrsSpawnObjectRequest(sps, cfg)
 
     if os.environ.get('AVRS_WITH_DEMO', '0') == '1':
         AvrsDemoRequest(sps, cfg)

{autoverse_cli-0.8.0 → autoverse_cli-0.10.0}/src/avrs/launcher.py

@@ -32,7 +32,13 @@ class AvrsLauncher:
             help='ask the build info api for the latest sim version')
         get_latest_psr.set_defaults(func=self.get_latest_sim_version)
 
+        get_variants_psr = sps.add_parser(
+            'list-variants',
+            help='lists the available variants of the simulator that can be downloaded')
+        get_variants_psr.set_defaults(func=self.get_variants)
+
         download_sim_psr = sps.add_parser('download-simulator', help='download the simulator')
+        download_sim_psr.add_argument('variant', help='which variant of the simulator to download (eg, \"a2rl-iron\" or \"a2rl-humble\")')
         download_sim_psr.add_argument('install_path', help='path to install the simulator')
         download_sim_psr.add_argument(
             '--copy-saved-from', 
@@ -80,6 +86,19 @@ class AvrsLauncher:
 
         # query something to find out what versions of the sim we can download
 
+    def get_variants(self, args):
+        if 'license' not in self.cfg:
+            status += 'no license has been registered\n'
+            return
+
+        (dl_keys_ok, dl_keys_status, self.cfg) = try_get_launcher_download_keys(self.cfg)
+        if not dl_keys_ok:
+            print('Error Getting Launcher Download Keys: {}'.format(dl_keys_status))
+            return
+        save_cfg('avrs', self.cfg)
+        print('{}'.format(self.cfg['variants']))
+
+
     def get_latest_sim_version(self, args):
         # Validate status of download keys
         dl_keys_ok, dl_keys_status = has_launcher_download_keys(self.cfg)
@@ -96,6 +115,15 @@ class AvrsLauncher:
 
     def download_simulator(self, args):
 
+        # update variants before each download. also updates download keys
+        print('Updating Variants...')
+        self.get_variants(args)
+
+        if args.variant not in self.cfg['variants']:
+            print('\"{}\" is not a known variant, try one of: {}'.format(
+                args.variant, self.cfg['variants']))
+            return
+
         file_path = args.install_path
         if not os.path.exists(file_path):
             print('Cannot Install Simulator at: {} (Invalid Path, Specify a Directory)'.format(file_path))
@@ -131,7 +159,7 @@ class AvrsLauncher:
 
         package_zip_name = 'autoverse-linux-{}.zip'.format(latest_version)
         package_name = 'autoverse-linux'
-        bucket_path = 'mainline/{}'.format(package_zip_name)
+        bucket_path = '{}/{}'.format(args.variant, package_zip_name)
         dl_path = os.path.join(args.install_path, package_zip_name)
         unzip_path = os.path.join(args.install_path, package_name)
 

{autoverse_cli-0.8.0 → autoverse_cli-0.10.0}/src/avrs/launcher_util.py

@@ -58,6 +58,10 @@ def try_get_launcher_download_keys(cfg):
 
     out_cfg['dlkey_id'] = dlinfo['dlkey_id']
     out_cfg['dlkey'] = dlinfo['dlkey']
+    out_cfg['variants'] = dlinfo['variants']
+
+    # set available variants here as well
+
     return (True, status, out_cfg)
 
 def has_launcher_download_keys(cfg):

autoverse_cli-0.10.0/src/avrs/requests/spawn_object.py

@@ -0,0 +1,44 @@
+from avrs.requests.request import AvrsApiRequest
+from argparse import RawTextHelpFormatter
+
+SPAWN_OBJECT_HELP = '''
+spawn an object with the specified configuration, optionally overriding its name
+'''
+
+class AvrsSpawnObjectRequest(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'SpawnObject', 0)
+        psr = parser.add_parser('spawn-object', help=SPAWN_OBJECT_HELP, formatter_class=RawTextHelpFormatter)
+
+        psr.add_argument(
+            '--object-type',
+            default='Eav24',
+            help='the type of object to spawn')
+
+        psr.add_argument(
+            'spec',
+            help='the specialization of the object (eg eav24_mv0)')
+
+        psr.add_argument(
+            '--name-override',
+            default='',
+            help='if not empty, will override the name given to the spawned object')
+
+        psr.add_argument(
+            'spawn_landmark',
+            help='what landmark to spawn at (eg MvStart0, MvStart1, MvStart2, or MvStart3)')
+
+        psr.set_defaults(func=self.send_request)
+    
+    def get_request_body(self, args):
+
+        return {
+            'name': args.name_override,
+            'type': args.object_type,
+            'spec': args.spec,
+            'bUseStoredInitializer': True,
+            'location': {},
+            'rotation': {},
+            'landmark': args.spawn_landmark,
+            'payloads': []
+        }