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

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

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

@@ -1,13 +1,13 @@
-autoverse_cli-0.26.1.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.28.0.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=sY1fpwqoCUAZ4uNFfM9x1GqSUrZ_mLqbJq7ZJUUmBoQ,856
+avrs/app_version.py,sha256=ZjHNAVB1i4EOR8zaQm3u8kxZ4NK_k2M1L4pg57kjpx4,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=-aCRoGxRnuwTjuhjgi0hNE_zee-X-4nQYnGJfXpjLVA,11409
-avrs/launcher_util.py,sha256=o9owKiXxgEBE-p6cAgFLUZ6Y26CauZsDAglk4bRvkuA,6447
+avrs/launcher.py,sha256=hPBRtUabUFDxT3-TUb1JrqrdH41tgsueQ8twO1rVk3U,11511
+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
 avrs/race_cloud_cfg_util.py,sha256=TF_gsP7c_39MKs1CyzeXkTH-Fwyd8wLkFkMbqQVmdeo,12066
@@ -15,7 +15,7 @@ avrs/race_cloud_fwd_api.py,sha256=jB4kt6Shu9Pj96WPVjK790PZjucYxmuHjjVKczQfyZI,16
 avrs/race_cloud_util.py,sha256=g1gCxmK-8n32aNj0NWEiZr79s1rB0EYbGmNLabsIW0U,14297
 avrs/shell_completion.py,sha256=_IM85ADKQHYNMlTa1_nhnYWsgdOzRQ7tIFHxAT6EWWA,4298
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
-avrs/simconfig_util.py,sha256=EDsIwMZeoOm-oyiktVgvKRKjTZtnFyPDc3dMFug7LH0,6044
+avrs/simconfig_util.py,sha256=ronvXg9Mraz60K99ABBvo_YDI1_rWphUWUn_s_voTKw,6044
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
 avrs/util.py,sha256=SB8Jgsh8IpFdpy3pWPuEoYExLed9XimEAMtYn4gU42g,301
 avrs/requests/change_camera.py,sha256=p7S5C2KtSBuknj4-0jkAJtTQcdlSQ5Mwm0lmZIk3QTI,857
@@ -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.26.1.dist-info/METADATA,sha256=U8tv2SWKbk1wiAD7dH782A_Jqgqez-IoekE7Xjx9BNM,3935
-autoverse_cli-0.26.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-autoverse_cli-0.26.1.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.26.1.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.26.1.dist-info/RECORD,,
+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,,

avrs/app_version.py

@@ -2,7 +2,7 @@ import http.client
 import json
 
 def get_app_version():
-    return '0.26.1'
+    return '0.28.0'
 
 def check_app_is_latest():
     pass
@@ -21,4 +21,4 @@ def check_app_is_latest():
     # response = connection.getresponse()
     # if response.status != 200:
     #     print('response had status code {}'.format(response))
-    # print('{}'.format(response.read().decode('utf-8')))
+    # print('{}'.format(response.read().decode('utf-8')))

avrs/launcher.py

@@ -5,6 +5,7 @@ import logging
 import http.client
 import boto3
 import sys
+import shutil
 from avrs.cfg import *
 from avrs.launcher_util import *
 
@@ -114,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 != "staged":
+        if args.variant not in ["staged", "feature"]:
             # 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)
@@ -127,22 +128,26 @@ class AvrsLauncher:
                 sys.stderr.write('Warning: "{}" is not a known variant. Available variants: {}\n'.format(
                     args.variant, self.cfg['variants']))
 
-        # special case where we want staged version
+        variant_to_query = "autoverse" if args.variant in ["staged", "feature"] 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(
+            self.cfg, variant_to_query)
+        if not build_info_ok:
+            print('Error Getting Latest Version Info: {}'.format(build_info_status))
+            return
+
         if args.variant == "staged":
-            # Get latest build info from API
-            build_info_ok, build_info_status, latest_version, staged_version = get_launcher_build_info(
-                self.cfg, "autoverse")
-            if not build_info_ok:
-                print('Error Getting Latest Version Info: {}'.format(build_info_status))
-                return
             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:
-            # Get latest build info from API
-            build_info_ok, build_info_status, latest_version, staged_version = get_launcher_build_info(
-                self.cfg, args.variant)
-            if not build_info_ok:
-                print('Error Getting Latest Version Info: {}'.format(build_info_status))
-                return
             print('{}'.format(latest_version))
             if variant_is_invalid:
                 # Explain that the output is the default/prod variant version, not the requested variant
@@ -172,7 +177,7 @@ class AvrsLauncher:
             return
 
         # Get latest build info from API
-        build_info_ok, build_info_status, latest_version, staged_version = get_launcher_build_info(
+        build_info_ok, build_info_status, latest_version, staged_version, _build_info = get_launcher_build_info(
             self.cfg, args.variant)
         if not build_info_ok:
             print('Error Getting Latest Version Info: {}'.format(build_info_status))
@@ -246,4 +251,4 @@ If you are sure, re-run with the --update-existing flag
         os.chmod(autoverse_exe, st.st_mode | stat.S_IEXEC)
 
         print('Cleaning up')
-        os.remove(dl_path)
+        os.remove(dl_path)

avrs/launcher_util.py

@@ -121,7 +121,7 @@ def get_launcher_license_status_string(cfg):
 
 def get_launcher_build_info(cfg, variant):
     """
-    Contacts API to discover the current latest build version
+    Contacts API to discover the current latest build version and returns full build info
     """
 
     api_url = 'zn5boqqk60.execute-api.us-east-1.amazonaws.com'
@@ -134,17 +134,24 @@ def get_launcher_build_info(cfg, variant):
     response = connection.getresponse()
 
     if response.status != 200:
-        return (False, "get build info api returned {}".format(response.status), "", "")
+        return (False, "get build info api returned {}".format(response.status), "", "", {})
 
     res_full = json.loads(response.read().decode('utf-8'))
-    info = json.loads(res_full['body'])
-    code = res_full['statusCode']
+    raw_body = res_full.get('body', "{}")
+    info = json.loads(raw_body) if isinstance(raw_body, str) else raw_body
+    if not isinstance(info, dict):
+        return (False, "get build info api returned unexpected format", "", "", {})
+
+    code = res_full.get('statusCode')
     if code != 200:
-        return (False, "get build info api returned {}".format(code), "", "")
+        return (False, "get build info api returned {}".format(code), "", "", info)
+
+    latest_version = info.get('prod', '')
+    if latest_version == '':
+        return (False, "get build info api response missing prod", "", "", info)
 
-    latest_version = info['prod']
     staged_version = info.get('staging', latest_version)
-    return (True, "ok", latest_version, staged_version)
+    return (True, "ok", latest_version, staged_version, info)
 
 def download_simulator_archive(cfg, source_path, target_path):
     """
@@ -184,7 +191,10 @@ def s3_download_with_progress(s3_client, s3_bucket, s3_object_key, local_file_pa
     def progress(chunk):
         nonlocal downloaded
         downloaded += chunk
-        done = int(50 * downloaded / total_length)
+        if total_length > 0:
+            done = int(50 * downloaded / total_length)
+        else:
+            done = 0
         sys.stdout.write("\r[%s%s]" % ('=' * done, ' ' * (50-done)) )
         sys.stdout.flush()
 

avrs/simconfig_util.py

@@ -130,7 +130,7 @@ def compare_dicts(a, b, parent_key, out_checks):
 
 def apply_simconfig_preset(sim_saved_dir, preset_name):
     cfg_files = SimConfigFiles(sim_saved_dir)
-    ok, status = cfg_files.valdiate()
+    ok, status = cfg_files.validate()
     if not ok:
         print(status)
         return