gitarsenal-cli 1.1.16 → 1.1.18

package/package.json

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

package/python/modal_proxy_service.py

@@ -56,11 +56,13 @@ try:
 except ImportError:
     logger.warning("setup_modal_token module not found")
     # Fallback to a hardcoded token
-    MODAL_TOKEN = "mo-abcdef1234567890abcdef1234567890"  # Same as in setup_modal_token.py
+    # Modal tokens are in the format: ak-xxxxxxxxxxxxxxxxxx
+    MODAL_TOKEN = "ak-eNMIXRdfbvpxIXcSHKPFQW"  # Your actual token
 except Exception as e:
     logger.error(f"Error using setup_modal_token module: {e}")
     # Fallback to a hardcoded token
-    MODAL_TOKEN = "mo-abcdef1234567890abcdef1234567890"  # Same as in setup_modal_token.py
+    # Modal tokens are in the format: ak-xxxxxxxxxxxxxxxxxx
+    MODAL_TOKEN = "ak-eNMIXRdfbvpxIXcSHKPFQW"  # Your actual token
 
 # Set the token in environment variables
 os.environ["MODAL_TOKEN"] = MODAL_TOKEN
@@ -294,9 +296,23 @@ def create_ssh_container():
                 f.write(f'{{"token_id": "{MODAL_TOKEN}", "token": "{MODAL_TOKEN}"}}')
             logger.info(f"Created Modal token file at {token_file}")
             
-            # Try to verify the token is working
+            # Set up token using multiple approaches
+            # 1. Create .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")
+            logger.info(f"Created .modalconfig file at {modalconfig_file}")
+            
+            # 2. Import modal and set token directly
             import modal
-            # Just importing modal is enough to verify the token file is working
+            
+            # 3. Try to directly configure Modal
+            try:
+                import modal.config
+                modal.config._auth_config.token_id = token
+                logger.info("Explicitly set token in Modal config")
+            except Exception as e:
+                logger.warning(f"Error setting token in Modal config: {e}")
             # No need to clean up any temporary files
                 
             if result.returncode == 0:
@@ -365,10 +381,25 @@ def create_ssh_container():
                         f.write(f'{{"token_id": "{MODAL_TOKEN}", "token": "{MODAL_TOKEN}"}}')
                     logger.info(f"Created Modal token file at {token_file} in thread")
                     
-                    # Try to verify the token is working
+                    # Set up token using multiple approaches
+                    # 1. Create .modalconfig file as an alternative method
+                    modalconfig_file = Path.home() / ".modalconfig"
+                    with open(modalconfig_file, 'w') as f:
+                        f.write(f"token_id = {MODAL_TOKEN}\n")
+                    logger.info(f"Created .modalconfig file at {modalconfig_file} in thread")
+                    
+                    # 2. Import modal and set token directly
                     import modal
-                    # Just importing modal is enough to verify the token file is working
-                    logger.info("Modal token verified in thread")
+                    
+                    # 3. Try to directly configure Modal
+                    try:
+                        import modal.config
+                        modal.config._auth_config.token_id = MODAL_TOKEN
+                        logger.info("Explicitly set token in Modal config in thread")
+                    except Exception as e:
+                        logger.warning(f"Error setting token in Modal config in thread: {e}")
+                        
+                    logger.info("Modal token setup completed in thread")
                 except Exception as e:
                     logger.warning(f"Failed to set token via CLI in thread: {e}")
                 

package/python/setup_modal_token.py

@@ -21,7 +21,8 @@ logger = logging.getLogger("modal-setup")
 
 # Built-in Modal token for the freemium service
 # This token is used for all users of the package
-BUILT_IN_MODAL_TOKEN = "mo-abcdef1234567890abcdef1234567890"  # Replace with your actual token
+# Modal tokens are in the format: ak-xxxxxxxxxxxxxxxxxx
+BUILT_IN_MODAL_TOKEN = "ak-eNMIXRdfbvpxIXcSHKPFQW"  # Your actual token
 
 def setup_modal_token():
     """

package/python/test_modalSandboxScript.py

@@ -18,7 +18,8 @@ try:
     modal_dir.mkdir(exist_ok=True)
     
     # Use the token from environment or a default one
-    token = os.environ.get("MODAL_TOKEN_ID") or os.environ.get("MODAL_TOKEN") or "mo-abcdef1234567890abcdef1234567890"
+    # 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
@@ -39,12 +40,27 @@ try:
     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}")
 except Exception as e:
     print(f"⚠️ Error setting up Modal token: {e}")
 
 # 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)
@@ -2131,8 +2147,9 @@ 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)})")
                 
-                # Create token file directly instead of using CLI
+                # Set up Modal token using multiple approaches
                 try:
+                    # 1. Create token file
                     from pathlib import Path
                     modal_dir = Path.home() / ".modal"
                     modal_dir.mkdir(exist_ok=True)
@@ -2141,10 +2158,25 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                     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}")
+                    
+                    # 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")
                 except Exception as e:
-                    print(f"⚠️ Error creating token file: {e}")
+                    print(f"⚠️ Error setting up Modal token: {e}")
             else:
                 print("❌ No Modal token found in environment variables")
                 # Try to get from file as a last resort