gitarsenal-cli 1.8.4 → 1.8.5

package/scripts/postinstall.js

@@ -65,46 +65,95 @@ async function checkAndInstallUv() {
   }
 }
 
-// Function to install Python packages
-async function installPythonPackages() {
+// Function to create and activate virtual environment
+async function createVirtualEnvironment() {
+  const venvPath = path.join(__dirname, '..', 'venv');
   const packages = ['modal', 'gitingest', 'requests'];
   
-  console.log(chalk.yellow(`📦 Installing Python packages: ${packages.join(', ')}`));
+  console.log(chalk.yellow(`📦 Creating virtual environment and installing packages: ${packages.join(', ')}`));
   
-  // Try uv first, then fall back to pip commands
-  const installCommands = [
-    'uv pip install',
-    'pip3 install',
-    'pip install', 
-    'python -m pip install',
-    'py -m pip install'
-  ];
-  
-  for (const installCommand of installCommands) {
-    try {
-      // Check if command exists
-      const [cmd] = installCommand.split(' ');
-      await execAsync(`${cmd} --version`);
-      
-      console.log(chalk.gray(`🔄 Using: ${installCommand}`));
-      
-      await execAsync(`${installCommand} ${packages.join(' ')}`, { 
-        env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
-      });
-      
-      console.log(chalk.green('✅ Python packages installed successfully!'));
-      return true;
-    } catch (error) {
-      console.log(chalk.gray(`⚠️ ${installCommand} failed, trying next...`));
+  try {
+    // Create virtual environment directory
+    await fs.ensureDir(path.dirname(venvPath));
+    
+    // Try different Python commands to create virtual environment
+    const pythonCommands = ['python3', 'python', 'py'];
+    let pythonCmd = null;
+    
+    for (const cmd of pythonCommands) {
+      try {
+        await execAsync(`${cmd} --version`);
+        pythonCmd = cmd;
+        break;
+      } catch (error) {
+        // Continue to next command
+      }
+    }
+    
+    if (!pythonCmd) {
+      console.log(chalk.red('❌ No Python command found'));
+      return false;
     }
+    
+    console.log(chalk.gray(`🔄 Creating virtual environment with ${pythonCmd}...`));
+    
+    // Create virtual environment
+    await execAsync(`${pythonCmd} -m venv "${venvPath}"`, {
+      env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
+    });
+    
+    console.log(chalk.green('✅ Virtual environment created successfully!'));
+    
+    // Determine the pip path based on OS
+    const isWindows = process.platform === 'win32';
+    const pipPath = isWindows ? path.join(venvPath, 'Scripts', 'pip.exe') : path.join(venvPath, 'bin', 'pip');
+    const pythonPath = isWindows ? path.join(venvPath, 'Scripts', 'python.exe') : path.join(venvPath, 'bin', 'python');
+    
+    // Verify virtual environment was created properly
+    if (!(await fs.pathExists(pipPath))) {
+      console.log(chalk.red('❌ Virtual environment pip not found'));
+      return false;
+    }
+    
+    console.log(chalk.gray(`🔄 Installing packages in virtual environment...`));
+    
+    // Install packages in virtual environment
+    await execAsync(`"${pipPath}" install ${packages.join(' ')}`, {
+      env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
+    });
+    
+    console.log(chalk.green('✅ Python packages installed successfully in virtual environment!'));
+    
+    // Create a script to activate the virtual environment
+    const activateScript = isWindows ? 
+      `@echo off
+cd /d "%~dp0"
+call "${venvPath.replace(/\\/g, '\\\\')}\\Scripts\\activate.bat"
+%*` :
+      `#!/bin/bash
+cd "$(dirname "$0")"
+source "${venvPath}/bin/activate"
+exec "$@"`;
+    
+    const activateScriptPath = path.join(__dirname, '..', 'activate_venv' + (isWindows ? '.bat' : '.sh'));
+    await fs.writeFile(activateScriptPath, activateScript);
+    
+    if (!isWindows) {
+      await fs.chmod(activateScriptPath, 0o755);
+    }
+    
+    console.log(chalk.green(`✅ Virtual environment activation script created: ${activateScriptPath}`));
+    
+    return true;
+  } catch (error) {
+    console.log(chalk.red(`❌ Error creating virtual environment: ${error.message}`));
+    console.log(chalk.yellow('💡 Please run manually:'));
+    console.log(chalk.yellow('   python3 -m venv venv'));
+    console.log(chalk.yellow('   source venv/bin/activate  # On Unix/macOS'));
+    console.log(chalk.yellow('   venv\\Scripts\\activate.bat  # On Windows'));
+    console.log(chalk.yellow('   pip install modal gitingest requests'));
+    return false;
   }
-  
-  console.log(chalk.red('❌ Failed to install Python packages'));
-  console.log(chalk.yellow('💡 Please run manually:'));
-  console.log(chalk.yellow('   uv pip install modal gitingest requests'));
-  console.log(chalk.yellow('   or: pip install modal gitingest requests'));
-  console.log(chalk.yellow('   or: pip3 install modal gitingest requests'));
-  return false;
 }
 
 // Function to check Python
@@ -161,9 +210,9 @@ async function postinstall() {
     console.log(chalk.blue('🔍 Checking for uv package manager...'));
     await checkAndInstallUv();
     
-    // Install Python packages
-    console.log(chalk.blue('🔍 Installing Python dependencies...'));
-    await installPythonPackages();
+    // Install Python packages in virtual environment
+    console.log(chalk.blue('🔍 Installing Python dependencies in virtual environment...'));
+    await createVirtualEnvironment();
     
     // Create the Python directory if it doesn't exist
     await fs.ensureDir(pythonScriptDir);
@@ -278,15 +327,21 @@ if __name__ == "__main__":
 
  What was installed:
    • GitArsenal CLI (npm package)
-   • Modal (Python package)
-   • GitIngest (Python package) 
-   • Requests (Python package)
+   • Virtual environment with Python packages:
+     - Modal
+     - GitIngest  
+     - Requests
 
 💡 Next steps:
    • Run: gitarsenal --help
    • Run: gitarsenal setup
    • Visit: https://gitarsenal.dev
 
+💡 To activate the virtual environment:
+   • Unix/macOS: source venv/bin/activate
+   • Windows: venv\\Scripts\\activate.bat
+   • Or use: ./activate_venv.sh (Unix/macOS) or activate_venv.bat (Windows)
+
  Having issues? Run: gitarsenal --debug
     `));
     

package/test_modalSandboxScript.py

@@ -16,6 +16,13 @@ import signal
 from pathlib import Path
 import modal
 
+# Import authentication manager
+try:
+    from auth_manager import AuthManager
+except ImportError:
+    print("❌ Authentication module not found. Please ensure auth_manager.py is in the same directory.")
+    sys.exit(1)
+
 # Parse command-line arguments
 parser = argparse.ArgumentParser()
 parser.add_argument('--proxy-url', help='URL of the proxy server')
@@ -3325,6 +3332,18 @@ def show_usage_examples():
     """Display usage examples for the script."""
     print("Usage Examples\n")
     
+    print("🔐 Authentication Commands")
+    print("┌────────────────────────────────────────────────────────────────────────────────────┐")
+    print("│ gitarsenal --register                    # Register new account                  │")
+    print("│ gitarsenal --login                        # Login to existing account            │")
+    print("│ gitarsenal --logout                       # Logout from account                  │")
+    print("│ gitarsenal --user-info                    # Show current user information       │")
+    print("│ gitarsenal --change-password              # Change password                     │")
+    print("│ gitarsenal --delete-account               # Delete account                      │")
+    print("│ gitarsenal --store-api-key openai        # Store OpenAI API key                │")
+    print("│ gitarsenal --auth                         # Interactive auth management         │")
+    print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
+    
     print("Basic Container Creation")
     print("┌────────────────────────────────────────────────────────────────────────┐")
     print("│ gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git  │")
@@ -3359,19 +3378,32 @@ def show_usage_examples():
     print("│   --use-api                                                      │")
     print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
     
+    print("Development Mode (Skip Authentication)")
+    print("┌────────────────────────────────────────────────────────────────────────────────────┐")
+    print("│ gitarsenal --skip-auth --gpu A10G --repo-url https://github.com/username/repo.git │")
+    print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
+    
     print("Available GPU Options:")
     print("  T4, L4, A10G, A100-40GB, A100-80GB, L40S, H100, H200, B200")
     print()
+    print("Authentication Behavior:")
+    print("  • First time: Interactive registration/login required")
+    print("  • Subsequent runs: Automatic login with stored session")
+    print("  • Use --skip-auth for development (bypasses auth)")
+    print()
     print("GPU Selection Behavior:")
     print("  • With --gpu: Uses specified GPU without prompting")
     print("  • Without --gpu: Shows interactive GPU selection menu")
     print()
     print("Examples:")
-    print("  # Uses A10G without prompting:")
+    print("  # First time setup (will prompt for registration):")
     print("  gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git")
     print()
-    print("  # Shows interactive GPU selection menu:")
+    print("  # Subsequent runs (automatic login):")
     print("  gitarsenal --repo-url https://github.com/username/repo.git")
+    print()
+    print("  # Development mode (skip authentication):")
+    print("  gitarsenal --skip-auth --repo-url https://github.com/username/repo.git")
 
 def make_api_request_with_retry(url, payload, max_retries=2, timeout=180):
     """Make an API request with retry mechanism."""
@@ -4005,6 +4037,158 @@ def fallback_preprocess_commands(setup_commands, stored_credentials):
     print(f"🔧 Fallback preprocessing completed: {len(processed_commands)} commands")
     return processed_commands
 
+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"""
+    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.")
+
 # Replace the existing GPU argument parsing in the main section
 if __name__ == "__main__":
     # Parse command line arguments when script is run directly
@@ -4030,8 +4214,27 @@ if __name__ == "__main__":
     parser.add_argument('--list-gpus', action='store_true', help='List available GPU types with their specifications')
     parser.add_argument('--interactive', action='store_true', help='Run in interactive mode with prompts')
     
+    # Authentication-related arguments
+    parser.add_argument('--auth', action='store_true', help='Manage authentication (login, register, logout)')
+    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('--skip-auth', action='store_true', help='Skip authentication check (for development)')
+    
     args = parser.parse_args()
     
+    # Initialize authentication manager
+    auth_manager = AuthManager()
+    
+    # Handle authentication-related commands
+    if args.auth or 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:
+        _handle_auth_commands(auth_manager, args)
+        sys.exit(0)
+    
     # If --list-gpus is specified, just show GPU options and exit
     if args.list_gpus:
         prompt_for_gpu()
@@ -4042,6 +4245,13 @@ if __name__ == "__main__":
         show_usage_examples()
         sys.exit(0)
     
+    # Check authentication (unless skipped for development)
+    if not args.skip_auth:
+        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.")
+            sys.exit(1)
+    
     # Check for dependencies
     print("⠏ Checking dependencies...")
     print("--- Dependency Check ---")