gitarsenal-cli 1.3.4 → 1.3.5

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -3372,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()
@@ -3381,101 +3380,124 @@ if __name__ == "__main__":
     if len(sys.argv) == 1 or args.show_examples:
         show_usage_examples()
         sys.exit(0)
-        
-    # Get setup commands from file if specified
-    setup_commands = args.setup_commands or []
-    
-    # If --use-api flag is set and repo_url is provided, fetch setup commands from API
-    
-    # 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}")
+    try:    
+        # Get setup commands from file if specified
+        setup_commands = args.setup_commands or []
+        
+        # If --use-api flag is set and repo_url is provided, fetch setup commands from API
+        
+        # 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(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("⚠️ 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}")
                 
-                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)