gitarsenal-cli 1.3.5 → 1.3.7

package/package.json

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

package/python/fetch_modal_tokens.py

@@ -41,12 +41,12 @@ def fetch_tokens_from_proxy(proxy_url=None, api_key=None):
     # Check if we have the necessary information
     if not proxy_url:
         print("❌ No proxy URL provided or found in environment")
-        print("💡 Set MODAL_PROXY_URL environment variable or use --proxy-url argument")
+        # print("💡 Set MODAL_PROXY_URL environment variable or use --proxy-url argument")
         return None, None
         
     if not api_key:
         print("❌ No API key provided or found in environment")
-        print("💡 Set MODAL_PROXY_API_KEY environment variable or use --proxy-api-key argument")
+        # print("💡 Set MODAL_PROXY_API_KEY environment variable or use --proxy-api-key argument")
         return None, None
     
     # Ensure the URL ends with a slash
@@ -103,7 +103,7 @@ def get_tokens():
     # Set the tokens in environment variables
     os.environ["MODAL_TOKEN_ID"] = token_id
     os.environ["MODAL_TOKEN_SECRET"] = token_secret
-    print(f"✅ Set MODAL_TOKEN_ID and MODAL_TOKEN_SECRET environment variables")
+    # print(f"✅ Set MODAL_TOKEN_ID and MODAL_TOKEN_SECRET environment variables")
     
     return token_id, token_secret
 
@@ -119,25 +119,25 @@ if __name__ == "__main__":
     # Set proxy URL and API key in environment variables if provided
     if args.proxy_url:
         os.environ["MODAL_PROXY_URL"] = args.proxy_url
-        print(f"✅ Set MODAL_PROXY_URL from command line")
+        # print(f"✅ Set MODAL_PROXY_URL from command line")
     
     if args.proxy_api_key:
         os.environ["MODAL_PROXY_API_KEY"] = args.proxy_api_key
-        print(f"✅ Set MODAL_PROXY_API_KEY from command line")
+        # print(f"✅ Set MODAL_PROXY_API_KEY from command line")
     
     # Get tokens
     token_id, token_secret = get_tokens()
-    print(f"Token ID: [HIDDEN]")
-    print(f"Token Secret: [HIDDEN]")
-    
-    # Check if tokens are set in environment variables
-    print(f"\n🔍 DEBUG: Checking environment variables")
-    print(f"🔍 MODAL_TOKEN_ID exists: {'Yes' if os.environ.get('MODAL_TOKEN_ID') else 'No'}")
-    print(f"🔍 MODAL_TOKEN_SECRET exists: {'Yes' if os.environ.get('MODAL_TOKEN_SECRET') 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_SECRET'):
-        print(f"🔍 MODAL_TOKEN_SECRET length: {len(os.environ.get('MODAL_TOKEN_SECRET'))}")
+    # print(f"Token ID: [HIDDEN]")
+    # print(f"Token Secret: [HIDDEN]")
+    
+    # # Check if tokens are set in environment variables
+    # print(f"\n🔍 DEBUG: Checking environment variables")
+    # print(f"🔍 MODAL_TOKEN_ID exists: {'Yes' if os.environ.get('MODAL_TOKEN_ID') else 'No'}")
+    # print(f"🔍 MODAL_TOKEN_SECRET exists: {'Yes' if os.environ.get('MODAL_TOKEN_SECRET') 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_SECRET'):
+    #     print(f"🔍 MODAL_TOKEN_SECRET length: {len(os.environ.get('MODAL_TOKEN_SECRET'))}")
     
     # Write the tokens to a file for use by other scripts
     tokens_file = Path(__file__).parent / "modal_tokens.json"

package/python/fix_modal_token_advanced.py

@@ -24,24 +24,22 @@ 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")
+    # 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 default tokens")
+    # print(f"⚠️ Using default tokens")
 
-print("🔧 Advanced Modal Token Fixer")
+# print("🔧 Advanced Modal Token Fixer")
 
 # Approach 1: Set environment variables
-print("\n📋 Approach 1: Setting environment variables")
+# print("\n📋 Approach 1: Setting environment variables")
 os.environ["MODAL_TOKEN_ID"] = TOKEN_ID
 os.environ["MODAL_TOKEN_SECRET"] = TOKEN_SECRET
-print(f"✅ Set MODAL_TOKEN_ID = [HIDDEN]")
-print(f"✅ Set MODAL_TOKEN_SECRET = [HIDDEN]")
+# print(f"✅ Set MODAL_TOKEN_ID = [HIDDEN]")
+# print(f"✅ Set MODAL_TOKEN_SECRET = [HIDDEN]")
 
 # Approach 2: Create token files in various formats
-print("\n📋 Approach 2: Creating token files in various formats")
+# print("\n📋 Approach 2: Creating token files in various formats")
 modal_dir = Path.home() / ".modal"
 modal_dir.mkdir(exist_ok=True)
 
@@ -53,7 +51,7 @@ with open(token_file, 'w') as f:
         "token_secret": TOKEN_SECRET
     }
     json.dump(token_data, f)
-print(f"✅ Created token file at {token_file}")
+# print(f"✅ Created token file at {token_file}")
 
 # Format 2: Alternative token.json format
 token_file_alt = modal_dir / "token_alt.json"
@@ -63,14 +61,14 @@ with open(token_file_alt, 'w') as f:
         "secret": TOKEN_SECRET
     }
     json.dump(token_data_alt, f)
-print(f"✅ Created alternative token file at {token_file_alt}")
+# print(f"✅ Created alternative token file at {token_file_alt}")
 
 # Format 3: 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}")
+# print(f"✅ Created .modalconfig file at {modalconfig_file}")
 
 # Format 4: Create config.json file
 config_file = modal_dir / "config.json"
@@ -80,10 +78,10 @@ with open(config_file, 'w') as f:
         "token_secret": TOKEN_SECRET
     }
     json.dump(config_data, f)
-print(f"✅ Created config.json file at {config_file}")
+# print(f"✅ Created config.json file at {config_file}")
 
 # Approach 3: Use Modal CLI to set token
-print("\n📋 Approach 3: Using Modal CLI")
+# print("\n📋 Approach 3: Using Modal CLI")
 try:
     # Use the CLI to set the token directly
     result = subprocess.run(
@@ -92,17 +90,17 @@ try:
     )
     
     if result.returncode == 0:
-        print(f"✅ Successfully set token via Modal CLI")
+        # print(f"✅ Successfully set token via Modal CLI")
     else:
-        print(f"❌ Failed to set token via Modal CLI: {result.stderr}")
+        # print(f"❌ Failed to set token via Modal CLI: {result.stderr}")
 except Exception as e:
-    print(f"❌ Error using Modal CLI: {e}")
+    # print(f"❌ Error using Modal CLI: {e}")
 
 # Approach 4: Use Modal Python API to set token
-print("\n📋 Approach 4: Using Modal Python API")
+# print("\n📋 Approach 4: Using Modal Python API")
 try:
     import modal
-    print(f"✅ Successfully imported Modal")
+    # print(f"✅ Successfully imported Modal")
     
     # Try to set token directly in Modal's config
     try:
@@ -114,49 +112,49 @@ try:
             if hasattr(modal.config, '_auth_config'):
                 modal.config._auth_config.token_id = TOKEN_ID
                 modal.config._auth_config.token_secret = TOKEN_SECRET
-                print(f"✅ Set tokens via _auth_config")
+                # print(f"✅ Set tokens via _auth_config")
         except Exception as e:
-            print(f"❌ Error setting tokens via _auth_config: {e}")
+            # print(f"❌ Error setting tokens via _auth_config: {e}")
             
         try:
             # Approach 4.2: Set token via set_token() if it exists
             if hasattr(modal.config, 'set_token'):
                 modal.config.set_token(TOKEN_ID, TOKEN_SECRET)
-                print(f"✅ Set tokens via set_token()")
+                # print(f"✅ Set tokens via set_token()")
         except Exception as e:
-            print(f"❌ Error setting tokens via set_token(): {e}")
+            # print(f"❌ Error setting tokens via set_token(): {e}")
             
         try:
             # Approach 4.3: Set token via Config
             if hasattr(modal.config, 'Config'):
                 modal.config.Config.token_id = TOKEN_ID
                 modal.config.Config.token_secret = TOKEN_SECRET
-                print(f"✅ Set tokens via Config")
+                # print(f"✅ Set tokens via Config")
         except Exception as e:
-            print(f"❌ Error setting tokens via Config: {e}")
+            # print(f"❌ Error setting tokens via Config: {e}")
             
         # Approach 4.4: Inspect modal.config and try to find token-related attributes
-        print("\n🔍 Inspecting modal.config for token-related attributes...")
+        # print("\n🔍 Inspecting modal.config for token-related attributes...")
         for name in dir(modal.config):
             if "token" in name.lower() or "auth" in name.lower():
-                print(f"Found potential token-related attribute: {name}")
+                # print(f"Found potential token-related attribute: {name}")
                 try:
                     attr = getattr(modal.config, name)
                     if hasattr(attr, "token_id"):
-                        print(f"  - Setting token_id in {name}")
+                        # print(f"  - Setting token_id in {name}")
                         setattr(attr, "token_id", TOKEN_ID)
                     if hasattr(attr, "token_secret"):
-                        print(f"  - Setting token_secret in {name}")
+                        # print(f"  - Setting token_secret in {name}")
                         setattr(attr, "token_secret", TOKEN_SECRET)
                 except Exception as e:
-                    print(f"  - Error setting tokens in {name}: {e}")
+                    # print(f"  - Error setting tokens in {name}: {e}")
     except Exception as e:
-        print(f"❌ Error setting tokens in Modal config: {e}")
+        # print(f"❌ Error setting tokens in Modal config: {e}")
 except Exception as e:
     print(f"❌ Error importing Modal: {e}")
 
 # Approach 5: Monkey-patch Modal's authentication system
-print("\n📋 Approach 5: Monkey-patching Modal's authentication system")
+# print("\n📋 Approach 5: Monkey-patching Modal's authentication system")
 try:
     import modal
     
@@ -174,7 +172,7 @@ try:
             try:
                 module = getattr(modal, module_name)
                 auth_related.append((module_name, module))
-                print(f"Found potential auth-related module: {module_name}")
+                # print(f"Found potential auth-related module: {module_name}")
             except Exception:
                 pass
     
@@ -187,25 +185,25 @@ try:
                         try:
                             original_func = getattr(module, func_name)
                             if callable(original_func):
-                                print(f"  - Patching {name}.{func_name} to return token_id")
+                                # print(f"  - Patching {name}.{func_name} to return token_id")
                                 setattr(module, func_name, get_token_id)
                         except Exception as e:
-                            print(f"  - Error patching {name}.{func_name}: {e}")
+                            # print(f"  - Error patching {name}.{func_name}: {e}")
                     elif "token_secret" in func_name.lower() or "token" in func_name.lower():
                         try:
                             original_func = getattr(module, func_name)
                             if callable(original_func):
-                                print(f"  - Patching {name}.{func_name} to return token_secret")
+                                # print(f"  - Patching {name}.{func_name} to return token_secret")
                                 setattr(module, func_name, get_token_secret)
                         except Exception as e:
-                            print(f"  - Error patching {name}.{func_name}: {e}")
+                            # print(f"  - Error patching {name}.{func_name}: {e}")
     
-    print(f"✅ Monkey-patching completed")
+    # print(f"✅ Monkey-patching completed")
 except Exception as e:
-    print(f"❌ Error during monkey-patching: {e}")
+    # print(f"❌ Error during monkey-patching: {e}")
 
 # Approach 6: Test Modal authentication
-print("\n📋 Approach 6: Testing Modal authentication")
+# print("\n📋 Approach 6: Testing Modal authentication")
 try:
     import modal
     
@@ -217,14 +215,14 @@ try:
         return "Hello, world!"
     
     # Try to run the function to test authentication
-    print("Creating a test Modal app...")
+    # print("Creating a test Modal app...")
     with app.run() as running_app:
-        print("Running the test function...")
+        # print("Running the test function...")
         result = running_app.hello.remote()
-        print(f"✅ Successfully ran Modal function: {result}")
-        print("🎉 Modal authentication is working!")
+        # print(f"✅ Successfully ran Modal function: {result}")
+        # print("🎉 Modal authentication is working!")
         
 except Exception as e:
-    print(f"❌ Error testing Modal authentication: {e}")
+    # print(f"❌ Error testing Modal authentication: {e}")
 
-print("\n✅ Done fixing Modal token. Please try your command again.") 
+# print("\n✅ Done fixing Modal token. Please try your command again.")