gitarsenal-cli 1.2.7 → 1.3.1

package/bin/gitarsenal.js

@@ -7,7 +7,7 @@ const ora = require('ora');
 const path = require('path');
 const { version } = require('../package.json');
 const { checkDependencies } = require('../lib/dependencies');
-const { runModalSandbox } = require('../lib/sandbox');
+const { runContainer } = require('../lib/sandbox');
 const updateNotifier = require('update-notifier');
 const pkg = require('../package.json');
 const boxen = require('boxen');
@@ -16,27 +16,86 @@ const boxen = require('boxen');
 updateNotifier({ pkg }).notify();
 
 // Display banner
-console.log(boxen(chalk.bold.green('GitArsenal CLI') + '\n' + chalk.blue('Create Modal sandboxes with GitHub repositories'), {
+console.log(boxen(chalk.bold.green('GitArsenal CLI') + '\n' + chalk.blue('Create GPU-accelerated development environments'), {
   padding: 1,
   margin: 1,
   borderStyle: 'round',
   borderColor: 'green'
 }));
 
-// Set up CLI options
+// Set up main command
 program
   .version(version)
-  .description('Create Modal sandboxes with GitHub repositories')
+  .description('GitArsenal CLI - Create GPU-accelerated development environments');
+
+// Container command
+const containerCmd = program
+  .command('container')
+  .description('Create a container with a GitHub repository')
+  .option('-g, --gpu <type>', 'GPU type (A10G, A100, H100, T4, L4, L40S, V100)', 'A10G')
+  .option('-r, --repo-url <url>', 'GitHub repository URL')
+  .option('-v, --volume-name <name>', 'Name of persistent volume')
+  .option('-s, --setup-commands <commands...>', 'Setup commands to run in the container')
+  .option('-y, --yes', 'Skip confirmation prompts')
+  .option('-m, --manual', 'Disable automatic setup command detection')
+  .action(async (options) => {
+    await runContainerCommand(options);
+  });
+
+// Keys management command
+const keysCmd = program
+  .command('keys')
+  .description('Manage API keys for services');
+
+keysCmd
+  .command('add')
+  .description('Add an API key')
+  .option('-s, --service <service>', 'Service name (openai, wandb, huggingface)')
+  .option('-k, --key <key>', 'API key (if not provided, will prompt)')
+  .action(async (options) => {
+    await handleKeysAdd(options);
+  });
+
+keysCmd
+  .command('list')
+  .description('List saved API keys')
+  .action(async () => {
+    await handleKeysList();
+  });
+
+keysCmd
+  .command('view')
+  .description('View a specific API key (masked)')
+  .option('-s, --service <service>', 'Service name')
+  .action(async (options) => {
+    await handleKeysView(options);
+  });
+
+keysCmd
+  .command('delete')
+  .description('Delete an API key')
+  .option('-s, --service <service>', 'Service name')
+  .action(async (options) => {
+    await handleKeysDelete(options);
+  });
+
+// For backward compatibility, support running without a subcommand
+program
   .option('-r, --repo <url>', 'GitHub repository URL')
-  .option('-g, --gpu <type>', 'GPU type (A10G, A100, H100, T4, V100)', 'A10G')
+  .option('-g, --gpu <type>', 'GPU type (A10G, A100, H100, T4, L4, L40S, V100)', 'A10G')
   .option('-v, --volume <n>', 'Name of persistent volume')
   .option('-y, --yes', 'Skip confirmation prompts')
   .option('-m, --manual', 'Disable automatic setup command detection')
-  .parse(process.argv);
+  .action(async (options) => {
+    // If options are provided directly, run the container command
+    if (options.repo || process.argv.length <= 3) {
+      await runContainerCommand(options);
+    }
+  });
 
-const options = program.opts();
+program.parse(process.argv);
 
-async function main() {
+async function runContainerCommand(options) {
   try {
     // Check for required dependencies
     const spinner = ora('Checking dependencies...').start();
@@ -49,11 +108,12 @@ async function main() {
     spinner.succeed('Dependencies checked');
 
     // If repo URL not provided, prompt for it
-    let repoUrl = options.repo;
+    let repoUrl = options.repoUrl || options.repo;
     let gpuType = options.gpu;
-    let volumeName = options.volume;
+    let volumeName = options.volumeName || options.volume;
     let skipConfirmation = options.yes;
     let useApi = !options.manual;
+    let setupCommands = options.setupCommands || [];
 
     if (!repoUrl) {
       const answers = await inquirer.prompt([
@@ -68,7 +128,7 @@ async function main() {
     }
 
     // Prompt for GPU type if not specified
-    if (!options.gpu) {
+    if (!gpuType) {
       const gpuAnswers = await inquirer.prompt([
         {
           type: 'list',
@@ -79,6 +139,8 @@ async function main() {
             { name: 'A100 (40GB VRAM)', value: 'A100' },
             { name: 'H100 (80GB VRAM)', value: 'H100' },
             { name: 'T4 (16GB VRAM)', value: 'T4' },
+            { name: 'L4 (24GB VRAM)', value: 'L4' },
+            { name: 'L40S (48GB VRAM)', value: 'L40S' },
             { name: 'V100 (16GB VRAM)', value: 'V100' }
           ],
           default: 'A10G'
@@ -111,7 +173,7 @@ async function main() {
     }
 
     // Ask about setup command detection if not specified via CLI
-    if (!options.manual && !options.yes) {
+    if (!options.manual && !options.yes && setupCommands.length === 0) {
       const apiAnswers = await inquirer.prompt([
         {
           type: 'confirm',
@@ -124,10 +186,8 @@ async function main() {
       useApi = apiAnswers.useApi;
     }
 
-    let setupCommands = [];
-    
-    // Only prompt for custom commands if auto-detection is disabled
-    if (!useApi) {
+    // Only prompt for custom commands if auto-detection is disabled and no commands provided
+    if (!useApi && setupCommands.length === 0) {
       const setupAnswers = await inquirer.prompt([
         {
           type: 'confirm',
@@ -156,7 +216,7 @@ async function main() {
     }
 
     // Show configuration summary
-    console.log(chalk.bold('\n📋 Sandbox Configuration:'));
+    console.log(chalk.bold('\n📋 Container Configuration:'));
     console.log(chalk.cyan('Repository URL: ') + repoUrl);
     console.log(chalk.cyan('GPU Type: ') + gpuType);
     console.log(chalk.cyan('Volume: ') + (volumeName || 'None'));
@@ -189,8 +249,8 @@ async function main() {
       }
     }
 
-    // Run the sandbox
-    await runModalSandbox({
+    // Run the container
+    await runContainer({
       repoUrl,
       gpuType,
       volumeName,
@@ -204,4 +264,225 @@ async function main() {
   }
 }
 
-main(); 
+async function handleKeysAdd(options) {
+  try {
+    const spinner = ora('Adding API key...').start();
+    
+    let service = options.service;
+    let key = options.key;
+    
+    if (!service) {
+      spinner.stop();
+      const serviceAnswer = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'service',
+          message: 'Select service:',
+          choices: [
+            { name: 'OpenAI', value: 'openai' },
+            { name: 'Weights & Biases', value: 'wandb' },
+            { name: 'Hugging Face', value: 'huggingface' }
+          ]
+        }
+      ]);
+      service = serviceAnswer.service;
+    }
+    
+    if (!key) {
+      spinner.stop();
+      const keyAnswer = await inquirer.prompt([
+        {
+          type: 'password',
+          name: 'key',
+          message: `Enter ${service} API key:`,
+          mask: '*'
+        }
+      ]);
+      key = keyAnswer.key;
+    }
+    
+    // Call Python script to add the key
+    const { spawn } = require('child_process');
+    const scriptPath = require('../lib/sandbox').getPythonScriptPath();
+    
+    const pythonProcess = spawn('python', [
+      scriptPath,
+      'keys',
+      'add',
+      '--service', service,
+      '--key', key
+    ], { stdio: 'pipe' });
+    
+    let output = '';
+    pythonProcess.stdout.on('data', (data) => {
+      output += data.toString();
+    });
+    
+    pythonProcess.stderr.on('data', (data) => {
+      output += data.toString();
+    });
+    
+    pythonProcess.on('close', (code) => {
+      if (code === 0) {
+        spinner.succeed(`API key for ${service} added successfully`);
+      } else {
+        spinner.fail(`Failed to add API key: ${output}`);
+      }
+    });
+    
+  } catch (error) {
+    console.error(chalk.red(`Error: ${error.message}`));
+    process.exit(1);
+  }
+}
+
+async function handleKeysList() {
+  try {
+    const spinner = ora('Fetching API keys...').start();
+    
+    // Call Python script to list keys
+    const { spawn } = require('child_process');
+    const scriptPath = require('../lib/sandbox').getPythonScriptPath();
+    
+    const pythonProcess = spawn('python', [
+      scriptPath,
+      'keys',
+      'list'
+    ], { stdio: 'inherit' });
+    
+    pythonProcess.on('close', (code) => {
+      if (code !== 0) {
+        spinner.fail('Failed to list API keys');
+      } else {
+        spinner.stop();
+      }
+    });
+    
+  } catch (error) {
+    console.error(chalk.red(`Error: ${error.message}`));
+    process.exit(1);
+  }
+}
+
+async function handleKeysView(options) {
+  try {
+    const spinner = ora('Viewing API key...').start();
+    
+    let service = options.service;
+    
+    if (!service) {
+      spinner.stop();
+      const serviceAnswer = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'service',
+          message: 'Select service:',
+          choices: [
+            { name: 'OpenAI', value: 'openai' },
+            { name: 'Weights & Biases', value: 'wandb' },
+            { name: 'Hugging Face', value: 'huggingface' }
+          ]
+        }
+      ]);
+      service = serviceAnswer.service;
+    }
+    
+    // Call Python script to view the key
+    const { spawn } = require('child_process');
+    const scriptPath = require('../lib/sandbox').getPythonScriptPath();
+    
+    const pythonProcess = spawn('python', [
+      scriptPath,
+      'keys',
+      'view',
+      '--service', service
+    ], { stdio: 'inherit' });
+    
+    pythonProcess.on('close', (code) => {
+      if (code !== 0) {
+        spinner.fail(`Failed to view API key for ${service}`);
+      } else {
+        spinner.stop();
+      }
+    });
+    
+  } catch (error) {
+    console.error(chalk.red(`Error: ${error.message}`));
+    process.exit(1);
+  }
+}
+
+async function handleKeysDelete(options) {
+  try {
+    const spinner = ora('Deleting API key...').start();
+    
+    let service = options.service;
+    
+    if (!service) {
+      spinner.stop();
+      const serviceAnswer = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'service',
+          message: 'Select service:',
+          choices: [
+            { name: 'OpenAI', value: 'openai' },
+            { name: 'Weights & Biases', value: 'wandb' },
+            { name: 'Hugging Face', value: 'huggingface' }
+          ]
+        }
+      ]);
+      service = serviceAnswer.service;
+    }
+    
+    // Confirm deletion
+    spinner.stop();
+    const confirmAnswer = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'confirm',
+        message: `Are you sure you want to delete the API key for ${service}?`,
+        default: false
+      }
+    ]);
+    
+    if (!confirmAnswer.confirm) {
+      console.log(chalk.yellow('Operation cancelled by user.'));
+      return;
+    }
+    
+    spinner.start();
+    
+    // Call Python script to delete the key
+    const { spawn } = require('child_process');
+    const scriptPath = require('../lib/sandbox').getPythonScriptPath();
+    
+    const pythonProcess = spawn('python', [
+      scriptPath,
+      'keys',
+      'delete',
+      '--service', service
+    ], { stdio: 'pipe' });
+    
+    let output = '';
+    pythonProcess.stdout.on('data', (data) => {
+      output += data.toString();
+    });
+    
+    pythonProcess.stderr.on('data', (data) => {
+      output += data.toString();
+    });
+    
+    pythonProcess.on('close', (code) => {
+      if (code === 0) {
+        spinner.succeed(`API key for ${service} deleted successfully`);
+      } else {
+        spinner.fail(`Failed to delete API key: ${output}`);
+      }
+    });
+    
+  } catch (error) {
+    console.error(chalk.red(`Error: ${error.message}`));
+    process.exit(1);
+  }
+} 

package/lib/sandbox.js

@@ -26,8 +26,8 @@ function getPythonScriptPath() {
 }
 
 /**
- * Run the Modal sandbox with the given options
- * @param {Object} options - Sandbox options
+ * Run the container with the given options
+ * @param {Object} options - Container options
  * @param {string} options.repoUrl - GitHub repository URL
  * @param {string} options.gpuType - GPU type
  * @param {string} options.volumeName - Volume name
@@ -35,7 +35,7 @@ function getPythonScriptPath() {
  * @param {boolean} options.useApi - Whether to use the API to fetch setup commands
  * @returns {Promise<void>}
  */
-async function runModalSandbox(options) {
+async function runContainer(options) {
   const { repoUrl, gpuType, volumeName, setupCommands = [], useApi = true } = options;
   
   // Get the path to the Python script
@@ -74,7 +74,7 @@ async function runModalSandbox(options) {
   console.log(chalk.dim(`\nExecuting: python ${args.join(' ')}`));
   
   // Start the spinner
-  const spinner = ora('Launching Modal sandbox...').start();
+  const spinner = ora('Launching container...').start();
   
   try {
     // Run the Python script
@@ -86,10 +86,10 @@ async function runModalSandbox(options) {
     return new Promise((resolve, reject) => {
       pythonProcess.on('close', (code) => {
         if (code === 0) {
-          spinner.succeed('Modal sandbox launched successfully');
+          spinner.succeed('Container launched successfully');
           resolve();
         } else {
-          spinner.fail(`Modal sandbox launch failed with exit code ${code}`);
+          spinner.fail(`Container launch failed with exit code ${code}`);
           reject(new Error(`Process exited with code ${code}`));
         }
       });
@@ -101,12 +101,12 @@ async function runModalSandbox(options) {
       });
     });
   } catch (error) {
-    spinner.fail(`Error launching Modal sandbox: ${error.message}`);
+    spinner.fail(`Error launching container: ${error.message}`);
     throw error;
   }
 }
 
 module.exports = {
-  runModalSandbox,
+  runContainer,
   getPythonScriptPath
 }; 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitarsenal-cli",
-  "version": "1.2.7",
+  "version": "1.3.1",
   "description": "CLI tool for creating Modal sandboxes with GitHub repositories",
   "main": "index.js",
   "bin": {
@@ -34,4 +34,4 @@
   "engines": {
     "node": ">=14.0.0"
   }
-} 
+}

package/python/emoji_fix_patch.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+"""
+This script removes emojis from the test_modalSandboxScript.py file to fix syntax errors.
+"""
+
+import re
+import sys
+import shutil
+from pathlib import Path
+
+def remove_emojis(script_path):
+    """
+    Remove emojis from the Python script to fix syntax errors.
+    """
+    print(f"Removing emojis from {script_path}...")
+    
+    # Make a backup of the original file
+    backup_path = f"{script_path}.emoji_backup"
+    shutil.copy2(script_path, backup_path)
+    
+    # Read the file
+    with open(script_path, 'r', encoding='utf-8', errors='ignore') as f:
+        content = f.read()
+    
+    # Emoji pattern - matches most common emoji characters
+    emoji_pattern = re.compile(
+        "["
+        "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+        "\U0001F300-\U0001F5FF"  # symbols & pictographs
+        "\U0001F600-\U0001F64F"  # emoticons
+        "\U0001F680-\U0001F6FF"  # transport & map symbols
+        "\U0001F700-\U0001F77F"  # alchemical symbols
+        "\U0001F780-\U0001F7FF"  # Geometric Shapes
+        "\U0001F800-\U0001F8FF"  # Supplemental Arrows-C
+        "\U0001F900-\U0001F9FF"  # Supplemental Symbols and Pictographs
+        "\U0001FA00-\U0001FA6F"  # Chess Symbols
+        "\U0001FA70-\U0001FAFF"  # Symbols and Pictographs Extended-A
+        "\U00002702-\U000027B0"  # Dingbats
+        "\U000024C2-\U0001F251" 
+        "]+", flags=re.UNICODE)
+    
+    # Simply remove all emojis
+    content = emoji_pattern.sub('', content)
+    
+    # Fix common syntax issues after emoji removal
+    content = re.sub(r'print\(\s*\)', r'print()', content)
+    content = re.sub(r'print\(\s*"', r'print("', content)
+    
+    # Fix specific syntax errors
+    content = re.sub(r'print\(\s*container\'s', r'print("container\'s', content)
+    
+    # Write the modified content back to the file
+    with open(script_path, 'w', encoding='utf-8') as f:
+        f.write(content)
+    
+    print(f"Emoji removal 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:
+        remove_emojis(script_path)
+        return 0
+    except Exception as e:
+        print(f"Error removing emojis: {e}")
+        return 1
+
+if __name__ == "__main__":
+    sys.exit(main()) 

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())