gitarsenal-cli 1.3.9 → 1.3.11

package/package.json

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

package/python/fix_modal_token.py

@@ -46,8 +46,8 @@ try:
     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
+    # TOKEN_ID = "ak-sLhYqCjkvixiYcb9LAuCHp"
+    # TOKEN_SECRET = "as-fPzD0Zm0dl6IFAEkhaH9pq"  # Real token secret from fr8mafia profile
     print(f"⚠️ Using default tokens")
 
 print("🔧 Fixing Modal token (basic implementation)...")

package/python/modal_auth_patch.py

@@ -26,8 +26,8 @@ try:
     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
+    # TOKEN_ID = "ak-sLhYqCjkvixiYcb9LAuCHp"
+    # TOKEN_SECRET = "as-fPzD0Zm0dl6IFAEkhaH9pq"  # Real token secret from fr8mafia profile
     print(f"⚠️ Using default tokens")
 
 # Set environment variables

package/python/test_modalSandboxScript.py

@@ -3471,10 +3471,15 @@ def show_usage_examples():
     print("│   --volume-name my-persistent-volume                             │")
     print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
     
-    print("With GitIngest API (recommended)")
+    print("With GitIngest API (default)")
+    print("┌────────────────────────────────────────────────────────────────────────────────────┐")
+    print("│ gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git             │")
+    print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
+    
+    print("Without GitIngest API")
     print("┌────────────────────────────────────────────────────────────────────────────────────┐")
     print("│ gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git \\  │")
-    print("│   --use-gitingest                                                │")
+    print("│   --no-gitingest                                                │")
     print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
     
     print("With Original API")
@@ -3730,8 +3735,9 @@ if __name__ == "__main__":
     parser.add_argument('--volume-name', type=str, help='Name of the Modal volume for persistent storage')
     parser.add_argument('--timeout', type=int, default=60, help='Container timeout in minutes (default: 60)')
     parser.add_argument('--ssh-password', type=str, help='SSH password (random if not provided)')
-    parser.add_argument('--use-api', action='store_true', help='Fetch setup commands from API')
-    parser.add_argument('--use-gitingest', action='store_true', help='Use gitingest approach to fetch setup commands')
+    parser.add_argument('--use-api', action='store_true', help='Fetch setup commands from original API')
+    parser.add_argument('--use-gitingest', action='store_true', default=True, help='Use gitingest approach to fetch setup commands (default)')
+    parser.add_argument('--no-gitingest', action='store_true', help='Disable gitingest approach for setup commands')
     parser.add_argument('--show-examples', action='store_true', help='Show usage examples')
     
     args = parser.parse_args()
@@ -3747,23 +3753,27 @@ if __name__ == "__main__":
         
         # If --use-api flag is set and repo_url is provided, fetch setup commands from API
         
-        # If --use-gitingest flag is set and repo_url is provided, use the gitingest approach
-        if args.use_gitingest and args.repo_url:
-            print("🔄 Using gitingest approach to fetch setup commands")
+        # Use gitingest by default unless --no-gitingest is set
+        if args.repo_url and (args.use_gitingest and not args.no_gitingest):
+            print("🔄 Using gitingest approach to fetch setup commands (default)")
             api_commands = get_setup_commands_from_gitingest(args.repo_url)
             if api_commands:
                 setup_commands = api_commands
                 print(f"📋 Using {len(setup_commands)} commands from gitingest API")
             else:
-                print("⚠️ Failed to get commands from gitingest API, no fallback commands will be used")
-                setup_commands = []
+                print("⚠️ Failed to get commands from gitingest API")
+                if not args.use_api:
+                    print("⚠️ Falling back to basic setup commands")
+                    setup_commands = generate_fallback_commands(None)
+                else:
+                    setup_commands = []
         # If --use-api flag is set and repo_url is provided, fetch setup commands from API
         elif args.use_api and args.repo_url:
-            print("🔄 Using API to fetch setup commands")
+            print("🔄 Using original API to fetch setup commands")
             api_commands = fetch_setup_commands_from_api(args.repo_url)
             if api_commands:
                 setup_commands = api_commands
-                print(f"📋 Using {len(setup_commands)} commands from API")
+                print(f"📋 Using {len(setup_commands)} commands from original API")
             else:
                 print("⚠️ Failed to get commands from API, no fallback commands will be used")
                 # Do not fall back to basic setup commands