autoverse-cli 0.28.2__tar.gz → 0.29.1.dev408__tar.gz

{autoverse_cli-0.28.2 → autoverse_cli-0.29.1.dev408}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.28.2
+Version: 0.29.1.dev408
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI
@@ -52,10 +52,31 @@ The new implementation of the Autoverse CLI
 
 ## Installation
 
+### Stable Release (Recommended)
 ```bash
 pip install autoverse-cli
 ```
 
+### Development Versions
+
+Development versions are published from feature branches and follow the format `X.Y.Z.devN`.
+
+```bash
+# Install the latest development version
+pip install autoverse-cli --pre
+
+# Install a specific development version
+pip install autoverse-cli==0.29.1.dev123
+
+# Check available versions (including dev)
+pip index versions autoverse-cli
+
+# Upgrade to latest dev version
+pip install --upgrade --pre autoverse-cli
+```
+
+> **Note:** `pip install autoverse-cli` (without `--pre`) always installs the latest stable release from `main`. Development versions require the `--pre` flag explicitly.
+
 ## Shell Completion
 
 To enable tab completion for the `avrs` command, run:

autoverse_cli-0.29.1.dev408/README.md

@@ -0,0 +1,64 @@
+# Autoverse CLI
+
+The new implementation of the Autoverse CLI
+
+## Installation
+
+### Stable Release (Recommended)
+```bash
+pip install autoverse-cli
+```
+
+### Development Versions
+
+Development versions are published from feature branches and follow the format `X.Y.Z.devN`.
+
+```bash
+# Install the latest development version
+pip install autoverse-cli --pre
+
+# Install a specific development version
+pip install autoverse-cli==0.29.1.dev123
+
+# Check available versions (including dev)
+pip index versions autoverse-cli
+
+# Upgrade to latest dev version
+pip install --upgrade --pre autoverse-cli
+```
+
+> **Note:** `pip install autoverse-cli` (without `--pre`) always installs the latest stable release from `main`. Development versions require the `--pre` flag explicitly.
+
+## Shell Completion
+
+To enable tab completion for the `avrs` command, run:
+
+```bash
+avrs --install-completion
+```
+
+Then reload your shell:
+
+```bash
+source ~/.bashrc  # or ~/.zshrc, ~/.config/fish/config.fish, etc.
+```
+
+For full details, see [SHELL_COMPLETION.md](SHELL_COMPLETION.md).
+
+### Supported Shells
+
+- Bash
+- Zsh
+- Fish
+- Tcsh
+
+### Quick Usage Examples
+
+```bash
+# List all available commands
+avrs <TAB>
+
+# Complete subcommand arguments
+avrs launcher <TAB>
+avrs restart <TAB>
+```

{autoverse_cli-0.28.2 → autoverse_cli-0.29.1.dev408}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autoverse-cli"
-version = "0.28.2"
+version = "0.29.1.dev408"
 dependencies = [
   "boto3",
   "cantools",

{autoverse_cli-0.28.2 → autoverse_cli-0.29.1.dev408}/src/autoverse_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.28.2
+Version: 0.29.1.dev408
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI
@@ -52,10 +52,31 @@ The new implementation of the Autoverse CLI
 
 ## Installation
 
+### Stable Release (Recommended)
 ```bash
 pip install autoverse-cli
 ```
 
+### Development Versions
+
+Development versions are published from feature branches and follow the format `X.Y.Z.devN`.
+
+```bash
+# Install the latest development version
+pip install autoverse-cli --pre
+
+# Install a specific development version
+pip install autoverse-cli==0.29.1.dev123
+
+# Check available versions (including dev)
+pip index versions autoverse-cli
+
+# Upgrade to latest dev version
+pip install --upgrade --pre autoverse-cli
+```
+
+> **Note:** `pip install autoverse-cli` (without `--pre`) always installs the latest stable release from `main`. Development versions require the `--pre` flag explicitly.
+
 ## Shell Completion
 
 To enable tab completion for the `avrs` command, run:

{autoverse_cli-0.28.2 → autoverse_cli-0.29.1.dev408}/src/avrs/app_version.py

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

{autoverse_cli-0.28.2 → autoverse_cli-0.29.1.dev408}/src/avrs/race_cloud.py

@@ -2,6 +2,7 @@ import subprocess
 import base64
 import logging
 import time
+import ipaddress
 from avrs.cfg import *
 from avrs.race_cloud_util import *
 from avrs.race_cloud_cfg_util import *
@@ -11,6 +12,47 @@ from avrs.util import *
 from avrs.requests.request import AvrsApiRequest
 from argparse import RawTextHelpFormatter
 
+
+def is_valid_public_ip(value):
+    """Check if a string is a valid public IP address (not private, not loopback, not reserved)."""
+    try:
+        ip = ipaddress.ip_address(value)
+        # Reject private, loopback, reserved, multicast, and link-local addresses
+        return not (ip.is_private or ip.is_loopback or ip.is_reserved or
+                    ip.is_multicast or ip.is_link_local)
+    except ValueError:
+        return False
+
+
+def parse_sim_target(value):
+    """
+    Parse sim_target argument: can be a legacy index (0-5) or a public IP address.
+    Returns (is_valid, parsed_value, is_ip).
+    """
+    # First, check if it's a legacy integer index (0-5)
+    try:
+        index = int(value)
+        if 0 <= index <= 5:
+            return (True, index, False)
+        else:
+            return (False, "Legacy index must be between 0 and 5", False)
+    except ValueError:
+        pass
+
+    # Check if it's a valid public IP address
+    try:
+        ip = ipaddress.ip_address(value)
+        if is_valid_public_ip(value):
+            # Valid public IP address
+            return (True, value, True)
+        else:
+            # IP is private, loopback, or otherwise not public
+            return (False, "IP address must be public (not private, loopback, or reserved)", False)
+    except ValueError:
+        pass
+
+    return (False, "Must be a legacy index (0-5) or a valid public IP address", False)
+
 class AvrsRaceCloud(AvrsApiRequest):
     def __init__(self, parser, cfg):
         self.cfg = cfg
@@ -24,10 +66,9 @@ class AvrsRaceCloud(AvrsApiRequest):
             'connect',
             help='connect to an instance for cloud racing')
         connect_parser.add_argument(
-            'sim_index',
-            type = int,
-            choices = [0, 1, 2, 3, 4, 5],
-            help='the index of the simulator instance to connect to')
+            'sim_target',
+            type=str,
+            help='simulator target: legacy index (0-5) or PUBLIC IP address of the server instance (private IPs not allowed)')
         connect_parser.add_argument(
             'team_name',
             help='the name of the team to race under')
@@ -74,10 +115,9 @@ class AvrsRaceCloud(AvrsApiRequest):
             'sim-ctrl',
             help='control the sim program (start, stop, restart, reset)')
         sim_ctrl_parser.add_argument(
-            'sim_index',
-            type=int,
-            choices=[0, 1, 2, 3, 4, 5],
-            help='the index of the simulator instance to apply the action')
+            'sim_target',
+            type=str,
+            help='simulator target: legacy index (0-5) or PUBLIC IP address of the server instance (private IPs not allowed)')
         sim_ctrl_parser.add_argument(
             'action',
             choices=['start', 'stop', 'restart', 'reset-connection', 'get-log'],
@@ -169,6 +209,12 @@ class AvrsRaceCloud(AvrsApiRequest):
     def race_connect(self, args):
         logger = logging.getLogger('avrs')
 
+        # Validate sim_target (can be legacy index 0-5 or public IP only)
+        is_valid, parsed_value, is_ip = parse_sim_target(args.sim_target)
+        if not is_valid:
+            print('invalid sim_target: {}'.format(parsed_value))
+            return
+
         # make api call to begin connection
         our_ip = get_local_instance_ip()
 
@@ -176,8 +222,9 @@ class AvrsRaceCloud(AvrsApiRequest):
             print('this machines IP was returned as localhost. was this run on the cloud instance?')
             return
 
-        logger.info('starting race-cloud connect for team {} to instance {}'.format(
-            args.team_name, args.sim_index))
+        target_display = args.sim_target if is_ip else 'index {}'.format(parsed_value)
+        logger.info('starting race-cloud connect for team {} to {}'.format(
+            args.team_name, target_display))
         print('connecting to race with team name: {}'.format(args.team_name))
 
         if args.no_restart_sim:
@@ -217,7 +264,7 @@ class AvrsRaceCloud(AvrsApiRequest):
 
         connection_request = {
             'action': 'connect',
-            'sim_index': args.sim_index,
+            'sim_id': str(parsed_value),  # Can be index (0-5) or public IP address only
             'ip_to_reserve': our_ip,
             'team_name': args.team_name,
             'sim_id_override': args.instance_id,
@@ -241,9 +288,27 @@ class AvrsRaceCloud(AvrsApiRequest):
 
         slot_info = {}
         for k, v in rbody.items():
-            #print('out: {}'.format(v['stdout']))
-            #print('err: {}'.format(v['stderr']))
-            slot_info = json.loads(v['stdout'])
+            logger.info('Processing response for key: {}'.format(k))
+            logger.info('stdout: {}'.format(v.get('stdout', '')))
+            logger.info('stderr: {}'.format(v.get('stderr', '')))
+
+            stdout = v.get('stdout', '').strip()
+            stderr = v.get('stderr', '').strip()
+
+            if not stdout:
+                print('Error: No stdout from remote command')
+                if stderr:
+                    print('stderr: {}'.format(stderr))
+                return
+
+            try:
+                slot_info = json.loads(stdout)
+            except json.JSONDecodeError as e:
+                print('Error parsing JSON from stdout: {}'.format(e))
+                print('stdout content: {}'.format(stdout[:500]))  # Print first 500 chars
+                if stderr:
+                    print('stderr: {}'.format(stderr))
+                return
 
         if not slot_info['ok']:
             print('issue reserving slot: {}'.format(slot_info['msg']))
@@ -405,6 +470,12 @@ class AvrsRaceCloud(AvrsApiRequest):
     def remote_sim_ctrl(self, args):
         logger = logging.getLogger('avrs')
 
+        # Validate sim_target (can be legacy index 0-5 or public IP only)
+        is_valid, parsed_value, is_ip = parse_sim_target(args.sim_target)
+        if not is_valid:
+            print('invalid sim_target: {}'.format(parsed_value))
+            return
+
         # go ahead and reset local connection as well
         if args.action == 'reset-connection':
             reset_race_cloud_connection()
@@ -413,7 +484,7 @@ class AvrsRaceCloud(AvrsApiRequest):
 
         reset_request = {
             'action': args.action,
-            'sim_index': args.sim_index,
+            'sim_id': str(parsed_value),  # Can be index (0-5) or public IP address only
             'ip_to_reserve': our_ip,
             'sim_id_override': args.instance_id,
             'ensure_instance_is_running': False

{autoverse_cli-0.28.2 → autoverse_cli-0.29.1.dev408}/src/avrs/race_cloud_util.py

@@ -1,7 +1,10 @@
 import os
 import json
-import http.client
 import logging
+import boto3
+from botocore.auth import SigV4Auth
+from botocore.awsrequest import AWSRequest
+import urllib.request
 from avrs.util import *
 
 BASH_KILL_PROCESS_SCRIPT = '''
@@ -360,23 +363,53 @@ def call_race_cloud_api(body):
     logger = logging.getLogger('avrs')
     logger.info('calling race-cloud api with body: {}'.format(body))
 
-    api_url = 'gitzels0l7.execute-api.us-east-1.amazonaws.com'
+    url = 'https://9gca6018p0.execute-api.us-east-1.amazonaws.com/backend/race-connect'
+    region = 'us-east-1'
 
-    connection = http.client.HTTPSConnection(api_url)
-    headers = {
-        'Content-type': 'application/json',
-        'x-api-key': '7aQ83sJ89Q2DZ8NdIi9aUTBuUS2uyix5QoDwrl1j'
-    }
-    body = json.dumps(body).encode('utf-8')
-    connection.request('POST', '/beta/connect', body, headers)
-    response = connection.getresponse()
-    if response.status != 200:
-        return (False, 'response had status code {}'.format(response))
-    return (True, response.read().decode('utf-8'))
+    # Get credentials from boto3 session (uses IAM role on EC2)
+    session = boto3.Session()
+    credentials = session.get_credentials()
+
+    # Prepare the request body
+    body_json = json.dumps(body)
+
+    # Create AWS request for signing
+    request = AWSRequest(
+        method='POST',
+        url=url,
+        data=body_json,
+        headers={'Content-Type': 'application/json'}
+    )
+
+    # Sign the request with SigV4
+    SigV4Auth(credentials, 'execute-api', region).add_auth(request)
+
+    # Make the request using urllib
+    try:
+        req = urllib.request.Request(
+            url,
+            data=body_json.encode('utf-8'),
+            headers=dict(request.headers),
+            method='POST'
+        )
+        with urllib.request.urlopen(req) as response:
+            response_body = response.read().decode('utf-8')
+            return (True, response_body)
+    except urllib.error.HTTPError as e:
+        error_body = e.read().decode('utf-8')
+        logger.error('API error - status: {}, body: {}'.format(e.code, error_body))
+        return (False, 'response had status code {} - {}'.format(e.code, error_body))
+    except Exception as e:
+        logger.error('API request failed: {}'.format(str(e)))
+        return (False, 'request failed: {}'.format(str(e)))
 
 def get_api_script_response(raw):
-    decoded = json.loads(raw)['body']
     logger = logging.getLogger('avrs')
+    # Parse API Gateway response, then parse the body which is also JSON string
+    api_response = json.loads(raw)
+    body_str = api_response['body']
+    # Body is a JSON string from Lambda Proxy integration
+    decoded = json.loads(body_str) if isinstance(body_str, str) else body_str
     logger.info('race cloud api response: {}'.format(decoded))
     if decoded['script_response']['statusCode'] != 200:
         return (False, 'inner response had bad status code {}'.format(decoded))

autoverse_cli-0.28.2/README.md

@@ -1,43 +0,0 @@
-# Autoverse CLI
-
-The new implementation of the Autoverse CLI
-
-## Installation
-
-```bash
-pip install autoverse-cli
-```
-
-## Shell Completion
-
-To enable tab completion for the `avrs` command, run:
-
-```bash
-avrs --install-completion
-```
-
-Then reload your shell:
-
-```bash
-source ~/.bashrc  # or ~/.zshrc, ~/.config/fish/config.fish, etc.
-```
-
-For full details, see [SHELL_COMPLETION.md](SHELL_COMPLETION.md).
-
-### Supported Shells
-
-- Bash
-- Zsh
-- Fish
-- Tcsh
-
-### Quick Usage Examples
-
-```bash
-# List all available commands
-avrs <TAB>
-
-# Complete subcommand arguments
-avrs launcher <TAB>
-avrs restart <TAB>
-```