gitarsenal-cli 1.9.65 → 1.9.66

package/python/gitarsenal.py

@@ -1,488 +0,0 @@
-#!/usr/bin/env python3
-"""
-GitArsenal CLI - Main entry point
-
-This script provides a user-friendly interface to the GitArsenal CLI tools.
-"""
-
-import argparse
-import sys
-import os
-import subprocess
-import json
-from pathlib import Path
-
-# Import the Modal token setup module
-try:
-    from setup_modal_token import setup_modal_token
-    # Set up Modal token at import time
-    setup_modal_token()
-except ImportError:
-    print("⚠️ Warning: setup_modal_token module not found. Modal authentication may fail.")
-except Exception as e:
-    print(f"⚠️ Warning: Error setting up Modal token: {e}")
-
-# Import authentication manager
-try:
-    from auth_manager import AuthManager
-except ImportError:
-    print("⚠️ Warning: auth_manager module not found. Authentication will be disabled.")
-    AuthManager = None
-
-def check_modal_auth():
-    """Check if Modal is authenticated and set up the built-in token if needed"""
-    try:
-        # Set up the built-in token first
-        from setup_modal_token import setup_modal_token
-        setup_modal_token()
-        
-        # Try to run a simple Modal command to check authentication
-        result = subprocess.run(["modal", "app", "list"], 
-                              capture_output=True, text=True, timeout=10)
-        
-        # If the command was successful, Modal is authenticated
-        if result.returncode == 0:
-            return True
-            
-        # If we get here, there might be an issue with the Modal CLI itself
-        print(f"⚠️ Modal command returned error: {result.stderr}")
-        print("This could be a temporary issue with the Modal service.")
-        print("The built-in token should work automatically without any user action.")
-        return True  # Return True anyway to continue with the operation
-        
-    except FileNotFoundError:
-        print("\n" + "="*80)
-        print("❌ MODAL CLI NOT INSTALLED")
-        print("="*80)
-        print("GitArsenal requires the Modal CLI to be installed.")
-        print("\nTo install Modal CLI, run:")
-        print("   pip install modal")
-        print("="*80)
-        return False
-    except Exception as e:
-        print(f"⚠️ Error checking Modal authentication: {e}")
-        return False
-
-def check_proxy_config():
-    """Check if Modal proxy configuration exists and is valid"""
-    try:
-        from gitarsenal_proxy_client import GitArsenalProxyClient
-        
-        # Initialize client
-        client = GitArsenalProxyClient()
-        
-        # Check if configuration exists
-        config = client.load_config()
-        
-        # Set default proxy URL to localhost since we're running the proxy locally
-        default_url = "http://127.0.0.1:5001"
-        
-        if not config.get("proxy_url"):
-            print(f"⚠️ Modal proxy URL not configured. Setting to default: {default_url}")
-            
-            # Update configuration with default URL
-            config["proxy_url"] = default_url
-            client.save_config(config)
-            client.base_url = default_url
-            
-            print(f"✅ Set default proxy URL: {default_url}")
-        
-        # Set a default API key if missing
-        if not config.get("api_key"):
-            print("⚠️ API key not configured. Setting a default key...")
-            
-            # Use a default API key for local development
-            default_api_key = "gitarsenal-default-key"
-            config["api_key"] = default_api_key
-            client.save_config(config)
-            client.api_key = default_api_key
-            
-            print("✅ Set default API key for local proxy")
-        
-        # Verify connection to proxy
-        print(f"🔍 Testing connection to proxy at {client.base_url}...")
-        health = client.health_check()
-        if not health["success"]:
-            print(f"⚠️ Could not connect to Modal proxy at {client.base_url}")
-            print(f"   Error: {health.get('error', 'Unknown error')}")
-            print("   Make sure the proxy server is running with:")
-            print("   python modal_proxy_service.py")
-            return False
-        
-        print(f"✅ Connected to Modal proxy at {client.base_url}")
-        return True
-        
-    except ImportError:
-        print("⚠️ GitArsenalProxyClient module not found")
-        return False
-    except Exception as e:
-        print(f"⚠️ Error checking proxy configuration: {e}")
-        return False
-
-def _check_authentication(auth_manager):
-    """Check if user is authenticated, prompt for login if not"""
-    if auth_manager.is_authenticated():
-        user = auth_manager.get_current_user()
-        print(f"✅ Authenticated as: {user['username']}")
-        return True
-    
-    print("\n🔐 Authentication required")
-    return auth_manager.interactive_auth_flow()
-
-def _handle_auth_commands(auth_manager, args):
-    """Handle authentication-related commands"""
-    import getpass
-    
-    if args.login:
-        print("\n🔐 LOGIN")
-        username = input("Username: ").strip()
-        password = getpass.getpass("Password: ").strip()
-        if auth_manager.login_user(username, password):
-            print("✅ Login successful!")
-        else:
-            print("❌ Login failed.")
-    
-    elif args.register:
-        print("\n🔐 REGISTRATION")
-        username = input("Username (min 3 characters): ").strip()
-        email = input("Email: ").strip()
-        password = getpass.getpass("Password (min 8 characters): ").strip()
-        confirm_password = getpass.getpass("Confirm password: ").strip()
-        
-        if password != confirm_password:
-            print("❌ Passwords do not match.")
-            return
-        
-        if auth_manager.register_user(username, email, password):
-            print("✅ Registration successful!")
-            # Auto-login after registration
-            if auth_manager.login_user(username, password):
-                print("✅ Auto-login successful!")
-        else:
-            print("❌ Registration failed.")
-    
-    elif args.logout:
-        auth_manager.logout_user()
-    
-    elif args.user_info:
-        auth_manager.show_user_info()
-    
-    elif args.change_password:
-        if not auth_manager.is_authenticated():
-            print("❌ Not logged in. Please login first.")
-            return
-        
-        current_password = getpass.getpass("Current password: ").strip()
-        new_password = getpass.getpass("New password (min 8 characters): ").strip()
-        confirm_password = getpass.getpass("Confirm new password: ").strip()
-        
-        if new_password != confirm_password:
-            print("❌ New passwords do not match.")
-            return
-        
-        if auth_manager.change_password(current_password, new_password):
-            print("✅ Password changed successfully!")
-        else:
-            print("❌ Failed to change password.")
-    
-    elif args.delete_account:
-        if not auth_manager.is_authenticated():
-            print("❌ Not logged in. Please login first.")
-            return
-        
-        password = getpass.getpass("Enter your password to confirm deletion: ").strip()
-        if auth_manager.delete_account(password):
-            print("✅ Account deleted successfully!")
-        else:
-            print("❌ Failed to delete account.")
-    
-    elif args.store_api_key:
-        if not auth_manager.is_authenticated():
-            print("❌ Not logged in. Please login first.")
-            return
-        
-        service = args.store_api_key
-        api_key = getpass.getpass(f"Enter {service} API key: ").strip()
-        
-        if auth_manager.store_api_key(service, api_key):
-            print(f"✅ {service} API key stored successfully!")
-        else:
-            print(f"❌ Failed to store {service} API key.")
-    
-    elif args.auth:
-        # Interactive authentication management
-        while True:
-            print("\n" + "="*60)
-            print("🔐 AUTHENTICATION MANAGEMENT")
-            print("="*60)
-            print("1. Login")
-            print("2. Register")
-            print("3. Show user info")
-            print("4. Change password")
-            print("5. Store API key")
-            print("6. Delete account")
-            print("7. Logout")
-            print("8. Exit")
-            
-            choice = input("\nSelect an option (1-8): ").strip()
-            
-            if choice == "1":
-                username = input("Username: ").strip()
-                password = getpass.getpass("Password: ").strip()
-                auth_manager.login_user(username, password)
-            elif choice == "2":
-                username = input("Username (min 3 characters): ").strip()
-                email = input("Email: ").strip()
-                password = getpass.getpass("Password (min 8 characters): ").strip()
-                confirm_password = getpass.getpass("Confirm password: ").strip()
-                if password == confirm_password:
-                    auth_manager.register_user(username, email, password)
-                else:
-                    print("❌ Passwords do not match.")
-            elif choice == "3":
-                auth_manager.show_user_info()
-            elif choice == "4":
-                if auth_manager.is_authenticated():
-                    current_password = getpass.getpass("Current password: ").strip()
-                    new_password = getpass.getpass("New password (min 8 characters): ").strip()
-                    confirm_password = getpass.getpass("Confirm new password: ").strip()
-                    if new_password == confirm_password:
-                        auth_manager.change_password(current_password, new_password)
-                    else:
-                        print("❌ New passwords do not match.")
-                else:
-                    print("❌ Not logged in.")
-            elif choice == "5":
-                if auth_manager.is_authenticated():
-                    service = input("Service name (e.g., openai, modal): ").strip()
-                    api_key = getpass.getpass(f"Enter {service} API key: ").strip()
-                    auth_manager.store_api_key(service, api_key)
-                else:
-                    print("❌ Not logged in.")
-            elif choice == "6":
-                if auth_manager.is_authenticated():
-                    password = getpass.getpass("Enter your password to confirm deletion: ").strip()
-                    auth_manager.delete_account(password)
-                else:
-                    print("❌ Not logged in.")
-            elif choice == "7":
-                auth_manager.logout_user()
-            elif choice == "8":
-                print("👋 Goodbye!")
-                break
-            else:
-                print("❌ Invalid option. Please try again.")
-
-def main():
-    """Main entry point for the GitArsenal CLI"""
-    parser = argparse.ArgumentParser(description="GitArsenal CLI - Tools for AI development")
-    subparsers = parser.add_subparsers(dest="command", help="Command to run")
-    
-    # Authentication arguments (global)
-    parser.add_argument('--skip-auth', action='store_true', help='Skip authentication check (for development)')
-    parser.add_argument('--login', action='store_true', help='Login to GitArsenal')
-    parser.add_argument('--register', action='store_true', help='Register new account')
-    parser.add_argument('--logout', action='store_true', help='Logout from GitArsenal')
-    parser.add_argument('--user-info', action='store_true', help='Show current user information')
-    parser.add_argument('--change-password', action='store_true', help='Change password')
-    parser.add_argument('--delete-account', action='store_true', help='Delete account')
-    parser.add_argument('--store-api-key', type=str, help='Store API key for a service (e.g., openai, modal)')
-    parser.add_argument('--auth', action='store_true', help='Manage authentication (login, register, logout)')
-    
-    # SSH command
-    ssh_parser = subparsers.add_parser("ssh", help="Create a Modal SSH container")
-    ssh_parser.add_argument("--gpu", type=str, default="A10G", help="GPU type (default: A10G)")
-    ssh_parser.add_argument("--repo-url", type=str, help="Repository URL to clone")
-    ssh_parser.add_argument("--repo-name", type=str, help="Repository name override")
-    ssh_parser.add_argument("--volume-name", type=str, help="Volume name for persistent storage")
-    ssh_parser.add_argument("--timeout", type=int, default=60, help="Container timeout in minutes (default: 60)")
-    ssh_parser.add_argument("--use-proxy", action="store_true", help="Use Modal proxy service instead of direct Modal API")
-    ssh_parser.add_argument("--wait", action="store_true", help="Wait for container to be ready")
-    ssh_parser.add_argument("--interactive", action="store_true", help="Run in interactive mode with prompts")
-    
-    # Sandbox command
-    sandbox_parser = subparsers.add_parser("sandbox", help="Create a Modal sandbox")
-    sandbox_parser.add_argument("--gpu", type=str, default="A10G", help="GPU type (default: A10G)")
-    sandbox_parser.add_argument("--repo-url", type=str, help="Repository URL to clone")
-    sandbox_parser.add_argument("--repo-name", type=str, help="Repository name override")
-    sandbox_parser.add_argument("--volume-name", type=str, help="Volume name for persistent storage")
-    sandbox_parser.add_argument("--use-proxy", action="store_true", help="Use Modal proxy service instead of direct Modal API")
-    sandbox_parser.add_argument("--wait", action="store_true", help="Wait for container to be ready")
-    
-    # Proxy commands
-    proxy_parser = subparsers.add_parser("proxy", help="Modal proxy service commands")
-    proxy_subparsers = proxy_parser.add_subparsers(dest="proxy_command", help="Proxy command to run")
-    
-    # Proxy configure command
-    proxy_configure_parser = proxy_subparsers.add_parser("configure", help="Configure proxy settings")
-    
-    # Proxy status command
-    proxy_status_parser = proxy_subparsers.add_parser("status", help="Check proxy status")
-    
-    # Proxy SSH command
-    proxy_ssh_parser = proxy_subparsers.add_parser("ssh", help="Create SSH container through proxy")
-    proxy_ssh_parser.add_argument("--gpu", type=str, default="A10G", help="GPU type (default: A10G)")
-    proxy_ssh_parser.add_argument("--repo-url", type=str, help="Repository URL to clone")
-    proxy_ssh_parser.add_argument("--repo-name", type=str, help="Repository name override")
-    proxy_ssh_parser.add_argument("--volume-name", type=str, help="Volume name for persistent storage")
-    proxy_ssh_parser.add_argument("--timeout", type=int, default=60, help="Container timeout in minutes (default: 60)")
-    proxy_ssh_parser.add_argument("--wait", action="store_true", help="Wait for container to be ready")
-    
-    # Parse arguments
-    args = parser.parse_args()
-    
-    # Handle authentication commands first
-    if AuthManager and (args.login or args.register or args.logout or args.user_info or 
-                       args.change_password or args.delete_account or args.store_api_key or args.auth):
-        auth_manager = AuthManager()
-        _handle_auth_commands(auth_manager, args)
-        return
-    
-    # Check authentication for main commands (unless skipped)
-    if AuthManager and not args.skip_auth and args.command:
-        auth_manager = AuthManager()
-        if not _check_authentication(auth_manager):
-            print("\n❌ Authentication required. Please login or register first.")
-            print("Use --login to login or --register to create an account.")
-            print("Use --skip-auth to bypass authentication for development.")
-            return
-    
-    if args.command == "ssh":
-        if args.use_proxy:
-            # Use proxy service for SSH container
-            print("🚀 Creating SSH container through proxy...")
-            if check_proxy_config():
-                from gitarsenal_proxy_client import GitArsenalProxyClient
-                client = GitArsenalProxyClient()
-                result = client.create_ssh_container(
-                    gpu_type=args.gpu,
-                    repo_url=args.repo_url,
-                    repo_name=args.repo_name,
-                    volume_name=args.volume_name,
-                    timeout=args.timeout,
-                    wait=args.wait
-                )
-                if result:
-                    print("✅ SSH container created successfully through proxy service")
-                    print(f"📋 Container ID: {result.get('container_id')}")
-                    print(f"🔐 SSH Password: {result.get('ssh_password')}")
-                    if not args.wait:
-                        print("\n⚠️ Container creation is asynchronous. Use --wait flag to wait for it to be ready.")
-                        print("   You can check the status later using the container ID above.")
-                else:
-                    print("❌ Failed to create SSH container through proxy service")
-            else:
-                print("❌ Proxy configuration failed or was cancelled.")
-        else:
-            # Use direct Modal API for SSH container
-            print("🚀 Creating SSH container...")
-            if check_modal_auth():
-                # Import the SSH container creation function
-                from test_modalSandboxScript import create_modal_ssh_container
-                result = create_modal_ssh_container(
-                    args.gpu,
-                    repo_url=args.repo_url,
-                    repo_name=args.repo_name,
-                    volume_name=args.volume_name,
-                    timeout_minutes=args.timeout,
-                    interactive=args.interactive
-                )
-                if result:
-                    print("✅ SSH container created successfully")
-                else:
-                    print("❌ Failed to create SSH container")
-            else:
-                print("❌ Modal authentication failed or was cancelled.")
-    
-    elif args.command == "sandbox":
-        if args.use_proxy:
-            # Use proxy service for sandbox
-            print("🚀 Creating sandbox through proxy...")
-            if check_proxy_config():
-                from gitarsenal_proxy_client import GitArsenalProxyClient
-                client = GitArsenalProxyClient()
-                result = client.create_sandbox(
-                    gpu_type=args.gpu,
-                    repo_url=args.repo_url,
-                    repo_name=args.repo_name,
-                    volume_name=args.volume_name,
-                    wait=args.wait
-                )
-                if result:
-                    print("✅ Sandbox created successfully through proxy service")
-                else:
-                    print("❌ Failed to create sandbox through proxy service")
-            else:
-                print("❌ Proxy configuration failed or was cancelled.")
-        else:
-            # Use direct Modal API for sandbox
-            print("🚀 Creating sandbox...")
-            if check_modal_auth():
-                # Import the sandbox creation function
-                from test_modalSandboxScript import create_modal_sandbox
-                result = create_modal_sandbox(
-                    args.gpu,
-                    repo_url=args.repo_url,
-                    repo_name=args.repo_name,
-                    volume_name=args.volume_name
-                )
-                if result:
-                    print("✅ Sandbox created successfully")
-                else:
-                    print("❌ Failed to create sandbox")
-            else:
-                print("❌ Modal authentication failed or was cancelled.")
-    
-    elif args.command == "proxy":
-        if args.proxy_command == "configure":
-            # Configure proxy settings
-            from gitarsenal_proxy_client import GitArsenalProxyClient
-            client = GitArsenalProxyClient()
-            client.configure(interactive=True)
-        
-        elif args.proxy_command == "status":
-            # Check proxy status
-            from gitarsenal_proxy_client import GitArsenalProxyClient
-            client = GitArsenalProxyClient()
-            response = client.health_check()
-            if response["success"]:
-                print(f"✅ Proxy service is running: {response['data']['message']}")
-            else:
-                print(f"❌ Proxy service health check failed: {response['error']}")
-        
-        elif args.proxy_command == "ssh":
-            # Create SSH container through proxy
-            print("🚀 Creating SSH container through proxy...")
-            if check_proxy_config():
-                from gitarsenal_proxy_client import GitArsenalProxyClient
-                client = GitArsenalProxyClient()
-                result = client.create_ssh_container(
-                    gpu_type=args.gpu,
-                    repo_url=args.repo_url,
-                    repo_name=args.repo_name,
-                    volume_name=args.volume_name,
-                    timeout=args.timeout,
-                    wait=args.wait
-                )
-                if result:
-                    print("✅ SSH container created successfully through proxy service")
-                    print(f"📋 Container ID: {result.get('container_id')}")
-                    print(f"🔐 SSH Password: {result.get('ssh_password')}")
-                    if not args.wait:
-                        print("\n⚠️ Container creation is asynchronous. Use --wait flag to wait for it to be ready.")
-                        print("   You can check the status later using the container ID above.")
-                else:
-                    print("❌ Failed to create SSH container through proxy service")
-            else:
-                print("❌ Proxy configuration failed or was cancelled.")
-        
-        else:
-            print("❌ Unknown proxy command. Available commands: configure, status, ssh")
-    
-    else:
-        parser.print_help()
-    
-    return 0
-
-if __name__ == "__main__":
-    sys.exit(main())