gitarsenal-cli 1.1.21 → 1.1.23

package/lib/dependencies.js

@@ -65,6 +65,15 @@ async function checkGit() {
   }
 }
 
+async function checkGitingest() {
+  try {
+    await execAsync('gitingest --version');
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
 /**
  * Check all required dependencies
  * @returns {Promise<boolean>} - True if all dependencies are met
@@ -73,6 +82,7 @@ async function checkDependencies() {
   const pythonCheck = await checkPython();
   const modalExists = await checkModal();
   const gitExists = await checkGit();
+  const gitingestExists = await checkGitingest();
   
   let allDependenciesMet = true;
   
@@ -91,6 +101,13 @@ async function checkDependencies() {
     console.log(`${chalk.red('✗')} Modal CLI not found. Please install it with: pip install modal`);
     allDependenciesMet = false;
   }
+
+  if (gitingestExists) {
+    console.log(`${chalk.green('✓')} Gitingest CLI found`);
+  } else {
+    console.log(`${chalk.red('✗')} Gitingest CLI not found. Please install it with: pip install gitingest`);
+    allDependenciesMet = false;
+  }
   
   if (gitExists) {
     console.log(`${chalk.green('✓')} Git found`);

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -2494,7 +2494,7 @@ def fetch_setup_commands_from_api(repo_url):
     import shutil
     import json
     
-    api_url = "http://git-arsenal.vercel.app/api/analyze-with-gitingest"
+    api_url = "https://git-arsenal.vercel.app/api/analyze-with-gitingest"
     
     print(f"🔍 Fetching setup commands from API for repository: {repo_url}")
     
@@ -2605,11 +2605,32 @@ def fetch_setup_commands_from_api(repo_url):
                         commands = data["setupInstructions"]["commands"]
                         print(f"✅ Successfully fetched {len(commands)} setup commands from API")
                         
-                        # Print the commands for reference
+                        # Print the original commands for reference
+                        print("📋 Original commands from API:")
                         for i, cmd in enumerate(commands, 1):
                             print(f"  {i}. {cmd}")
                         
-                        return commands
+                        # Fix the commands by removing placeholders and comments
+                        fixed_commands = fix_setup_commands(commands)
+                        
+                        # If we have a temp_dir with the cloned repo, try to find the entry point
+                        # and replace any placeholder entry points
+                        for i, cmd in enumerate(fixed_commands):
+                            if "python main.py" in cmd or "python3 main.py" in cmd:
+                                try:
+                                    entry_point = find_entry_point(temp_dir)
+                                    if entry_point and entry_point != "main.py":
+                                        fixed_commands[i] = cmd.replace("main.py", entry_point)
+                                        print(f"🔄 Replaced main.py with detected entry point: {entry_point}")
+                                except Exception as e:
+                                    print(f"⚠️ Error finding entry point: {e}")
+                        
+                        # Print the fixed commands
+                        print("\n📋 Fixed commands:")
+                        for i, cmd in enumerate(fixed_commands, 1):
+                            print(f"  {i}. {cmd}")
+                        
+                        return fixed_commands
                     else:
                         print("⚠️ API response did not contain setupInstructions.commands field")
                         print("📋 Available fields in response:")
@@ -2755,11 +2776,14 @@ def generate_fallback_commands(gitingest_data):
     # Combine all commands
     all_commands = default_commands + language_commands
     
+    # Fix the commands
+    fixed_commands = fix_setup_commands(all_commands)
+    
     print("\n📋 Generated fallback setup commands:")
-    for i, cmd in enumerate(all_commands, 1):
+    for i, cmd in enumerate(fixed_commands, 1):
         print(f"  {i}. {cmd}")
     
-    return all_commands
+    return fixed_commands
 
 def generate_basic_repo_analysis_from_url(repo_url):
     """Generate basic repository analysis data from a repository URL."""
@@ -2947,9 +2971,21 @@ def get_setup_commands_from_local_api(repo_url, gitingest_data):
             if "setupInstructions" in data and "commands" in data["setupInstructions"]:
                 commands = data["setupInstructions"]["commands"]
                 print(f"✅ Successfully fetched {len(commands)} setup commands from local API")
+                
+                # Print the original commands
+                print("📋 Original commands from local API:")
                 for i, cmd in enumerate(commands, 1):
                     print(f"  {i}. {cmd}")
-                return commands
+                
+                # Fix the commands
+                fixed_commands = fix_setup_commands(commands)
+                
+                # Print the fixed commands
+                print("\n📋 Fixed commands:")
+                for i, cmd in enumerate(fixed_commands, 1):
+                    print(f"  {i}. {cmd}")
+                
+                return fixed_commands
     except Exception as e:
         print(f"❌ Error connecting to local API: {e}")
     
@@ -3073,6 +3109,58 @@ def create_ssh_container_function(gpu_type="a10g", timeout_minutes=60, volume=No
     # Return the configured function
     return ssh_container, app_name
 
+def fix_setup_commands(commands):
+    """Fix setup commands by removing placeholders and comments."""
+    fixed_commands = []
+    
+    for cmd in commands:
+        # Remove placeholders like "(or the appropriate entry point...)"
+        cmd = re.sub(r'\([^)]*\)', '', cmd).strip()
+        
+        # Skip empty commands or pure comments
+        if not cmd or cmd.startswith('#'):
+            continue
+            
+        # Remove trailing comments
+        cmd = re.sub(r'#.*$', '', cmd).strip()
+        
+        if cmd:
+            fixed_commands.append(cmd)
+    
+    return fixed_commands
+
+def find_entry_point(repo_dir):
+    """Find the entry point script for a repository."""
+    # Common entry point files to check
+    common_entry_points = [
+        "main.py", "app.py", "run.py", "train.py", "start.py", 
+        "server.py", "cli.py", "demo.py", "example.py"
+    ]
+    
+    # Check if any of the common entry points exist
+    for entry_point in common_entry_points:
+        if os.path.exists(os.path.join(repo_dir, entry_point)):
+            return entry_point
+    
+    # Look for Python files in the root directory
+    python_files = [f for f in os.listdir(repo_dir) if f.endswith('.py')]
+    if python_files:
+        # Prioritize files with main function or if_name_main pattern
+        for py_file in python_files:
+            file_path = os.path.join(repo_dir, py_file)
+            try:
+                with open(file_path, 'r') as f:
+                    content = f.read()
+                    if "def main" in content or "if __name__ == '__main__'" in content or 'if __name__ == "__main__"' in content:
+                        return py_file
+            except:
+                pass
+        
+        # If no main function found, return the first Python file
+        return python_files[0]
+    
+    return None
+
 if __name__ == "__main__":
     # Parse command line arguments when script is run directly
     import argparse