gitarsenal-cli 1.1.8 → 1.1.9

package/package.json

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

package/python/modal_proxy_service.py

@@ -211,6 +211,7 @@ def create_ssh_container():
     try:
         # Set the token directly in environment
         os.environ["MODAL_TOKEN_ID"] = MODAL_TOKEN
+        os.environ["MODAL_TOKEN"] = MODAL_TOKEN
         logger.info(f"Set MODAL_TOKEN_ID in environment (length: {len(MODAL_TOKEN)})")
         
         # Try to set token via CLI as well
@@ -256,8 +257,29 @@ def create_ssh_container():
             try:
                 # Set token in environment for this thread
                 os.environ["MODAL_TOKEN_ID"] = MODAL_TOKEN
+                os.environ["MODAL_TOKEN"] = MODAL_TOKEN
                 logger.info(f"Set MODAL_TOKEN_ID in thread (length: {len(MODAL_TOKEN)})")
                 
+                # Create a copy of the environment variables for the container creation
+                env_copy = os.environ.copy()
+                env_copy["MODAL_TOKEN_ID"] = MODAL_TOKEN
+                env_copy["MODAL_TOKEN"] = MODAL_TOKEN
+                
+                # Try to set token via CLI again in this thread
+                try:
+                    import subprocess
+                    subprocess.run(
+                        ["modal", "token", "set", MODAL_TOKEN],
+                        capture_output=True, text=True, check=False
+                    )
+                    logger.info("Set Modal token via CLI in thread")
+                except Exception as e:
+                    logger.warning(f"Failed to set token via CLI in thread: {e}")
+                
+                # Explicitly print token status for debugging
+                logger.info(f"MODAL_TOKEN_ID in thread env: {os.environ.get('MODAL_TOKEN_ID')}")
+                logger.info(f"MODAL_TOKEN in thread env: {os.environ.get('MODAL_TOKEN')}")
+                
                 result = create_modal_ssh_container(
                     gpu_type, 
                     repo_url=repo_url, 

package/python/test_modalSandboxScript.py

@@ -2069,26 +2069,40 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     
     # Check if Modal is authenticated
     try:
+        # Print all environment variables for debugging
+        print("🔍 DEBUG: Checking environment variables")
+        modal_token_id = os.environ.get("MODAL_TOKEN_ID")
+        modal_token = os.environ.get("MODAL_TOKEN")
+        print(f"🔍 MODAL_TOKEN_ID exists: {'Yes' if modal_token_id else 'No'}")
+        print(f"🔍 MODAL_TOKEN exists: {'Yes' if modal_token else 'No'}")
+        if modal_token_id:
+            print(f"🔍 MODAL_TOKEN_ID length: {len(modal_token_id)}")
+        if modal_token:
+            print(f"🔍 MODAL_TOKEN length: {len(modal_token)}")
+        
         # Try to access Modal token to check authentication
         try:
             # Check if token is set in environment
-            modal_token = os.environ.get("MODAL_TOKEN_ID")
-            if not modal_token:
+            modal_token_id = os.environ.get("MODAL_TOKEN_ID")
+            if not modal_token_id:
                 print("⚠️ MODAL_TOKEN_ID not found in environment.")
                 # Try to get from MODAL_TOKEN
                 modal_token = os.environ.get("MODAL_TOKEN")
                 if modal_token:
                     print("✅ Found token in MODAL_TOKEN environment variable")
                     os.environ["MODAL_TOKEN_ID"] = modal_token
+                    modal_token_id = modal_token
+                    print(f"✅ Set MODAL_TOKEN_ID from MODAL_TOKEN (length: {len(modal_token)})")
             
-            if modal_token:
-                print(f"✅ Modal token found (length: {len(modal_token)})")
+            if modal_token_id:
+                print(f"✅ Modal token found (length: {len(modal_token_id)})")
                 
                 # Use the Modal CLI to set the token
                 try:
                     import subprocess
+                    print(f"🔄 Setting token via Modal CLI (token length: {len(modal_token_id)})")
                     result = subprocess.run(
-                        ["modal", "token", "set", modal_token],
+                        ["modal", "token", "set", modal_token_id],
                         capture_output=True, text=True
                     )
                     if result.returncode == 0:
@@ -2099,20 +2113,51 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                     print(f"⚠️ Error setting token via CLI: {e}")
             else:
                 print("❌ No Modal token found in environment variables")
-                return None
+                # Try to get from file as a last resort
+                try:
+                    home_dir = os.path.expanduser("~")
+                    modal_dir = os.path.join(home_dir, ".modal")
+                    token_file = os.path.join(modal_dir, "token.json")
+                    if os.path.exists(token_file):
+                        print(f"🔍 Found Modal token file at {token_file}")
+                        with open(token_file, 'r') as f:
+                            import json
+                            token_data = json.load(f)
+                            if "token_id" in token_data:
+                                modal_token_id = token_data["token_id"]
+                                os.environ["MODAL_TOKEN_ID"] = modal_token_id
+                                os.environ["MODAL_TOKEN"] = modal_token_id
+                                print(f"✅ Loaded token from file (length: {len(modal_token_id)})")
+                            else:
+                                print("❌ Token file does not contain token_id")
+                    else:
+                        print("❌ Modal token file not found")
+                except Exception as e:
+                    print(f"❌ Error loading token from file: {e}")
+                
+                if not os.environ.get("MODAL_TOKEN_ID"):
+                    print("❌ Could not find Modal token in any location")
+                    return None
                 
         except Exception as e:
             print(f"⚠️ Error checking Modal token: {e}")
             # Try to use the token from environment
-            modal_token = os.environ.get("MODAL_TOKEN_ID") or os.environ.get("MODAL_TOKEN")
-            if not modal_token:
+            modal_token_id = os.environ.get("MODAL_TOKEN_ID")
+            modal_token = os.environ.get("MODAL_TOKEN")
+            if modal_token_id:
+                print(f"🔄 Using MODAL_TOKEN_ID from environment (length: {len(modal_token_id)})")
+            elif modal_token:
+                print(f"🔄 Using MODAL_TOKEN from environment (length: {len(modal_token)})")
+                os.environ["MODAL_TOKEN_ID"] = modal_token
+                modal_token_id = modal_token
+            else:
                 print("❌ No Modal token available. Cannot proceed.")
                 return None
             
-            print(f"🔄 Using Modal token from environment (length: {len(modal_token)})")
             # Set it in both environment variables
-            os.environ["MODAL_TOKEN_ID"] = modal_token
-            os.environ["MODAL_TOKEN"] = modal_token
+            os.environ["MODAL_TOKEN_ID"] = modal_token_id
+            os.environ["MODAL_TOKEN"] = modal_token_id
+            print("✅ Set both MODAL_TOKEN_ID and MODAL_TOKEN environment variables")
     except Exception as e:
         print(f"⚠️ Error checking Modal authentication: {e}")
         print("Continuing anyway, but Modal operations may fail")