autoverse-cli 0.7.0__tar.gz → 0.9.0__tar.gz

{autoverse_cli-0.7.0 → autoverse_cli-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autoverse-cli
-Version: 0.7.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.7.0 → autoverse_cli-0.9.0}/pyproject.toml

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

{autoverse_cli-0.7.0 → autoverse_cli-0.9.0}/src/autoverse_cli.egg-info/PKG-INFO

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

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

{autoverse_cli-0.7.0 → autoverse_cli-0.9.0}/src/avrs/avrs.py

@@ -82,6 +82,8 @@ def main():
     AvrsToggleHudRequest(sps, cfg)
     AvrsGetObjectConfigRequest(sps, cfg)
     AvrsGetSimVersionRequest(sps, cfg)
+    AvrsPingRequest(sps, cfg)
+    AvrsConfigureSimLodRequest(sps, cfg)
 
     if os.environ.get('AVRS_WITH_DEMO', '0') == '1':
         AvrsDemoRequest(sps, cfg)

{autoverse_cli-0.7.0 → autoverse_cli-0.9.0}/src/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)
 

{autoverse_cli-0.7.0 → autoverse_cli-0.9.0}/src/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):

autoverse_cli-0.9.0/src/avrs/requests/misc.py

@@ -0,0 +1,40 @@
+from avrs.requests.request import AvrsApiRequest
+
+class AvrsGetSimVersionRequest(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'GetVersion', 0)
+        psr = parser.add_parser('get-sim-version', help='get the version of the currently running simulator')
+        psr.set_defaults(func=self.send_request)
+    
+    def get_request_body(self, args):
+        return {
+        }
+
+class AvrsPingRequest(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'GetVersion', 0)
+        psr = parser.add_parser('ping', help='ping the simulator to see if it is running and responsive')
+        psr.set_defaults(func=self.send_ping)
+
+    def send_ping(self, args):
+        try:
+            self.send_http_request(args)
+        except:
+            print('no')
+
+class AvrsConfigureSimLodRequest(AvrsApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsApiRequest.__init__(self, parser, cfg, 'ConfigureSimLod', 'lodctrl')
+        psr = parser.add_parser('set-lod', help='set the LOD of the sim, possibly reducing GPU overhead')
+
+        psr.add_argument(
+            'lod', 
+            type=int, 
+            help='the new lod level to set. 0 is max lod, 1 is min lod')
+
+        psr.set_defaults(func=self.send_request)
+    
+    def get_request_body(self, args):
+        return {
+            'newLod': args.lod
+        }

{autoverse_cli-0.7.0 → autoverse_cli-0.9.0}/src/avrs/requests/teleport.py

@@ -4,10 +4,11 @@ class Teleport(AvrsApiRequest):
     def __init__(self, parser, cfg):
         AvrsApiRequest.__init__(self, parser, cfg, 'Teleport', "Ego")
         psr = parser.add_parser('teleport', help='Teleports the car to the given x,y,z in either enu or lla.')
-        psr.add_argument('x', type=float, help='new x position (NED meters)')
-        psr.add_argument('y', type=float, help='new y position (NED meters)')
-        psr.add_argument('z', type=float, help='new z position (NED meters)')
-        #psr.add_argument('nav', help='lla or enu coordinate system.', nargs=1, choices=('lla', 'enu'))
+        psr.add_argument('x', type=float, help='new x position (NED meters) or latitude (if frame is set to lla)')
+        psr.add_argument('y', type=float, help='new y position (NED meters) or longitude (if frame is set to lla)')
+        psr.add_argument('z', type=float, help='new z position (NED meters) or altitude (if frame is set to lla)')
+        psr.add_argument('--yaw', type=float, default=0.0, help='the yaw in degrees (0 north, + CW) to apply post teleport')
+        psr.add_argument('--frame', choices=['lla', 'ned'], default='ned', help='LLA or NED coordinate system.')
         psr.set_defaults(func=self.send_request)
 
 
@@ -15,6 +16,7 @@ class Teleport(AvrsApiRequest):
         return { 
             "X": args.x,
             "Y": args.y,
-            "Z": args.z
-            #'NavFrame': args.nav 
+            "Z": args.z,
+            "yaw": args.yaw,
+            "NavFrame": args.frame 
         }

{autoverse_cli-0.7.0 → autoverse_cli-0.9.0}/src/avrs/simconfig.py

@@ -15,6 +15,17 @@ class AvrsSimConfig:
 
         sps = sim_config_parser.add_subparsers(required=True, help='sim-config options')
 
+        compare_parser = sps.add_parser(
+            'compare-configs',
+            help='compare two sets of configuration files')
+        compare_parser.add_argument(
+            'a',
+            help='the path to the first set of config files')
+        compare_parser.add_argument(
+            'b',
+            help='the path to the second set of config files')
+        compare_parser.set_defaults(func=self.compare_configs)
+
         apply_preset_parser = sps.add_parser(
             'apply-preset',
             help='apply a preset configuration for a certain use-case')
@@ -58,4 +69,7 @@ the target
             return
 
         print('applying preset {} to sim install at {}'.format(args.preset_name, sim_path))
-        apply_simconfig_preset(get_sim_saved_dir(sim_path), args.preset_name)
+        apply_simconfig_preset(get_sim_saved_dir(sim_path), args.preset_name)
+
+    def compare_configs(self, args):
+        compare_simconfig_defaults(args.a, args.b)

autoverse_cli-0.9.0/src/avrs/simconfig_util.py

@@ -0,0 +1,146 @@
+import os
+import json
+
+class SimConfigFiles():
+    def __init__(self, saved_dir):
+
+        self.required_files = {
+            'main': os.path.join(saved_dir, 'simconfig.json'),
+            'eav24': os.path.join(saved_dir, 'Objects', 'Eav24_default.json'),
+            'yas': os.path.join(saved_dir, 'Environments', 'yasmarina_env.json')
+        }
+        self.files = {}
+
+        ok, status = self.valdiate()
+        if ok:
+            for name, path in self.required_files.items():
+                with open(path, 'r', encoding='utf-8') as f:
+                    self.files[name] = json.load(f)
+
+    def valdiate(self):
+        for name, path in self.required_files.items():
+            if not os.path.exists(path):
+                return (False, '{} not found'.format(path))
+        return (True, '')
+
+    def save(self):
+        for name, path in self.required_files.items():
+            with open(path, 'w', encoding='utf-8') as f:
+                json.dump(self.files[name], f, ensure_ascii=False, indent=4)
+
+def compare_simconfig_defaults(sim_saved_dir, new_defaults_dir):
+    old_cfg_files = SimConfigFiles(sim_saved_dir)
+    new_cfg_files = SimConfigFiles(new_defaults_dir)
+
+    ok, status = old_cfg_files.valdiate()
+    if not ok:
+        print(status)
+        return
+    ok, status = new_cfg_files.valdiate()
+    if not ok:
+        print(status)
+        return
+
+    print('comparing config files at {} with those at {}'.format(
+        sim_saved_dir, new_defaults_dir))
+
+    out_cpr = {}
+    compare_dicts(old_cfg_files.files['main'], new_cfg_files.files['main'], 'main', out_cpr)
+
+    #print('{}'.format(out_cpr))
+    print_simconfig_compare(out_cpr['main'])
+
+def print_simconfig_compare(cpr):
+        for i in cpr['only_a']:
+            print('{} in a ({}) but not b'.format(i[0], i[1]))
+        for i in cpr['only_b']:
+            print('{} in b ({}) but not a'.format(i[0], i[1]))
+        for i in cpr['type_mismatch']:
+            print('{} ({}) does not match type {} ({})'.format(i[0], i[1], i[0], i[2]))
+        for i in cpr['value_mismatch']:
+            print('{} ({}) value does not match ({})'.format(i[0], i[1], i[2]))
+
+        for key, value in cpr['sub'].items():
+            print_simconfig_compare(value)
+
+def compare_dicts(a, b, parent_key, out_checks):
+
+    only_a = []
+    only_b = []
+    type_mismatch = []
+    value_mismatch = []
+
+    out_checks[parent_key] = {}
+    out_checks[parent_key]['sub'] = {}
+
+
+    for key, value in a.items():
+        key_chain = '{}.{}'.format(parent_key, key)
+        if key not in b:
+            only_a.append((key_chain, value))
+        else:
+            if type(value) != type(b[key]):
+                type_mismatch.append((key_chain, type(value), type(b[key])))
+            elif isinstance(value, dict):
+                compare_dicts(value, b[key], key_chain, out_checks[parent_key]['sub']) 
+            elif value != b[key]:
+                value_mismatch.append((key_chain, value, b[key]))
+
+    for key, value in b.items():
+        key_chain = '{}.{}'.format(parent_key, key)
+        if key not in a:
+            only_b.append((key_chain, value))
+
+    out_checks[parent_key]['only_a'] = only_a
+    out_checks[parent_key]['only_b'] = only_b
+    out_checks[parent_key]['type_mismatch'] = type_mismatch
+    out_checks[parent_key]['value_mismatch'] = value_mismatch
+
+    #print('only a \n {} \n\n'.format(only_a))
+    #print('only b \n {} \n\n'.format(only_b))
+    #print('type mismatch \n {} \n\n'.format(type_mismatch))
+    #print('value mismatch \n {} \n\n'.format(value_mismatch))
+    #print('sub_checks')
+
+
+
+def apply_simconfig_preset(sim_saved_dir, preset_name):
+    cfg_files = SimConfigFiles(sim_saved_dir)
+    ok, status = cfg_files.valdiate()
+    if not ok:
+        print(status)
+        return
+
+    presets = {
+        'default': apply_default_simconfig_preset,
+        'lightweight': apply_lightweight_simconfig_preset,
+        'a2rl': apply_a2rl_simconfig_preset
+    }
+    presets[preset_name](cfg_files)    
+
+def apply_default_simconfig_preset(cfg_files):
+    files = cfg_files.files
+    
+    print('globally enabling ROS2 and CAN')
+    files['main']['interfaces']['bEnableRos2'] = True
+    files['main']['interfaces']['bEnableCan'] = True
+
+    print('ensuring default eav24 and yasmarina are reference in main config')
+    if not 'Environments/yasmarina_env.json' in files['main']['environmentPaths']:
+        print('missing yas environment. adding')
+        print('{}'.format(files['main']['environmentPaths']))
+    if not 'Objects/Eav24_default.json' in files['main']['objectTemplatePaths']:
+        print('missing eav24. adding')
+
+    cfg_files.save()
+
+
+def apply_lightweight_simconfig_preset(cfg_files):
+    files = cfg_files.files
+    
+    cfg_files.save()
+
+def apply_a2rl_simconfig_preset(cfg_files):
+    files = cfg_files.files
+    
+    cfg_files.save()

autoverse_cli-0.7.0/src/avrs/requests/misc.py

@@ -1,11 +0,0 @@
-from avrs.requests.request import AvrsApiRequest
-
-class AvrsGetSimVersionRequest(AvrsApiRequest):
-    def __init__(self, parser, cfg):
-        AvrsApiRequest.__init__(self, parser, cfg, 'GetVersion', 0)
-        psr = parser.add_parser('get-sim-version', help='get the version of the currently running simulator')
-        psr.set_defaults(func=self.send_request)
-    
-    def get_request_body(self, args):
-        return {
-        }

autoverse_cli-0.7.0/src/avrs/simconfig_util.py

@@ -1,70 +0,0 @@
-import os
-import json
-
-class SimConfigFiles():
-    def __init__(self, saved_dir):
-
-        self.required_files = {
-            'main': os.path.join(saved_dir, 'simconfig.json'),
-            'eav24': os.path.join(saved_dir, 'Objects', 'Eav24_default.json'),
-            'yas': os.path.join(saved_dir, 'Environments', 'yasmarina_env.json')
-        }
-        self.files = {}
-
-        ok, status = self.valdiate()
-        if ok:
-            for name, path in self.required_files.items():
-                with open(path, 'r', encoding='utf-8') as f:
-                    self.files[name] = json.load(f)
-
-    def valdiate(self):
-        for name, path in self.required_files.items():
-            if not os.path.exists(path):
-                return (False, '{} not found'.format(path))
-        return (True, '')
-
-    def save(self):
-        for name, path in self.required_files.items():
-            with open(path, 'w', encoding='utf-8') as f:
-                json.dump(self.files[name], f, ensure_ascii=False, indent=4)
-
-def apply_simconfig_preset(sim_saved_dir, preset_name):
-    cfg_files = SimConfigFiles(sim_saved_dir)
-    ok, status = cfg_files.valdiate()
-    if not ok:
-        print(status)
-        return
-
-    presets = {
-        'default': apply_default_simconfig_preset,
-        'lightweight': apply_lightweight_simconfig_preset,
-        'a2rl': apply_a2rl_simconfig_preset
-    }
-    presets[preset_name](cfg_files)    
-
-def apply_default_simconfig_preset(cfg_files):
-    files = cfg_files.files
-    
-    print('globally enabling ROS2 and CAN')
-    files['main']['interfaces']['bEnableRos2'] = True
-    files['main']['interfaces']['bEnableCan'] = True
-
-    print('ensuring default eav24 and yasmarina are reference in main config')
-    if not 'Environments/yasmarina_env.json' in files['main']['environmentPaths']:
-        print('missing yas environment. adding')
-        print('{}'.format(files['main']['environmentPaths']))
-    if not 'Objects/Eav24_default.json' in files['main']['objectTemplatePaths']:
-        print('missing eav24. adding')
-
-    cfg_files.save()
-
-
-def apply_lightweight_simconfig_preset(cfg_files):
-    files = cfg_files.files
-    
-    cfg_files.save()
-
-def apply_a2rl_simconfig_preset(cfg_files):
-    files = cfg_files.files
-    
-    cfg_files.save()