autoverse-cli 0.24.0__tar.gz → 0.25.1__tar.gz

{autoverse_cli-0.24.0 → autoverse_cli-0.25.1}/PKG-INFO

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

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

{autoverse_cli-0.24.0 → autoverse_cli-0.25.1}/src/autoverse_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.24.0
+Version: 0.25.1
 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.24.0 → autoverse_cli-0.25.1}/src/autoverse_cli.egg-info/SOURCES.txt

@@ -32,6 +32,7 @@ src/avrs/requests/dump_sim_config.py
 src/avrs/requests/environment.py
 src/avrs/requests/fault_injection.py
 src/avrs/requests/get_object_config.py
+src/avrs/requests/get_web_viz_meta.py
 src/avrs/requests/leaderboard.py
 src/avrs/requests/list_sim_objects.py
 src/avrs/requests/log_path.py

{autoverse_cli-0.24.0 → autoverse_cli-0.25.1}/src/avrs/app_version.py

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

{autoverse_cli-0.24.0 → autoverse_cli-0.25.1}/src/avrs/avrs.py

@@ -36,6 +36,7 @@ from avrs.requests.get_object_config import *
 from avrs.requests.misc import *
 from avrs.requests.spawn_object import *
 from avrs.requests.dump_sim_config import *
+from avrs.requests.get_web_viz_meta import *
 from avrs.requests.leaderboard import AvrsLeaderboardRequest
 
 def get_version():
@@ -140,6 +141,9 @@ def main():
     # new api requests
     AvrsDescribeSimRestRequest(sps, cfg)
 
+    if os.environ.get('AVRS_CLI_WITH_TESTS', '0') == '1':
+        AvrsGetWebVizMetaRequest(sps, cfg)
+
     if os.environ.get('AVRS_WITH_DEMO', '0') == '1':
         AvrsDemoRequest(sps, cfg)
 

{autoverse_cli-0.24.0 → autoverse_cli-0.25.1}/src/avrs/launcher.py

@@ -111,13 +111,23 @@ class AvrsLauncher:
             print('Launcher Download Keys Error: {}'.format(dl_keys_status))
             return
 
-        # Get latest build info from API
-        build_info_ok, build_info_status, latest_version, staged_version = get_launcher_build_info(
-            self.cfg, args.variant)
-        if not build_info_ok:
-            print('Error Getting Latest Version Info: {}'.format(build_info_status))
-            return
-        print('{}'.format(latest_version))
+        # special case where we want staged version
+        if args.variant == "staged":
+            # Get latest build info from API
+            build_info_ok, build_info_status, latest_version, staged_version = get_launcher_build_info(
+                self.cfg, "autoverse")
+            if not build_info_ok:
+                print('Error Getting Latest Version Info: {}'.format(build_info_status))
+                return
+            print('{}'.format(staged_version))
+        else:
+            # Get latest build info from API
+            build_info_ok, build_info_status, latest_version, staged_version = get_launcher_build_info(
+                self.cfg, args.variant)
+            if not build_info_ok:
+                print('Error Getting Latest Version Info: {}'.format(build_info_status))
+                return
+            print('{}'.format(latest_version))
 
     def download_simulator(self, args):
 

{autoverse_cli-0.24.0 → autoverse_cli-0.25.1}/src/avrs/requests/environment.py

@@ -5,7 +5,7 @@ class AvrsEnvironmentRequests():
             psr = parser.add_parser('environment', help='Edits the environment')
             sps = psr.add_subparsers(required= True, help='')
             AvrsSetTimeOfDayRequest(sps, cfg)
-            AvrsGetEnvironmentMetaRequets(sps, cfg)
+            AvrsGetEnvironmentMetaRequest(sps, cfg)
 
 
 class AvrsSetTimeOfDayRequest(AvrsApiRequest):
@@ -21,7 +21,7 @@ class AvrsSetTimeOfDayRequest(AvrsApiRequest):
             'TimeOfDay': args.tod
         }
 
-class AvrsGetEnvironmentMetaRequets(AvrsApiRequest):
+class AvrsGetEnvironmentMetaRequest(AvrsApiRequest):
     def __init__(self, parser, cfg):
         AvrsApiRequest.__init__(self, parser, cfg, 'GetEnvironmentMeta', '')
         psr = parser.add_parser('get-meta', help='get metadata about the currently loaded environment')

autoverse_cli-0.25.1/src/avrs/requests/get_web_viz_meta.py

@@ -0,0 +1,11 @@
+from avrs.requests.rest_request import AvrsRestApiRequest
+
+
+class AvrsGetWebVizMetaRequest(AvrsRestApiRequest):
+    def __init__(self, parser, cfg):
+        AvrsRestApiRequest.__init__(self, parser, cfg, '/api/v1.0/get-web-viz-meta', 'GET')
+        psr = parser.add_parser('get-web-viz-meta', help='get metadata from the simulator needed by the web frontend')
+        psr.set_defaults(func=self.send_request)
+
+    def get_request_params(self, args):
+        return {}

{autoverse_cli-0.24.0 → autoverse_cli-0.25.1}/src/avrs/requests/race_control.py

@@ -1,10 +1,9 @@
-
 from avrs.requests.request import AvrsApiRequest
-
 class AvrsRaceControlRequest(AvrsApiRequest):
     def __init__(self, parser, cfg):
         AvrsApiRequest.__init__(self, parser, cfg, 'RaceControl', 'Ego')
         psr = parser.add_parser('race-control', help='send different flags to the race control')
+        self.sector_number = 3  # Assuming there are 3 sectors; adjust as necessary, constant for now
 
         psr.add_argument(
             '--session-type', 
@@ -25,10 +24,11 @@ class AvrsRaceControlRequest(AvrsApiRequest):
             help='the id of the car flag to set')
         
         psr.add_argument(
-            '--sector-flag', 
-            type=int, 
-            default=-1,
-            help='the id of the sector flag to set')
+            '--sector-flag',
+            nargs=self.sector_number, 
+            type=int,
+            default=[-1, -1, -1],
+            help='the ids of the sector flags to set, provide 3 values for sector 1, sector 2 and sector 3 in that order')
 
         psr.add_argument(
             '--object-name',