autoverse-cli 0.26.0__tar.gz → 0.28.0__tar.gz

{autoverse_cli-0.26.0 → autoverse_cli-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.26.0
+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.0 → autoverse_cli-0.28.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autoverse-cli"
-version = "0.26.0"
+version = "0.28.0"
 dependencies = [
   "boto3",
   "cantools",
@@ -18,4 +18,4 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 [project.scripts]
-avrs = "avrs.avrs:main"
+avrs = "avrs.avrs:main"

{autoverse_cli-0.26.0 → autoverse_cli-0.28.0}/src/autoverse_cli.egg-info/PKG-INFO

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

@@ -2,7 +2,7 @@ import http.client
 import json
 
 def get_app_version():
-    return '0.26.0'
+    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')))

{autoverse_cli-0.26.0 → autoverse_cli-0.28.0}/src/avrs/launcher.py

@@ -4,6 +4,8 @@ import json
 import logging
 import http.client
 import boto3
+import sys
+import shutil
 from avrs.cfg import *
 from avrs.launcher_util import *
 
@@ -111,23 +113,46 @@ class AvrsLauncher:
             print('Launcher Download Keys Error: {}'.format(dl_keys_status))
             return
 
-        # special case where we want staged version
+        # 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"]:
+            # 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)
+                if not dl_keys_ok:
+                    # If we can't get variants, proceed anyway for backwards compatibility
+                    pass
+            if 'variants' in self.cfg and args.variant not in self.cfg['variants']:
+                variant_is_invalid = True
+                # Write warning to stderr so it doesn't interfere with scripts parsing stdout
+                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
+
+        # 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
+                sys.stderr.write('Note: The version shown above is the production version of the default variant, not "{}"\n'.format(
+                    args.variant))
 
     def download_simulator(self, args):
 
@@ -152,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))
@@ -226,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)

{autoverse_cli-0.26.0 → autoverse_cli-0.28.0}/src/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()
 

{autoverse_cli-0.26.0 → autoverse_cli-0.28.0}/src/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