gitarsenal-cli 1.6.6 → 1.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitarsenal-cli",
-  "version": "1.6.6",
+  "version": "1.6.9",
   "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_container.py

@@ -0,0 +1,54 @@
+import subprocess
+import time
+import secrets
+import string
+import modal
+
+def generate_random_password(length=16):
+    """Generate a random password for SSH access"""
+    alphabet = string.ascii_letters + string.digits + "!@#$%^&*"
+    password = ''.join(secrets.choice(alphabet) for i in range(length))
+    return password
+
+image = (
+    modal.Image.from_registry("nvidia/cuda:12.4.0-devel-ubuntu22.04", add_python="3.11")
+    .apt_install("openssh-server", "sudo", "curl", "wget", "git", "vim", "htop", "tmux", "nvtop")
+    .pip_install("cupy-cuda12x", "torch", "transformers")
+    .run_commands(
+        "mkdir -p /var/run/sshd",
+        "ssh-keygen -A",
+        "sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config",
+        "sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config",
+        "echo 'export PATH=/usr/local/cuda/bin:$PATH' >> /root/.bashrc"
+    )
+)
+
+app = modal.App("cuda-ssh-container", image=image)
+
+@app.function(gpu="A10G", timeout=3600)
+def start_ssh():
+    # Generate SSH password
+    password = generate_random_password()
+    subprocess.run(["bash", "-c", f"echo 'root:{password}' | chpasswd"], check=True)
+    
+    # Start SSH server
+    subprocess.Popen(["/usr/sbin/sshd", "-D"])
+    time.sleep(2)
+    
+    # Test CUDA
+    subprocess.run(["nvidia-smi"])
+    subprocess.run(["nvcc", "--version"])
+    
+    # Forward SSH port
+    with modal.forward(port=22, unencrypted=True) as tunnel:
+        hostname, port = tunnel.tcp_socket
+        print(f"SSH: ssh -p {port} root@{hostname}")
+        print(f"Password: {password}")
+        
+        # Keep alive
+        while True:
+            time.sleep(60)
+
+if __name__ == "__main__":
+    with app.run():
+        start_ssh.remote()

package/python/test_modal.py

@@ -0,0 +1,54 @@
+import subprocess
+import time
+import secrets
+import string
+import modal
+
+def generate_random_password(length=16):
+    """Generate a random password for SSH access"""
+    alphabet = string.ascii_letters + string.digits + "!@#$%^&*"
+    password = ''.join(secrets.choice(alphabet) for i in range(length))
+    return password
+
+image = (
+    modal.Image.from_registry("nvidia/cuda:12.4.0-devel-ubuntu22.04", add_python="3.11")
+    .apt_install("openssh-server", "sudo", "curl", "wget", "git", "vim", "htop", "tmux", "nvtop")
+    .pip_install("cupy-cuda12x", "torch", "transformers")
+    .run_commands(
+        "mkdir -p /var/run/sshd",
+        "ssh-keygen -A",
+        "sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config",
+        "sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config",
+        "echo 'export PATH=/usr/local/cuda/bin:$PATH' >> /root/.bashrc"
+    )
+)
+
+app = modal.App("cuda-ssh-container", image=image)
+
+@app.function(gpu="A10G", timeout=3600)
+def start_ssh():
+    # Generate SSH password
+    password = generate_random_password()
+    subprocess.run(["bash", "-c", f"echo 'root:{password}' | chpasswd"], check=True)
+
+    # Start SSH server
+    subprocess.Popen(["/usr/sbin/sshd", "-D"])
+    time.sleep(2)
+
+    # Test CUDA
+    subprocess.run(["nvidia-smi"])
+    subprocess.run(["nvcc", "--version"])
+
+    # Forward SSH port
+    with modal.forward(port=22, unencrypted=True) as tunnel:
+        hostname, port = tunnel.tcp_socket
+        print(f"SSH: ssh -p {port} root@{hostname}")
+        print(f"Password: {password}")
+
+        # Keep alive
+        while True:
+            time.sleep(60)
+
+if __name__ == "__main__":
+    with app.run():
+        start_ssh.remote()

package/python/test_modalSandboxScript.py

@@ -1183,15 +1183,16 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     # Create SSH-enabled image
     try:
         print("📦 Building SSH-enabled image...")
+        
+        # Use a more stable CUDA base image and avoid problematic packages
         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-runtime-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"
             )
-            .pip_install("uv", "modal", "requests", "openai")  # Fast Python package installer and Modal
+            .pip_install("uv", "modal", "requests", "openai")  # Remove problematic CUDA packages
             .run_commands(
                 # Create SSH directory
                 "mkdir -p /var/run/sshd",
@@ -1223,14 +1224,21 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     volumes_config = {}
     if volume:
         volumes_config[volume_mount_path] = volume
+    
+    # Create app with image passed directly (THIS IS THE KEY CHANGE)
+    try:
+        print("🔍 Testing app creation...")
+        app = modal.App(app_name, image=ssh_image)  # Pass image here
+        print("✅ Created app successfully")
+    except Exception as e:
+        print(f"❌ Error creating app: {e}")
+        return None
         
-    # Define the SSH container function
+    # Define the SSH container function (remove image from decorator)
     @app.function(
-        image=ssh_image,
         timeout=timeout_minutes * 60,  # Convert to seconds
         gpu=gpu_spec['gpu'],
         cpu=2,
-        memory=8192,
         serialized=True,
         volumes=volumes_config if volumes_config else None,
     )

package/test_modalSandboxScript.py

@@ -1183,15 +1183,16 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     # Create SSH-enabled image
     try:
         print("📦 Building SSH-enabled image...")
+        
+        # Use a more stable CUDA base image and avoid problematic packages
         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-runtime-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"
             )
-            .pip_install("uv", "modal", "requests", "openai")  # Fast Python package installer and Modal
+            .pip_install("uv", "modal", "requests", "openai")  # Remove problematic CUDA packages
             .run_commands(
                 # Create SSH directory
                 "mkdir -p /var/run/sshd",
@@ -1223,14 +1224,21 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     volumes_config = {}
     if volume:
         volumes_config[volume_mount_path] = volume
+    
+    # Create app with image passed directly (THIS IS THE KEY CHANGE)
+    try:
+        print("🔍 Testing app creation...")
+        app = modal.App(app_name, image=ssh_image)  # Pass image here
+        print("✅ Created app successfully")
+    except Exception as e:
+        print(f"❌ Error creating app: {e}")
+        return None
         
-    # Define the SSH container function
+    # Define the SSH container function (remove image from decorator)
     @app.function(
-        image=ssh_image,
         timeout=timeout_minutes * 60,  # Convert to seconds
         gpu=gpu_spec['gpu'],
         cpu=2,
-        memory=8192,
         serialized=True,
         volumes=volumes_config if volumes_config else None,
     )

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())