gitarsenal-cli 1.9.28 → 1.9.30

package/python/test_modalSandboxScript.py

@@ -31,6 +31,7 @@ parser.add_argument('--gpu', default='A10G', help='GPU type to use')
 parser.add_argument('--repo-url', help='Repository URL')
 parser.add_argument('--volume-name', help='Volume name')
 parser.add_argument('--use-api', action='store_true', help='Use API to fetch setup commands')
+parser.add_argument('--yes', action='store_true', help='Automatically confirm prompts (non-interactive)')
 
 # Parse only known args to avoid conflicts with other arguments
 args, unknown = parser.parse_known_args()
@@ -435,7 +436,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"📋 Executing main command {cmd_index + 1}/{cmd_manager.total_commands}: {cmd_text}")
                         
                         start_time = time.time()
-                        success, stdout, stderr = shell.execute(cmd_text, timeout=300)
+                        success, stdout, stderr = shell.execute(cmd_text, timeout=100)
                         execution_time = time.time() - start_time
                         
                         # Check if the command was aborted due to waiting for input and an alternative was suggested
@@ -521,7 +522,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                                             # Retry the original command
                                             print(f"🔄 Retrying original command: {cmd_text}")
                                             retry_start_time = time.time()
-                                            retry_success, retry_stdout, retry_stderr = shell.execute(cmd_text, timeout=300)
+                                            retry_success, retry_stdout, retry_stderr = shell.execute(cmd_text, timeout=100)
                                             retry_execution_time = time.time() - retry_start_time
                                             
                                             # Update the original command status
@@ -540,93 +541,10 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                                                 print(f"⚠️ Original command still failed after fix, continuing...")
                                     else:
                                         print(f"❌ Fix command failed: {fix_stderr}")
-                                        print(f"🌐 First fix attempt failed, trying with web search...")
+                                        print(f"⚠️ First fix attempt failed; continuing without web search...")
                                         
-                                        # Retry with web search enabled
-                                        try:
-                                            retry_fix_command = call_llm_for_debug(
-                                                cmd_text, stderr, 
-                                                current_dir=current_dir, 
-                                                sandbox=shell, 
-                                                use_web_search=True
-                                            )
-                                            
-                                            if retry_fix_command:
-                                                # Get the current debug model to show the correct provider name
-                                                from llm_debugging import get_current_debug_model
-                                                current_model = get_current_debug_model()
-                                                print(f"🔧 {current_model.capitalize()} suggested web-enhanced fix: {retry_fix_command}")
-                                                
-                                                # Add the web-enhanced fix to the command list manager
-                                                retry_fix_index = cmd_manager.add_suggested_fix(cmd_text, retry_fix_command, "Web-enhanced LLM fix")
-                                                
-                                                # Execute the web-enhanced fix command
-                                                print(f"🔄 Running web-enhanced fix command: {retry_fix_command}")
-                                                retry_fix_start_time = time.time()
-                                                retry_fix_success, retry_fix_stdout, retry_fix_stderr = shell.execute(retry_fix_command, timeout=120)
-                                                retry_fix_execution_time = time.time() - retry_fix_start_time
-                                                
-                                                # Mark web-enhanced fix command as executed
-                                                cmd_manager.mark_command_executed(
-                                                    retry_fix_index, 'fix', retry_fix_success, retry_fix_stdout, retry_fix_stderr, retry_fix_execution_time
-                                                )
-                                                
-                                                if retry_fix_success:
-                                                    print(f"✅ Web-enhanced fix command succeeded!")
-                                                    
-                                                    # Check if we should skip the original command
-                                                    api_key = os.environ.get("OPENAI_API_KEY")
-                                                    should_skip, skip_reason = cmd_manager.should_skip_original_command(
-                                                        cmd_text, retry_fix_command, retry_fix_stdout, retry_fix_stderr, api_key
-                                                    )
-                                                    
-                                                    if should_skip:
-                                                        print(f"🔄 Skipping original command: {skip_reason}")
-                                                        
-                                                        # Mark the original command as successful without running it
-                                                        cmd_manager.mark_command_executed(
-                                                            cmd_index, 'main', True, 
-                                                            f"Command skipped after successful web-enhanced fix: {skip_reason}", 
-                                                            "", time.time() - start_time
-                                                        )
-                                                        
-                                                        print(f"✅ Original command marked as successful (skipped)")
-                                                        
-                                                        # After a successful web-enhanced fix and skipping the original command,
-                                                        # analyze and update the entire command list
-                                                        print("\n🔍 Analyzing and updating remaining commands based on web-enhanced fix results...")
-                                                        cmd_manager.update_command_list_with_llm(api_key)
-                                                    else:
-                                                        # Retry the original command
-                                                        print(f"🔄 Retrying original command: {cmd_text}")
-                                                        retry_start_time = time.time()
-                                                        retry_success, retry_stdout, retry_stderr = shell.execute(cmd_text, timeout=300)
-                                                        retry_execution_time = time.time() - retry_start_time
-                                                        
-                                                        # Update the original command status
-                                                        cmd_manager.mark_command_executed(
-                                                            cmd_index, 'main', retry_success, retry_stdout, retry_stderr, retry_execution_time
-                                                        )
-                                                        
-                                                        if retry_success:
-                                                            print(f"✅ Original command succeeded after web-enhanced fix!")
-                                                            
-                                                            # After a successful web-enhanced fix and successful retry,
-                                                            # analyze and update the entire command list
-                                                            print("\n🔍 Analyzing and updating remaining commands based on web-enhanced fix results...")
-                                                            cmd_manager.update_command_list_with_llm(api_key)
-                                                        else:
-                                                            print(f"⚠️ Original command still failed after web-enhanced fix, continuing...")
-                                                else:
-                                                    print(f"❌ Web-enhanced fix command also failed: {retry_fix_stderr}")
-                                                    print(f"⚠️ Continuing with remaining commands...")
-                                            else:
-                                                print(f"❌ No web-enhanced fix suggested")
-                                                print(f"⚠️ Continuing with remaining commands...")
-                                                
-                                        except Exception as web_debug_e:
-                                            print(f"❌ Web-enhanced debugging failed: {web_debug_e}")
-                                            print(f"⚠️ Continuing with remaining commands...")
+                                        # No web-search retry; continue
+                                        print(f"⚠️ Continuing with remaining commands...")
                                 else:
                                     # Get the current debug model to show the correct provider name
                                     from llm_debugging import get_current_debug_model
@@ -644,7 +562,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         print(f"🔧 Executing fix command {cmd_index + 1}: {cmd_text}")
                         
                         start_time = time.time()
-                        success, stdout, stderr = shell.execute(cmd_text, timeout=300)
+                        success, stdout, stderr = shell.execute(cmd_text, timeout=100)
                         execution_time = time.time() - start_time
                         
                         # Check if the fix command was aborted due to waiting for input and an alternative was suggested
@@ -679,8 +597,8 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                     current_model = get_current_debug_model()
                     api_key = get_api_key(current_model)
                     
-                    # Use batch analysis to get additional fixes with web search enabled
-                    additional_fixes = cmd_manager.analyze_failed_commands_with_llm(api_key, current_dir, shell, use_web_search=True)
+                    # Use batch analysis to get additional fixes
+                    additional_fixes = cmd_manager.analyze_failed_commands_with_llm(api_key, current_dir, shell)
                     
                     if additional_fixes:
                         print(f"🔧 Executing {len(additional_fixes)} additional fix commands...")
@@ -692,7 +610,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                             print(f"🔧 Executing additional fix: {cmd_text}")
                             
                             start_time = time.time()
-                            success, stdout, stderr = shell.execute(cmd_text, timeout=300)
+                            success, stdout, stderr = shell.execute(cmd_text, timeout=100)
                             execution_time = time.time() - start_time
                             
                             # Check if the fix command was aborted due to waiting for input and an alternative was suggested
@@ -1782,8 +1700,8 @@ def get_setup_commands_from_gitingest(repo_url):
                                     # Prompt user for the API key
                                     try:
                                         import getpass
-                                        print(f"\nPlease enter your {key_name}:")
-                                        new_key = getpass.getpass("API Key (hidden): ").strip()
+                                        print(f"\nPlease enter your {key_name} for {service}:")
+                                        new_key = getpass.getpass(f"{key_name} ({service}) API Key (hidden): ").strip()
                                         
                                         if new_key:
                                             # Save to credentials file
@@ -2174,7 +2092,8 @@ if __name__ == "__main__":
     parser.add_argument('--show-examples', action='store_true', help='Show usage examples')
     parser.add_argument('--list-gpus', action='store_true', help='List available GPU types with their specifications')
     parser.add_argument('--interactive', action='store_true', help='Run in interactive mode with prompts')
-
+    parser.add_argument('--yes', action='store_true', help='Automatically confirm prompts (non-interactive)')
+    
     parser.add_argument('--proxy-url', help='URL of the proxy server')
     parser.add_argument('--proxy-api-key', help='API key for the proxy server')
     parser.add_argument('--gpu', default='A10G', help='GPU type to use')
@@ -2293,15 +2212,18 @@ if __name__ == "__main__":
     else:
         print("Setup Commands: Auto-detect from repository")
     
-    # Confirm settings
-    try:
-        proceed = input("Proceed with these settings? (Y/n): ").strip().lower()
-        if proceed in ('n', 'no'):
-            print("🛑 Operation cancelled by user.")
+    # Confirm settings (skip if --yes specified)
+    if not getattr(args, 'yes', False):
+        try:
+            proceed = input("Proceed with these settings? (Y/n): ").strip().lower()
+            if proceed in ('n', 'no'):
+                print("🛑 Operation cancelled by user.")
+                sys.exit(0)
+        except KeyboardInterrupt:
+            print("\n🛑 Operation cancelled by user.")
             sys.exit(0)
-    except KeyboardInterrupt:
-        print("\n🛑 Operation cancelled by user.")
-        sys.exit(0)
+    else:
+        print("🔍 Debug: yes parameter = true")
     
     # Interactive mode or missing required arguments
     if args.interactive or not args.repo_url or not args.volume_name: