gitarsenal-cli 1.3.4 → 1.3.6

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -36,10 +36,10 @@ if args.proxy_api_key:
 # First, try to fetch tokens from the proxy server
 try:
     # Import the fetch_modal_tokens module
-    print("🔄 Fetching Modal tokens from proxy server...")
+    print("🔄 Fetching tokens from proxy server...")
     from fetch_modal_tokens import get_tokens
     token_id, token_secret = get_tokens()
-    print(f"✅ Modal tokens fetched successfully")
+    print(f"✅ Tokens fetched successfully")
     
     # Explicitly set the environment variables again to be sure
     os.environ["MODAL_TOKEN_ID"] = token_id
@@ -116,16 +116,16 @@ except Exception as e:
 
 # Print debug info
 print(f"🔍 DEBUG: Checking environment variables")
-print(f"🔍 MODAL_TOKEN_ID exists: {'Yes' if os.environ.get('MODAL_TOKEN_ID') else 'No'}")
-print(f"🔍 MODAL_TOKEN_SECRET exists: {'Yes' if os.environ.get('MODAL_TOKEN_SECRET') else 'No'}")
-print(f"🔍 MODAL_TOKEN exists: {'Yes' if os.environ.get('MODAL_TOKEN') else 'No'}")
+print(f"🔍 Token ID exists: {'Yes' if os.environ.get('MODAL_TOKEN_ID') else 'No'}")
+print(f"🔍 Token secret exists: {'Yes' if os.environ.get('MODAL_TOKEN_SECRET') else 'No'}")
+print(f"🔍 Token exists: {'Yes' if os.environ.get('MODAL_TOKEN') else 'No'}")
 if os.environ.get('MODAL_TOKEN_ID'):
-    print(f"🔍 MODAL_TOKEN_ID length: {len(os.environ.get('MODAL_TOKEN_ID'))}")
+    print(f"🔍 Token ID length: {len(os.environ.get('MODAL_TOKEN_ID'))}")
 if os.environ.get('MODAL_TOKEN_SECRET'):
-    print(f"🔍 MODAL_TOKEN_SECRET length: {len(os.environ.get('MODAL_TOKEN_SECRET'))}")
+    print(f"🔍 Token secret length: {len(os.environ.get('MODAL_TOKEN_SECRET'))}")
 if os.environ.get('MODAL_TOKEN'):
-    print(f"🔍 MODAL_TOKEN length: {len(os.environ.get('MODAL_TOKEN'))}")
-print(f"✅ Modal token setup completed")
+    print(f"🔍 Token length: {len(os.environ.get('MODAL_TOKEN'))}")
+print(f"✅ Token setup completed")
 
 # Import modal after token setup
 import modal
@@ -604,12 +604,12 @@ def create_modal_sandbox(gpu_type, repo_url=None, repo_name=None, setup_commands
         try:
             # This will raise an exception if not authenticated
             modal.config.get_current_workspace_name()
-            print("✅ Modal authentication verified")
+            print("✅ Authentication verified")
         except modal.exception.AuthError:
             print("\n" + "="*80)
-            print("🔑 MODAL AUTHENTICATION REQUIRED")
+            print("🔑 AUTHENTICATION REQUIRED")
             print("="*80)
-            print("GitArsenal requires Modal authentication to create cloud environments.")
+            print("GitArsenal requires authentication to create cloud environments.")
             
             # Try to get token from credentials manager
             modal_token = None
@@ -703,7 +703,7 @@ def create_modal_sandbox(gpu_type, repo_url=None, repo_name=None, setup_commands
         gpu_type = 'A10G'
     
     gpu_spec = gpu_configs[gpu_type]
-    print(f"🚀 Creating Modal sandbox with {gpu_spec['gpu']} GPU ({gpu_spec['memory']}GB VRAM)")
+    print(f"🚀 Creating sandbox with {gpu_spec['gpu']} GPU ({gpu_spec['memory']}GB VRAM)")
     
     # Initialize uv_path variable
     uv_path = ""
@@ -738,7 +738,7 @@ def create_modal_sandbox(gpu_type, repo_url=None, repo_name=None, setup_commands
     # Enable output for image building
     with modal.enable_output():
         # Create a Modal app and sandbox
-        print(f"🚀 Creating Modal sandbox with GPU: {gpu_type.lower()} (App: {app_name})...")
+        print(f"🚀 Creating sandbox with GPU: {gpu_type.lower()} (App: {app_name})...")
         # Always use lookup with create_if_missing=True to properly initialize the app
         app = modal.App.lookup(app_name, create_if_missing=True)
         print(f"Created app: {app_name}")
@@ -947,7 +947,7 @@ def create_modal_sandbox(gpu_type, repo_url=None, repo_name=None, setup_commands
             return str(maybe_bytes)
 
     # Skip the persistent shell approach for now due to async stream complexity
-    print("🔍 Modal's async streams require complex async handling")
+    print("🔍 async streams require complex async handling")
     print("🔄 Switching to individual command execution approach for reliability...")
     
     # Initialize state tracking variables
@@ -2013,7 +2013,7 @@ cd "{current_dir}"
         f.write(container_id)
 
     # Print connection instructions
-    print(f"✅ Modal sandbox created successfully!")
+    print(f"✅ Sandbox created successfully!")
     print(f"📋 Sandbox ID: {sandbox_id}")
     print(f"📋 Container ID: {container_id}")
     if volume:
@@ -2246,12 +2246,12 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         print("🔍 DEBUG: Checking environment variables")
         modal_token_id = os.environ.get("MODAL_TOKEN_ID")
         modal_token = os.environ.get("MODAL_TOKEN")
-        print(f"🔍 MODAL_TOKEN_ID exists: {'Yes' if modal_token_id else 'No'}")
-        print(f"🔍 MODAL_TOKEN exists: {'Yes' if modal_token else 'No'}")
+        print(f"🔍 token exists: {'Yes' if modal_token_id else 'No'}")
+        print(f"🔍 token exists: {'Yes' if modal_token else 'No'}")
         if modal_token_id:
-            print(f"🔍 MODAL_TOKEN_ID length: {len(modal_token_id)}")
+            print(f"🔍 token length: {len(modal_token_id)}")
         if modal_token:
-            print(f"🔍 MODAL_TOKEN length: {len(modal_token)}")
+            print(f"🔍 token length: {len(modal_token)}")
         
         # Try to access Modal token to check authentication
         try:
@@ -2262,13 +2262,13 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                 # Try to get from MODAL_TOKEN
                 modal_token = os.environ.get("MODAL_TOKEN")
                 if modal_token:
-                    print("✅ Found token in MODAL_TOKEN environment variable")
+                    print("✅ Found token in environment variable")
                     os.environ["MODAL_TOKEN_ID"] = modal_token
                     modal_token_id = modal_token
-                    print(f"✅ Set MODAL_TOKEN_ID from MODAL_TOKEN (length: {len(modal_token)})")
+                    print(f"✅ Set token (length: {len(modal_token)})")
             
             if modal_token_id:
-                print(f"✅ Modal token found (length: {len(modal_token_id)})")
+                print(f"✅ token found (length: {len(modal_token_id)})")
                 
                 # Use the comprehensive fix_modal_token script
                 try:
@@ -2289,11 +2289,11 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         if result.stderr:
                             print(f"Error: {result.stderr}")
                             
-                    print(f"✅ Modal token setup completed")
+                    print(f"✅ token setup completed")
                 except Exception as e:
                     print(f"⚠️ Error running fix_modal_token.py: {e}")
             else:
-                print("❌ No Modal token found in environment variables")
+                print("❌ No token found in environment variables")
                 # Try to get from file as a last resort
                 try:
                     home_dir = os.path.expanduser("~")
@@ -2312,7 +2312,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                             else:
                                 print("❌ Token file does not contain token_id")
                     else:
-                        print("❌ Modal token file not found")
+                        print("❌ token file not found")
                 except Exception as e:
                     print(f"❌ Error loading token from file: {e}")
                 
@@ -2326,9 +2326,9 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             modal_token_id = os.environ.get("MODAL_TOKEN_ID")
             modal_token = os.environ.get("MODAL_TOKEN")
             if modal_token_id:
-                print(f"🔄 Using MODAL_TOKEN_ID from environment (length: {len(modal_token_id)})")
+                print(f"🔄 Using token from environment (length: {len(modal_token_id)})")
             elif modal_token:
-                print(f"🔄 Using MODAL_TOKEN from environment (length: {len(modal_token)})")
+                print(f"🔄 Using token from environment (length: {len(modal_token)})")
                 os.environ["MODAL_TOKEN_ID"] = modal_token
                 modal_token_id = modal_token
             else:
@@ -2338,7 +2338,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             # Set it in both environment variables
             os.environ["MODAL_TOKEN_ID"] = modal_token_id
             os.environ["MODAL_TOKEN"] = modal_token_id
-            print("✅ Set both MODAL_TOKEN_ID and MODAL_TOKEN environment variables")
+            print("✅ Set both token and id environment variables")
     except Exception as e:
         print(f"⚠️ Error checking Modal authentication: {e}")
         print("Continuing anyway, but Modal operations may fail")
@@ -2364,7 +2364,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         gpu_type = 'A10G'
     
     gpu_spec = gpu_configs[gpu_type]
-    print(f"🚀 Creating Modal SSH container with {gpu_spec['gpu']} GPU ({gpu_spec['memory']}GB VRAM)")
+    print(f"🚀 Creating SSH container with {gpu_spec['gpu']} GPU ({gpu_spec['memory']}GB VRAM)")
     
     # Generate or use provided SSH password
     if not ssh_password:
@@ -2400,16 +2400,16 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     # Print debug info for authentication
     print("🔍 Modal authentication debug info:")
     modal_token = os.environ.get("MODAL_TOKEN_ID")
-    print(f"  - MODAL_TOKEN_ID in env: {'Yes' if modal_token else 'No'}")
+    print(f"  - token in env: {'Yes' if modal_token else 'No'}")
     print(f"  - Token length: {len(modal_token) if modal_token else 'N/A'}")
     
     # Verify we can create a Modal app
     try:
-        print("🔍 Testing Modal app creation...")
+        print("🔍 Testing app creation...")
         app = modal.App(app_name)
-        print("✅ Created Modal app successfully")
+        print("✅ Created app successfully")
     except Exception as e:
-        print(f"❌ Error creating Modal app: {e}")
+        print(f"❌ Error creating app: {e}")
         return None
 
     # Create SSH-enabled image
@@ -3302,33 +3302,33 @@ Respond with only 'NAVIGATE' if navigation makes sense, or 'SKIP' if it's redund
         return None
 
 def cleanup_modal_token():
-    """Delete Modal token files and environment variables after SSH container is started"""
-    print("🧹 Cleaning up Modal token for security...")
+    """Delete token files and environment variables after SSH container is started"""
+    print("🧹 Cleaning up tokens for security...")
     
     try:
         # Remove token from environment variables
         if "MODAL_TOKEN_ID" in os.environ:
             del os.environ["MODAL_TOKEN_ID"]
-            print("✅ Removed MODAL_TOKEN_ID from environment")
+            print("✅ Removed token ID from environment")
         
         if "MODAL_TOKEN" in os.environ:
             del os.environ["MODAL_TOKEN"]
-            print("✅ Removed MODAL_TOKEN from environment")
+            print("✅ Removed token from environment")
             
         if "MODAL_TOKEN_SECRET" in os.environ:
             del os.environ["MODAL_TOKEN_SECRET"]
-            print("✅ Removed MODAL_TOKEN_SECRET from environment")
+            print("✅ Removed token secret from environment")
         
         # Delete ~/.modal.toml file
         home_dir = os.path.expanduser("~")
         modal_toml = os.path.join(home_dir, ".modal.toml")
         if os.path.exists(modal_toml):
             os.remove(modal_toml)
-            print(f"✅ Deleted Modal token file at {modal_toml}")
+            print(f"✅ Deleted token file at {modal_toml}")
         
-        print("✅ Modal token cleanup completed successfully")
+        print("✅ Token cleanup completed successfully")
     except Exception as e:
-        print(f"❌ Error during Modal token cleanup: {e}")
+        print(f"❌ Error during token cleanup: {e}")
 
 def show_usage_examples():
     """Display usage examples for the script."""
@@ -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)