gitarsenal-cli 1.0.6 → 1.0.7

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -1841,7 +1841,109 @@ def generate_random_password(length=16):
     password = ''.join(secrets.choice(alphabet) for i in range(length))
     return password
 
+# First, add the standalone ssh_container function at the module level, before the create_modal_ssh_container function
 
+# Define a module-level ssh container function
+ssh_app = modal.App("ssh-container-app")
+
+@ssh_app.function(
+    image=modal.Image.debian_slim()
+        .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")
+        .run_commands(
+            # Create SSH directory
+            "mkdir -p /var/run/sshd",
+            "mkdir -p /root/.ssh",
+            "chmod 700 /root/.ssh",
+            
+            # 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",
+            "sed -i 's/#PubkeyAuthentication yes/PubkeyAuthentication yes/' /etc/ssh/sshd_config",
+            
+            # SSH keep-alive settings
+            "echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config",
+            "echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config",
+            
+            # 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",
+        ),
+    timeout=3600,  # Default 1 hour timeout
+    gpu="a10g",    # Default GPU
+    cpu=2,
+    memory=8192,
+    serialized=True,
+)
+def ssh_container_function(ssh_password, repo_url=None, repo_name=None, setup_commands=None):
+    import subprocess
+    import time
+    import os
+    
+    # Set root password
+    subprocess.run(["bash", "-c", f"echo 'root:{ssh_password}' | chpasswd"], check=True)
+    
+    # Start SSH service
+    subprocess.run(["service", "ssh", "start"], check=True)
+    
+    # Setup environment
+    os.environ['PS1'] = r'\[\e[1;32m\]modal:\[\e[1;34m\]\w\[\e[0m\]$ '
+    
+    # Clone repository if provided
+    if repo_url:
+        repo_name_from_url = repo_name or repo_url.split('/')[-1].replace('.git', '')
+        print(f"📥 Cloning repository: {repo_url}")
+        
+        try:
+            subprocess.run(["git", "clone", repo_url], check=True, cwd="/root")
+            print(f"✅ Repository cloned successfully: {repo_name_from_url}")
+            
+            # Change to repository directory
+            repo_dir = f"/root/{repo_name_from_url}"
+            if os.path.exists(repo_dir):
+                os.chdir(repo_dir)
+                print(f"📂 Changed to repository directory: {repo_dir}")
+            
+        except subprocess.CalledProcessError as e:
+            print(f"❌ Failed to clone repository: {e}")
+    
+    # Run setup commands if provided
+    if setup_commands:
+        print(f"⚙️ Running {len(setup_commands)} setup commands...")
+        for i, cmd in enumerate(setup_commands, 1):
+            print(f"📋 Executing command {i}/{len(setup_commands)}: {cmd}")
+            try:
+                result = subprocess.run(cmd, shell=True, check=True, 
+                                      capture_output=True, text=True)
+                if result.stdout:
+                    print(f"✅ Output: {result.stdout}")
+            except subprocess.CalledProcessError as e:
+                print(f"❌ Command failed: {e}")
+                if e.stderr:
+                    print(f"❌ Error: {e.stderr}")
+    
+    # Get container info
+    print("🔍 Container started successfully!")
+    print(f"🆔 Container ID: {os.environ.get('MODAL_TASK_ID', 'unknown')}")
+    
+    # Keep the container running
+    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)
+
+# Now modify the create_modal_ssh_container function to use the standalone ssh_container_function
 
 def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_commands=None, 
                                volume_name=None, timeout_minutes=60, ssh_password=None):
@@ -1897,125 +1999,25 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             print("⚠️ Continuing without persistent volume")
             volume = None
 
-    # Create SSH-enabled image
-    ssh_image = (
-        modal.Image.debian_slim()
-        .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")  # Fast Python package installer
-        .run_commands(
-            # Create SSH directory
-            "mkdir -p /var/run/sshd",
-            "mkdir -p /root/.ssh",
-            "chmod 700 /root/.ssh",
-            
-            # 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",
-            "sed -i 's/#PubkeyAuthentication yes/PubkeyAuthentication yes/' /etc/ssh/sshd_config",
-            
-            # SSH keep-alive settings
-            "echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config",
-            "echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config",
-            
-            # 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",
-        )
-    )
-
     # Create Modal app
     with modal.enable_output():
         print(f"🚀 Creating Modal app: {app_name}")
-        app = modal.App.lookup(app_name, create_if_missing=True)
         
-        # Setup volume mount if available
-        volumes = {}
-        if volume:
-            volumes[volume_mount_path] = volume
-            print(f"📦 Mounting volume '{volume_name}' at {volume_mount_path}")
+        # Configure the global ssh_container_function with the correct parameters
+        global ssh_container_function
         
-        @app.function(
-            image=ssh_image,
-            timeout=timeout_minutes * 60,  # Convert to seconds
+        # Update the function's configuration with our specific needs
+        ssh_container_function = ssh_container_function.update(
             gpu=gpu_spec['gpu'],
-            cpu=2,
-            memory=8192,
-            serialized=True,
-            volumes=volumes if volumes else None,
+            timeout=timeout_minutes * 60,
+            volumes={volume_mount_path: volume} if volume else None
         )
-        def ssh_container():
-            import subprocess
-            import time
-            import os
-            
-            # Set root password
-            subprocess.run(["bash", "-c", f"echo 'root:{ssh_password}' | chpasswd"], check=True)
-            
-            # Start SSH service
-            subprocess.run(["service", "ssh", "start"], check=True)
-            
-            # Setup environment
-            os.environ['PS1'] = r'\[\e[1;32m\]modal:\[\e[1;34m\]\w\[\e[0m\]$ '
-            
-            # Clone repository if provided
-            if repo_url:
-                repo_name_from_url = repo_name or repo_url.split('/')[-1].replace('.git', '')
-                print(f"📥 Cloning repository: {repo_url}")
-                
-                try:
-                    subprocess.run(["git", "clone", repo_url], check=True, cwd="/root")
-                    print(f"✅ Repository cloned successfully: {repo_name_from_url}")
-                    
-                    # Change to repository directory
-                    repo_dir = f"/root/{repo_name_from_url}"
-                    if os.path.exists(repo_dir):
-                        os.chdir(repo_dir)
-                        print(f"📂 Changed to repository directory: {repo_dir}")
-                    
-                except subprocess.CalledProcessError as e:
-                    print(f"❌ Failed to clone repository: {e}")
-            
-            # Run setup commands if provided
-            if setup_commands:
-                print(f"⚙️ Running {len(setup_commands)} setup commands...")
-                for i, cmd in enumerate(setup_commands, 1):
-                    print(f"📋 Executing command {i}/{len(setup_commands)}: {cmd}")
-                    try:
-                        result = subprocess.run(cmd, shell=True, check=True, 
-                                              capture_output=True, text=True)
-                        if result.stdout:
-                            print(f"✅ Output: {result.stdout}")
-                    except subprocess.CalledProcessError as e:
-                        print(f"❌ Command failed: {e}")
-                        if e.stderr:
-                            print(f"❌ Error: {e.stderr}")
-            
-            # Get container info
-            print("🔍 Container started successfully!")
-            print(f"🆔 Container ID: {os.environ.get('MODAL_TASK_ID', 'unknown')}")
-            
-            # Keep the container running
-            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)
         
         # Start the container
         print("🚀 Starting SSH container...")
         
         # Use spawn to run the container in the background
-        container_handle = ssh_container.spawn()
+        container_handle = ssh_container_function.spawn(ssh_password, repo_url, repo_name, setup_commands)
         
         # Wait a moment for the container to start
         print("⏳ Waiting for container to initialize...")
@@ -2037,7 +2039,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                     if containers and isinstance(containers, list):
                         # Find the most recent container
                         for container in containers:
-                            if container.get("App") == app_name:
+                            if container.get("App") == "ssh-container-app":
                                 container_id = container.get("Container ID")
                                 break
                         
@@ -2055,7 +2057,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                 if result.returncode == 0:
                     lines = result.stdout.split('\n')
                     for line in lines:
-                        if app_name in line or ('ta-' in line and '│' in line):
+                        if "ssh-container-app" in line or ('ta-' in line and '│' in line):
                             parts = line.split('│')
                             if len(parts) >= 2:
                                 possible_id = parts[1].strip()
@@ -2079,7 +2081,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                     print("="*80)
                     print(f"🆔 Container ID: {container_id}")
                     print(f"🔐 SSH Password: {ssh_password}")
-                    print(f"📱 App Name: {app_name}")
+                    print(f"📱 App Name: ssh-container-app")
                     if volume:
                         print(f"💾 Volume: {volume_name} (mounted at {volume_mount_path})")
                     print("\n🔗 SSH Connection:")
@@ -2122,7 +2124,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         return {
             "container_handle": container_handle,
             "container_id": container_id,
-            "app_name": app_name,
+            "app_name": "ssh-container-app",
             "ssh_password": ssh_password,
             "volume_name": volume_name,
             "volume_mount_path": volume_mount_path if volume else None
@@ -2687,7 +2689,7 @@ if __name__ == "__main__":
                         # Try alternative approach with iTerm2
                         try:
                             iterm_script = f'''
-                            tell application "iTerm"
+                            tell application "iTerm" 
                                 create window with default profile
                                 tell current session of current window
                                     write text "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password or 'unknown'}'; ssh root@{container_id}.modal.run"