autoverse-cli 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

{autoverse_cli-0.7.0.dist-info → autoverse_cli-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autoverse-cli
-Version: 0.7.0
+Version: 0.8.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.dist-info → autoverse_cli-0.8.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=bO0-qxfSWvkZgYy9nV11HSq5gNRuKteUi2-YrsSoTwM,855
+avrs/app_version.py,sha256=VfRTIcA5zw19bJnPtFiKisskuTewdBFE9HveNWqihT8,855
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
-avrs/avrs.py,sha256=9DfUzBn3yuCUTVs2Mx_hYgznEAHbErHqGXShCIO4Iqg,2844
+avrs/avrs.py,sha256=M1DMvsUirNYZpIsiPH50ZhMwuZVefB4NjErLjkYbFbQ,2915
 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=u7COEMvvkqxeGyW0kd2m6KK4375nWY5ONO4TxKJ2Xt4,7710
 avrs/launcher_util.py,sha256=y_F2YvIe81l3B1_lCjpoOgkbE4hAr2C9eaPio0es34o,5236
-avrs/simconfig.py,sha256=CtpIeU32Lfsek37Z4XR4mjSKwF27IlYvC92184VOuuQ,2389
-avrs/simconfig_util.py,sha256=R3ggjx1fIdOAHpUroNLjH6gg0G07PbFTI4PfwUOWtdw,2277
+avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
+avrs/simconfig_util.py,sha256=0LKYr6pS1CAHQq0esIWEEvhAa6-BB5-jQ9mnVBY5eq4,4839
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
 avrs/requests/change_camera.py,sha256=twqdE049DHwdjgKFZbindwpK7Oz-ivCjbI8WQj8QsxI,416
 avrs/requests/code_booz.py,sha256=SXaEAMTqID4lf1o_4Cc1wY9609X-dNcfNa-UZv3FWF4,2471
@@ -18,7 +18,7 @@ avrs/requests/fault_injection.py,sha256=EkpjPCx-UtrNbAR_vQS1zaGKN49UDCyYOoVcdlP1
 avrs/requests/get_object_config.py,sha256=Mkwp32lfskQERsqfmAgHi4vf4C0hfjg6Ru8UjyMt3cw,654
 avrs/requests/list_sim_objects.py,sha256=YWpqHdCHijerPxI5606_KjeFvezcLFN33wO4YOr9G3U,977
 avrs/requests/log_path.py,sha256=Ur24C9VqPVx78MfpicgQu2uOEe-0dXbGoWF_7dzMtZE,1326
-avrs/requests/misc.py,sha256=PpoyCsFID7PyoW1M6wjDQ7Mcf-dyCtJwIuiWu0tWFQg,431
+avrs/requests/misc.py,sha256=lejEFt5aB6tbfKXHI1DGwP4fsntFIv16NXO23R6Bfhw,1423
 avrs/requests/move_to_landmark.py,sha256=cLRBKu9XEDsmCoftBJ8JwoBLqzb0IZsxFMBnus4T-kc,702
 avrs/requests/npc.py,sha256=Y_WovbcLomCCcOLAMMO_DHZtc1crAzWo97qEIGS3SvU,9691
 avrs/requests/request.py,sha256=eUorvMKuKn7OuxjLCty40CX_uE0v1o6xfqsNO5cGvt8,1611
@@ -26,14 +26,14 @@ avrs/requests/reserve_mv_slot.py,sha256=ejB_RSZBXCpxY7B_2f66Or8twKdMI1gn9nEQgZ2Y
 avrs/requests/reset_to_track.py,sha256=lSd2YavBxDV_hQMhVoi08_TpTFEq7G2MA18xosFYa1g,450
 avrs/requests/restart.py,sha256=ih5mnWiU34q3-xhOth45CtOUXxKI0PoMDCnFJV0JbwE,415
 avrs/requests/scenario_control.py,sha256=u-KQx-mdCm6IE_c88a6iEgWUsZZVOayxBo58Ocjg0ZI,1502
-avrs/requests/teleport.py,sha256=X4OfUOWXiAaG9d6iRxb5xL9XpFXYG8waQRp0Ar8BR48,863
+avrs/requests/teleport.py,sha256=fzBmlqaCuV6-R79co__Q8Wpu4ozmEXFh8EGZKs8l8Io,1140
 avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,397
 avrs/requests/vd.py,sha256=at6oUAGY2h0OxYU6MLOi1gnxyUn6i24vL9DUAj0L880,1600
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.7.0.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.7.0.dist-info/METADATA,sha256=Lc7liX7GMeXqWbvB9DdD0keiyI_KJhC27P-rXq8w7PQ,3341
-autoverse_cli-0.7.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-autoverse_cli-0.7.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.7.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.7.0.dist-info/RECORD,,
+autoverse_cli-0.8.0.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.8.0.dist-info/METADATA,sha256=vdZQYRfoWOavizoc0npEuZ90biZxStbIdERPpxmt88E,3341
+autoverse_cli-0.8.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+autoverse_cli-0.8.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.8.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.8.0.dist-info/RECORD,,

{autoverse_cli-0.7.0.dist-info → autoverse_cli-0.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

avrs/app_version.py

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

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)

avrs/requests/misc.py

@@ -8,4 +8,33 @@ class AvrsGetSimVersionRequest(AvrsApiRequest):
     
     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
         }

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 
         }

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)

avrs/simconfig_util.py

@@ -28,6 +28,82 @@ class SimConfigFiles():
             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()