autoverse-cli 0.28.1__tar.gz → 0.28.3__tar.gz

{autoverse_cli-0.28.1 → autoverse_cli-0.28.3}/PKG-INFO

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

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

{autoverse_cli-0.28.1 → autoverse_cli-0.28.3}/src/autoverse_cli.egg-info/PKG-INFO

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

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

{autoverse_cli-0.28.1 → autoverse_cli-0.28.3}/src/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,10 +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)

{autoverse_cli-0.28.1 → autoverse_cli-0.28.3}/src/avrs/race_cloud.py

@@ -229,6 +229,7 @@ class AvrsRaceCloud(AvrsApiRequest):
         ok, response = call_race_cloud_api(connection_request)
         if not ok:
             print('connect api error: {}'.format(response))
+            return
 
         ok, rbody, sim_ip = get_api_script_response(response)
         if not ok:

{autoverse_cli-0.28.1 → autoverse_cli-0.28.3}/src/avrs/race_cloud_cfg_util.py

@@ -78,13 +78,13 @@ def register_received_vehicle(team_name, slot, cfg_data, bsu_vcan, kistler_vcan,
     if eav24 is None:
         return (False, 'no eav24 payload found')
 
-    logger.info('disabling perception for received vehicle config')
-    eav24['body']['bLidarEnabled'] = False
+    #logger.info('disabling perception for received vehicle config')
+    # eav24['body']['bLidarEnabled'] = False
     eav24['body']['bCameraEnabled'] = False
     eav24['body']['bRadarEnabled'] = False
-    eav24['body']['bPublishGroundTruth'] = False
+    # eav24['body']['bPublishGroundTruth'] = False
     eav24['body']['bPublishInputs'] = False
-    eav24['body']['bRenderHudInWorld'] = True
+    eav24['body']['bRenderHudInWorld'] = False
 
     # do not disable HUD
     #logger.info('disabling hud for received vehicle config')
@@ -208,6 +208,32 @@ def register_received_vehicle(team_name, slot, cfg_data, bsu_vcan, kistler_vcan,
         logger.info("opponentGroundTruthDsd rate was > 100. clamping")
         gtc["body"]["opponentGroundTruthDsd"]["rateHz"] = 100
 
+    # clamp lidar rates
+    for payload in cfg_object['payloads']:
+        if payload['typeName'].lower() == 'genericlidaripd':
+            lidar_rate = payload.get("body", {}).get("sensorDesc", {}).get("dataStream", {}).get("rateHz", 0)
+            if lidar_rate > 20:
+                instance_name = payload.get("body", {}).get("componentConfig", {}).get("instanceName", "unknown")
+                logger.info("lidar {} rate was > 20. clamping".format(instance_name))
+                payload["body"]["sensorDesc"]["dataStream"]["rateHz"] = 20
+
+    # clamp camera rates
+    for payload in cfg_object['payloads']:
+        if payload['typeName'].lower() == 'camerasensor':
+            camera_rate = payload.get("body", {}).get("sensorDesc", {}).get("dataStream", {}).get("rateHz", 0)
+            if camera_rate > 20:
+                instance_name = payload.get("body", {}).get("componentConfig", {}).get("instanceName", "unknown")
+                logger.info("camera {} rate was > 20. clamping".format(instance_name))
+                payload["body"]["sensorDesc"]["dataStream"]["rateHz"] = 20
+
+    # clamp radar rates
+    for payload in cfg_object['payloads']:
+        if payload['typeName'].lower() == 'radarsensor':
+            radar_rate = payload.get("body", {}).get("sensorDesc", {}).get("dataStream", {}).get("rateHz", 0)
+            if radar_rate > 20:
+                instance_name = payload.get("body", {}).get("componentConfig", {}).get("instanceName", "unknown")
+                logger.info("radar {} rate was > 20. clamping".format(instance_name))
+                payload["body"]["sensorDesc"]["dataStream"]["rateHz"] = 20
 
     # do not allow default object name (collision)
     if cfg_object['name'] == 'eav24':

{autoverse_cli-0.28.1 → autoverse_cli-0.28.3}/src/avrs/race_cloud_util.py

@@ -375,10 +375,30 @@ def call_race_cloud_api(body):
     return (True, response.read().decode('utf-8'))
 
 def get_api_script_response(raw):
-    decoded = json.loads(raw)['body']
     logger = logging.getLogger('avrs')
-    logger.info('race cloud api response: {}'.format(decoded))
-    if decoded['script_response']['statusCode'] != 200:
-        return (False, 'inner response had bad status code {}'.format(decoded))
-    #print(decoded)
-    return (True, json.loads(decoded['script_response']['body']), decoded['sim_private_ip'])
+    try:
+        parsed = json.loads(raw)
+        decoded = parsed['body']
+
+        # Handle double-encoded JSON (body is a string instead of dict)
+        if isinstance(decoded, str):
+            decoded = json.loads(decoded)
+
+        logger.info('race cloud api response: {}'.format(decoded))
+
+        if 'script_response' not in decoded:
+            return (False, 'missing script_response in response: {}'.format(decoded), None)
+
+        if decoded['script_response']['statusCode'] != 200:
+            return (False, 'inner response had bad status code {}'.format(decoded), None)
+
+        return (True, json.loads(decoded['script_response']['body']), decoded['sim_private_ip'])
+    except json.JSONDecodeError as e:
+        logger.error('failed to parse API response as JSON: {}'.format(e))
+        return (False, 'invalid JSON response: {}'.format(raw[:500]), None)
+    except KeyError as e:
+        logger.error('missing expected key in API response: {}'.format(e))
+        return (False, 'missing key {} in response: {}'.format(e, raw[:500]), None)
+    except Exception as e:
+        logger.error('unexpected error parsing API response: {}'.format(e))
+        return (False, 'error parsing response: {}'.format(e), None)