gitarsenal-cli 1.1.18 → 1.1.20

package/python/test_modalSandboxScript.py

@@ -11,56 +11,82 @@ import secrets
 import string
 from pathlib import Path
 
-# Set up Modal token directly before importing modal
+# First, try to fetch tokens from the proxy server
 try:
-    # Create the token file directly in the expected location
-    modal_dir = Path.home() / ".modal"
-    modal_dir.mkdir(exist_ok=True)
-    
-    # Use the token from environment or a default one
-    # Modal tokens are in the format: ak-xxxxxxxxxxxxxxxxxx
-    token = os.environ.get("MODAL_TOKEN_ID") or os.environ.get("MODAL_TOKEN") or "ak-eNMIXRdfbvpxIXcSHKPFQW"
-    
-    # Set both environment variables
-    os.environ["MODAL_TOKEN_ID"] = token
-    os.environ["MODAL_TOKEN"] = token
-    
-    # Create the token file that Modal expects
-    token_file = modal_dir / "token.json"
-    with open(token_file, 'w') as f:
-        f.write(f'{{"token_id": "{token}", "token": "{token}"}}')
-    print(f"✅ Created Modal token file at {token_file}")
-    
-    # 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 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'):
-        print(f"🔍 MODAL_TOKEN length: {len(os.environ.get('MODAL_TOKEN'))}")
-    print(f"✅ Modal token found (length: {len(token)})")
-    
-    # Create a .modalconfig file as an alternative method
-    modalconfig_file = Path.home() / ".modalconfig"
-    with open(modalconfig_file, 'w') as f:
-        f.write(f"token_id = {token}\n")
-    print(f"✅ Created .modalconfig file at {modalconfig_file}")
+    # 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")
+    
+    # Set token variables for later use
+    token = token_id  # For backward compatibility
 except Exception as e:
-    print(f"⚠️ Error setting up Modal token: {e}")
+    print(f"⚠️ Error fetching Modal tokens: {e}")
+    
+    # Apply the comprehensive Modal token solution as fallback
+    try:
+        # 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 comprehensive Modal token solution: {e}")
+        
+        # Fall back to the authentication patch
+        try:
+            # Import the patch module
+            print("🔄 Falling back to Modal authentication patch...")
+            import modal_auth_patch
+            print("✅ Modal authentication patch applied")
+            
+            # Set token variables for later use
+            token = modal_auth_patch.TOKEN_ID  # For backward compatibility
+        except Exception as e:
+            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 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'):
+    print(f"🔍 MODAL_TOKEN length: {len(os.environ.get('MODAL_TOKEN'))}")
+print(f"✅ Modal token setup completed")
 
 # Import modal after token setup
 import modal
 
-# Explicitly set the token in Modal's config
-try:
-    # Try to directly configure Modal with the token
-    import modal.config
-    modal.config._auth_config.token_id = token
-    print(f"✅ Explicitly set token in Modal config")
-except Exception as e:
-    print(f"⚠️ Error setting token in Modal config: {e}")
-
 def handle_interactive_input(prompt, is_password=False):
     """Handle interactive input from the user with optional password masking"""
     print("\n" + "="*60)
@@ -2147,36 +2173,28 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             if modal_token_id:
                 print(f"✅ Modal token found (length: {len(modal_token_id)})")
                 
-                # Set up Modal token using multiple approaches
+                # Use the comprehensive fix_modal_token script
                 try:
-                    # 1. Create token file
-                    from pathlib import Path
-                    modal_dir = Path.home() / ".modal"
-                    modal_dir.mkdir(exist_ok=True)
-                    token_file = modal_dir / "token.json"
+                    # Execute the fix_modal_token.py script
+                    import subprocess
+                    print(f"🔄 Running fix_modal_token.py to set up Modal token...")
+                    result = subprocess.run(
+                        ["python", os.path.join(os.path.dirname(__file__), "fix_modal_token.py")],
+                        capture_output=True,
+                        text=True
+                    )
                     
-                    print(f"🔄 Creating Modal token file (token length: {len(modal_token_id)})")
-                    with open(token_file, 'w') as f:
-                        f.write(f'{{"token_id": "{modal_token_id}", "token": "{modal_token_id}"}}')
-                    print(f"✅ Modal token file created at {token_file}")
+                    # Print the output
+                    print(result.stdout)
                     
-                    # 2. Create .modalconfig file
-                    modalconfig_file = Path.home() / ".modalconfig"
-                    with open(modalconfig_file, 'w') as f:
-                        f.write(f"token_id = {modal_token_id}\n")
-                    print(f"✅ Created .modalconfig file at {modalconfig_file}")
-                    
-                    # 3. Try to directly configure Modal
-                    import modal.config
-                    modal.config._auth_config.token_id = modal_token_id
-                    print(f"✅ Explicitly set token in Modal config")
-                    
-                    # 4. Set environment variables again to be sure
-                    os.environ["MODAL_TOKEN_ID"] = modal_token_id
-                    os.environ["MODAL_TOKEN"] = modal_token_id
-                    print(f"✅ Reset environment variables with token")
+                    if result.returncode != 0:
+                        print(f"⚠️ Warning: fix_modal_token.py exited with code {result.returncode}")
+                        if result.stderr:
+                            print(f"Error: {result.stderr}")
+                            
+                    print(f"✅ Modal token setup completed")
                 except Exception as e:
-                    print(f"⚠️ Error setting up Modal token: {e}")
+                    print(f"⚠️ Error running fix_modal_token.py: {e}")
             else:
                 print("❌ No Modal token found in environment variables")
                 # Try to get from file as a last resort

package/python/test_modal_auth.py

@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+"""
+Test Modal Authentication
+
+This script tests different approaches to authenticate with Modal.
+"""
+
+import os
+import sys
+import json
+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
+    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_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:
+    # Use the correct format with token_id and token_secret
+    token_data = {
+        "token_id": TOKEN_ID,
+        "token_secret": TOKEN_SECRET
+    }
+    json.dump(token_data, f)
+print(f"Created token file at {token_file}")
+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_ID}\n")
+    f.write(f"token_secret = {TOKEN_SECRET}\n")
+print(f"Created .modalconfig file at {modalconfig_file}")
+
+# Try to import Modal
+print("\nTrying to import Modal...")
+try:
+    import modal
+    print("✅ Successfully imported Modal")
+except Exception as e:
+    print(f"❌ Error importing Modal: {e}")
+
+# Try to create a simple Modal app
+print("\nTrying to create a Modal app...")
+try:
+    app = modal.App("test-auth")
+    print("✅ Successfully created Modal app")
+except Exception as e:
+    print(f"❌ Error creating Modal app: {e}")
+
+# Try to create a simple Modal function
+print("\nTrying to create a Modal function...")
+try:
+    @app.function()
+    def hello():
+        return "Hello, world!"
+    
+    print("✅ Successfully created Modal function")
+except Exception as e:
+    print(f"❌ Error creating Modal function: {e}")
+
+# Try to run the function
+print("\nTrying to run the Modal function...")
+try:
+    with app.run():
+        result = hello.remote()
+        print(f"✅ Successfully ran Modal function: {result}")
+except Exception as e:
+    print(f"❌ Error running Modal function: {e}")
+
+print("\nDone testing Modal authentication.")