autoverse-cli 0.28.0__py3-none-any.whl → 0.28.2__py3-none-any.whl

{autoverse_cli-0.28.0.dist-info → autoverse_cli-0.28.2.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
-autoverse_cli-0.28.0.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.28.2.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=ZjHNAVB1i4EOR8zaQm3u8kxZ4NK_k2M1L4pg57kjpx4,857
+avrs/app_version.py,sha256=ullV714kk4FcU4YhcTqWvwnpaDh3TO1AMKAxlmgp2dM,857
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=pQHc8KLAD0hCxpBoNbXOgj2Et3qiqxSMKyAXFLwWFjE,5787
 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=hPBRtUabUFDxT3-TUb1JrqrdH41tgsueQ8twO1rVk3U,11511
+avrs/launcher.py,sha256=uk7xG2JTLJv7FJMDo1diwc-zmTvUxXJME9-0ctrZRuk,11352
 avrs/launcher_util.py,sha256=zXUbJByn9M-ErkNM6DvLCFtUkueYH-R0dehjQj0aYEs,6879
 avrs/race_cloud.py,sha256=0m7BdclKhTrqdAA2kLIobwfoYA8X_PRDCFWoizHtPIQ,20124
 avrs/race_cloud_bridge_can.py,sha256=K3is7GFzWo2KBojr6V65kz138UfkVFXXofVxSAziArY,2888
@@ -44,8 +44,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.28.0.dist-info/METADATA,sha256=Q0tx_zwOksv2XrKY99xtRfbN3ZTUE5qjGFjZa78Nt3s,3935
-autoverse_cli-0.28.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-autoverse_cli-0.28.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.28.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.28.0.dist-info/RECORD,,
+autoverse_cli-0.28.2.dist-info/METADATA,sha256=EN_N8x4TzqMGdvq37kRqV-3quJT2GrSWWa0ZV-ec-lc,3935
+autoverse_cli-0.28.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+autoverse_cli-0.28.2.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.28.2.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.28.2.dist-info/RECORD,,

avrs/app_version.py

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

avrs/launcher.py

@@ -115,7 +115,7 @@ class AvrsLauncher:
 
         # Check if variant is valid (for backwards compatibility, we still proceed even if invalid)
         variant_is_invalid = False
-        if args.variant not in ["staged", "feature"]:
+        if args.variant != "staged":
             # Ensure variants are loaded
             if 'variants' not in self.cfg:
                 (dl_keys_ok, dl_keys_status, self.cfg) = try_get_launcher_download_keys(self.cfg)
@@ -128,7 +128,7 @@ class AvrsLauncher:
                 sys.stderr.write('Warning: "{}" is not a known variant. Available variants: {}\n'.format(
                     args.variant, self.cfg['variants']))
 
-        variant_to_query = "autoverse" if args.variant in ["staged", "feature"] else args.variant
+        variant_to_query = "autoverse" if args.variant == "staged" else args.variant
 
         # Get latest build info from API
         build_info_ok, build_info_status, latest_version, staged_version, build_info = get_launcher_build_info(
@@ -139,19 +139,11 @@ class AvrsLauncher:
 
         if args.variant == "staged":
             print('{}'.format(staged_version))
-        elif args.variant == "feature":
-            feature_info = build_info.get('feature', {})
-            if isinstance(feature_info, str):
-                try:
-                    feature_info = json.loads(feature_info)
-                except json.JSONDecodeError:
-                    pass
-            print('{}'.format(json.dumps(feature_info)))
         else:
             print('{}'.format(latest_version))
             if variant_is_invalid:
-                # Explain that the output is the default/prod variant version, not the requested variant
-                sys.stderr.write('Note: The version shown above is the production version of the default variant, not "{}"\n'.format(
+                # Explain that the variant name was not recognized
+                sys.stderr.write('Note: "{}" is not a known variant; showing the prod version value returned by the build info\n'.format(
                     args.variant))
 
     def download_simulator(self, args):
@@ -207,8 +199,15 @@ class AvrsLauncher:
             target_version = args.target_version
             print('attempting to download specified version: {}'.format(target_version))
 
-        package_zip_name = 'autoverse-linux-{}.zip'.format(target_version)
         package_name = 'autoverse-linux'
+        package_zip_name = '{}-{}.zip'.format(package_name, target_version)
+
+        if args.variant == 'feature':
+            package_zip_name = '{}-feature.zip'.format(package_name)
+        if target_version == 'feature':
+            args.variant = 'feature'
+            package_zip_name = '{}-feature.zip'.format(package_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)