gitarsenal-cli 1.1.14 → 1.1.15

package/package.json

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

package/python/modal_proxy_service.py

@@ -118,17 +118,45 @@ def setup_modal_auth():
         os.environ["MODAL_TOKEN_ID"] = token
         os.environ["MODAL_TOKEN"] = token
         
-        # Try to set the token using Modal CLI
+        # Try to set the token using Modal CLI by writing to a file
         try:
+            # Create a temporary token file
+            import tempfile
+            with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
+                temp_file.write(token)
+                temp_file_path = temp_file.name
+            
+            # Use the file with modal token set
             import subprocess
             result = subprocess.run(
-                ["modal", "token", "set", token],
+                ["modal", "token", "set", "--from-file", temp_file_path],
                 capture_output=True, text=True, check=False
             )
+            
+            # Clean up the temporary file
+            import os
+            try:
+                os.unlink(temp_file_path)
+            except:
+                pass
+                
             if result.returncode == 0:
                 logger.info("Modal token set via CLI command")
             else:
                 logger.warning(f"CLI token set returned: {result.stderr}")
+                
+            # As a fallback, also create the token file in the expected location
+            try:
+                from pathlib import Path
+                modal_dir = Path.home() / ".modal"
+                modal_dir.mkdir(exist_ok=True)
+                token_file = modal_dir / "token.json"
+                with open(token_file, 'w') as f:
+                    f.write(f'{{"token_id": "{token}", "token": "{token}"}}')
+                logger.info(f"Created Modal token file at {token_file}")
+            except Exception as file_err:
+                logger.warning(f"Failed to create Modal token file: {file_err}")
+                
         except Exception as cli_err:
             logger.warning(f"Failed to set token via CLI: {cli_err}")
         
@@ -251,15 +279,41 @@ def create_ssh_container():
         
         # Try to set token via CLI as well
         try:
+            # Create a temporary token file
+            import tempfile
+            with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
+                temp_file.write(MODAL_TOKEN)
+                temp_file_path = temp_file.name
+            
+            # Use the file with modal token set
             import subprocess
             result = subprocess.run(
-                ["modal", "token", "set", MODAL_TOKEN],
+                ["modal", "token", "set", "--from-file", temp_file_path],
                 capture_output=True, text=True
             )
+            
+            # Clean up the temporary file
+            try:
+                os.unlink(temp_file_path)
+            except:
+                pass
+                
             if result.returncode == 0:
                 logger.info("Successfully set token via Modal CLI")
             else:
                 logger.warning(f"Modal CLI token set returned: {result.stderr}")
+                
+            # As a fallback, also create the token file in the expected location
+            try:
+                from pathlib import Path
+                modal_dir = Path.home() / ".modal"
+                modal_dir.mkdir(exist_ok=True)
+                token_file = modal_dir / "token.json"
+                with open(token_file, 'w') as f:
+                    f.write(f'{{"token_id": "{MODAL_TOKEN}", "token": "{MODAL_TOKEN}"}}')
+                logger.info(f"Created Modal token file at {token_file}")
+            except Exception as file_err:
+                logger.warning(f"Failed to create Modal token file: {file_err}")
         except Exception as e:
             logger.warning(f"Failed to set token via CLI: {e}")
         
@@ -302,12 +356,38 @@ def create_ssh_container():
                 
                 # Try to set token via CLI again in this thread
                 try:
+                    # Create a temporary token file
+                    import tempfile
+                    with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
+                        temp_file.write(MODAL_TOKEN)
+                        temp_file_path = temp_file.name
+                    
+                    # Use the file with modal token set
                     import subprocess
                     subprocess.run(
-                        ["modal", "token", "set", MODAL_TOKEN],
+                        ["modal", "token", "set", "--from-file", temp_file_path],
                         capture_output=True, text=True, check=False
                     )
+                    
+                    # Clean up the temporary file
+                    try:
+                        os.unlink(temp_file_path)
+                    except:
+                        pass
+                        
                     logger.info("Set Modal token via CLI in thread")
+                    
+                    # Also create the token file in the expected location
+                    try:
+                        from pathlib import Path
+                        modal_dir = Path.home() / ".modal"
+                        modal_dir.mkdir(exist_ok=True)
+                        token_file = modal_dir / "token.json"
+                        with open(token_file, 'w') as f:
+                            f.write(f'{{"token_id": "{MODAL_TOKEN}", "token": "{MODAL_TOKEN}"}}')
+                        logger.info(f"Created Modal token file at {token_file} in thread")
+                    except Exception as file_err:
+                        logger.warning(f"Failed to create Modal token file in thread: {file_err}")
                 except Exception as e:
                     logger.warning(f"Failed to set token via CLI in thread: {e}")
                 

package/python/setup_modal_token.py

@@ -41,6 +41,18 @@ def setup_modal_token():
     os.environ["MODAL_TOKEN_ID"] = BUILT_IN_MODAL_TOKEN
     os.environ["MODAL_TOKEN"] = BUILT_IN_MODAL_TOKEN
     logger.info("Built-in Modal token set in environment")
+    
+    # Also create the token file in the expected location
+    try:
+        modal_dir = Path.home() / ".modal"
+        modal_dir.mkdir(exist_ok=True)
+        token_file = modal_dir / "token.json"
+        with open(token_file, 'w') as f:
+            f.write(f'{{"token_id": "{BUILT_IN_MODAL_TOKEN}", "token": "{BUILT_IN_MODAL_TOKEN}"}}')
+        logger.info(f"Created Modal token file at {token_file}")
+    except Exception as e:
+        logger.warning(f"Failed to create Modal token file: {e}")
+    
     return True
     
 def get_token_from_gitarsenal():

package/python/test_modalSandboxScript.py

@@ -517,7 +517,7 @@ def create_modal_sandbox(gpu_type, repo_url=None, repo_name=None, setup_commands
                         try:
                             import subprocess
                             token_result = subprocess.run(
-                                ["modal", "token", "set", modal_token], 
+                                ["modal", "token", "set", "--from-env"], 
                                 capture_output=True, text=True
                             )
                             if token_result.returncode == 0:
@@ -2113,7 +2113,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                     import subprocess
                     print(f"🔄 Setting token via Modal CLI (token length: {len(modal_token_id)})")
                     result = subprocess.run(
-                        ["modal", "token", "set", modal_token_id],
+                        ["modal", "token", "set", "--from-env"],
                         capture_output=True, text=True
                     )
                     if result.returncode == 0: