autoverse-cli 0.13.6__tar.gz → 0.14.0__tar.gz

{autoverse_cli-0.13.6 → autoverse_cli-0.14.0}/PKG-INFO

@@ -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 → autoverse_cli-0.14.0}/pyproject.toml

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

{autoverse_cli-0.13.6 → autoverse_cli-0.14.0}/src/autoverse_cli.egg-info/PKG-INFO

@@ -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 → autoverse_cli-0.14.0}/src/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

{autoverse_cli-0.13.6 → autoverse_cli-0.14.0}/src/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')

{autoverse_cli-0.13.6 → autoverse_cli-0.14.0}/src/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

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

autoverse_cli-0.14.0/src/avrs/requests/reset_to_track.py

@@ -0,0 +1,21 @@
+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.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 {
+            
+        }

autoverse_cli-0.14.0/src/avrs/requests/teleport.py

@@ -0,0 +1,40 @@
+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.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,
+            "Z": args.z,
+            "yaw": args.yaw,
+            "NavFrame": args.frame 
+        }

{autoverse_cli-0.13.6 → autoverse_cli-0.14.0}/src/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

autoverse_cli-0.13.6/src/avrs/requests/reset_to_track.py

@@ -1,12 +0,0 @@
-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.set_defaults(func=self.send_request)
-    
-    def get_request_body(self, args):
-        return {
-            
-        }

autoverse_cli-0.13.6/src/avrs/requests/teleport.py

@@ -1,22 +0,0 @@
-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.add_argument('--frame', choices=['lla', 'ned'], default='ned', help='LLA or NED coordinate system.')
-        psr.set_defaults(func=self.send_request)
-
-
-    def get_request_body(self, args):
-        return { 
-            "X": args.x,
-            "Y": args.y,
-            "Z": args.z,
-            "yaw": args.yaw,
-            "NavFrame": args.frame 
-        }