gitarsenal-cli 1.1.10 → 1.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitarsenal-cli",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "CLI tool for creating Modal sandboxes with GitHub repositories",
   "main": "index.js",
   "bin": {

package/python/MODAL_PROXY_README.md

@@ -46,7 +46,7 @@ The Modal proxy service allows users to access Modal services (like GPU-accelera
    
    This will provide you with a public URL that you can share with users.
    
-   Current ngrok URL: `https://cf487e07fd45.ngrok-free.app`
+   Current ngrok URL: `https://932ffd63ad3d.ngrok-free.app`
 
 ## Client-Side Setup
 
@@ -56,7 +56,7 @@ The Modal proxy service allows users to access Modal services (like GPU-accelera
    ```
    
    You'll be prompted to enter:
-   - The proxy URL (the default is now set to `https://cf487e07fd45.ngrok-free.app`)
+   - The proxy URL (the default is now set to `https://932ffd63ad3d.ngrok-free.app`)
    - Your API key
 
 2. **Check proxy service status**:

package/python/MODAL_TOKEN_SETUP.md

@@ -0,0 +1,82 @@
+# Modal Token Setup Solution
+
+This document explains how the Modal token setup solution works in GitArsenal CLI.
+
+## Problem
+
+The GitArsenal CLI was failing with errors like:
+
+```
+🔍 MODAL_TOKEN_ID not found in environment.
+❌ No Modal token found in environment variables
+❌ Modal token file not found
+❌ Could not find Modal token in any location
+```
+
+This happened because the Modal token was not being properly set in the environment variables.
+
+## Solution
+
+We implemented a comprehensive solution to automatically find and set up the Modal token from various sources:
+
+1. Created a `setup_modal_token.py` module that:
+   - Checks for the token in environment variables (MODAL_TOKEN_ID and MODAL_TOKEN)
+   - Checks for the token in GitArsenal credentials file (~/.gitarsenal/credentials.json)
+   - Checks for the token in Modal token file (~/.modal/token.json)
+   - Sets the token in both MODAL_TOKEN_ID and MODAL_TOKEN environment variables
+
+2. Modified key files to use this module:
+   - `gitarsenal.py` - Main CLI entry point
+   - `modal_proxy_service.py` - Modal proxy service
+   - `test_modalSandboxScript.py` - Modal sandbox script
+
+3. Created a wrapper script `run_with_modal_token.py` that:
+   - Sets up the Modal token using the setup_modal_token module
+   - Runs a specified command with the token properly set in the environment
+
+## Usage
+
+### Running Commands with Modal Token
+
+Use the wrapper script to run any command that requires Modal authentication:
+
+```bash
+python run_with_modal_token.py <command> [args...]
+```
+
+Example:
+
+```bash
+python run_with_modal_token.py python modal_proxy_service.py
+```
+
+### Setting Up Modal Token
+
+If you need to set up the Modal token manually:
+
+```bash
+python setup_modal_token.py
+```
+
+This will prompt you for the token if it's not found in any of the sources.
+
+### Adding Modal Token to GitArsenal Credentials
+
+You can also add the Modal token to GitArsenal credentials:
+
+```bash
+./gitarsenal.py credentials set modal_token
+```
+
+## How It Works
+
+1. The `setup_modal_token.py` module checks multiple sources for the Modal token:
+   - Environment variables (MODAL_TOKEN_ID and MODAL_TOKEN)
+   - GitArsenal credentials file (~/.gitarsenal/credentials.json)
+   - Modal token file (~/.modal/token.json)
+
+2. When it finds a token, it sets both MODAL_TOKEN_ID and MODAL_TOKEN environment variables.
+
+3. The modified files import and use this module to ensure the token is set before any Modal operations.
+
+4. The wrapper script makes it easy to run any command with the token properly set up. 

package/python/README.md

@@ -198,7 +198,7 @@ Proxy configuration is stored in `~/.gitarsenal/proxy_config.json` with similar
 
 ### Modal Authentication Issues
 
-If you see errors like "Token missing" or "Could not authenticate client":
+If you see errors like "Token missing", "Could not authenticate client", or "MODAL_TOKEN_ID not found in environment":
 
 1. Ensure Modal is installed:
    ```bash
@@ -215,6 +215,16 @@ If you see errors like "Token missing" or "Could not authenticate client":
    ./gitarsenal.py credentials set modal_token
    ```
 
+4. Use the wrapper script to run commands with the Modal token properly set up:
+   ```bash
+   python run_with_modal_token.py python modal_proxy_service.py
+   ```
+
+The wrapper script automatically sets up the Modal token from one of these sources:
+- Environment variables (MODAL_TOKEN_ID or MODAL_TOKEN)
+- GitArsenal credentials file (~/.gitarsenal/credentials.json)
+- Modal token file (~/.modal/token.json)
+
 ### Proxy Service Issues
 
 If you're having issues with the proxy service:

package/python/gitarsenal.py

@@ -12,6 +12,16 @@ import subprocess
 import json
 from pathlib import Path
 
+# Import the Modal token setup module
+try:
+    from setup_modal_token import setup_modal_token
+    # Set up Modal token at import time
+    setup_modal_token()
+except ImportError:
+    print("⚠️ Warning: setup_modal_token module not found. Modal authentication may fail.")
+except Exception as e:
+    print(f"⚠️ Warning: Error setting up Modal token: {e}")
+
 def check_modal_auth():
     """Check if Modal is authenticated and guide user if not"""
     try:
@@ -74,7 +84,7 @@ def check_proxy_config():
             print("⚠️ Modal proxy not configured. Setting up with default values...")
             
             # Set default proxy URL to the ngrok URL
-            default_url = "https://cf487e07fd45.ngrok-free.app"
+            default_url = "https://932ffd63ad3d.ngrok-free.app"
             
             # Update configuration with default URL
             config["proxy_url"] = default_url

package/python/gitarsenal_proxy_client.py

@@ -32,7 +32,7 @@ class GitArsenalProxyClient:
         
         # If still no URL, use default
         if not self.base_url:
-            self.base_url = "https://cf487e07fd45.ngrok-free.app"  # Default to new ngrok URL
+            self.base_url = "https://932ffd63ad3d.ngrok-free.app"  # Default to new ngrok URL
         
         # Warn if no API key
         if not self.api_key:

package/python/modal_proxy_service.py

@@ -42,8 +42,21 @@ logger = logging.getLogger("modal-proxy")
 app = Flask(__name__)
 CORS(app)  # Enable CORS for all routes
 
+# Try to set up Modal token using our setup module
+try:
+    from setup_modal_token import setup_modal_token
+    token_setup_success = setup_modal_token()
+    if token_setup_success:
+        logger.info("Modal token set up successfully using setup_modal_token module")
+    else:
+        logger.warning("setup_modal_token module failed to set up Modal token")
+except ImportError:
+    logger.warning("setup_modal_token module not found")
+except Exception as e:
+    logger.error(f"Error using setup_modal_token module: {e}")
+
 # Get Modal token from environment variable
-MODAL_TOKEN = os.environ.get("MODAL_TOKEN")
+MODAL_TOKEN = os.environ.get("MODAL_TOKEN") or os.environ.get("MODAL_TOKEN_ID")
 if not MODAL_TOKEN:
     logger.error("MODAL_TOKEN environment variable is not set!")
 
@@ -75,19 +88,34 @@ def generate_random_password(length=16):
 
 def setup_modal_auth():
     """Set up Modal authentication using the server's token"""
-    if not MODAL_TOKEN:
+    # Try to use our setup_modal_token module first
+    try:
+        from setup_modal_token import setup_modal_token
+        if setup_modal_token():
+            logger.info("Modal token set up successfully using setup_modal_token module")
+            return True
+    except ImportError:
+        logger.info("setup_modal_token module not found, falling back to direct setup")
+    except Exception as e:
+        logger.warning(f"Error using setup_modal_token module: {e}, falling back to direct setup")
+    
+    # Fall back to direct token setup if the module approach failed
+    token = MODAL_TOKEN or os.environ.get("MODAL_TOKEN") or os.environ.get("MODAL_TOKEN_ID")
+    
+    if not token:
         logger.error("Cannot set up Modal authentication: No token provided")
         return False
     
     try:
-        # Set the token in the environment
-        os.environ["MODAL_TOKEN_ID"] = MODAL_TOKEN
+        # Set the token in the environment (both variables to be safe)
+        os.environ["MODAL_TOKEN_ID"] = token
+        os.environ["MODAL_TOKEN"] = token
         
         # Try to set the token using Modal CLI
         try:
             import subprocess
             result = subprocess.run(
-                ["modal", "token", "set", MODAL_TOKEN],
+                ["modal", "token", "set", token],
                 capture_output=True, text=True, check=False
             )
             if result.returncode == 0:

package/python/run_with_modal_token.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+"""
+Run With Modal Token - Wrapper Script
+
+This script sets up the Modal token in the environment and then runs a specified command.
+It's useful for running commands that need Modal authentication without modifying them.
+
+Usage:
+    python run_with_modal_token.py <command> [args...]
+    
+Example:
+    python run_with_modal_token.py python modal_proxy_service.py
+"""
+
+import os
+import sys
+import subprocess
+from setup_modal_token import setup_modal_token
+
+def main():
+    # Set up Modal token
+    if not setup_modal_token():
+        print("❌ Failed to set up Modal token")
+        print("Please set up your credentials with:")
+        print("  ./gitarsenal.py credentials set modal_token")
+        sys.exit(1)
+    
+    # Check if a command was provided
+    if len(sys.argv) < 2:
+        print("❌ No command provided")
+        print(f"Usage: {sys.argv[0]} <command> [args...]")
+        sys.exit(1)
+    
+    # Get the command and arguments
+    cmd = sys.argv[1]
+    args = sys.argv[2:]
+    
+    # Print what we're about to run
+    print(f"🚀 Running command with Modal token: {cmd} {' '.join(args)}")
+    
+    # Run the command
+    try:
+        result = subprocess.run([cmd] + args)
+        sys.exit(result.returncode)
+    except Exception as e:
+        print(f"❌ Error running command: {e}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main() 

package/python/setup_modal_token.py

@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+"""
+Modal Token Setup Script for GitArsenal CLI
+
+This script ensures that the Modal token is properly set up in the environment
+before running any Modal operations. It checks for the token in various locations
+and sets the required environment variables.
+"""
+
+import os
+import sys
+from pathlib import Path
+import logging
+
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+)
+logger = logging.getLogger("modal-setup")
+
+def setup_modal_token():
+    """
+    Set up Modal token in the environment.
+    
+    Checks for the token in:
+    1. Environment variables (MODAL_TOKEN_ID and MODAL_TOKEN)
+    2. GitArsenal credentials file
+    3. Modal token file (~/.modal/token.json)
+    
+    Returns:
+        bool: True if token was set up successfully, False otherwise
+    """
+    # Check if token is already in environment
+    if os.environ.get("MODAL_TOKEN_ID") and os.environ.get("MODAL_TOKEN"):
+        logger.info("Modal token already set in environment")
+        return True
+        
+    # Try to get token from GitArsenal credentials
+    token = get_token_from_gitarsenal()
+    if token:
+        os.environ["MODAL_TOKEN_ID"] = token
+        os.environ["MODAL_TOKEN"] = token
+        logger.info("Modal token set from GitArsenal credentials")
+        return True
+        
+    # Try to get token from Modal token file
+    token = get_token_from_modal_file()
+    if token:
+        os.environ["MODAL_TOKEN_ID"] = token
+        os.environ["MODAL_TOKEN"] = token
+        logger.info("Modal token set from Modal token file")
+        return True
+        
+    # If we got here, no token was found
+    logger.error("No Modal token found in any location")
+    return False
+    
+def get_token_from_gitarsenal():
+    """Get Modal token from GitArsenal credentials file"""
+    try:
+        from credentials_manager import CredentialsManager
+        credentials_manager = CredentialsManager()
+        token = credentials_manager.get_modal_token()
+        if token:
+            logger.info("Found Modal token in GitArsenal credentials")
+            return token
+    except ImportError:
+        logger.warning("Could not import CredentialsManager")
+    except Exception as e:
+        logger.warning(f"Error getting token from GitArsenal credentials: {e}")
+    
+    return None
+    
+def get_token_from_modal_file():
+    """Get Modal token from Modal token file"""
+    try:
+        import json
+        token_file = Path.home() / ".modal" / "token.json"
+        
+        if not token_file.exists():
+            logger.warning(f"Modal token file not found at {token_file}")
+            return None
+            
+        with open(token_file, 'r') as f:
+            token_data = json.load(f)
+            
+        # The token file contains both token_id and token
+        token_id = token_data.get("token_id")
+        if token_id:
+            logger.info("Found token_id in Modal token file")
+            return token_id
+    except Exception as e:
+        logger.warning(f"Error reading Modal token file: {e}")
+    
+    return None
+    
+if __name__ == "__main__":
+    if setup_modal_token():
+        print("✅ Modal token set up successfully")
+        sys.exit(0)
+    else:
+        print("❌ Failed to set up Modal token")
+        print("Please set up your credentials with:")
+        print("  ./gitarsenal.py credentials set modal_token")
+        sys.exit(1) 

package/python/test_modalSandboxScript.py

@@ -1,6 +1,5 @@
 import os
 import sys
-import modal
 import time
 import subprocess
 import json
@@ -11,6 +10,18 @@ import requests
 import secrets
 import string
 
+# Try to set up Modal token before importing modal
+try:
+    from setup_modal_token import setup_modal_token
+    setup_modal_token()
+except ImportError:
+    print("⚠️ Warning: setup_modal_token module not found. Modal authentication may fail.")
+except Exception as e:
+    print(f"⚠️ Warning: Error setting up Modal token: {e}")
+
+# Import modal after token setup
+import modal
+
 def handle_interactive_input(prompt, is_password=False):
     """Handle interactive input from the user with optional password masking"""
     print("\n" + "="*60)