autoverse-cli 0.22.0__tar.gz → 0.23.2__tar.gz

{autoverse_cli-0.22.0 → autoverse_cli-0.23.2}/PKG-INFO

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

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

{autoverse_cli-0.22.0 → autoverse_cli-0.23.2}/src/autoverse_cli.egg-info/PKG-INFO

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

{autoverse_cli-0.22.0 → autoverse_cli-0.23.2}/src/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)

{autoverse_cli-0.22.0 → autoverse_cli-0.23.2}/src/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):
     """

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

{autoverse_cli-0.22.0 → autoverse_cli-0.23.2}/src/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()