gitarsenal-cli 1.6.8 → 1.6.9

package/package.json

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

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,23 +1183,22 @@ 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.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", "nvtop"
+                "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",
                 "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",
@@ -1209,9 +1208,8 @@ 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",
                 
-                # 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",
+                # Generate SSH host keys
+                "ssh-keygen -A",
                 
                 # Set up a nice bash prompt
                 "echo 'export PS1=\"\\[\\e[1;32m\\]modal:\\[\\e[1;34m\\]\\w\\[\\e[0m\\]$ \"' >> /root/.bashrc",
@@ -1226,18 +1224,25 @@ 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 - simplified like the example
+    # 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,
     )
-    def start_ssh():
+    def ssh_container_function(ssh_password=None, repo_url=None, repo_name=None, setup_commands=None, openai_api_key=None):
         """Start SSH container with password authentication and optional setup."""
         import subprocess
         import time
@@ -1247,25 +1252,14 @@ 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 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}")
+        # Start SSH service
+        subprocess.run(["service", "ssh", "start"], check=True)
         
         # Clone repository if provided
         if repo_url:
@@ -1393,28 +1387,43 @@ 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)
         
-        # 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
+        # Create SSH tunnel
+        with modal.forward(22, unencrypted=True) as tunnel:
+            host, port = tunnel.tcp_socket
             
             print("\n" + "=" * 80)
             print("🎉 SSH CONTAINER IS READY!")
             print("=" * 80)
-            print(f"SSH: ssh -p {port} root@{hostname}")
-            print(f"Password: {ssh_password}")
+            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("=" * 80)
             
-            # Keep alive - simplified like the example
+            # Keep the container running
             while True:
-                time.sleep(60)
+                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)
     
     # Run the container
     try:
         print("⏳ Starting container... This may take 1-2 minutes...")
         
-        # Start the container - simplified like the example
-        with app.run():
-            start_ssh.remote()
+        # 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)
                 
         # Clean up Modal token after container is successfully created
         cleanup_modal_token()

package/test_modalSandboxScript.py

@@ -1183,23 +1183,22 @@ 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.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", "nvtop"
+                "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",
                 "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",
@@ -1209,9 +1208,8 @@ 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",
                 
-                # 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",
+                # Generate SSH host keys
+                "ssh-keygen -A",
                 
                 # Set up a nice bash prompt
                 "echo 'export PS1=\"\\[\\e[1;32m\\]modal:\\[\\e[1;34m\\]\\w\\[\\e[0m\\]$ \"' >> /root/.bashrc",
@@ -1226,18 +1224,25 @@ 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 - simplified like the example
+    # 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,
     )
-    def start_ssh():
+    def ssh_container_function(ssh_password=None, repo_url=None, repo_name=None, setup_commands=None, openai_api_key=None):
         """Start SSH container with password authentication and optional setup."""
         import subprocess
         import time
@@ -1247,25 +1252,14 @@ 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 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}")
+        # Start SSH service
+        subprocess.run(["service", "ssh", "start"], check=True)
         
         # Clone repository if provided
         if repo_url:
@@ -1393,28 +1387,43 @@ 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)
         
-        # 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
+        # Create SSH tunnel
+        with modal.forward(22, unencrypted=True) as tunnel:
+            host, port = tunnel.tcp_socket
             
             print("\n" + "=" * 80)
             print("🎉 SSH CONTAINER IS READY!")
             print("=" * 80)
-            print(f"SSH: ssh -p {port} root@{hostname}")
-            print(f"Password: {ssh_password}")
+            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("=" * 80)
             
-            # Keep alive - simplified like the example
+            # Keep the container running
             while True:
-                time.sleep(60)
+                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)
     
     # Run the container
     try:
         print("⏳ Starting container... This may take 1-2 minutes...")
         
-        # Start the container - simplified like the example
-        with app.run():
-            start_ssh.remote()
+        # 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)
                 
         # Clean up Modal token after container is successfully created
         cleanup_modal_token()