gitarsenal-cli 1.9.21 → 1.9.24

package/python/modal_token_solution.py

@@ -1,293 +0,0 @@
-#!/usr/bin/env python3
-"""
-Modal Token Solution
-
-This is a comprehensive solution that combines all our approaches to fix the Modal token issue.
-It should be imported before any Modal code is used.
-
-Usage:
-    import modal_token_solution
-    import modal
-    # Now Modal will use our token
-"""
-
-import os
-import sys
-import json
-import subprocess
-import importlib
-import inspect
-import types
-from pathlib import Path
-import time
-
-# Try to get tokens from the proxy server
-try:
-    # First, try to import the fetch_modal_tokens module
-    from fetch_modal_tokens import get_tokens
-    TOKEN_ID, TOKEN_SECRET, _, _ = get_tokens()
-    print(f"✅ Using tokens from proxy server or defaults")
-except ImportError:
-    # If the module is not available, use hardcoded tokens
-    # print(f"⚠️ Using default tokens")
-
-print("🔧 Modal Token Solution - Comprehensive Fix")
-
-# =====================================================================
-# Approach 1: Set environment variables
-# =====================================================================
-print("\n📋 Approach 1: Setting environment variables")
-os.environ["MODAL_TOKEN_ID"] = TOKEN_ID
-os.environ["MODAL_TOKEN_SECRET"] = TOKEN_SECRET
-print(f"✅ Set MODAL_TOKEN_ID = [HIDDEN]")
-print(f"✅ Set MODAL_TOKEN_SECRET = [HIDDEN]")
-
-# =====================================================================
-# Approach 2: Create token files in various formats
-# =====================================================================
-print("\n📋 Approach 2: Creating token files in various formats")
-modal_dir = Path.home() / ".modal"
-modal_dir.mkdir(exist_ok=True)
-
-# Format 1: Standard token.json
-token_file = modal_dir / "token.json"
-with open(token_file, 'w') as f:
-    token_data = {
-        "token_id": TOKEN_ID,
-        "token_secret": TOKEN_SECRET
-    }
-    json.dump(token_data, f)
-print(f"✅ Created token file at {token_file}")
-
-# Format 2: Alternative token.json format
-token_file_alt = modal_dir / "token_alt.json"
-with open(token_file_alt, 'w') as f:
-    token_data_alt = {
-        "id": TOKEN_ID,
-        "secret": TOKEN_SECRET
-    }
-    json.dump(token_data_alt, f)
-print(f"✅ Created alternative token file at {token_file_alt}")
-
-# Format 3: Create .modalconfig file
-modalconfig_file = Path.home() / ".modalconfig"
-with open(modalconfig_file, 'w') as f:
-    f.write(f"token_id = {TOKEN_ID}\n")
-    f.write(f"token_secret = {TOKEN_SECRET}\n")
-print(f"✅ Created .modalconfig file at {modalconfig_file}")
-
-# Format 4: Create config.json file
-config_file = modal_dir / "config.json"
-with open(config_file, 'w') as f:
-    config_data = {
-        "token_id": TOKEN_ID,
-        "token_secret": TOKEN_SECRET
-    }
-    json.dump(config_data, f)
-print(f"✅ Created config.json file at {config_file}")
-
-# =====================================================================
-# Approach 3: Use Modal CLI to set token
-# =====================================================================
-print("\n📋 Approach 3: Using Modal CLI")
-try:
-    # Use the CLI to set the token directly
-    result = subprocess.run(
-        ["modal", "token", "set", "--token-id", TOKEN_ID, "--token-secret", TOKEN_SECRET, "--no-verify"],
-        capture_output=True, text=True
-    )
-    
-    if result.returncode == 0:
-        print(f"✅ Successfully set token via Modal CLI")
-    else:
-        print(f"❌ Failed to set token via Modal CLI: {result.stderr}")
-except Exception as e:
-    print(f"❌ Error using Modal CLI: {e}")
-
-# =====================================================================
-# Approach 4: Define functions that will always return our tokens
-# =====================================================================
-def get_token_id(*args, **kwargs):
-    return TOKEN_ID
-
-def get_token_secret(*args, **kwargs):
-    return TOKEN_SECRET
-
-# =====================================================================
-# Approach 5: Patch Modal's authentication system
-# =====================================================================
-print("\n📋 Approach 5: Patching Modal's authentication system")
-try:
-    # Try to import modal.config
-    import modal.config
-    
-    # Create a fake auth config object
-    class FakeAuthConfig:
-        token_id = TOKEN_ID
-        token_secret = TOKEN_SECRET
-        
-        def get_token_id(self, *args, **kwargs):
-            return TOKEN_ID
-            
-        def get_token_secret(self, *args, **kwargs):
-            return TOKEN_SECRET
-    
-    # Replace Modal's auth config with our fake one
-    try:
-        modal.config._auth_config = FakeAuthConfig()
-        print("✅ Replaced Modal's auth config with fake one")
-    except Exception as e:
-        print(f"❌ Error replacing auth config: {e}")
-    
-    # Also patch any token-related functions
-    for name in dir(modal.config):
-        if "token_id" in name.lower():
-            try:
-                attr = getattr(modal.config, name)
-                if callable(attr):
-                    setattr(modal.config, name, get_token_id)
-                    print(f"✅ Patched modal.config.{name}")
-            except:
-                pass
-        elif "token_secret" in name.lower() or "token" in name.lower():
-            try:
-                attr = getattr(modal.config, name)
-                if callable(attr):
-                    setattr(modal.config, name, get_token_secret)
-                    print(f"✅ Patched modal.config.{name}")
-            except:
-                pass
-    
-    print("✅ Modal authentication patched successfully")
-except ImportError:
-    # Modal not installed yet, we'll monkey-patch it when it's imported
-    print("⚠️ Modal not installed yet, setting up import hook")
-    
-    # Original import function
-    original_import = __import__
-    
-    # Our custom import function
-    def custom_import(name, globals=None, locals=None, fromlist=(), level=0):
-        # Call the original import function
-        module = original_import(name, globals, locals, fromlist, level)
-        
-        # Check if this is modal or a submodule
-        if name == "modal" or name.startswith("modal."):
-            try:
-                # Try to patch modal.config
-                if hasattr(module, "config"):
-                    config = module.config
-                    
-                    # Create a fake auth config object if needed
-                    if not hasattr(config, "_auth_config"):
-                        class FakeAuthConfig:
-                            token_id = TOKEN_ID
-                            token_secret = TOKEN_SECRET
-                            
-                            def get_token_id(self, *args, **kwargs):
-                                return TOKEN_ID
-                                
-                            def get_token_secret(self, *args, **kwargs):
-                                return TOKEN_SECRET
-                        
-                        config._auth_config = FakeAuthConfig()
-                    else:
-                        # Patch existing auth config
-                        config._auth_config.token_id = TOKEN_ID
-                        config._auth_config.token_secret = TOKEN_SECRET
-                        
-                        # Patch methods
-                        if hasattr(config._auth_config, "get_token_id"):
-                            config._auth_config.get_token_id = get_token_id
-                        if hasattr(config._auth_config, "get_token_secret"):
-                            config._auth_config.get_token_secret = get_token_secret
-                    
-                    # Also patch any token-related functions
-                    for name in dir(config):
-                        if "token_id" in name.lower():
-                            try:
-                                attr = getattr(config, name)
-                                if callable(attr):
-                                    setattr(config, name, get_token_id)
-                            except:
-                                pass
-                        elif "token_secret" in name.lower() or "token" in name.lower():
-                            try:
-                                attr = getattr(config, name)
-                                if callable(attr):
-                                    setattr(config, name, get_token_secret)
-                            except:
-                                pass
-                    
-                    print("✅ Modal authentication patched during import")
-            except Exception as e:
-                print(f"⚠️ Error patching Modal: {e}")
-        
-        return module
-    
-    # Replace the built-in import function
-    sys.modules["builtins"].__import__ = custom_import
-
-# =====================================================================
-# Approach 6: Monkey-patch Modal's authentication system
-# =====================================================================
-print("\n📋 Approach 6: Monkey-patching Modal's authentication system")
-try:
-    import modal
-    
-    # Find all authentication-related classes and functions
-    auth_related = []
-    for module_name in dir(modal):
-        if "auth" in module_name.lower() or "token" in module_name.lower() or "config" in module_name.lower():
-            try:
-                module = getattr(modal, module_name)
-                auth_related.append((module_name, module))
-                print(f"Found potential auth-related module: {module_name}")
-            except Exception:
-                pass
-    
-    # Try to monkey-patch auth functions to always return valid credentials
-    for name, module in auth_related:
-        if inspect.ismodule(module):
-            for func_name in dir(module):
-                if "get" in func_name.lower():
-                    if "token_id" in func_name.lower():
-                        try:
-                            original_func = getattr(module, func_name)
-                            if callable(original_func):
-                                print(f"  - Patching {name}.{func_name}")
-                                setattr(module, func_name, get_token_id)
-                        except Exception as e:
-                            print(f"  - Error patching {name}.{func_name}: {e}")
-                    elif "token_secret" in func_name.lower() or "token" in func_name.lower():
-                        try:
-                            original_func = getattr(module, func_name)
-                            if callable(original_func):
-                                print(f"  - Patching {name}.{func_name}")
-                                setattr(module, func_name, get_token_secret)
-                        except Exception as e:
-                            print(f"  - Error patching {name}.{func_name}: {e}")
-except Exception as e:
-    print(f"❌ Error monkey-patching Modal: {e}")
-
-# =====================================================================
-# Approach 7: Create a test Modal app to verify token
-# =====================================================================
-print("\n📋 Approach 7: Testing Modal authentication")
-try:
-    import modal
-    
-    print("Creating a test Modal app...")
-    app = modal.App("test-auth")
-    
-    @app.function()
-    def hello():
-        return "Hello, world!"
-    
-    print("✅ Modal app created successfully")
-except ImportError:
-    print("⚠️ Modal not installed, patch will be applied when it's imported")
-except Exception as e:
-    print(f"❌ Error testing Modal patch: {e}")
-
-print("\n✅ Modal token solution applied successfully. Please try your command again.") 

package/python/test_dynamic_commands.py

@@ -1,147 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test script for the dynamic command list functionality.
-This demonstrates how the CommandListManager works with setup commands.
-"""
-
-import sys
-import os
-import time
-
-# Add the current directory to the path so we can import from test_modalSandboxScript
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
-from test_modalSandboxScript import CommandListManager
-
-def simulate_command_execution(command, success_rate=0.8):
-    """Simulate command execution with a given success rate."""
-    import random
-    time.sleep(0.1)  # Simulate execution time
-    
-    success = random.random() < success_rate
-    stdout = f"Simulated output for: {command}"
-    stderr = "" if success else f"Simulated error for: {command}"
-    
-    return success, stdout, stderr
-
-def test_dynamic_command_list():
-    """Test the dynamic command list functionality."""
-    print("🧪 Testing Dynamic Command List Manager")
-    print("=" * 60)
-    
-    # Initialize with some setup commands
-    initial_commands = [
-        "echo 'Starting setup...'",
-        "pwd",
-        "ls -la",
-        "which python",
-        "python --version"
-    ]
-    
-    print(f"📋 Initial commands: {len(initial_commands)}")
-    for i, cmd in enumerate(initial_commands, 1):
-        print(f"  {i}. {cmd}")
-    
-    # Create command list manager
-    cmd_manager = CommandListManager(initial_commands)
-    
-    print(f"\n🔄 Starting command execution simulation...")
-    
-    # Simulate command execution
-    while cmd_manager.has_pending_commands():
-        next_cmd, cmd_type = cmd_manager.get_next_command()
-        
-        if not next_cmd:
-            break
-        
-        # Print current status
-        cmd_manager.print_status()
-        
-        if cmd_type == 'main':
-            cmd_text = next_cmd['command']
-            cmd_index = next_cmd['index']
-            
-            print(f"\n📋 Executing: {cmd_text}")
-            
-            # Simulate execution
-            start_time = time.time()
-            success, stdout, stderr = simulate_command_execution(cmd_text, success_rate=0.7)
-            execution_time = time.time() - start_time
-            
-            # Mark as executed
-            cmd_manager.mark_command_executed(
-                cmd_index, 'main', success, stdout, stderr, execution_time
-            )
-            
-            # If command failed, simulate adding a fix
-            if not success:
-                print(f"⚠️ Command failed, adding simulated fix...")
-                
-                # Simulate LLM suggesting a fix
-                fix_command = f"echo 'Fix for: {cmd_text}'"
-                fix_index = cmd_manager.add_suggested_fix(cmd_text, fix_command, "Simulated LLM fix")
-                
-                print(f"🔧 Added fix: {fix_command}")
-        
-        elif cmd_type == 'fix':
-            cmd_text = next_cmd['fix_command']
-            cmd_index = next_cmd['index']
-            
-            print(f"\n🔧 Executing fix: {cmd_text}")
-            
-            # Simulate execution
-            start_time = time.time()
-            success, stdout, stderr = simulate_command_execution(cmd_text, success_rate=0.9)
-            execution_time = time.time() - start_time
-            
-            # Mark as executed
-            cmd_manager.mark_command_executed(
-                cmd_index, 'fix', success, stdout, stderr, execution_time
-            )
-    
-    # Demonstrate dynamic command addition
-    print(f"\n📋 Adding dynamic commands...")
-    cmd_manager.add_command_dynamically("echo 'Dynamic command 1'", priority='normal')
-    cmd_manager.add_command_dynamically("echo 'High priority command'", priority='high')
-    cmd_manager.add_command_dynamically("echo 'Dynamic command 2'", priority='normal')
-    
-    # Execute the new commands
-    print(f"\n🔄 Executing dynamic commands...")
-    while cmd_manager.has_pending_commands():
-        next_cmd, cmd_type = cmd_manager.get_next_command()
-        
-        if not next_cmd:
-            break
-        
-        cmd_text = next_cmd['command']
-        cmd_index = next_cmd['index']
-        
-        print(f"📋 Executing dynamic command: {cmd_text}")
-        
-        # Simulate execution
-        start_time = time.time()
-        success, stdout, stderr = simulate_command_execution(cmd_text, success_rate=0.9)
-        execution_time = time.time() - start_time
-        
-        # Mark as executed
-        cmd_manager.mark_command_executed(
-            cmd_index, 'main', success, stdout, stderr, execution_time
-        )
-    
-    # Print final status
-    print(f"\n" + "=" * 60)
-    print("🎉 FINAL STATUS")
-    print("=" * 60)
-    cmd_manager.print_status()
-    
-    # Show all commands with their status
-    print(f"\n📋 All Commands Summary:")
-    all_commands = cmd_manager.get_all_commands()
-    for i, cmd in enumerate(all_commands, 1):
-        status_icon = "✅" if cmd['status'] == 'success' else "❌" if cmd['status'] == 'failed' else "⏳"
-        cmd_type = cmd.get('type', 'main')
-        cmd_text = cmd.get('command', cmd.get('fix_command', 'Unknown command'))
-        print(f"  {i}. {status_icon} [{cmd_type}] {cmd_text}")
-
-if __name__ == "__main__":
-    test_dynamic_command_list()