gitarsenal-cli 1.3.3 → 1.3.5

package/bin/gitarsenal.js

@@ -38,7 +38,6 @@ const containerCmd = program
   .option('-s, --setup-commands <commands...>', 'Setup commands to run in the container')
   .option('-y, --yes', 'Skip confirmation prompts')
   .option('-m, --manual', 'Disable automatic setup command detection')
-  .option('-i, --interactive', 'Run in interactive mode with prompts')
   .option('--show-examples', 'Show usage examples')
   .action(async (options) => {
     await runContainerCommand(options);
@@ -88,11 +87,10 @@ program
   .option('-v, --volume <n>', 'Name of persistent volume')
   .option('-y, --yes', 'Skip confirmation prompts')
   .option('-m, --manual', 'Disable automatic setup command detection')
-  .option('-i, --interactive', 'Run in interactive mode with prompts')
   .option('--show-examples', 'Show usage examples')
   .action(async (options) => {
     // If options are provided directly, run the container command
-    if (options.repo || options.interactive || options.showExamples || process.argv.length <= 3) {
+    if (options.repo || options.showExamples || process.argv.length <= 3) {
       await runContainerCommand(options);
     }
   });
@@ -119,14 +117,6 @@ async function runContainerCommand(options) {
     }
     spinner.succeed('Dependencies checked');
 
-    // If interactive mode is enabled, let the Python script handle the prompts
-    if (options.interactive) {
-      await runContainer({
-        interactive: true
-      });
-      return;
-    }
-
     // If repo URL not provided, prompt for it
     let repoUrl = options.repoUrl || options.repo;
     let gpuType = options.gpu;

package/lib/sandbox.js

@@ -33,7 +33,6 @@ function getPythonScriptPath() {
  * @param {string} options.volumeName - Volume name
  * @param {Array<string>} options.setupCommands - Setup commands
  * @param {boolean} options.useApi - Whether to use the API to fetch setup commands
- * @param {boolean} options.interactive - Whether to run in interactive mode
  * @param {boolean} options.showExamples - Whether to show usage examples
  * @returns {Promise<void>}
  */
@@ -44,7 +43,6 @@ async function runContainer(options) {
     volumeName, 
     setupCommands = [], 
     useApi = true,
-    interactive = false,
     showExamples = false
   } = options;
   
@@ -88,14 +86,9 @@ async function runContainer(options) {
     });
   }
   
-  // Add interactive flag if specified
-  if (interactive) {
-    args.push('--interactive');
-  } else {
-    // Only add these arguments in non-interactive mode
-    if (gpuType) args.push('--gpu', gpuType);
-    if (repoUrl) args.push('--repo-url', repoUrl);
-  }
+  // Add normal arguments
+  if (gpuType) args.push('--gpu', gpuType);
+  if (repoUrl) args.push('--repo-url', repoUrl);
   
   if (volumeName) {
     args.push('--volume-name', volumeName);

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -3331,34 +3331,28 @@ def cleanup_modal_token():
         print(f"❌ Error during Modal token cleanup: {e}")
 
 def show_usage_examples():
-    """Display usage examples for the command-line interface."""
-    print("\033[92mUsage Examples\033[0m")
-    print("")
-    print("\033[92mBasic Container Creation\033[0m")
-    print("\033[90m┌────────────────────────────────────────────────────────────────────────┐\033[0m")
-    print("\033[90m│\033[0m \033[92mgitarsenal --gpu A10G --repo-url https://github.com/username/repo.git\033[0m  \033[90m│\033[0m")
-    print("\033[90m└────────────────────────────────────────────────────────────────────────┘\033[0m")
-    print("")
-    print("\033[92mWith Setup Commands\033[0m")
-    print("\033[90m┌────────────────────────────────────────────────────────────────────────────────────────────────────┐\033[0m")
-    print("\033[90m│\033[0m \033[92mgitarsenal --gpu A100 --repo-url https://github.com/username/repo.git \\\033[0m           \033[90m│\033[0m")
-    print("\033[90m│\033[0m \033[92m  --setup-commands \"pip install -r requirements.txt\" \"python setup.py install\"\033[0m  \033[90m│\033[0m")
-    print("\033[90m└────────────────────────────────────────────────────────────────────────────────────────────────────┘\033[0m")
-    print("")
-    print("\033[92mWith Persistent Storage\033[0m")
-    print("\033[90m┌────────────────────────────────────────────────────────────────────────────────────┐\033[0m")
-    print("\033[90m│\033[0m \033[92mgitarsenal --gpu A10G --repo-url https://github.com/username/repo.git \\\033[0m  \033[90m│\033[0m")
-    print("\033[90m│\033[0m \033[92m  --volume-name my-persistent-volume\033[0m                             \033[90m│\033[0m")
-    print("\033[90m└────────────────────────────────────────────────────────────────────────────────────┘\033[0m")
-    print("")
-    print("\033[92mInteractive Mode\033[0m")
-    print("\033[90m┌────────────────────────────┐\033[0m")
-    print("\033[90m│\033[0m \033[92mgitarsenal --interactive\033[0m  \033[90m│\033[0m")
-    print("\033[90m└────────────────────────────┘\033[0m")
-    print("")
-    print("\033[92mAvailable GPU Options:\033[0m")
+    """Display usage examples for the script."""
+    print("Usage Examples\n")
+    
+    print("Basic Container Creation")
+    print("┌────────────────────────────────────────────────────────────────────────┐")
+    print("│ gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git  │")
+    print("└────────────────────────────────────────────────────────────────────────┘\n")
+    
+    print("With Setup Commands")
+    print("┌────────────────────────────────────────────────────────────────────────────────────────────────────┐")
+    print("│ gitarsenal --gpu A100 --repo-url https://github.com/username/repo.git \\           │")
+    print("│   --setup-commands \"pip install -r requirements.txt\" \"python setup.py install\"  │")
+    print("└────────────────────────────────────────────────────────────────────────────────────────────────────┘\n")
+    
+    print("With Persistent Storage")
+    print("┌────────────────────────────────────────────────────────────────────────────────────┐")
+    print("│ gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git \\  │")
+    print("│   --volume-name my-persistent-volume                             │")
+    print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
+    
+    print("Available GPU Options:")
     print("  T4, L4, A10G, A100-40GB, A100-80GB, L40S, H100, H200, B200")
-    print("")
 
 if __name__ == "__main__":
     # Parse command line arguments when script is run directly
@@ -3378,7 +3372,6 @@ if __name__ == "__main__":
     parser.add_argument('--timeout', type=int, default=60, help='Container timeout in minutes (default: 60)')
     parser.add_argument('--ssh-password', type=str, help='SSH password (random if not provided)')
     parser.add_argument('--use-api', action='store_true', help='Fetch setup commands from API')
-    parser.add_argument('--interactive', action='store_true', help='Run in interactive mode with prompts')
     parser.add_argument('--show-examples', action='store_true', help='Show usage examples')
     
     args = parser.parse_args()
@@ -3387,159 +3380,124 @@ if __name__ == "__main__":
     if len(sys.argv) == 1 or args.show_examples:
         show_usage_examples()
         sys.exit(0)
+    
+    try:    
+        # Get setup commands from file if specified
+        setup_commands = args.setup_commands or []
         
-    # Get setup commands from file if specified
-    setup_commands = args.setup_commands or []
-    
-    # If interactive mode is enabled, prompt for options
-    if args.interactive:
-        # If repo URL wasn't provided via command line, ask for it
-        if not args.repo_url:
-            args.repo_url = input("✔ Dependencies checked\n? Enter GitHub repository URL: ").strip()
-            if not args.repo_url:
-                print("❌ No repository URL provided. Exiting.")
-                sys.exit(1)
-        
-        # Ask about persistent volume
-        use_volume = input("? Use persistent volume for faster installs? (Yes/No) [Yes]: ").strip().lower()
-        if not use_volume or use_volume.startswith('y'):
-            if not args.volume_name:
-                args.volume_name = input("? Enter volume name [gitarsenal-volume]: ").strip()
-                if not args.volume_name:
-                    args.volume_name = "gitarsenal-volume"
-        else:
-            args.volume_name = None
-        
-        # Ask about auto-detecting setup commands
-        use_api = input("? Automatically detect setup commands for this repository? (Yes/No) [Yes]: ").strip().lower()
-        if not use_api or use_api.startswith('y'):
-            args.use_api = True
-        else:
-            args.use_api = False
+        # If --use-api flag is set and repo_url is provided, fetch setup commands from API
         
-        # GPU selection
-        gpu_options = ['T4', 'L4', 'A10G', 'A100-40GB', 'A100-80GB', 'L40S', 'H100', 'H200', 'B200']
-        print("\n? Select GPU type:")
-        for i, gpu in enumerate(gpu_options, 1):
-            print(f"  {i}. {gpu}")
+        # If --use-api flag is set and repo_url is provided, fetch setup commands from API
+        if args.use_api and args.repo_url:
+            print("🔄 Using API to fetch setup commands")
+            api_commands = fetch_setup_commands_from_api(args.repo_url)
+            if api_commands:
+                setup_commands = api_commands
+                print(f"📋 Using {len(setup_commands)} commands from API")
+            else:
+                print("⚠️ Failed to get commands from API, no fallback commands will be used")
+                # Do not fall back to basic setup commands
+                setup_commands = []
         
-        gpu_choice = input(f"Enter choice (1-{len(gpu_options)}) [default: 3 for A10G]: ").strip()
-        if not gpu_choice:
-            args.gpu = 'A10G'  # Default
-        else:
+        # Parse setup commands from JSON if provided
+        if args.setup_commands_json:
             try:
-                gpu_index = int(gpu_choice) - 1
-                if 0 <= gpu_index < len(gpu_options):
-                    args.gpu = gpu_options[gpu_index]
+                json_commands = json.loads(args.setup_commands_json)
+                if isinstance(json_commands, list):
+                    setup_commands = json_commands
+                    print(f"📋 Parsed {len(setup_commands)} commands from JSON:")
+                    for i, cmd in enumerate(setup_commands, 1):
+                        print(f"  {i}. {cmd}")
                 else:
-                    print("⚠️ Invalid choice. Using default: A10G")
-                    args.gpu = 'A10G'
-            except ValueError:
-                print("⚠️ Invalid input. Using default: A10G")
-                args.gpu = 'A10G'
-        
-        # Show configuration summary
-        print("\n📋 Container Configuration:")
-        print(f"Repository URL: {args.repo_url}")
-        print(f"GPU Type: {args.gpu}")
-        print(f"Volume: {args.volume_name if args.volume_name else 'None'}")
-        print(f"Setup Commands: {'Auto-detect from repository' if args.use_api else 'None'}")
-        
-        # Confirm settings
-        confirm = input("? Proceed with these settings? (Yes/No) [Yes]: ").strip().lower()
-        if confirm and not confirm.startswith('y'):
-            print("❌ Setup cancelled by user.")
-            sys.exit(0)
-    
-    # If --use-api flag is set and repo_url is provided, fetch setup commands from API
-    if args.use_api and args.repo_url:
-        print("🔄 Using API to fetch setup commands")
-        api_commands = fetch_setup_commands_from_api(args.repo_url)
-        if api_commands:
-            setup_commands = api_commands
-            print(f"📋 Using {len(setup_commands)} commands from API")
-        else:
-            print("⚠️ Failed to get commands from API, no fallback commands will be used")
-            # Do not fall back to basic setup commands
-            setup_commands = []
-    
-    # Parse setup commands from JSON if provided
-    if args.setup_commands_json:
-        try:
-            json_commands = json.loads(args.setup_commands_json)
-            if isinstance(json_commands, list):
-                setup_commands = json_commands
-                print(f"📋 Parsed {len(setup_commands)} commands from JSON:")
-                for i, cmd in enumerate(setup_commands, 1):
-                    print(f"  {i}. {cmd}")
-            else:
-                print(f"⚠️ Invalid JSON format for setup commands: not a list")
-        except json.JSONDecodeError as e:
-            print(f"⚠️ Error parsing JSON setup commands: {e}")
-            print(f"Received JSON string: {args.setup_commands_json}")
-    
-    # Print received setup commands for debugging
-    if setup_commands:
-        print(f"📋 Using {len(setup_commands)} setup commands:")
-        for i, cmd in enumerate(setup_commands, 1):
-            print(f"  {i}. {cmd}")
-            
-    # Load commands from file if specified
-    if args.commands_file and os.path.exists(args.commands_file):
-        try:
-            with open(args.commands_file, 'r') as f:
-                # Check if the file contains JSON or line-by-line commands
-                content = f.read().strip()
+                    print(f"⚠️ Invalid JSON format for setup commands: not a list")
+            except json.JSONDecodeError as e:
+                print(f"⚠️ Error parsing JSON setup commands: {e}")
+                print(f"Received JSON string: {args.setup_commands_json}")
+        
+        # Print received setup commands for debugging
+        if setup_commands:
+            print(f"📋 Using {len(setup_commands)} setup commands:")
+            for i, cmd in enumerate(setup_commands, 1):
+                print(f"  {i}. {cmd}")
                 
-                if content.startswith('[') and content.endswith(']'):
-                    # JSON format
-                    try:
-                        json_commands = json.loads(content)
-                        if isinstance(json_commands, list):
-                            setup_commands.extend(json_commands)
-                            print(f"📋 Loaded {len(json_commands)} commands from JSON file {args.commands_file}")
-                        else:
-                            print(f"⚠️ Invalid JSON format in commands file: not a list")
-                    except json.JSONDecodeError as json_err:
-                        print(f"⚠️ Error parsing JSON commands file: {json_err}")
-                        # Fall back to line-by-line parsing
+        # Load commands from file if specified
+        if args.commands_file and os.path.exists(args.commands_file):
+            try:
+                with open(args.commands_file, 'r') as f:
+                    # Check if the file contains JSON or line-by-line commands
+                    content = f.read().strip()
+                    
+                    if content.startswith('[') and content.endswith(']'):
+                        # JSON format
+                        try:
+                            json_commands = json.loads(content)
+                            if isinstance(json_commands, list):
+                                setup_commands.extend(json_commands)
+                                print(f"📋 Loaded {len(json_commands)} commands from JSON file {args.commands_file}")
+                            else:
+                                print(f"⚠️ Invalid JSON format in commands file: not a list")
+                        except json.JSONDecodeError as json_err:
+                            print(f"⚠️ Error parsing JSON commands file: {json_err}")
+                            # Fall back to line-by-line parsing
+                            file_commands = [line.strip() for line in content.split('\n') if line.strip()]
+                            setup_commands.extend(file_commands)
+                            print(f"📋 Loaded {len(file_commands)} commands from file (line-by-line fallback)")
+                    else:
+                        # Line-by-line format
                         file_commands = [line.strip() for line in content.split('\n') if line.strip()]
                         setup_commands.extend(file_commands)
-                        print(f"📋 Loaded {len(file_commands)} commands from file (line-by-line fallback)")
-                else:
-                    # Line-by-line format
-                    file_commands = [line.strip() for line in content.split('\n') if line.strip()]
-                    setup_commands.extend(file_commands)
-                    print(f"📋 Loaded {len(file_commands)} commands from file (line-by-line format)")
-                    
-        except Exception as e:
-            print(f"⚠️ Error reading commands file: {e}")
-            
-    try:
-        result = create_modal_ssh_container(
-            args.gpu,
-            args.repo_url,
-            args.repo_name,
-            setup_commands,
-            getattr(args, 'volume_name', None),
-            args.timeout,
-            args.ssh_password
-        )
+                        print(f"📋 Loaded {len(file_commands)} commands from file (line-by-line format)")
+            except Exception as e:
+                print(f"⚠️ Error loading commands from file: {e}")
         
-        print("\n⏳ Keeping the SSH container alive. Press Ctrl+C to exit (container will continue running)...")
-        try:
-            while True:
-                time.sleep(90)
-                print(".", end="", flush=True)
-        except KeyboardInterrupt:
-            print("\n👋 Script exited. The SSH container will continue running.")
-            sys.exit(0)
-            
+        # Load commands from setup script if specified
+        if args.setup_script and os.path.exists(args.setup_script):
+            try:
+                with open(args.setup_script, 'r') as f:
+                    script_content = f.read().strip()
+                    # Convert script to individual commands
+                    script_commands = [line.strip() for line in script_content.split('\n') 
+                                    if line.strip() and not line.strip().startswith('#')]
+                    setup_commands.extend(script_commands)
+                    print(f"📋 Loaded {len(script_commands)} commands from script {args.setup_script}")
+            except Exception as e:
+                print(f"⚠️ Error loading commands from script: {e}")
+        
+        # Create the container with the specified options
+        if args.ssh_password:
+            print(f"🔑 Using provided SSH password")
+            ssh_password = args.ssh_password
+        else:
+            ssh_password = generate_random_password()
+            print(f"🔑 Generated random SSH password: {ssh_password}")
+        
+        # Extract repository name from URL if not provided
+        repo_name = args.repo_name
+        if not repo_name and args.repo_url:
+            # Try to extract repo name from URL
+            url_parts = args.repo_url.rstrip('/').split('/')
+            if url_parts:
+                repo_name = url_parts[-1]
+                if repo_name.endswith('.git'):
+                    repo_name = repo_name[:-4]
+        
+        # Create the container
+        create_modal_ssh_container(
+            gpu_type=args.gpu,
+            repo_url=args.repo_url,
+            repo_name=repo_name,
+            setup_commands=setup_commands,
+            volume_name=args.volume_name,
+            timeout_minutes=args.timeout,
+            ssh_password=ssh_password
+        )
     except KeyboardInterrupt:
-        # Handle Ctrl+C during container creation
-        print("\n👋 Script interrupted during container creation.")
-        print("📝 You may need to check if a container was created with: modal container list")
-        sys.exit(0)
+        print("\n\n🛑 Execution interrupted")
+        print("🧹 Cleaning up resources...")
+        cleanup_modal_token()
+        sys.exit(1)
     except Exception as e:
-        print(f"❌ Error: {e}")
+        print(f"\n❌ Error: {e}")
+        print("🧹 Cleaning up resources...")
+        cleanup_modal_token()
         sys.exit(1)