gitarsenal-cli 1.7.9 → 1.8.2

package/README.md

@@ -18,26 +18,26 @@ GitArsenal CLI makes it incredibly easy to run any GitHub repository without wor
 
 ```bash
 # Basic usage - clone and run any repo
-gitarsenal container --repo-url https://github.com/username/awesome-project.git
+gitarsenal --repo-url https://github.com/username/awesome-project.git
 
 # With GPU acceleration
-gitarsenal container --gpu A10G --repo-url https://github.com/username/awesome-project.git
+gitarsenal --gpu A10G --repo-url https://github.com/username/awesome-project.git
 
 # With custom setup commands
-gitarsenal container --gpu A100 --repo-url https://github.com/username/awesome-project.git --setup-commands "pip install -r requirements.txt" "python setup.py install"
+gitarsenal --gpu A100 --repo-url https://github.com/username/awesome-project.git --setup-commands "pip install -r requirements.txt" "python setup.py install"
 ```
 
 ### Examples
 
 ```bash
 # Run a machine learning project
-gitarsenal container --gpu A100 --repo-url https://github.com/username/transformer-project.git --setup-commands "pip install torch transformers" "wandb login"
+gitarsenal --gpu A100 --repo-url https://github.com/username/transformer-project.git --setup-commands "pip install torch transformers" "wandb login"
 
 # Run a web development project
-gitarsenal container --repo-url https://github.com/username/react-app.git --setup-commands "npm install" "npm start"
+gitarsenal --repo-url https://github.com/username/react-app.git --setup-commands "npm install" "npm start"
 
 # Run a data science project with persistent storage
-gitarsenal container --gpu A10G --repo-url https://github.com/username/data-analysis.git --volume-name my-data --setup-commands "pip install pandas numpy matplotlib"
+gitarsenal --gpu A10G --repo-url https://github.com/username/data-analysis.git --volume-name my-data --setup-commands "pip install pandas numpy matplotlib"
 ```
 
 ## API Key Management
@@ -78,7 +78,7 @@ Keep your work safe with persistent volumes:
 
 ```bash
 # Create a persistent environment
-gitarsenal container --repo-url https://github.com/username/project.git --volume-name my-work
+gitarsenal --repo-url https://github.com/username/project.git --volume-name my-work
 
 # Your data, models, and work will persist between sessions
 ```
@@ -88,7 +88,7 @@ Connect directly to your running environment:
 
 ```bash
 # Get SSH connection details
-gitarsenal container --repo-url https://github.com/username/project.git --ssh
+gitarsenal --repo-url https://github.com/username/project.git --ssh
 
 # Connect via SSH to your environment
 ssh user@your-environment-ip
@@ -113,7 +113,7 @@ ssh user@your-environment-ip
 
 1. Install the CLI (see installation instructions)
 2. Add your API keys: `gitarsenal keys add --service openai`
-3. Run any repository: `gitarsenal container --repo-url https://github.com/username/project.git`
+3. Run any repository: `gitarsenal --repo-url https://github.com/username/project.git`
 4. Start coding!
 
 No more "works on my machine" - every environment is identical and ready to go. 

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -38,7 +38,7 @@ if args.proxy_api_key:
 class PersistentShell:
     """A persistent bash shell using subprocess.Popen for executing commands with state persistence."""
     
-    def __init__(self, working_dir="/root", timeout=200):
+    def __init__(self, working_dir="/root", timeout=240):
         self.working_dir = working_dir
         self.timeout = timeout
         self.process = None
@@ -197,7 +197,7 @@ class PersistentShell:
         
         # Wait for shell to be ready (prompt should be visible)
         if not self.wait_for_prompt(timeout=2):
-            print("⚠️ Shell not ready, waiting...")
+            # print("⚠️ Shell not ready, waiting...")
             time.sleep(0.5)
         
         # For source commands, we need special handling
@@ -1788,7 +1788,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             cmd_manager = CommandListManager(setup_commands)
             
             # Create persistent shell instance starting in /root
-            shell = PersistentShell(working_dir="/root", timeout=200)
+            shell = PersistentShell(working_dir="/root", timeout=240)
             
             try:
                 # Start the persistent shell
@@ -1812,7 +1812,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"📋 Executing main command {cmd_index + 1}/{cmd_manager.total_commands}: {cmd_text}")
                         
                         start_time = time.time()
-                        success, stdout, stderr = shell.execute(cmd_text, timeout=200)
+                        success, stdout, stderr = shell.execute(cmd_text, timeout=240)
                         execution_time = time.time() - start_time
                         
                         # Mark command as executed
@@ -1840,7 +1840,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                                     # Execute the fix command
                                     print(f"🔄 Running suggested fix command: {fix_command}")
                                     fix_start_time = time.time()
-                                    fix_success, fix_stdout, fix_stderr = shell.execute(fix_command, timeout=200)
+                                    fix_success, fix_stdout, fix_stderr = shell.execute(fix_command, timeout=240)
                                     fix_execution_time = time.time() - fix_start_time
                                     
                                     # Mark fix command as executed
@@ -1854,7 +1854,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                                         # Retry the original command
                                         print(f"🔄 Retrying original command: {cmd_text}")
                                         retry_start_time = time.time()
-                                        retry_success, retry_stdout, retry_stderr = shell.execute(cmd_text, timeout=200)
+                                        retry_success, retry_stdout, retry_stderr = shell.execute(cmd_text, timeout=240)
                                         retry_execution_time = time.time() - retry_start_time
                                         
                                         # Update the original command status
@@ -1883,7 +1883,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"🔧 Executing fix command {cmd_index + 1}: {cmd_text}")
                         
                         start_time = time.time()
-                        success, stdout, stderr = shell.execute(cmd_text, timeout=200)
+                        success, stdout, stderr = shell.execute(cmd_text, timeout=240)
                         execution_time = time.time() - start_time
                         
                         # Mark fix command as executed
@@ -1911,7 +1911,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                             print(f"🔧 Executing additional fix: {cmd_text}")
                             
                             start_time = time.time()
-                            success, stdout, stderr = shell.execute(cmd_text, timeout=200)
+                            success, stdout, stderr = shell.execute(cmd_text, timeout=240)
                             execution_time = time.time() - start_time
                             
                             # Mark fix command as executed

package/test_credentials_integration.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+"""
+Test script to verify that stored credentials are being passed correctly to SSH containers.
+"""
+
+import os
+import json
+from pathlib import Path
+
+def test_credentials_loading():
+    """Test that credentials can be loaded from the local file"""
+    print("🔍 Testing credentials loading...")
+    
+    # Test get_stored_credentials function
+    try:
+        from test_modalSandboxScript import get_stored_credentials
+        credentials = get_stored_credentials()
+        
+        if credentials:
+            print(f"✅ Found {len(credentials)} stored credentials:")
+            for key, value in credentials.items():
+                masked_value = value[:8] + "..." if len(value) > 8 else "***"
+                print(f"  - {key}: {masked_value}")
+        else:
+            print("⚠️ No stored credentials found")
+            
+        return credentials
+    except Exception as e:
+        print(f"❌ Error loading credentials: {e}")
+        return {}
+
+def test_credentials_file():
+    """Test that the credentials file exists and is readable"""
+    print("\n🔍 Testing credentials file...")
+    
+    credentials_file = Path.home() / ".gitarsenal" / "credentials.json"
+    
+    if credentials_file.exists():
+        print(f"✅ Credentials file exists at: {credentials_file}")
+        try:
+            with open(credentials_file, 'r') as f:
+                credentials = json.load(f)
+            print(f"✅ Successfully loaded {len(credentials)} credentials from file")
+            return credentials
+        except Exception as e:
+            print(f"❌ Error reading credentials file: {e}")
+            return {}
+    else:
+        print(f"⚠️ Credentials file not found at: {credentials_file}")
+        print("💡 You can create it by running the credentials manager")
+        return {}
+
+def test_environment_variables():
+    """Test that credentials are available as environment variables"""
+    print("\n🔍 Testing environment variables...")
+    
+    credential_env_vars = [
+        'OPENAI_API_KEY', 'WANDB_API_KEY', 'HF_TOKEN', 'HUGGINGFACE_TOKEN',
+        'GITHUB_TOKEN', 'KAGGLE_USERNAME', 'KAGGLE_KEY'
+    ]
+    
+    found_creds = {}
+    for env_var in credential_env_vars:
+        value = os.environ.get(env_var)
+        if value:
+            found_creds[env_var] = value
+            masked_value = value[:8] + "..." if len(value) > 8 else "***"
+            print(f"✅ {env_var}: {masked_value}")
+    
+    if not found_creds:
+        print("⚠️ No credential environment variables found")
+    
+    return found_creds
+
+def test_credentials_integration():
+    """Test the full credentials integration"""
+    print("\n" + "="*60)
+    print("🔐 CREDENTIALS INTEGRATION TEST")
+    print("="*60)
+    
+    # Test all credential sources
+    file_creds = test_credentials_file()
+    env_creds = test_environment_variables()
+    function_creds = test_credentials_loading()
+    
+    # Combine all credentials
+    all_creds = {}
+    all_creds.update(file_creds)
+    all_creds.update(env_creds)
+    all_creds.update(function_creds)
+    
+    print(f"\n📊 SUMMARY:")
+    print(f"  - File credentials: {len(file_creds)}")
+    print(f"  - Environment credentials: {len(env_creds)}")
+    print(f"  - Function credentials: {len(function_creds)}")
+    print(f"  - Total unique credentials: {len(all_creds)}")
+    
+    if all_creds:
+        print(f"\n✅ Credentials are available for SSH container integration")
+        print("💡 These credentials will be automatically passed to SSH containers")
+    else:
+        print(f"\n⚠️ No credentials found")
+        print("💡 Consider setting up credentials using the credentials manager")
+    
+    return all_creds
+
+if __name__ == "__main__":
+    test_credentials_integration() 

package/test_modalSandboxScript.py

@@ -38,7 +38,7 @@ if args.proxy_api_key:
 class PersistentShell:
     """A persistent bash shell using subprocess.Popen for executing commands with state persistence."""
     
-    def __init__(self, working_dir="/root", timeout=200):
+    def __init__(self, working_dir="/root", timeout=240):
         self.working_dir = working_dir
         self.timeout = timeout
         self.process = None
@@ -197,7 +197,7 @@ class PersistentShell:
         
         # Wait for shell to be ready (prompt should be visible)
         if not self.wait_for_prompt(timeout=2):
-            print("⚠️ Shell not ready, waiting...")
+            # print("⚠️ Shell not ready, waiting...")
             time.sleep(0.5)
         
         # For source commands, we need special handling
@@ -1788,7 +1788,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             cmd_manager = CommandListManager(setup_commands)
             
             # Create persistent shell instance starting in /root
-            shell = PersistentShell(working_dir="/root", timeout=200)
+            shell = PersistentShell(working_dir="/root", timeout=240)
             
             try:
                 # Start the persistent shell
@@ -1812,7 +1812,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"📋 Executing main command {cmd_index + 1}/{cmd_manager.total_commands}: {cmd_text}")
                         
                         start_time = time.time()
-                        success, stdout, stderr = shell.execute(cmd_text, timeout=200)
+                        success, stdout, stderr = shell.execute(cmd_text, timeout=240)
                         execution_time = time.time() - start_time
                         
                         # Mark command as executed
@@ -1840,7 +1840,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                                     # Execute the fix command
                                     print(f"🔄 Running suggested fix command: {fix_command}")
                                     fix_start_time = time.time()
-                                    fix_success, fix_stdout, fix_stderr = shell.execute(fix_command, timeout=200)
+                                    fix_success, fix_stdout, fix_stderr = shell.execute(fix_command, timeout=240)
                                     fix_execution_time = time.time() - fix_start_time
                                     
                                     # Mark fix command as executed
@@ -1854,7 +1854,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                                         # Retry the original command
                                         print(f"🔄 Retrying original command: {cmd_text}")
                                         retry_start_time = time.time()
-                                        retry_success, retry_stdout, retry_stderr = shell.execute(cmd_text, timeout=200)
+                                        retry_success, retry_stdout, retry_stderr = shell.execute(cmd_text, timeout=240)
                                         retry_execution_time = time.time() - retry_start_time
                                         
                                         # Update the original command status
@@ -1883,7 +1883,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"🔧 Executing fix command {cmd_index + 1}: {cmd_text}")
                         
                         start_time = time.time()
-                        success, stdout, stderr = shell.execute(cmd_text, timeout=200)
+                        success, stdout, stderr = shell.execute(cmd_text, timeout=240)
                         execution_time = time.time() - start_time
                         
                         # Mark fix command as executed
@@ -1911,7 +1911,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                             print(f"🔧 Executing additional fix: {cmd_text}")
                             
                             start_time = time.time()
-                            success, stdout, stderr = shell.execute(cmd_text, timeout=200)
+                            success, stdout, stderr = shell.execute(cmd_text, timeout=240)
                             execution_time = time.time() - start_time
                             
                             # Mark fix command as executed