autoverse-cli 0.22.0__py3-none-any.whl → 0.23.2__py3-none-any.whl

{autoverse_cli-0.22.0.dist-info → autoverse_cli-0.23.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.22.0
+Version: 0.23.2
 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.22.0.dist-info → autoverse_cli-0.23.2.dist-info}/RECORD

@@ -1,20 +1,20 @@
-autoverse_cli-0.22.0.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.23.2.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=w5X_Dh9-yJyZBOHdImpW4D66WqjgZI5bnaFJ3M988KQ,856
+avrs/app_version.py,sha256=cw08VU3BKOIk8N48m-1-F_Zqc0UaUH8XIiIGxwzE7qg,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=L9qjMWCYUBOyplMg1Mx0s6ZYDQzAciYCr8Qbgtw5b1U,4892
 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=1xew4ZPZtbKE2364ZRlT-TnWabRVKBESk8ZKSpxs8rU,9539
-avrs/launcher_util.py,sha256=oWsFBqqDgaLBvqe9m0ahTviXLZvOHKP_8mebKYzQF3Q,5384
+avrs/launcher.py,sha256=ejuWlm0c6yQivFHVb5L8M68rq9rS4M9rZa6l0E5Wu64,9536
+avrs/launcher_util.py,sha256=_0RjCcDfS_R8K5MFQJwrGaCzfPfeQY7ESvCdvtPbFyo,6358
 avrs/race_cloud.py,sha256=0m7BdclKhTrqdAA2kLIobwfoYA8X_PRDCFWoizHtPIQ,20124
 avrs/race_cloud_bridge_can.py,sha256=K3is7GFzWo2KBojr6V65kz138UfkVFXXofVxSAziArY,2888
-avrs/race_cloud_cfg_util.py,sha256=EsluoCgOqtyrG-hH_RIb9tPbIA6ayBRS_idqYD3Yk6s,12118
+avrs/race_cloud_cfg_util.py,sha256=u_wnMJgrHlidx8S7zF4jAoTRkl2gQTSgcXliGwsvG8E,12050
 avrs/race_cloud_fwd_api.py,sha256=jB4kt6Shu9Pj96WPVjK790PZjucYxmuHjjVKczQfyZI,1620
 avrs/race_cloud_util.py,sha256=g1gCxmK-8n32aNj0NWEiZr79s1rB0EYbGmNLabsIW0U,14297
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
-avrs/simconfig_util.py,sha256=2tNh-pU-Mbmc7SnGdRQ4UN43YAH0cpnyeCVTh1VHGHc,4922
+avrs/simconfig_util.py,sha256=Ds1lO3X8s5RAXQuc6KDSdH9N9MhdbVeE0kgMnNStIDM,5934
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
 avrs/util.py,sha256=SB8Jgsh8IpFdpy3pWPuEoYExLed9XimEAMtYn4gU42g,301
 avrs/requests/change_camera.py,sha256=p7S5C2KtSBuknj4-0jkAJtTQcdlSQ5Mwm0lmZIk3QTI,857
@@ -42,8 +42,8 @@ avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,3
 avrs/requests/vd.py,sha256=Rd0mCc89m2yKjftVf0cMHMFbJG4iFd09KzrI-DsCLgI,2606
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=7HPfVLjSLNbOyzU77Bz29qpHqRsMUAIWvnwvnNiw2nk,15026
-autoverse_cli-0.22.0.dist-info/METADATA,sha256=THzl7ol5bxB4Z7wOs8OHMZYlnCjWGEGABsBuWylPJPE,3364
-autoverse_cli-0.22.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-autoverse_cli-0.22.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.22.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.22.0.dist-info/RECORD,,
+autoverse_cli-0.23.2.dist-info/METADATA,sha256=Ea0bwsSjIaizcL857zOxTxPgFS3wB5RQHhcxDfNjy3E,3364
+autoverse_cli-0.23.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+autoverse_cli-0.23.2.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.23.2.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.23.2.dist-info/RECORD,,

avrs/app_version.py

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

avrs/launcher.py

@@ -91,7 +91,7 @@ class AvrsLauncher:
 
     def get_variants(self, args):
         if 'license' not in self.cfg:
-            status += 'no license has been registered\n'
+            print('no license has been registered\n')
             return
 
         (dl_keys_ok, dl_keys_status, self.cfg) = try_get_launcher_download_keys(self.cfg)

avrs/launcher_util.py

@@ -51,18 +51,41 @@ def try_get_launcher_download_keys(cfg):
     }).encode('utf-8')
     connection.request('POST', '/test', body, headers)
     response = connection.getresponse()
-    if response.status != 200:
-        status = 'response had status code {}'.format(response)
-        return (False, status, out_cfg)
-    dlinfo = json.loads(json.loads(response.read().decode('utf-8'))['body'])
-
-    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)
+    api_ok = False
+    api_status = ""
+
+    if response.status == 200:
+        res_full = json.loads(response.read().decode('utf-8'))
+        status += "primary api response: {}".format(res_full)
+        dlinfo = json.loads(res_full['body'])
+        code = res_full['statusCode']
+        if code == 200:
+            api_ok = True
+            for k, v in dlinfo.items():
+                    out_cfg[k] = v
+
+    if not api_ok:
+        #try other api
+        alt_api_url = 'uu6fmbvrhk.execute-api.us-east-1.amazonaws.com'
+        connection = http.client.HTTPSConnection(alt_api_url)
+        connection.request('POST', '/test/alt', body, headers)
+        response = connection.getresponse()
+        if response.status == 200:
+            res_full = json.loads(response.read().decode('utf-8'))
+            status += "alt api response: {}".format(res_full)
+            dlinfo = json.loads(res_full.get('body', "{}"))
+            code = res_full['statusCode']
+            if code == 200:
+                api_ok = True
+                for k, v in dlinfo.items():
+                    out_cfg[k] = v
+            else:
+                status += "primary and alt returned non 200"
+        else:
+            status += "primary and alt returned non 200"
+
+    return (api_ok, status, out_cfg)
 
 def has_launcher_download_keys(cfg):
     """
@@ -100,23 +123,25 @@ def get_launcher_build_info(cfg):
     """
     Contacts API to discover the current latest build version
     """
-    status = ''
-    db_resource = boto3.resource(
-        'dynamodb',
-        'us-east-1',
-        aws_access_key_id=cfg['dlkey_id'],
-        aws_secret_access_key=cfg['dlkey'])
 
-    table = db_resource.Table('autoverse-ci-meta')
-    item = table.get_item(Key={'package-name': 'autoverse'})
+    api_url = 'zn5boqqk60.execute-api.us-east-1.amazonaws.com'
+    connection = http.client.HTTPSConnection(api_url)
+    headers = {'Content-type': 'application/json'}
+    connection.request('POST', '/test', {}, headers)
+    response = connection.getresponse()
+
+    if response.status != 200:
+        return (False, "get build info api returned {}".format(response.status), "", "")
 
-    if not 'Item' in item or 'prod' not in item['Item'] or 'staging' not in item['Item']:
-        status = 'Unable to Retrieve Latest Version'
-        return (False, status, '', '')
+    res_full = json.loads(response.read().decode('utf-8'))
+    info = json.loads(res_full['body'])
+    code = res_full['statusCode']
+    if code != 200:
+        return (False, "get build info api returned {}".format(code), "", "")
 
-    latest_version = item['Item']['prod']
-    staged_version = item.get('Item', {}).get('staging', latest_version)
-    return (True, status, latest_version, staged_version)
+    latest_version = info['prod']
+    staged_version = info.get('staging', latest_version)
+    return (True, "ok", latest_version, staged_version)
 
 def download_simulator_archive(cfg, source_path, target_path):
     """

avrs/race_cloud_cfg_util.py

@@ -13,7 +13,8 @@ from avrs.simconfig_util import *
 # inside SimConfigFiles instead of doing it manually
 EXPECTED_ENV_NAMES = [
     "yas",
-    "adrome"
+    "adrome",
+    "suzuka"
 ]
 
 def get_payload(cfg_object, payload_name):
@@ -24,7 +25,6 @@ def get_payload(cfg_object, payload_name):
 
 def clear_autospawns():
     logger = logging.getLogger('avrs')
-    # also need to edit the yas_marina_env.json to have autospawn for this config
     sim_path = os.environ.get('AVRS_INSTALL_PATH', 
         os.path.join(os.environ['HOME'], 'autoverse-linux'))
     sim_saved = os.path.join(sim_path, 'Linux', 'Autoverse', 'Saved')

avrs/simconfig_util.py

@@ -1,15 +1,37 @@
 import os
 import json
+import logging
 
 class SimConfigFiles():
     def __init__(self, saved_dir):
 
+        logger = logging.getLogger('avrs')
+
         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'),
-            'adrome': os.path.join(saved_dir, 'Environments', 'autonodrome.json')
+            'adrome': os.path.join(saved_dir, 'Environments', 'autonodrome.json'),
+            'suzuka': os.path.join(saved_dir, "Environments", "Suzuka", "suzuka.json")
+        }
+
+        self.alt_paths = {
+            "main": [],
+            "eav24": [],
+            "yas": [os.path.join(saved_dir, 'Environments', "YasMarina", 'yasmarina_env.json')],
+            "adrome": [os.path.join(saved_dir, 'Environments', "Autonodrome", 'autonodrome.json')],
+            "suzuka": [os.path.join(saved_dir, "Environments", "Suzuka", "suzuka.json")]
         }
+
+        # support alternative paths for new directory structure, but retain backward compat
+        for k, v in self.required_files.items():
+            if not os.path.exists(v):
+                for alt_path in self.alt_paths.get(k, []):
+                    if os.path.exists(alt_path):
+                        logger.info("could not find file under {} but found under alt path {}".format(
+                            v, alt_path))
+                        self.required_files[k] = alt_path
+
         self.files = {}
 
         ok, status = self.validate()