gitarsenal-cli 1.6.6 → 1.6.8

package/package.json

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

package/python/fix_modal_token.py

@@ -60,19 +60,19 @@ except (ImportError, ValueError) as e:
 # os.environ["MODAL_TOKEN_SECRET"] = TOKEN_SECRET
 # print(f"✅ Set MODAL_TOKEN_ID and MODAL_TOKEN_SECRET environment variables")
 
-# # Create token file
-# modal_dir = Path.home() / ".modal"
-# modal_dir.mkdir(exist_ok=True)
-# token_file = modal_dir / "token.json"
-# with open(token_file, 'w') as f:
-#     f.write(f'{{"token_id": "{TOKEN_ID}", "token_secret": "{TOKEN_SECRET}"}}')
-# print(f"✅ Created token file at {token_file}")
+# Create token file
+modal_dir = Path.home() / ".modal"
+modal_dir.mkdir(exist_ok=True)
+token_file = modal_dir / "token.json"
+with open(token_file, 'w') as f:
+    f.write(f'{{"token_id": "{TOKEN_ID}", "token_secret": "{TOKEN_SECRET}"}}')
+print(f"✅ Created token file at {token_file}")
 
-# # Create .modalconfig file
-# modalconfig_file = Path.home() / ".modalconfig"
-# with open(modalconfig_file, 'w') as f:
-#     f.write(f"token_id = {TOKEN_ID}\n")
-#     f.write(f"token_secret = {TOKEN_SECRET}\n")
-# print(f"✅ Created .modalconfig file at {modalconfig_file}")
+# Create .modalconfig file
+modalconfig_file = Path.home() / ".modalconfig"
+with open(modalconfig_file, 'w') as f:
+    f.write(f"token_id = {TOKEN_ID}\n")
+    f.write(f"token_secret = {TOKEN_SECRET}\n")
+print(f"✅ Created .modalconfig file at {modalconfig_file}")
 
-# print("\n✅ Done fixing Modal token. Please try your command again.") 
+print("\n✅ Done fixing Modal token. Please try your command again.") 

package/python/fix_modal_token_advanced.py

@@ -234,5 +234,6 @@ try:
         
 except Exception as e:
     # print(f"❌ Error testing Modal authentication: {e}")
+    print("")
 
 # print("\n✅ Done fixing Modal token. Please try your command again.") 

package/python/test_modalSandboxScript.py

@@ -1184,12 +1184,11 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     try:
         print("📦 Building SSH-enabled image...")
         ssh_image = (
-            # modal.Image.from_registry("nvidia/cuda:12.4.0-devel-ubuntu22.04", add_python="3.11")
-            modal.Image.debian_slim()
+            modal.Image.from_registry("nvidia/cuda:12.4.0-devel-ubuntu22.04", add_python="3.11")
             .apt_install(
                 "openssh-server", "sudo", "curl", "wget", "vim", "htop", "git", 
                 "python3", "python3-pip", "build-essential", "tmux", "screen", "nano",
-                "gpg", "ca-certificates", "software-properties-common"
+                "gpg", "ca-certificates", "software-properties-common", "nvtop"
             )
             .pip_install("uv", "modal", "requests", "openai")  # Fast Python package installer and Modal
             .run_commands(
@@ -1198,6 +1197,9 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                 "mkdir -p /root/.ssh",
                 "chmod 700 /root/.ssh",
                 
+                # Generate SSH host keys
+                "ssh-keygen -A",
+                
                 # Configure SSH server
                 "sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config",
                 "sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config",
@@ -1207,8 +1209,9 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                 "echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config",
                 "echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config",
                 
-                # Generate SSH host keys
-                "ssh-keygen -A",
+                # Set up CUDA environment
+                "echo 'export PATH=/usr/local/cuda/bin:$PATH' >> /root/.bashrc",
+                "echo 'export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH' >> /root/.bashrc",
                 
                 # Set up a nice bash prompt
                 "echo 'export PS1=\"\\[\\e[1;32m\\]modal:\\[\\e[1;34m\\]\\w\\[\\e[0m\\]$ \"' >> /root/.bashrc",
@@ -1224,7 +1227,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     if volume:
         volumes_config[volume_mount_path] = volume
         
-    # Define the SSH container function
+    # Define the SSH container function - simplified like the example
     @app.function(
         image=ssh_image,
         timeout=timeout_minutes * 60,  # Convert to seconds
@@ -1234,7 +1237,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         serialized=True,
         volumes=volumes_config if volumes_config else None,
     )
-    def ssh_container_function(ssh_password=None, repo_url=None, repo_name=None, setup_commands=None, openai_api_key=None):
+    def start_ssh():
         """Start SSH container with password authentication and optional setup."""
         import subprocess
         import time
@@ -1244,14 +1247,25 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         subprocess.run(["bash", "-c", f"echo 'root:{ssh_password}' | chpasswd"], check=True)
         
         # Set OpenAI API key if provided
+        openai_api_key = os.environ.get("OPENAI_API_KEY")
         if openai_api_key:
             os.environ['OPENAI_API_KEY'] = openai_api_key
             print(f"✅ Set OpenAI API key in container environment (length: {len(openai_api_key)})")
         else:
             print("⚠️ No OpenAI API key provided to container")
         
-        # Start SSH service
-        subprocess.run(["service", "ssh", "start"], check=True)
+        # Start SSH service using Popen (non-blocking) like in the example
+        subprocess.Popen(["/usr/sbin/sshd", "-D"])
+        time.sleep(2)  # Give SSH time to start
+        
+        # Test CUDA setup
+        try:
+            print("🔧 Testing CUDA setup...")
+            subprocess.run(["nvidia-smi"], check=True)
+            subprocess.run(["nvcc", "--version"], check=True)
+            print("✅ CUDA setup verified")
+        except subprocess.CalledProcessError as e:
+            print(f"⚠️ CUDA test failed: {e}")
         
         # Clone repository if provided
         if repo_url:
@@ -1379,43 +1393,28 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"🔍 Analyzing directory structure after failed cd command...")
                         subprocess.run("pwd && ls -la && echo '--- Parent directory ---' && ls -la ..", shell=True, check=False)
         
-        # Create SSH tunnel
-        with modal.forward(22, unencrypted=True) as tunnel:
-            host, port = tunnel.tcp_socket
+        # Forward SSH port and keep container alive - exactly like the example
+        with modal.forward(port=22, unencrypted=True) as tunnel:
+            hostname, port = tunnel.tcp_socket
             
             print("\n" + "=" * 80)
             print("🎉 SSH CONTAINER IS READY!")
             print("=" * 80)
-            print(f"🌐 SSH Host: {host}")
-            print(f"🔌 SSH Port: {port}")
-            print(f"👤 Username: root")
-            print(f"🔐 Password: {ssh_password}")
-            print()
-            print("🔗 CONNECT USING THIS COMMAND:")
-            print(f"ssh -p {port} root@{host}")
+            print(f"SSH: ssh -p {port} root@{hostname}")
+            print(f"Password: {ssh_password}")
             print("=" * 80)
             
-            # Keep the container running
+            # Keep alive - simplified like the example
             while True:
-                time.sleep(30)
-                # Check if SSH service is still running
-                try:
-                    subprocess.run(["service", "ssh", "status"], check=True, 
-                                 capture_output=True)
-                except subprocess.CalledProcessError:
-                    print("⚠️ SSH service stopped, restarting...")
-                    subprocess.run(["service", "ssh", "start"], check=True)
+                time.sleep(60)
     
     # Run the container
     try:
         print("⏳ Starting container... This may take 1-2 minutes...")
         
-        # Start the container in a new thread to avoid blocking
-        with modal.enable_output():
-            with app.run():
-                # Get the API key from environment
-                api_key = os.environ.get("OPENAI_API_KEY")
-                ssh_container_function.remote(ssh_password, repo_url, repo_name, setup_commands, api_key)
+        # Start the container - simplified like the example
+        with app.run():
+            start_ssh.remote()
                 
         # Clean up Modal token after container is successfully created
         cleanup_modal_token()

package/test_modalSandboxScript.py

@@ -1184,12 +1184,11 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     try:
         print("📦 Building SSH-enabled image...")
         ssh_image = (
-            # modal.Image.from_registry("nvidia/cuda:12.4.0-devel-ubuntu22.04", add_python="3.11")
-            modal.Image.debian_slim()
+            modal.Image.from_registry("nvidia/cuda:12.4.0-devel-ubuntu22.04", add_python="3.11")
             .apt_install(
                 "openssh-server", "sudo", "curl", "wget", "vim", "htop", "git", 
                 "python3", "python3-pip", "build-essential", "tmux", "screen", "nano",
-                "gpg", "ca-certificates", "software-properties-common"
+                "gpg", "ca-certificates", "software-properties-common", "nvtop"
             )
             .pip_install("uv", "modal", "requests", "openai")  # Fast Python package installer and Modal
             .run_commands(
@@ -1198,6 +1197,9 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                 "mkdir -p /root/.ssh",
                 "chmod 700 /root/.ssh",
                 
+                # Generate SSH host keys
+                "ssh-keygen -A",
+                
                 # Configure SSH server
                 "sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config",
                 "sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config",
@@ -1207,8 +1209,9 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                 "echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config",
                 "echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config",
                 
-                # Generate SSH host keys
-                "ssh-keygen -A",
+                # Set up CUDA environment
+                "echo 'export PATH=/usr/local/cuda/bin:$PATH' >> /root/.bashrc",
+                "echo 'export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH' >> /root/.bashrc",
                 
                 # Set up a nice bash prompt
                 "echo 'export PS1=\"\\[\\e[1;32m\\]modal:\\[\\e[1;34m\\]\\w\\[\\e[0m\\]$ \"' >> /root/.bashrc",
@@ -1224,7 +1227,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     if volume:
         volumes_config[volume_mount_path] = volume
         
-    # Define the SSH container function
+    # Define the SSH container function - simplified like the example
     @app.function(
         image=ssh_image,
         timeout=timeout_minutes * 60,  # Convert to seconds
@@ -1234,7 +1237,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         serialized=True,
         volumes=volumes_config if volumes_config else None,
     )
-    def ssh_container_function(ssh_password=None, repo_url=None, repo_name=None, setup_commands=None, openai_api_key=None):
+    def start_ssh():
         """Start SSH container with password authentication and optional setup."""
         import subprocess
         import time
@@ -1244,14 +1247,25 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         subprocess.run(["bash", "-c", f"echo 'root:{ssh_password}' | chpasswd"], check=True)
         
         # Set OpenAI API key if provided
+        openai_api_key = os.environ.get("OPENAI_API_KEY")
         if openai_api_key:
             os.environ['OPENAI_API_KEY'] = openai_api_key
             print(f"✅ Set OpenAI API key in container environment (length: {len(openai_api_key)})")
         else:
             print("⚠️ No OpenAI API key provided to container")
         
-        # Start SSH service
-        subprocess.run(["service", "ssh", "start"], check=True)
+        # Start SSH service using Popen (non-blocking) like in the example
+        subprocess.Popen(["/usr/sbin/sshd", "-D"])
+        time.sleep(2)  # Give SSH time to start
+        
+        # Test CUDA setup
+        try:
+            print("🔧 Testing CUDA setup...")
+            subprocess.run(["nvidia-smi"], check=True)
+            subprocess.run(["nvcc", "--version"], check=True)
+            print("✅ CUDA setup verified")
+        except subprocess.CalledProcessError as e:
+            print(f"⚠️ CUDA test failed: {e}")
         
         # Clone repository if provided
         if repo_url:
@@ -1379,43 +1393,28 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"🔍 Analyzing directory structure after failed cd command...")
                         subprocess.run("pwd && ls -la && echo '--- Parent directory ---' && ls -la ..", shell=True, check=False)
         
-        # Create SSH tunnel
-        with modal.forward(22, unencrypted=True) as tunnel:
-            host, port = tunnel.tcp_socket
+        # Forward SSH port and keep container alive - exactly like the example
+        with modal.forward(port=22, unencrypted=True) as tunnel:
+            hostname, port = tunnel.tcp_socket
             
             print("\n" + "=" * 80)
             print("🎉 SSH CONTAINER IS READY!")
             print("=" * 80)
-            print(f"🌐 SSH Host: {host}")
-            print(f"🔌 SSH Port: {port}")
-            print(f"👤 Username: root")
-            print(f"🔐 Password: {ssh_password}")
-            print()
-            print("🔗 CONNECT USING THIS COMMAND:")
-            print(f"ssh -p {port} root@{host}")
+            print(f"SSH: ssh -p {port} root@{hostname}")
+            print(f"Password: {ssh_password}")
             print("=" * 80)
             
-            # Keep the container running
+            # Keep alive - simplified like the example
             while True:
-                time.sleep(30)
-                # Check if SSH service is still running
-                try:
-                    subprocess.run(["service", "ssh", "status"], check=True, 
-                                 capture_output=True)
-                except subprocess.CalledProcessError:
-                    print("⚠️ SSH service stopped, restarting...")
-                    subprocess.run(["service", "ssh", "start"], check=True)
+                time.sleep(60)
     
     # Run the container
     try:
         print("⏳ Starting container... This may take 1-2 minutes...")
         
-        # Start the container in a new thread to avoid blocking
-        with modal.enable_output():
-            with app.run():
-                # Get the API key from environment
-                api_key = os.environ.get("OPENAI_API_KEY")
-                ssh_container_function.remote(ssh_password, repo_url, repo_name, setup_commands, api_key)
+        # Start the container - simplified like the example
+        with app.run():
+            start_ssh.remote()
                 
         # Clean up Modal token after container is successfully created
         cleanup_modal_token()

package/test_cuda_setup.py

@@ -1,148 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test script to verify CUDA setup in GitArsenal containers
-"""
-
-import subprocess
-import sys
-import os
-
-def test_cuda_basic():
-    """Test basic CUDA functionality"""
-    print("🧪 Testing basic CUDA functionality...")
-    
-    try:
-        # Test nvidia-smi
-        result = subprocess.run(["nvidia-smi"], capture_output=True, text=True, timeout=30)
-        if result.returncode == 0:
-            print("✅ nvidia-smi working")
-            print(f"Output: {result.stdout[:200]}...")
-        else:
-            print(f"❌ nvidia-smi failed: {result.stderr}")
-            return False
-        
-        # Test nvcc
-        result = subprocess.run(["nvcc", "--version"], capture_output=True, text=True, timeout=30)
-        if result.returncode == 0:
-            print("✅ nvcc available")
-            print(f"Version: {result.stdout.split('release')[0].strip()}")
-        else:
-            print(f"❌ nvcc failed: {result.stderr}")
-            return False
-        
-        return True
-        
-    except subprocess.TimeoutExpired:
-        print("❌ CUDA test timed out")
-        return False
-    except Exception as e:
-        print(f"❌ CUDA test error: {e}")
-        return False
-
-def test_cupy_import():
-    """Test cupy import"""
-    print("🧪 Testing cupy import...")
-    
-    try:
-        import cupy as cp
-        print("✅ cupy imported successfully")
-        
-        # Test basic cupy functionality
-        x = cp.array([1, 2, 3, 4, 5])
-        y = cp.square(x)
-        print(f"✅ cupy basic operation: {y}")
-        
-        return True
-        
-    except ImportError as e:
-        print(f"❌ cupy import failed: {e}")
-        return False
-    except Exception as e:
-        print(f"❌ cupy test error: {e}")
-        return False
-
-def test_gpu_environment():
-    """Test GPU environment variables"""
-    print("🧪 Testing GPU environment variables...")
-    
-    gpu_vars = {
-        'CUDA_VISIBLE_DEVICES': '0',
-        'NVIDIA_VISIBLE_DEVICES': 'all',
-        'NVIDIA_DRIVER_CAPABILITIES': 'compute,utility'
-    }
-    
-    for var, value in gpu_vars.items():
-        os.environ[var] = value
-        print(f"✅ Set {var}={value}")
-    
-    # Verify they're set
-    for var, expected_value in gpu_vars.items():
-        actual_value = os.environ.get(var)
-        if actual_value == expected_value:
-            print(f"✅ {var} correctly set to {actual_value}")
-        else:
-            print(f"❌ {var} not set correctly. Expected: {expected_value}, Got: {actual_value}")
-            return False
-    
-    return True
-
-def test_modal_cuda_image():
-    """Test Modal CUDA image creation"""
-    print("🧪 Testing Modal CUDA image creation...")
-    
-    try:
-        import modal
-        
-        # Test the same image configuration as the SSH container
-        image = (
-            modal.Image.from_registry("nvidia/cuda:12.4.0-devel-ubuntu22.04", add_python="3.11")
-            .pip_install("cupy-cuda12x", "setuptools", "uv", "modal", "requests", "openai")
-        )
-        
-        print("✅ Modal CUDA image created successfully")
-        return True
-        
-    except ImportError as e:
-        print(f"❌ Modal import failed: {e}")
-        return False
-    except Exception as e:
-        print(f"❌ Modal CUDA image creation failed: {e}")
-        return False
-
-def main():
-    """Run all CUDA tests"""
-    print("🧪 GitArsenal CUDA Setup Tests")
-    print("=" * 50)
-    
-    tests = [
-        ("GPU Environment", test_gpu_environment),
-        ("Modal CUDA Image", test_modal_cuda_image),
-        ("Basic CUDA", test_cuda_basic),
-        ("Cupy Import", test_cupy_import),
-    ]
-    
-    passed = 0
-    total = len(tests)
-    
-    for test_name, test_func in tests:
-        print(f"\n🔍 Running: {test_name}")
-        try:
-            if test_func():
-                passed += 1
-                print(f"✅ {test_name} PASSED")
-            else:
-                print(f"❌ {test_name} FAILED")
-        except Exception as e:
-            print(f"❌ {test_name} ERROR: {e}")
-    
-    print(f"\n📊 Test Results: {passed}/{total} tests passed")
-    
-    if passed == total:
-        print("🎉 All CUDA tests passed! The SSH container should work correctly.")
-        return 0
-    else:
-        print("⚠️ Some CUDA tests failed. The SSH container may have issues.")
-        return 1
-
-if __name__ == "__main__":
-    sys.exit(main())