gitarsenal-cli 1.1.4 → 1.1.5

package/package.json

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

package/python/MODAL_PROXY_README.md

@@ -94,18 +94,37 @@ If you see a "Token missing" error when creating containers through the proxy se
 
 1. **Check that the MODAL_TOKEN is set on the server**:
    - Verify the `.env` file has a valid MODAL_TOKEN
+   - Ensure the token is correctly formatted and not expired
    - Restart the proxy service after updating the token
 
-2. **Check that the proxy service is running**:
-   - Use `./gitarsenal.py proxy status` to check connectivity
-   - Verify the ngrok tunnel is active and the URL is correct
+2. **Manually set the token on the server**:
+   ```bash
+   # On the server running the proxy service
+   export MODAL_TOKEN_ID=your_modal_token_here
+   modal token set your_modal_token_here
+   ```
 
-3. **Check API key authentication**:
-   - Make sure your client is configured with a valid API key
-   - If needed, reconfigure with `./gitarsenal.py proxy configure`
+3. **Verify the token works directly on the server**:
+   ```bash
+   # Test if the token works by listing Modal volumes
+   modal volume list
+   ```
 
-4. **Check server logs**:
+4. **Check the proxy service logs**:
    - Look at `modal_proxy.log` on the server for detailed error messages
+   - Check for messages like "Modal token verification failed"
+   - Ensure the token is being properly passed to the Modal API
+
+5. **Restart the proxy service**:
+   ```bash
+   # Kill the existing process and restart
+   pkill -f modal_proxy_service.py
+   python modal_proxy_service.py
+   ```
+
+6. **Check ngrok connection**:
+   - Verify the ngrok tunnel is active and the URL is correct
+   - Ensure requests are being properly forwarded to the proxy service
 
 ### "Unauthorized" Error
 

package/python/modal_proxy_service.py

@@ -84,6 +84,27 @@ def setup_modal_auth():
         os.environ["MODAL_TOKEN_ID"] = MODAL_TOKEN
         # Also set the token directly in modal.config
         modal.config._auth_config.token_id = MODAL_TOKEN
+        
+        # Verify token is working by attempting a simple operation
+        try:
+            # Try to list volumes as a simple API test
+            test_vol = modal.Volume.list()
+            logger.info("Modal token verified successfully - able to list volumes")
+        except Exception as vol_err:
+            logger.error(f"Modal token verification failed: {vol_err}")
+            # Try setting token again with different approach
+            try:
+                import subprocess
+                result = subprocess.run(
+                    ["modal", "token", "set", MODAL_TOKEN],
+                    capture_output=True, text=True, check=True
+                )
+                logger.info("Modal token set via CLI command")
+                return True
+            except Exception as cli_err:
+                logger.error(f"Failed to set token via CLI: {cli_err}")
+                return False
+        
         logger.info("Modal token set in environment and config")
         return True
     except Exception as e:
@@ -203,6 +224,18 @@ def create_ssh_container():
         # Create a unique ID for this container
         container_id = str(uuid.uuid4())
         
+        # Log token status for debugging
+        token_status = "Token is set" if MODAL_TOKEN else "Token is missing"
+        logger.info(f"Modal token status before thread: {token_status}")
+        logger.info(f"Modal token length: {len(MODAL_TOKEN) if MODAL_TOKEN else 'N/A'}")
+        
+        # Ensure Modal token is set in environment
+        if MODAL_TOKEN:
+            os.environ["MODAL_TOKEN_ID"] = MODAL_TOKEN
+            # Also set directly in modal.config
+            modal.config._auth_config.token_id = MODAL_TOKEN
+            logger.info("Modal token explicitly set in environment and config")
+        
         # Start container creation in a separate thread
         def create_container_thread():
             try:
@@ -214,9 +247,21 @@ def create_ssh_container():
                 # Explicitly set the Modal token in the environment again for this thread
                 os.environ["MODAL_TOKEN_ID"] = MODAL_TOKEN
                 
+                # Directly set the token in Modal config
+                modal.config._auth_config.token_id = MODAL_TOKEN
+                
                 # Log token status for debugging
                 token_status = "Token is set" if MODAL_TOKEN else "Token is missing"
-                logger.info(f"Modal token status: {token_status}")
+                logger.info(f"Modal token status in thread: {token_status}")
+                logger.info(f"Modal token length in thread: {len(MODAL_TOKEN) if MODAL_TOKEN else 'N/A'}")
+                
+                # Verify token is actually working
+                try:
+                    # Try a simple Modal operation to verify authentication
+                    import modal.cli.app_create
+                    logger.info("Modal module imported successfully in thread")
+                except Exception as auth_err:
+                    logger.error(f"Modal authentication verification error: {auth_err}")
                 
                 result = create_modal_ssh_container(
                     gpu_type, 

package/python/test_modalSandboxScript.py

@@ -2071,9 +2071,30 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
     try:
         # Try to access Modal token to check authentication
         try:
-            # This will raise an exception if not authenticated
-            modal.config.get_current_workspace_name()
-            print("✅ Modal authentication verified")
+            # Check if token is set in environment
+            modal_token = os.environ.get("MODAL_TOKEN_ID")
+            if not modal_token:
+                print("⚠️ MODAL_TOKEN_ID not found in environment.")
+                # Try to set from modal.config if available
+                try:
+                    modal_token = modal.config._auth_config.token_id
+                    if modal_token:
+                        print("✅ Found token in modal.config")
+                        # Set it in environment for consistency
+                        os.environ["MODAL_TOKEN_ID"] = modal_token
+                except Exception as e:
+                    print(f"⚠️ Error accessing modal.config: {e}")
+            
+            # If still no token, try to get workspace name as authentication test
+            if not modal_token:
+                # This will raise an exception if not authenticated
+                workspace = modal.config.get_current_workspace_name()
+                print(f"✅ Modal authentication verified (workspace: {workspace})")
+            else:
+                print(f"✅ Modal token found (length: {len(modal_token)})")
+                # Explicitly set the token in modal config
+                modal.config._auth_config.token_id = modal_token
+                print("✅ Token explicitly set in modal.config")
         except modal.exception.AuthError:
             print("\n" + "="*80)
             print("🔑 MODAL AUTHENTICATION REQUIRED")
@@ -2160,6 +2181,29 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         print(f"  - Current workspace: {workspace}")
     except Exception as e:
         print(f"  - Error getting workspace: {e}")
+        
+    # Verify token is valid by trying a simple Modal operation
+    try:
+        print("🔍 Verifying Modal token validity...")
+        # Try to access Modal API
+        if not modal_token:
+            print("❌ No Modal token available. Cannot proceed.")
+            return None
+            
+        # Set token directly in modal config again to be sure
+        modal.config._auth_config.token_id = modal_token
+        
+        # Try to list volumes as a simple API test
+        try:
+            test_vol = modal.Volume.list()
+            print(f"✅ Modal token is valid! Successfully listed volumes.")
+        except Exception as vol_err:
+            print(f"❌ Token validation failed: {vol_err}")
+            print("Please check that your Modal token is valid and properly set.")
+            return None
+    except Exception as e:
+        print(f"❌ Error during token validation: {e}")
+        return None
 
     # Create SSH-enabled image
     ssh_image = (