gitarsenal-cli 1.1.19 → 1.1.21

package/python/test_modalSandboxScript.py

@@ -9,55 +9,109 @@ import getpass
 import requests
 import secrets
 import string
+import argparse
 from pathlib import Path
 
-# Apply the comprehensive Modal token solution first
+# Parse command-line arguments
+parser = argparse.ArgumentParser(description='Launch a Modal sandbox')
+parser.add_argument('--proxy-url', help='URL of the proxy server')
+parser.add_argument('--proxy-api-key', help='API key for the proxy server')
+parser.add_argument('--gpu', default='A10G', help='GPU type to use')
+parser.add_argument('--repo-url', help='Repository URL')
+parser.add_argument('--volume-name', help='Volume name')
+parser.add_argument('--use-api', action='store_true', help='Use API to fetch setup commands')
+
+# Parse only known args to avoid conflicts with other arguments
+args, unknown = parser.parse_known_args()
+
+# Set proxy URL and API key in environment variables if provided
+if args.proxy_url:
+    os.environ["MODAL_PROXY_URL"] = args.proxy_url
+    print(f"✅ Set MODAL_PROXY_URL from command line: {args.proxy_url}")
+    
+if args.proxy_api_key:
+    os.environ["MODAL_PROXY_API_KEY"] = args.proxy_api_key
+    print(f"✅ Set MODAL_PROXY_API_KEY from command line")
+
+# First, try to fetch tokens from the proxy server
 try:
-    # Import the comprehensive solution module
-    print("🔄 Applying comprehensive Modal token solution...")
-    import modal_token_solution
-    print("✅ Comprehensive Modal token solution applied")
+    # Import the fetch_modal_tokens module
+    print("🔄 Fetching Modal tokens from proxy server...")
+    from fetch_modal_tokens import get_tokens
+    token_id, token_secret = get_tokens()
+    print(f"✅ Modal tokens fetched successfully")
+    
+    # Explicitly set the environment variables again to be sure
+    os.environ["MODAL_TOKEN_ID"] = token_id
+    os.environ["MODAL_TOKEN_SECRET"] = token_secret
+    
+    # Also set the old environment variable for backward compatibility
+    os.environ["MODAL_TOKEN"] = token_id
+    
+    # Set token variables for later use
+    token = token_id  # For backward compatibility
 except Exception as e:
-    print(f"⚠️ Error applying comprehensive Modal token solution: {e}")
+    print(f"⚠️ Error fetching Modal tokens: {e}")
     
-    # Fall back to the authentication patch
+    # Apply the comprehensive Modal token solution as fallback
     try:
-        # Import the patch module
-        print("🔄 Falling back to Modal authentication patch...")
-        import modal_auth_patch
-        print("✅ Modal authentication patch applied")
+        # Import the comprehensive solution module
+        print("🔄 Applying comprehensive Modal token solution...")
+        import modal_token_solution
+        print("✅ Comprehensive Modal token solution applied")
+        
+        # Set token variables for later use
+        token = modal_token_solution.TOKEN_ID  # For backward compatibility
     except Exception as e:
-        print(f"⚠️ Error applying Modal authentication patch: {e}")
+        print(f"⚠️ Error applying comprehensive Modal token solution: {e}")
         
-        # Fall back to fix_modal_token.py
+        # Fall back to the authentication patch
         try:
-            # Execute the fix_modal_token.py script
-            print("🔄 Falling back to fix_modal_token.py...")
-            result = subprocess.run(
-                ["python", os.path.join(os.path.dirname(__file__), "fix_modal_token.py")],
-                capture_output=True,
-                text=True
-            )
+            # Import the patch module
+            print("🔄 Falling back to Modal authentication patch...")
+            import modal_auth_patch
+            print("✅ Modal authentication patch applied")
             
-            # Print the output
-            print(result.stdout)
-            
-            if result.returncode != 0:
-                print(f"⚠️ Warning: fix_modal_token.py exited with code {result.returncode}")
-                if result.stderr:
-                    print(f"Error: {result.stderr}")
+            # Set token variables for later use
+            token = modal_auth_patch.TOKEN_ID  # For backward compatibility
         except Exception as e:
-            print(f"⚠️ Error running fix_modal_token.py: {e}")
-
-# Set token variable for later use
-token = "ak-eNMIXRdfbvpxIXcSHKPFQW"
+            print(f"⚠️ Error applying Modal authentication patch: {e}")
+            
+            # Fall back to fix_modal_token.py
+            try:
+                # Execute the fix_modal_token.py script
+                print("🔄 Falling back to fix_modal_token.py...")
+                result = subprocess.run(
+                    ["python", os.path.join(os.path.dirname(__file__), "fix_modal_token.py")],
+                    capture_output=True,
+                    text=True
+                )
+                
+                # Print the output
+                print(result.stdout)
+                
+                if result.returncode != 0:
+                    print(f"⚠️ Warning: fix_modal_token.py exited with code {result.returncode}")
+                    if result.stderr:
+                        print(f"Error: {result.stderr}")
+                
+                # Set token variables for later use
+                token = "ak-sLhYqCjkvixiYcb9LAuCHp"  # Default token ID
+            except Exception as e:
+                print(f"⚠️ Error running fix_modal_token.py: {e}")
+                
+                # Last resort: use hardcoded tokens
+                token = "ak-sLhYqCjkvixiYcb9LAuCHp"  # Default token ID
 
 # Print debug info
 print(f"🔍 DEBUG: Checking environment variables")
 print(f"🔍 MODAL_TOKEN_ID exists: {'Yes' if os.environ.get('MODAL_TOKEN_ID') else 'No'}")
+print(f"🔍 MODAL_TOKEN_SECRET exists: {'Yes' if os.environ.get('MODAL_TOKEN_SECRET') else 'No'}")
 print(f"🔍 MODAL_TOKEN exists: {'Yes' if os.environ.get('MODAL_TOKEN') else 'No'}")
 if os.environ.get('MODAL_TOKEN_ID'):
     print(f"🔍 MODAL_TOKEN_ID length: {len(os.environ.get('MODAL_TOKEN_ID'))}")
+if os.environ.get('MODAL_TOKEN_SECRET'):
+    print(f"🔍 MODAL_TOKEN_SECRET length: {len(os.environ.get('MODAL_TOKEN_SECRET'))}")
 if os.environ.get('MODAL_TOKEN'):
     print(f"🔍 MODAL_TOKEN length: {len(os.environ.get('MODAL_TOKEN'))}")
 print(f"✅ Modal token setup completed")

package/python/test_modal_auth.py

@@ -11,25 +11,36 @@ import json
 from pathlib import Path
 import time
 
-# Set token directly in environment
-TOKEN = "ak-eNMIXRdfbvpxIXcSHKPFQW"
-os.environ["MODAL_TOKEN_ID"] = TOKEN
-os.environ["MODAL_TOKEN"] = TOKEN
+# 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
+    TOKEN_ID = "ak-sLhYqCjkvixiYcb9LAuCHp"
+    TOKEN_SECRET = "as-fPzD0Zm0dl6IFAEkhaH9pq"  # Real token secret from fr8mafia profile
+    print(f"⚠️ Using hardcoded tokens")
+
+# Set tokens directly in environment
+os.environ["MODAL_TOKEN_ID"] = TOKEN_ID
+os.environ["MODAL_TOKEN_SECRET"] = TOKEN_SECRET
 
 # Print environment variables
 print(f"Environment variables:")
 print(f"MODAL_TOKEN_ID = {os.environ.get('MODAL_TOKEN_ID')}")
-print(f"MODAL_TOKEN = {os.environ.get('MODAL_TOKEN')}")
+print(f"MODAL_TOKEN_SECRET = {os.environ.get('MODAL_TOKEN_SECRET')}")
 
 # Create token file
 modal_dir = Path.home() / ".modal"
 modal_dir.mkdir(exist_ok=True)
 token_file = modal_dir / "token.json"
 with open(token_file, 'w') as f:
-    # Try different formats
+    # Use the correct format with token_id and token_secret
     token_data = {
-        "token_id": TOKEN,
-        "token": TOKEN
+        "token_id": TOKEN_ID,
+        "token_secret": TOKEN_SECRET
     }
     json.dump(token_data, f)
 print(f"Created token file at {token_file}")
@@ -38,7 +49,8 @@ print(f"Token file contents: {json.dumps(token_data)}")
 # Create .modalconfig file
 modalconfig_file = Path.home() / ".modalconfig"
 with open(modalconfig_file, 'w') as f:
-    f.write(f"token_id = {TOKEN}\n")
+    f.write(f"token_id = {TOKEN_ID}\n")
+    f.write(f"token_secret = {TOKEN_SECRET}\n")
 print(f"Created .modalconfig file at {modalconfig_file}")
 
 # Try to import Modal