autoverse-cli 0.8.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

{autoverse_cli-0.8.0.dist-info → autoverse_cli-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autoverse-cli
-Version: 0.8.0
+Version: 0.9.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.dist-info → autoverse_cli-0.9.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=VfRTIcA5zw19bJnPtFiKisskuTewdBFE9HveNWqihT8,855
+avrs/app_version.py,sha256=E6G0obeUBrTGyejqsa_G5DaZ6qEiKnIWLLN6nIcqkwo,855
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=M1DMvsUirNYZpIsiPH50ZhMwuZVefB4NjErLjkYbFbQ,2915
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
 avrs/can_tool_util.py,sha256=G3q21dTGMLc09SDq_RieoW7kSn-kXPkXxPDjavPh4hQ,7710
 avrs/cfg.py,sha256=kMn08Z4Ms1PAu2-U1QI8weEJeIVEppP4A4_tFfwnjtg,2924
-avrs/launcher.py,sha256=u7COEMvvkqxeGyW0kd2m6KK4375nWY5ONO4TxKJ2Xt4,7710
-avrs/launcher_util.py,sha256=y_F2YvIe81l3B1_lCjpoOgkbE4hAr2C9eaPio0es34o,5236
+avrs/launcher.py,sha256=Ez1yfXBOpJmy1Qy64G-8VPgwJrybkxJUx561x6Ih59o,8883
+avrs/launcher_util.py,sha256=sO3k_z3A-HIQdJVkVXNXUAE_MGFwAYiZUqQBoFwOqew,5325
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
 avrs/simconfig_util.py,sha256=0LKYr6pS1CAHQq0esIWEEvhAa6-BB5-jQ9mnVBY5eq4,4839
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
@@ -31,9 +31,9 @@ avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,3
 avrs/requests/vd.py,sha256=at6oUAGY2h0OxYU6MLOi1gnxyUn6i24vL9DUAj0L880,1600
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.8.0.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.8.0.dist-info/METADATA,sha256=vdZQYRfoWOavizoc0npEuZ90biZxStbIdERPpxmt88E,3341
-autoverse_cli-0.8.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-autoverse_cli-0.8.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.8.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.8.0.dist-info/RECORD,,
+autoverse_cli-0.9.0.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.9.0.dist-info/METADATA,sha256=Sc4MvJfnt4AY6m8uyIFowXzxpuYh413OLtz5wTkqJ4E,3341
+autoverse_cli-0.9.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+autoverse_cli-0.9.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.9.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.9.0.dist-info/RECORD,,

avrs/app_version.py

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

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, \"ros2-iron\" or \"ros2-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)
 

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):