🤖 Plandex → Enhance dependency management and installation scripts to fully support sub-dependencies with improved validation, error handling, and FreeCAD integration testing

Author: jango-blockchained

freecad-ai/ai/providers/__init__.py

@@ -26,56 +26,56 @@
 def _attempt_dependency_installation():
     """Attempt to install missing dependencies automatically."""
     global _dependency_install_attempted
-    
+
     if _dependency_install_attempted:
         return False  # Don't try multiple times
-    
+
     _dependency_install_attempted = True
-    
+
     try:
         FreeCAD.Console.PrintMessage("FreeCAD AI: Attempting automatic dependency installation...\n")
-        
+
         # Try to import and use the dependency manager
         try:
             from utils.dependency_manager import DependencyManager
-            
+
             def progress_callback(message):
                 FreeCAD.Console.PrintMessage(f"FreeCAD AI: {message}\n")
-            
+
             manager = DependencyManager(progress_callback)
-            
+
             # Check for missing critical dependencies and sub-dependencies
             critical_missing = manager.get_critical_missing_dependencies()
-            
+
             if critical_missing:
                 FreeCAD.Console.PrintMessage(f"FreeCAD AI: Installing critical dependencies: {', '.join(critical_missing)}\n")
-                
+
                 # Special handling for aiohttp and its sub-dependencies
                 if "aiohttp" in critical_missing:
                     FreeCAD.Console.PrintMessage("FreeCAD AI: Checking aiohttp sub-dependencies...\n")
-                    
+
                     # Check sub-dependencies
                     sub_deps = manager.check_sub_dependencies("aiohttp")
                     missing_sub_deps = [dep for dep, available in sub_deps.items() if not available]
-                    
+
                     if missing_sub_deps:
                         FreeCAD.Console.PrintMessage(f"FreeCAD AI: Missing sub-dependencies: {', '.join(missing_sub_deps)}\n")
-                
+
                 # Try to install critical dependencies with sub-dependency support
                 success = manager.install_missing_dependencies(critical_only=True)
-                
+
                 if success:
                     FreeCAD.Console.PrintMessage("FreeCAD AI: ✅ Critical dependencies installed successfully\n")
-                    
+
                     # Verify sub-dependencies were installed correctly
                     if "aiohttp" in critical_missing and manager.check_dependency("aiohttp"):
                         sub_deps_after = manager.check_sub_dependencies("aiohttp")
                         still_missing = [dep for dep, available in sub_deps_after.items() if not available]
-                        
+
                         if still_missing:
                             FreeCAD.Console.PrintWarning(f"FreeCAD AI: ⚠️ Some sub-dependencies still missing: {', '.join(still_missing)}\n")
                             FreeCAD.Console.PrintMessage("FreeCAD AI: Attempting to install missing sub-dependencies individually...\n")
-                            
+
                             # Try to install missing sub-dependencies individually
                             for sub_dep in still_missing:
                                 if manager.install_dependency(sub_dep):
@@ -84,38 +84,38 @@ def progress_callback(message):
                                     FreeCAD.Console.PrintWarning(f"FreeCAD AI: ❌ Failed to install sub-dependency {sub_dep}\n")
                         else:
                             FreeCAD.Console.PrintMessage("FreeCAD AI: ✅ All aiohttp sub-dependencies verified\n")
-                    
+
                     FreeCAD.Console.PrintMessage("FreeCAD AI: Please restart FreeCAD to use the new dependencies\n")
                     return True
                 else:
                     FreeCAD.Console.PrintWarning("FreeCAD AI: ❌ Failed to install some critical dependencies\n")
                     return False
             else:
                 FreeCAD.Console.PrintMessage("FreeCAD AI: All critical dependencies are already available\n")
-                
+
                 # Even if main dependencies are available, check sub-dependencies
                 if manager.check_dependency("aiohttp"):
                     sub_deps = manager.check_sub_dependencies("aiohttp")
                     missing_sub_deps = [dep for dep, available in sub_deps.items() if not available]
-                    
+
                     if missing_sub_deps:
                         FreeCAD.Console.PrintMessage(f"FreeCAD AI: Installing missing aiohttp sub-dependencies: {', '.join(missing_sub_deps)}\n")
-                        
+
                         for sub_dep in missing_sub_deps:
                             if manager.install_dependency(sub_dep):
                                 FreeCAD.Console.PrintMessage(f"FreeCAD AI: ✅ Sub-dependency {sub_dep} installed\n")
                             else:
                                 FreeCAD.Console.PrintWarning(f"FreeCAD AI: ❌ Failed to install sub-dependency {sub_dep}\n")
-                
+
                 return True
-                
+
         except ImportError as e:
             FreeCAD.Console.PrintWarning(f"FreeCAD AI: Could not import dependency manager: {e}\n")
             return False
         except Exception as e:
             FreeCAD.Console.PrintError(f"FreeCAD AI: Dependency installation failed: {e}\n")
             return False
-            
+
     except Exception as e:
         FreeCAD.Console.PrintError(f"FreeCAD AI: Automatic dependency installation error: {e}\n")
         return False
@@ -173,32 +173,30 @@ def _show_dependency_guidance(missing_dependency, provider_name):
     FreeCAD.Console.PrintMessage("=" * 60 + "\n")
 
 
-
 def _show_sub_dependency_guidance(main_dependency, missing_sub_dependency, provider_name):
     """Show user-friendly guidance for installing missing sub-dependencies."""
     FreeCAD.Console.PrintMessage("=" * 60 + "\n")
     FreeCAD.Console.PrintMessage("FreeCAD AI: SUB-DEPENDENCY INSTALLATION GUIDE\n")
     FreeCAD.Console.PrintMessage("=" * 60 + "\n")
-    
+
     FreeCAD.Console.PrintMessage(f"The {provider_name} provider requires '{missing_sub_dependency}', which is a sub-dependency of '{main_dependency}'.\n")
     FreeCAD.Console.PrintMessage(f"This usually means {main_dependency} was installed without its required sub-dependencies.\n")
-    
+
     FreeCAD.Console.PrintMessage("\n📋 INSTALLATION OPTIONS:\n")
     FreeCAD.Console.PrintMessage("\n1. 🔧 Use the FreeCAD AI Dependencies Tab:\n")
     FreeCAD.Console.PrintMessage("   - Open the FreeCAD AI interface\n")
     FreeCAD.Console.PrintMessage("   - Go to the 'Dependencies' or 'Settings' tab\n")
     FreeCAD.Console.PrintMessage("   - Click 'Install Missing Dependencies'\n")
-    FreeCAD.Console.PrintMessage("   - This will install both main and sub-dependencies\n")
-    
+
     FreeCAD.Console.PrintMessage("\n2. 🐍 Manual Installation via FreeCAD Python Console:\n")
     FreeCAD.Console.PrintMessage("   Copy and paste this into the FreeCAD Python console:\n")
     FreeCAD.Console.PrintMessage("   " + "-" * 50 + "\n")
-    
+
     # Generate installation script for sub-dependency
     try:
         from utils.dependency_manager import DependencyManager
         manager = DependencyManager()
-        
+
         # Create script for both main dependency and sub-dependency
         FreeCAD.Console.PrintMessage("   exec('''\n")
         FreeCAD.Console.PrintMessage("   import subprocess, sys, os\n")
@@ -214,27 +212,28 @@ def _show_sub_dependency_guidance(main_dependency, missing_sub_dependency, provi
         FreeCAD.Console.PrintMessage("   import subprocess, sys\n")
         FreeCAD.Console.PrintMessage(f"   subprocess.run([sys.executable, '-m', 'pip', 'install', '{missing_sub_dependency}'])\n")
         FreeCAD.Console.PrintMessage(f"   subprocess.run([sys.executable, '-m', 'pip', 'install', '--upgrade', '{main_dependency}'])\n")
-    
+
     FreeCAD.Console.PrintMessage("   " + "-" * 50 + "\n")
-    
+
     FreeCAD.Console.PrintMessage("\n3. 💻 System Package Manager:\n")
     if main_dependency == "aiohttp":
         FreeCAD.Console.PrintMessage("   Ubuntu/Debian: sudo apt install python3-aiohttp python3-multidict python3-yarl\n")
         FreeCAD.Console.PrintMessage("   Fedora: sudo dnf install python3-aiohttp python3-multidict python3-yarl\n")
         FreeCAD.Console.PrintMessage("   macOS: pip3 install aiohttp[speedups]\n")
     else:
         FreeCAD.Console.PrintMessage(f"   Install both: pip3 install {missing_sub_dependency} {main_dependency}\n")
-    
+
     FreeCAD.Console.PrintMessage("\n4. 🔄 Restart FreeCAD:\n")
     FreeCAD.Console.PrintMessage("   After installation, restart FreeCAD to use the new dependencies\n")
-    
+
     FreeCAD.Console.PrintMessage("\n💡 TROUBLESHOOTING:\n")
     FreeCAD.Console.PrintMessage("   - Sub-dependencies are often missed when using --no-deps flag\n")
     FreeCAD.Console.PrintMessage("   - Try reinstalling the main dependency without --no-deps\n")
     FreeCAD.Console.PrintMessage("   - Check that your pip version is up to date\n")
-    
+
     FreeCAD.Console.PrintMessage("=" * 60 + "\n")
 
+
 def _lazy_import_provider(provider_name: str, module_name: str, class_name: str):
     """Lazy import a provider with enhanced dependency management and error handling."""
     if provider_name in _providers:
@@ -250,15 +249,15 @@ def _lazy_import_provider(provider_name: str, module_name: str, class_name: str)
         _providers[provider_name] = provider_class
         FreeCAD.Console.PrintMessage(f"FreeCAD AI: ✅ {provider_name} provider loaded successfully\n")
         return provider_class
-        
+
     except ImportError as e:
         error_msg = f"Failed to import {provider_name}: {str(e)}"
         _provider_errors[provider_name] = error_msg
-        
+
         # Enhanced sub-dependency detection
         missing_dependency = None
         missing_sub_dependency = None
-        
+
         if "aiohttp" in str(e):
             missing_dependency = "aiohttp"
         elif "multidict" in str(e):
@@ -274,21 +273,21 @@ def _lazy_import_provider(provider_name: str, module_name: str, class_name: str)
             missing_dependency = "requests"
         elif "mcp" in str(e):
             missing_dependency = "mcp"
-        
+
         if missing_dependency:
             if missing_sub_dependency:
                 FreeCAD.Console.PrintWarning(f"FreeCAD AI: ❌ {provider_name} provider unavailable - missing '{missing_sub_dependency}' sub-dependency\n")
                 FreeCAD.Console.PrintWarning(f"FreeCAD AI: This is a sub-dependency of '{missing_dependency}' that wasn't installed properly\n")
             else:
                 FreeCAD.Console.PrintWarning(f"FreeCAD AI: ❌ {provider_name} provider unavailable - missing '{missing_dependency}' dependency\n")
-            
+
             # Attempt automatic installation with sub-dependency handling
             if not _dependency_install_attempted:
                 if missing_sub_dependency:
                     FreeCAD.Console.PrintMessage(f"FreeCAD AI: Attempting to install {missing_dependency} with sub-dependencies...\n")
                 else:
                     FreeCAD.Console.PrintMessage(f"FreeCAD AI: Attempting to install {missing_dependency} automatically...\n")
-                
+
                 if _attempt_dependency_installation():
                     FreeCAD.Console.PrintMessage(f"FreeCAD AI: ✅ Dependencies installed - restart FreeCAD to use {provider_name}\n")
                 else:
@@ -304,9 +303,9 @@ def _lazy_import_provider(provider_name: str, module_name: str, class_name: str)
                     _show_dependency_guidance(missing_dependency, provider_name)
         else:
             FreeCAD.Console.PrintWarning(f"FreeCAD AI: ❌ {provider_name} provider import failed: {error_msg}\n")
-        
+
         return None
-        
+
     except Exception as e:
         error_msg = f"Error loading {provider_name}: {str(e)}"
         _provider_errors[provider_name] = error_msg
@@ -344,24 +343,23 @@ def get_available_providers() -> Dict[str, Any]:
         "OpenRouter": get_openrouter_provider(),
     }
 
-
     # Enhanced availability summary with sub-dependency information
     available_count = sum(1 for p in providers.values() if p is not None)
     total_count = len(providers)
 
     if available_count == 0:
         FreeCAD.Console.PrintWarning(f"FreeCAD AI: ⚠️ No AI providers available ({available_count}/{total_count})\n")
         FreeCAD.Console.PrintWarning("FreeCAD AI: Install missing dependencies to enable AI providers\n")
-        
+
         # Check if it's a sub-dependency issue
         try:
             from utils.dependency_manager import DependencyManager
             manager = DependencyManager()
-            
+
             if manager.check_dependency("aiohttp"):
                 sub_deps = manager.check_sub_dependencies("aiohttp")
                 missing_sub_deps = [dep for dep, available in sub_deps.items() if not available]
-                
+
                 if missing_sub_deps:
                     FreeCAD.Console.PrintWarning(f"FreeCAD AI: ⚠️ aiohttp is installed but missing sub-dependencies: {', '.join(missing_sub_deps)}\n")
                     FreeCAD.Console.PrintWarning("FreeCAD AI: Use Dependencies tab to fix sub-dependency issues\n")
@@ -370,7 +368,7 @@ def get_available_providers() -> Dict[str, Any]:
 
     elif available_count < total_count:
         FreeCAD.Console.PrintMessage(f"FreeCAD AI: ⚠️ Partial AI provider availability ({available_count}/{total_count})\n")
-        
+
         # Show which providers are missing and why
         for provider_name, provider_class in providers.items():
             if provider_class is None and provider_name in _provider_errors:
@@ -379,10 +377,9 @@ def get_available_providers() -> Dict[str, Any]:
                     FreeCAD.Console.PrintMessage(f"FreeCAD AI: ⚠️ {provider_name}: Missing sub-dependency\n")
                 else:
                     FreeCAD.Console.PrintMessage(f"FreeCAD AI: ⚠️ {provider_name}: Missing main dependency\n")
-
     else:
         FreeCAD.Console.PrintMessage(f"FreeCAD AI: ✅ All AI providers available ({available_count}/{total_count})\n")
-    
+
     return providers
 
 
@@ -407,7 +404,7 @@ def check_dependencies() -> Dict[str, bool]:
         # Try to use the enhanced dependency manager
 
         from utils.dependency_manager import check_dependencies as enhanced_check
-    
+
         dependencies = enhanced_check()
 
         # Log dependency status
@@ -444,7 +441,6 @@ def install_missing_dependencies():
         # Try to use the dependency manager
 
         from utils.dependency_manager import auto_install_dependencies
-    
 
         def progress_callback(message):
             FreeCAD.Console.PrintMessage(f"FreeCAD AI: {message}\n")

freecad-ai/install_dependencies.py

@@ -165,14 +165,14 @@ def install_mcp_dependencies():
                 "--disable-pip-version-check",
                 "--target",
                 vendor_path,
-                "--upgrade",  # Ensure latest compatible version
+                "--upgrade",
             ]
 
             # Add Python 3.13+ specific options
             if python_version >= (3, 13):
                 cmd.extend(["--use-feature", "2020-resolver"])
                 if package_name in ["aiohttp", "multidict", "yarl", "aiosignal"]:
-                    cmd.append("--pre")  # Allow pre-releases if needed
+                    cmd.append("--pre")
 
             cmd.append(package_spec)
 
@@ -195,7 +195,7 @@ def install_mcp_dependencies():
                         success_count += 1
                     except ImportError:
                         print(f"   ⚠️ {package_name} installed but not importable - may need restart")
-                        success_count += 1  # Still count as success, restart may be needed
+                        success_count += 1
                 else:
                     print(f"   ❌ Failed to install {package_name}")
                     if result.stderr:
@@ -214,8 +214,7 @@ def install_mcp_dependencies():
                             "--disable-pip-version-check",
                             "--target",
                             vendor_path,
-                            # NOTE: Removed --no-deps to allow sub-dependencies to install
-                            package_name  # No version specification
+                            package_name
                         ]
 
                         alt_result = subprocess.run(
@@ -248,7 +247,6 @@ def install_mcp_dependencies():
 
         print("\n" + "=" * 60)
 
-
         # Enhanced results reporting with sub-dependency verification
         if success_count == len(dependencies):
             print("🎉 All dependencies installed successfully!")
@@ -321,8 +319,6 @@ def install_mcp_dependencies():
             print("   - Avoid using --no-deps flag which skips sub-dependencies")
             print("   - Consider using a virtual environment with compatible package versions")
             print("   - Check package documentation for Python 3.13 support status")
-    
-
     except Exception as e:
         print(f"❌ Unexpected error: {str(e)}")
         print("💡 Please report this error to the addon developers")