autoverse-cli 0.13.6__py3-none-any.whl → 0.14.0__py3-none-any.whl

{autoverse_cli-0.13.6.dist-info → autoverse_cli-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: autoverse-cli
-Version: 0.13.6
+Version: 0.14.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.13.6.dist-info → autoverse_cli-0.14.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=q9eu-Welv6ex74hek8yab_D6nZbF6arJpoB1e-alW5Q,856
+avrs/app_version.py,sha256=OTtZ85M8hzRUayr0aFKqt9dDXBj9hytgLvvwU0Og4Ao,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=bGF35a72MZU41OVWnFHmchqmgKXBKh9djokzGA_4pL4,4621
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
@@ -7,9 +7,9 @@ avrs/can_tool_util.py,sha256=G3q21dTGMLc09SDq_RieoW7kSn-kXPkXxPDjavPh4hQ,7710
 avrs/cfg.py,sha256=kMn08Z4Ms1PAu2-U1QI8weEJeIVEppP4A4_tFfwnjtg,2924
 avrs/launcher.py,sha256=kk1lyHHLgFZ4zsFfa_zV5f1kYbUODT6wEILJ8TZ16rQ,9353
 avrs/launcher_util.py,sha256=sO3k_z3A-HIQdJVkVXNXUAE_MGFwAYiZUqQBoFwOqew,5325
-avrs/race_cloud.py,sha256=15nJXs8SEwjRYuhV0Got9FE_1uq5QRClnXvPqjYRv7Q,15336
-avrs/race_cloud_cfg_util.py,sha256=gcHyUY0m5zc_9zZatKLaSIC_oFGc-6Vs8UlcX5yry9o,5158
-avrs/race_cloud_fwd_api.py,sha256=8ai4YnuqB16ewHxsT9RzNOLNSLcR95uuWfhOkIImjyA,1418
+avrs/race_cloud.py,sha256=ZRkiq3MXW5bboxP6odz9foNrqUQwxWoEapllbofR6JE,15685
+avrs/race_cloud_cfg_util.py,sha256=Rqp-SemS_ZL6wD_nABsMDc5thkoit7FQTJecaB9oWA8,5261
+avrs/race_cloud_fwd_api.py,sha256=HuLE5kfmzVq08aP3tlEh3f8WNjGL5N3K5EbXg9uQomo,1506
 avrs/race_cloud_util.py,sha256=ltp3_mPRV7TpdX0ZlcNQP0qzEq-l0l_mEAdCB4YZAU4,10187
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
 avrs/simconfig_util.py,sha256=1RmnmhK5C4HlCicTQeqn-1ORz3Xrku_QMt1Fqr9XjZs,4839
@@ -28,18 +28,18 @@ 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=uUAndVZPbTQgbiXqrd4S3l3TQ0J_3STBtghEFlVr5GA,2058
-avrs/requests/reset_to_track.py,sha256=lSd2YavBxDV_hQMhVoi08_TpTFEq7G2MA18xosFYa1g,450
+avrs/requests/reset_to_track.py,sha256=6BXe2EtezdZR1Xrs0pej_eBK-ilqeN8ZrJGN_KKPLbk,672
 avrs/requests/restart.py,sha256=ih5mnWiU34q3-xhOth45CtOUXxKI0PoMDCnFJV0JbwE,415
 avrs/requests/scenario_control.py,sha256=u-KQx-mdCm6IE_c88a6iEgWUsZZVOayxBo58Ocjg0ZI,1502
 avrs/requests/spawn_object.py,sha256=RzTJprcyPpNIesu4s_GMuEYbHII-sopw1sDcbTDgvrY,1429
-avrs/requests/teleport.py,sha256=fzBmlqaCuV6-R79co__Q8Wpu4ozmEXFh8EGZKs8l8Io,1140
+avrs/requests/teleport.py,sha256=zwawRgTs6N1KYtEsKDlDhfINElmbI_FSID-TQ1ykzX8,1415
 avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,397
-avrs/requests/vd.py,sha256=at6oUAGY2h0OxYU6MLOi1gnxyUn6i24vL9DUAj0L880,1600
+avrs/requests/vd.py,sha256=gdt5XCdCCVdECL3qt8y-PKDrlArjeY_lxtT4VpZmAJo,1804
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.13.6.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.13.6.dist-info/METADATA,sha256=lFWUR2zZwWxZUfG2dCQS7WUt6tPaqPgHxpstpfkEuJg,3342
-autoverse_cli-0.13.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autoverse_cli-0.13.6.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.13.6.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.13.6.dist-info/RECORD,,
+autoverse_cli-0.14.0.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.14.0.dist-info/METADATA,sha256=aKr843SOu3yHpAv323cqtSnYWFF_xag8AesW48Nn5nQ,3342
+autoverse_cli-0.14.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autoverse_cli-0.14.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.14.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.14.0.dist-info/RECORD,,

avrs/app_version.py

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

avrs/race_cloud.py

@@ -70,7 +70,7 @@ class AvrsRaceCloud(AvrsApiRequest):
             help='the index of the simulator instance to apply the action')
         sim_ctrl_parser.add_argument(
             'action',
-            choices=['start', 'stop', 'restart', 'reset-connection'],
+            choices=['start', 'stop', 'restart', 'reset-connection', 'get-log'],
             help='what action to apply to the simulator program')
         sim_ctrl_parser.add_argument(
             '--local',
@@ -291,7 +291,7 @@ class AvrsRaceCloud(AvrsApiRequest):
         # stop it if its already running
         stop_result = stop_fwd_api()
         logger.info('stopped fwd-api: {}'.format(stop_result))
-        start_result = start_fwd_api(args.source_port, args.target_port)
+        start_result = start_fwd_api(30333, 30313)
         logger.info('started fwd-api: {}'.format(start_result))
 
 
@@ -321,6 +321,15 @@ class AvrsRaceCloud(AvrsApiRequest):
             print('starting sim program on sim instance')
             exe_path = os.path.join(get_sim_exe_path())
             start_exe(exe_path)
+        if args.action == 'get-log':
+            logger.info('getting connection log')
+            log_path = os.path.join(get_cfg_dir('avrs'), 'avrs.log')
+            if os.path.isfile(log_path):
+                with open(log_path, 'r', encoding='utf-8') as f:
+                    print(f.read())
+            else:
+                print('no log file found')
+
 
     def remote_sim_ctrl(self, args):
         logger = logging.getLogger('avrs')

avrs/race_cloud_cfg_util.py

@@ -46,6 +46,9 @@ def register_received_vehicle(team_name, slot, cfg_data, bsu_vcan, kistler_vcan,
     eav24['body']['bPublishGroundTruth'] = False
     eav24['body']['bPublishInputs'] = False
 
+    logger.info('disabling hud for received vehicle config')
+    eav24['body']['bHudEnabled'] = False
+
     logger.info('setting bsu vcan to: {}, kistler to: {}, and badenia to: {}'.format(
         bsu_vcan, kistler_vcan, badenia_vcan))
     eav24['body']['bsuCanName'] = bsu_vcan

avrs/race_cloud_fwd_api.py

@@ -22,8 +22,10 @@ class ApiForwardHandler(BaseHTTPRequestHandler):
         length = int(self.headers.get('content-length'))
         rfile_str = self.rfile.read(length).decode('utf8')
         sim_response = self.get_fwd_response(rfile_str)
-        self.wfile.write(sim_response.encode('utf-8'))
         self.send_response(HTTPStatus.OK)
+        self.send_header("Content-Type", "application/json")
+        self.end_headers()
+        self.wfile.write(sim_response.encode('utf-8'))
         self.end_headers()
         
     def get_fwd_response(self, body):

avrs/requests/reset_to_track.py

@@ -3,10 +3,19 @@ from avrs.requests.request import AvrsApiRequest
 class ResetToTrack(AvrsApiRequest):
     def __init__(self, parser, cfg):
         AvrsApiRequest.__init__(self, parser, cfg, 'ResetToTrack', 'Ego')
-        psr = parser.add_parser('reset-to-track', help='moves the car to the closest point on track pointing down track')
+        psr = parser.add_parser(
+            'reset-to-track', 
+            help='moves the car to the closest point on track pointing down track')
+
+        psr.add_argument(
+            '--object-name',
+            default='ego',
+            help='the simulated object to apply the fault to')
+
         psr.set_defaults(func=self.send_request)
     
     def get_request_body(self, args):
+        self.target_object_id = args.object_name
         return {
             
         }

avrs/requests/teleport.py

@@ -3,16 +3,34 @@ from avrs.requests.request import AvrsApiRequest
 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) 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 = 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) 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.add_argument(
+            '--object-name',
+            default='ego',
+            help='the simulated object to apply the fault to')
+
         psr.set_defaults(func=self.send_request)
 
 
     def get_request_body(self, args):
+        self.target_object_id = args.object_name
         return { 
             "X": args.x,
             "Y": args.y,

avrs/requests/vd.py

@@ -15,9 +15,16 @@ class SetFrictionModifier(AvrsApiRequest):
         psr.add_argument('modifier', type = float, help = "Modified grip value")
         psr.add_argument('tires', help = "Tires to apply the modifier to", 
             choices=("FL", "FR", "RL", "RR", "F", "R", "All"))
+
+        psr.add_argument(
+            '--object-name',
+            default='ego',
+            help='the simulated object to apply the fault to')
+        
         psr.set_defaults(func=self.send_request)
     
     def get_request_body(self, args):
+        self.target_object_id = args.object_name
         return {
             'NewModifier': args.modifier,
             'Tires': args.tires