gitarsenal-cli 1.9.34 → 1.9.36

package/.venv_status.json

@@ -1 +1 @@
-{"created":"2025-08-10T17:58:47.793Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}
+{"created":"2025-08-11T10:04:42.375Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}

package/bin/gitarsenal.js

@@ -108,7 +108,13 @@ function activateVirtualEnvironment() {
 async function previewRecommendations(repoUrl) {
   const spinner = ora('Analyzing repository for GPU/Torch/CUDA recommendations...').start();
   try {
-    const apiUrl = process.env.GITARSENAL_API_URL || 'https://www.gitarsenal.dev/api/gitingest-setup-commands';
+    const envUrl = process.env.GITARSENAL_API_URL;
+    const endpoints = envUrl
+      ? [envUrl]
+      : [
+          'https://www.gitarsenal.dev/api/best_gpu'
+        ];
+
     const payload = {
       repoUrl,
       // Minimal GitIngest data to allow backend to run LLM analysis
@@ -130,32 +136,61 @@ async function previewRecommendations(repoUrl) {
           content_preview: ''
         },
         success: true
-      }
+      },
+      // Hint server to do lightweight preview if supported
+      preview: true
     };
 
-    // Use global fetch (Node 18+) and follow redirects
-    const res = await fetch(apiUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'User-Agent': 'GitArsenal-CLI/1.0'
-      },
-      body: JSON.stringify(payload),
-      redirect: 'follow'
-    });
+    // Increase timeout to allow server to compute recommendations before GPU selection
+    const previewTimeoutMs = Number(process.env.GITARSENAL_PREVIEW_TIMEOUT_MS || 90000);
 
-    spinner.stop();
+    const fetchWithTimeout = async (url, body, timeoutMs = previewTimeoutMs) => {
+      const controller = new AbortController();
+      const id = setTimeout(() => controller.abort(), timeoutMs);
+      try {
+        const res = await fetch(url, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'User-Agent': 'GitArsenal-CLI/1.0'
+          },
+          body: JSON.stringify(body),
+          redirect: 'follow',
+          signal: controller.signal
+        });
+        clearTimeout(id);
+        return res;
+      } catch (e) {
+        clearTimeout(id);
+        throw e;
+      }
+    };
 
-    if (!res.ok) {
-      const text = await res.text().catch(() => '');
-      console.log(chalk.yellow(`⚠️ Preview request failed (${res.status}).`));
-      if (text) console.log(chalk.gray(`Response: ${text.slice(0, 500)}`));
-      return null;
+    let data = null;
+    let lastErrorText = '';
+
+    for (const url of endpoints) {
+      try {
+        spinner.text = `Analyzing (preview): ${url}`;
+        const res = await fetchWithTimeout(url, payload, previewTimeoutMs);
+        if (!res.ok) {
+          const text = await res.text().catch(() => '');
+          lastErrorText = `${res.status} ${text.slice(0, 300)}`;
+          continue;
+        }
+        data = await res.json().catch(() => null);
+        if (data) break;
+      } catch (err) {
+        lastErrorText = err && err.message ? err.message : 'request failed';
+        continue;
+      }
     }
 
-    const data = await res.json().catch(() => null);
+    spinner.stop();
+
     if (!data) {
-      console.log(chalk.yellow('⚠️ Could not parse recommendations preview response.'));
+      console.log(chalk.yellow('⚠️ Preview unavailable (timeout or server error).'));
+      if (lastErrorText) console.log(chalk.gray(`Reason: ${lastErrorText}`));
       return null;
     }
 
@@ -261,6 +296,66 @@ function printGpuTorchCudaSummary(result) {
   } catch {}
 }
 
+// Full fetch to get both setup commands and recommendations in one request
+async function fetchFullSetupAndRecs(repoUrl) {
+  const envUrl = process.env.GITARSENAL_API_URL;
+  const endpoints = envUrl ? [envUrl] : ['https://www.gitarsenal.dev/api/gitingest-setup-commands'];
+  const payload = {
+    repoUrl,
+    gitingestData: {
+      system_info: {
+        platform: process.platform,
+        python_version: process.version,
+        detected_language: 'Unknown',
+        detected_technologies: [],
+        file_count: 0,
+        repo_stars: 0,
+        repo_forks: 0,
+        primary_package_manager: 'Unknown',
+        complexity_level: 'Unknown'
+      },
+      repository_analysis: {
+        summary: `Repository: ${repoUrl}`,
+        tree: '',
+        content_preview: ''
+      },
+      success: true
+    }
+  };
+  const timeoutMs = Number(process.env.GITARSENAL_FULL_TIMEOUT_MS || 180000);
+
+  const fetchWithTimeout = async (url, body, timeout) => {
+    const controller = new AbortController();
+    const id = setTimeout(() => controller.abort(), timeout);
+    try {
+      const res = await fetch(url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'User-Agent': 'GitArsenal-CLI/1.0' },
+        body: JSON.stringify(body),
+        redirect: 'follow',
+        signal: controller.signal
+      });
+      clearTimeout(id);
+      return res;
+    } catch (e) {
+      clearTimeout(id);
+      throw e;
+    }
+  };
+
+  for (const url of endpoints) {
+    try {
+      const res = await fetchWithTimeout(url, payload, timeoutMs);
+      if (!res.ok) continue;
+      const data = await res.json().catch(() => null);
+      if (data) return data;
+    } catch (_e) {
+      continue;
+    }
+  }
+  return null;
+}
+
 // Function to send user data to web application
 async function sendUserData(userId, userName) {
   try {
@@ -563,9 +658,19 @@ async function runContainerCommand(options) {
       repoUrl = answers.repoUrl;
     }
 
-    // NEW: Preview CUDA/Torch/GPU recommendations before choosing GPU (only if auto-detect enabled)
+    // Attempt full fetch first to get both commands and recommendations; fallback to preview on failure
     if (useApi && repoUrl) {
-      await previewRecommendations(repoUrl);
+      const fullData = await fetchFullSetupAndRecs(repoUrl).catch(() => null);
+      if (fullData) {
+        printGpuTorchCudaSummary(fullData);
+        if (Array.isArray(fullData.commands) && fullData.commands.length) {
+          setupCommands = fullData.commands;
+          // Disable auto-detection since we already have commands
+          useApi = false;
+        }
+      } else {
+        await previewRecommendations(repoUrl);
+      }
     }
 
     // Prompt for GPU type if not specified
@@ -948,4 +1053,4 @@ async function handleKeysDelete(options) {
     console.error(chalk.red(`Error: ${error.message}`));
     process.exit(1);
   }
-} 
+}

package/lib/sandbox.js

@@ -113,6 +113,8 @@ async function runContainer(options) {
     const tempCommandsFile = path.join(os.tmpdir(), `gitarsenal-commands-${Date.now()}.txt`);
     fs.writeFileSync(tempCommandsFile, setupCommands.join('\n'));
     args.push('--commands-file', tempCommandsFile);
+    // Ensure Python skips auto-detection via GitIngest when commands are provided
+    args.push('--no-gitingest');
   }
   
   // Log the command being executed

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -914,68 +914,6 @@ def fetch_setup_commands_from_api(repo_url):
                     print(f"📄 Response size: {len(response.text)} bytes")
                     print(f"📄 Response URL: {response.url}")
                     
-                    # NEW: Print a concise summary of only GPU, Torch, and CUDA recommendations
-                    try:
-                        print("\n📊 API RESULT SUMMARY (GPU/Torch/CUDA)")
-                        print("────────────────────────────────────────────────────────")
-                        
-                        # CUDA Recommendation
-                        cuda = data.get("cudaRecommendation")
-                        if cuda:
-                            print("🎯 CUDA Recommendation")
-                            print("  - CUDA: ", cuda.get("recommendedCudaVersion", "Unknown"))
-                            ct = cuda.get("compatibleTorchVersions") or []
-                            if ct:
-                                print("  - Torch Compatibility: ", ", ".join(ct))
-                            if cuda.get("dockerImage"):
-                                print("  - Docker Image: ", cuda.get("dockerImage"))
-                            install_cmds = cuda.get("installCommands") or []
-                            if install_cmds:
-                                print("  - Install Commands:")
-                                for c in install_cmds:
-                                    print(f"    $ {c}")
-                            if cuda.get("notes"):
-                                print("  - Notes: ", cuda.get("notes"))
-                        
-                        # Torch Recommendation
-                        torch = data.get("torchRecommendation")
-                        if torch:
-                            print("\n🔥 PyTorch Recommendation")
-                            print("  - Torch: ", torch.get("recommendedTorchVersion", "Unknown"))
-                            print("  - CUDA Variant: ", torch.get("cudaVariant", "Unknown"))
-                            if torch.get("pipInstallCommand"):
-                                print("  - Install:")
-                                print(f"    $ {torch.get('pipInstallCommand')}")
-                            extras = torch.get("extraPackages") or []
-                            if extras:
-                                print("  - Extra Packages: ", ", ".join(extras))
-                            if torch.get("notes"):
-                                print("  - Notes: ", torch.get("notes"))
-                        
-                        # GPU Recommendation
-                        gpu = data.get("gpuRecommendation")
-                        if gpu:
-                            print("\n🖥️ GPU Recommendation")
-                            if gpu.get("minimumVramGb") is not None:
-                                print(f"  - Min VRAM: {gpu.get('minimumVramGb')} GB")
-                            if gpu.get("recommendedVramGb") is not None:
-                                print(f"  - Recommended VRAM: {gpu.get('recommendedVramGb')} GB")
-                            if gpu.get("minComputeCapability"):
-                                print(f"  - Min Compute Capability: {gpu.get('minComputeCapability')}")
-                            rec_models = gpu.get("recommendedModels") or []
-                            if rec_models:
-                                print("  - Recommended Models: ", ", ".join(rec_models))
-                            budget = gpu.get("budgetOptions") or []
-                            if budget:
-                                print("  - Budget Options: ", ", ".join(budget))
-                            clouds = gpu.get("cloudInstances") or []
-                            if clouds:
-                                print("  - Cloud Instances: ", ", ".join(clouds))
-                            if gpu.get("notes"):
-                                print("  - Notes: ", gpu.get("notes"))
-                    except Exception as summary_err:
-                        print(f"⚠️ Failed to print API summary: {summary_err}")
-                    
                     # Extract setup commands from the response
                     if "setupInstructions" in data and "commands" in data["setupInstructions"]:
                         commands = data["setupInstructions"]["commands"]
@@ -1009,16 +947,6 @@ def fetch_setup_commands_from_api(repo_url):
                         return fixed_commands
                     else:
                         print("⚠️ API response did not contain setupInstructions.commands field")
-                        # If top-level commands exist (newer API), use them
-                        if "commands" in data and isinstance(data["commands"], list):
-                            commands = data["commands"]
-                            print(f"✅ Found top-level commands array with {len(commands)} entries")
-                            fixed_commands = fix_setup_commands(commands)
-                            print("\n📋 Fixed commands:")
-                            for i, cmd in enumerate(fixed_commands, 1):
-                                print(f"  {i}. {cmd}")
-                            return fixed_commands
-                        
                         print("📋 Available fields in response:")
                         for key in data.keys():
                             print(f"  - {key}")
@@ -1692,68 +1620,6 @@ def get_setup_commands_from_gitingest(repo_url):
             try:
                 result = response.json()
                 
-                # NEW: Print a concise summary of only GPU, Torch, and CUDA recommendations
-                try:
-                    print("\n📊 API RESULT SUMMARY (GPU/Torch/CUDA)")
-                    print("────────────────────────────────────────────────────────")
-                    
-                    # CUDA Recommendation
-                    cuda = result.get("cudaRecommendation")
-                    if cuda:
-                        print("🎯 CUDA Recommendation")
-                        print("  - CUDA: ", cuda.get("recommendedCudaVersion", "Unknown"))
-                        ct = cuda.get("compatibleTorchVersions") or []
-                        if ct:
-                            print("  - Torch Compatibility: ", ", ".join(ct))
-                        if cuda.get("dockerImage"):
-                            print("  - Docker Image: ", cuda.get("dockerImage"))
-                        install_cmds = cuda.get("installCommands") or []
-                        if install_cmds:
-                            print("  - Install Commands:")
-                            for c in install_cmds:
-                                print(f"    $ {c}")
-                        if cuda.get("notes"):
-                            print("  - Notes: ", cuda.get("notes"))
-                    
-                    # Torch Recommendation
-                    torch = result.get("torchRecommendation")
-                    if torch:
-                        print("\n🔥 PyTorch Recommendation")
-                        print("  - Torch: ", torch.get("recommendedTorchVersion", "Unknown"))
-                        print("  - CUDA Variant: ", torch.get("cudaVariant", "Unknown"))
-                        if torch.get("pipInstallCommand"):
-                            print("  - Install:")
-                            print(f"    $ {torch.get('pipInstallCommand')}")
-                        extras = torch.get("extraPackages") or []
-                        if extras:
-                            print("  - Extra Packages: ", ", ".join(extras))
-                        if torch.get("notes"):
-                            print("  - Notes: ", torch.get("notes"))
-                    
-                    # GPU Recommendation
-                    gpu = result.get("gpuRecommendation")
-                    if gpu:
-                        print("\n🖥️ GPU Recommendation")
-                        if gpu.get("minimumVramGb") is not None:
-                            print(f"  - Min VRAM: {gpu.get('minimumVramGb')} GB")
-                        if gpu.get("recommendedVramGb") is not None:
-                            print(f"  - Recommended VRAM: {gpu.get('recommendedVramGb')} GB")
-                        if gpu.get("minComputeCapability"):
-                            print(f"  - Min Compute Capability: {gpu.get('minComputeCapability')}")
-                        rec_models = gpu.get("recommendedModels") or []
-                        if rec_models:
-                            print("  - Recommended Models: ", ", ".join(rec_models))
-                        budget = gpu.get("budgetOptions") or []
-                        if budget:
-                            print("  - Budget Options: ", ", ".join(budget))
-                        clouds = gpu.get("cloudInstances") or []
-                        if clouds:
-                            print("  - Cloud Instances: ", ", ".join(clouds))
-                        if gpu.get("notes"):
-                            print("  - Notes: ", gpu.get("notes"))
-                except Exception as summary_err:
-                    print(f"⚠️ Failed to print API summary: {summary_err}")
-                
                 # Check if we have commands in the response
                 commands = None
                 
@@ -2534,5 +2400,4 @@ if __name__ == "__main__":
     except Exception as e:
         # print(f"\n❌ Error: {e}")
         # print("🧹 Cleaning up resources...")
-        cleanup_modal_token()
-        
+        cleanup_modal_token()