gitarsenal-cli 1.2.8 → 1.3.2

package/python/modal_logs_patch.py

@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+"""
+This script patches the test_modalSandboxScript.py file to replace "modal" with "container" in the logs.
+"""
+
+import os
+import re
+import sys
+import shutil
+from pathlib import Path
+
+def patch_modal_logs(script_path):
+    """
+    Patch the Python script to replace "modal" with "container" in the logs.
+    """
+    print(f"Patching {script_path} to replace 'modal' with 'container' in logs...")
+    
+    # Make a backup of the original file
+    backup_path = f"{script_path}.bak"
+    shutil.copy2(script_path, backup_path)
+    
+    # Read the file
+    with open(script_path, 'r', encoding='utf-8') as f:
+        content = f.read()
+    
+    # Define replacements
+    replacements = [
+        # Function names
+        (r'def create_modal_sandbox', r'def create_container'),
+        (r'def create_modal_ssh_container', r'def create_ssh_container'),
+        
+        # Log messages - case sensitive replacements
+        (r'Modal sandbox', r'Container'),
+        (r'Modal authentication', r'Container authentication'),
+        (r'Modal token', r'Container token'),
+        (r'Modal package', r'Container package'),
+        (r'Modal operations', r'Container operations'),
+        
+        # Log messages - case insensitive replacements (lowercase)
+        (r'modal sandbox', r'container'),
+        (r'modal authentication', r'container authentication'),
+        (r'modal token', r'container token'),
+        (r'modal package', r'container package'),
+        (r'modal operations', r'container operations'),
+        
+        # Keep function calls to modal library intact but change logs
+        (r'print\([\'"](.*)modal(.*)[\'"]', r'print(\1container\2'),
+        (r'log\([\'"](.*)modal(.*)[\'"]', r'log(\1container\2'),
+        (r'logger\.info\([\'"](.*)modal(.*)[\'"]', r'logger.info(\1container\2'),
+        (r'logger\.error\([\'"](.*)modal(.*)[\'"]', r'logger.error(\1container\2'),
+        (r'logger\.warning\([\'"](.*)modal(.*)[\'"]', r'logger.warning(\1container\2'),
+        (r'logger\.debug\([\'"](.*)modal(.*)[\'"]', r'logger.debug(\1container\2'),
+    ]
+    
+    # Apply replacements
+    for pattern, replacement in replacements:
+        content = re.sub(pattern, replacement, content, flags=re.IGNORECASE)
+    
+    # Write the modified content back to the file
+    with open(script_path, 'w', encoding='utf-8') as f:
+        f.write(content)
+    
+    print(f"Patching complete. Original file backed up to {backup_path}")
+    return True
+
+def main():
+    """
+    Main entry point for the script.
+    """
+    # Get the path to the script
+    script_dir = Path(__file__).parent
+    script_path = script_dir / "test_modalSandboxScript.py"
+    
+    if not script_path.exists():
+        print(f"Error: Script not found at {script_path}")
+        return 1
+    
+    try:
+        patch_modal_logs(script_path)
+        return 0
+    except Exception as e:
+        print(f"Error patching file: {e}")
+        return 1
+
+if __name__ == "__main__":
+    sys.exit(main()) 

package/python/test_modalSandboxScript.py

@@ -687,11 +687,15 @@ def create_modal_sandbox(gpu_type, repo_url=None, repo_name=None, setup_commands
     app_name = f"sandbox-{timestamp}"
     
     gpu_configs = {
+        'T4': {'gpu': 'T4', 'memory': 16},
+        'L4': {'gpu': 'L4', 'memory': 24},
         'A10G': {'gpu': 'A10G', 'memory': 24},
-        'A100': {'gpu': 'A100-SXM4-40GB', 'memory': 40},
+        'A100-40GB': {'gpu': 'A100-SXM4-40GB', 'memory': 40},
+        'A100-80GB': {'gpu': 'A100-80GB', 'memory': 80},
+        'L40S': {'gpu': 'L40S', 'memory': 48},
         'H100': {'gpu': 'H100', 'memory': 80},
-        'T4': {'gpu': 'T4', 'memory': 16},
-        'V100': {'gpu': 'V100-SXM2-16GB', 'memory': 16}
+        'H200': {'gpu': 'H200', 'memory': 141},
+        'B200': {'gpu': 'B200', 'memory': 96}
     }
     
     if gpu_type not in gpu_configs:
@@ -2163,7 +2167,7 @@ ssh_app = modal.App("ssh-container-app")
             "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
+    gpu="a10g",    # Default GPU - this will be overridden when called
     cpu=2,
     memory=8192,
     serialized=True,
@@ -2344,11 +2348,15 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     app_name = f"ssh-container-{timestamp}"
     
     gpu_configs = {
+        'T4': {'gpu': 't4', 'memory': 16},
+        'L4': {'gpu': 'l4', 'memory': 24},
         'A10G': {'gpu': 'a10g', 'memory': 24},
-        'A100': {'gpu': 'a100', 'memory': 40},
+        'A100-40GB': {'gpu': 'a100', 'memory': 40},
+        'A100-80GB': {'gpu': 'a100-80gb', 'memory': 80},
+        'L40S': {'gpu': 'l40s', 'memory': 48},
         'H100': {'gpu': 'h100', 'memory': 80},
-        'T4': {'gpu': 't4', 'memory': 16},
-        'V100': {'gpu': 'v100', 'memory': 16}
+        'H200': {'gpu': 'h200', 'memory': 141},
+        'B200': {'gpu': 'b200', 'memory': 96}
     }
     
     if gpu_type not in gpu_configs:
@@ -3322,9 +3330,40 @@ def cleanup_modal_token():
     except Exception as e:
         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")
+    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
     import argparse
+    import sys
     
     parser = argparse.ArgumentParser(description='Create a Modal SSH container with GPU')
     parser.add_argument('--gpu', type=str, default='A10G', help='GPU type (default: A10G)')
@@ -3339,12 +3378,79 @@ 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()
     
+    # If no arguments or only --show-examples is provided, show usage examples
+    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 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
+        
+        # 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}")
+        
+        gpu_choice = input(f"Enter choice (1-{len(gpu_options)}) [default: 3 for A10G]: ").strip()
+        if not gpu_choice:
+            args.gpu = 'A10G'  # Default
+        else:
+            try:
+                gpu_index = int(gpu_choice) - 1
+                if 0 <= gpu_index < len(gpu_options):
+                    args.gpu = gpu_options[gpu_index]
+                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")
@@ -3408,70 +3514,7 @@ if __name__ == "__main__":
                     
         except Exception as e:
             print(f"⚠️ Error reading commands file: {e}")
-    
-    # Execute setup script if provided
-    if args.setup_script:
-        print(f"📜 Setup script path: {args.setup_script}")
-        
-        # Verify script exists
-        if os.path.exists(args.setup_script):
-            print(f"✅ Script exists at: {args.setup_script}")
-            
-            # Check if script is executable
-            if not os.access(args.setup_script, os.X_OK):
-                print(f"⚠️ Script is not executable, setting permissions...")
-                try:
-                    os.chmod(args.setup_script, 0o755)
-                    print(f"✅ Set executable permissions on script")
-                except Exception as e:
-                    print(f"❌ Failed to set permissions: {e}")
-            
-            working_dir = args.working_dir or os.getcwd()
-            print(f"📂 Using working directory: {working_dir}")
-            
-            # Execute the script directly instead of through container
-            try:
-                print(f"🔄 Executing script directly: bash {args.setup_script} {working_dir}")
-                result = subprocess.run(['bash', args.setup_script, working_dir], 
-                                       capture_output=True, text=True)
-                
-                print(f"📋 Script output:")
-                print(result.stdout)
-                
-                if result.returncode != 0:
-                    print(f"❌ Script execution failed with error code {result.returncode}")
-                    print(f"Error output: {result.stderr}")
-                else:
-                    print(f"✅ Script executed successfully")
-                    
-                # Skip the regular setup commands since we executed the script directly
-                setup_commands = []
-            except Exception as e:
-                print(f"❌ Failed to execute script: {e}")
-                # Fall back to running the script through container
-                setup_commands = [f"bash {args.setup_script} {working_dir}"]
-                print("🔄 Falling back to running script through container")
-        else:
-            print(f"❌ Script not found at: {args.setup_script}")
-            # Try to find the script in common locations
-            possible_paths = [
-                os.path.join(os.path.expanduser('~'), os.path.basename(args.setup_script)),
-                os.path.join('/tmp', os.path.basename(args.setup_script)),
-                os.path.join('/var/tmp', os.path.basename(args.setup_script))
-            ]
             
-            found = False
-            for test_path in possible_paths:
-                if os.path.exists(test_path):
-                    print(f"🔍 Found script at alternative location: {test_path}")
-                    setup_commands = [f"bash {test_path} {args.working_dir or os.getcwd()}"]
-                    found = True
-                    break
-            
-            if not found:
-                print("❌ Could not find script in any location")
-                setup_commands = []
-    
     try:
         result = create_modal_ssh_container(
             args.gpu,
@@ -3490,79 +3533,6 @@ if __name__ == "__main__":
                 print(".", end="", flush=True)
         except KeyboardInterrupt:
             print("\n👋 Script exited. The SSH container will continue running.")
-            if 'result' in locals() and result:
-                container_id = None
-                ssh_password = None
-                
-                # Try to get container ID and SSH password from the result dictionary
-                if isinstance(result, dict):
-                    container_id = result.get('container_id')
-                    ssh_password = result.get('ssh_password')
-                elif hasattr(result, 'container_id'):
-                    container_id = result.container_id
-                    ssh_password = getattr(result, 'ssh_password', None)
-                
-                # If we still don't have the container ID, try to read it from the file
-                if not container_id:
-                    try:
-                        with open(os.path.expanduser("~/.modal_last_container_id"), "r") as f:
-                            container_id = f.read().strip()
-                        print(f"📋 Retrieved container ID from file: {container_id}")
-                    except Exception as e:
-                        print(f"⚠️ Could not read container ID from file: {e}")
-                
-                if container_id:
-                    print(f"🚀 SSH connection information:")
-                    print(f"   ssh root@{container_id}.modal.run")
-                    if ssh_password:
-                        print(f"   Password: {ssh_password}")
-                    
-                    # Try to open a new terminal window with SSH connection
-                    try:
-                        terminal_script = f'''
-                        tell application "Terminal"
-                            do script "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password or 'unknown'}'; ssh root@{container_id}.modal.run"
-                            activate
-                        end tell
-                        '''
-                        
-                        subprocess.run(['osascript', '-e', terminal_script], 
-                                      capture_output=True, text=True, timeout=30)
-                        print("✅ New terminal window opened with SSH connection")
-                        
-                    except Exception as e:
-                        print(f"⚠️ Failed to open terminal window: {e}")
-                        
-                        # Try alternative approach with iTerm2
-                        try:
-                            iterm_script = f'''
-                            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"
-                                end tell
-                            end tell
-                            '''
-                            
-                            subprocess.run(['osascript', '-e', iterm_script], 
-                                          capture_output=True, text=True, timeout=30)
-                            print("✅ New iTerm2 window opened with SSH connection")
-                            
-                        except Exception as e2:
-                            print(f"⚠️ Failed to open iTerm2 window: {e2}")
-                            print("📝 You can manually connect using:")
-                            print(f"   ssh root@{container_id}.modal.run")
-                            if ssh_password:
-                                print(f"   Password: {ssh_password}")
-                            print("   Or use Modal exec:")
-                            print(f"   modal container exec --pty {container_id} bash")
-                else:
-                    print("⚠️ Could not determine container ID")
-                    print("📝 You can manually connect using:")
-                    print("   modal container list")
-                    print("   modal container exec --pty <CONTAINER_ID> bash")
-            
-            # Exit cleanly
             sys.exit(0)
             
     except KeyboardInterrupt: