claude-mpm 4.1.6__py3-none-any.whl → 4.24.0__py3-none-any.whl

claude_mpm/utils/agent_dependency_loader.py

@@ -14,7 +14,7 @@ import logging
 import subprocess
 import sys
 import time
-from typing import Dict, List, Optional, Set, Tuple
+from typing import Any, Dict, List, Optional, Set, Tuple
 
 from packaging.requirements import InvalidRequirement, Requirement
 
@@ -31,6 +31,22 @@ class AgentDependencyLoader:
     and being used, rather than all possible agents.
     """
 
+    # Optional database packages - if one fails, try alternatives
+    OPTIONAL_DB_PACKAGES = {
+        "mysqlclient": ["pymysql"],  # PyMySQL is a pure Python alternative
+        "psycopg2": ["psycopg2-binary"],  # Binary version doesn't require compilation
+        "cx_Oracle": [],  # No good alternative, mark as optional
+    }
+
+    # Packages that commonly fail compilation on certain platforms
+    COMPILATION_PRONE = [
+        "mysqlclient",  # Requires MySQL development headers
+        "psycopg2",  # Requires PostgreSQL development headers (use psycopg2-binary instead)
+        "cx_Oracle",  # Requires Oracle client libraries
+        "pycairo",  # Requires Cairo development headers
+        "lxml",  # Can fail if libxml2 dev headers missing
+    ]
+
     def __init__(self, auto_install: bool = False):
         """
         Initialize the agent dependency loader.
@@ -44,6 +60,7 @@ class AgentDependencyLoader:
         self.agent_dependencies: Dict[str, Dict] = {}
         self.missing_dependencies: Dict[str, List[str]] = {}
         self.checked_packages: Set[str] = set()
+        self.optional_failed: Dict[str, str] = {}  # Track optional packages that failed
         self.deployment_state_file = (
             Path.cwd() / ".claude" / "agents" / ".mpm_deployment_state"
         )
@@ -55,7 +72,7 @@ class AgentDependencyLoader:
         Returns:
             Dictionary mapping agent IDs to their file paths
         """
-        deployed_agents = {}
+        deployed_agents: Dict[str, Path] = {}
         claude_agents_dir = Path.cwd() / ".claude" / "agents"
 
         if not claude_agents_dir.exists():
@@ -68,7 +85,7 @@ class AgentDependencyLoader:
             deployed_agents[agent_id] = agent_file
             logger.debug(f"Found deployed agent: {agent_id}")
 
-        logger.info(f"Discovered {len(deployed_agents)} deployed agents")
+        logger.debug(f"Discovered {len(deployed_agents)} deployed agents")
         self.deployed_agents = deployed_agents
         return deployed_agents
 
@@ -94,7 +111,7 @@ class AgentDependencyLoader:
                 config_file = config_dir / f"{agent_id}.json"
                 if config_file.exists():
                     try:
-                        with open(config_file) as f:
+                        with config_file.open() as f:
                             config = json.load(f)
                             if "dependencies" in config:
                                 agent_dependencies[agent_id] = config["dependencies"]
@@ -104,7 +121,7 @@ class AgentDependencyLoader:
                         logger.warning(f"Failed to load config for {agent_id}: {e}")
 
         self.agent_dependencies = agent_dependencies
-        logger.info(f"Loaded dependencies for {len(agent_dependencies)} agents")
+        logger.debug(f"Loaded dependencies for {len(agent_dependencies)} agents")
         return agent_dependencies
 
     def check_python_dependency(self, package_spec: str) -> Tuple[bool, Optional[str]]:
@@ -130,6 +147,13 @@ class AgentDependencyLoader:
                 self.checked_packages.add(package_name)
                 return True, "built-in"
 
+            # Check if this is an optional package that already failed
+            if package_name in self.optional_failed:
+                logger.debug(
+                    f"Skipping optional package {package_name} (previously failed)"
+                )
+                return True, "optional-skipped"
+
             # Try to import and check version
             try:
                 import importlib.metadata
@@ -147,6 +171,24 @@ class AgentDependencyLoader:
                     return False, version
 
                 except importlib.metadata.PackageNotFoundError:
+                    # Check if there's an alternative for this optional package
+                    if package_name in self.OPTIONAL_DB_PACKAGES:
+                        for alternative in self.OPTIONAL_DB_PACKAGES[package_name]:
+                            try:
+                                alt_version = importlib.metadata.version(alternative)
+                                logger.info(
+                                    f"Using {alternative} as alternative to {package_name}"
+                                )
+                                self.checked_packages.add(package_name)
+                                return True, f"{alternative}:{alt_version}"
+                            except importlib.metadata.PackageNotFoundError:
+                                continue
+                        # If no alternatives work, mark as optional failure
+                        self.optional_failed[package_name] = "No alternatives available"
+                        logger.warning(
+                            f"Optional package {package_name} not found, marking as optional"
+                        )
+                        return True, "optional-not-found"
                     return False, None
 
             except ImportError:
@@ -162,6 +204,25 @@ class AgentDependencyLoader:
                     return False, version
 
                 except pkg_resources.DistributionNotFound:
+                    # Check alternatives for optional packages
+                    if package_name in self.OPTIONAL_DB_PACKAGES:
+                        for alternative in self.OPTIONAL_DB_PACKAGES[package_name]:
+                            try:
+                                alt_version = pkg_resources.get_distribution(
+                                    alternative
+                                ).version
+                                logger.info(
+                                    f"Using {alternative} as alternative to {package_name}"
+                                )
+                                self.checked_packages.add(package_name)
+                                return True, f"{alternative}:{alt_version}"
+                            except pkg_resources.DistributionNotFound:
+                                continue
+                        self.optional_failed[package_name] = "No alternatives available"
+                        logger.warning(
+                            f"Optional package {package_name} not found, marking as optional"
+                        )
+                        return True, "optional-not-found"
                     return False, None
 
         except InvalidRequirement as e:
@@ -348,7 +409,7 @@ class AgentDependencyLoader:
         Returns:
             Analysis results including missing and satisfied dependencies
         """
-        results = {
+        results: Dict[str, Any] = {
             "agents": {},
             "summary": {
                 "total_agents": len(self.deployed_agents),
@@ -361,7 +422,7 @@ class AgentDependencyLoader:
         }
 
         for agent_id, deps in self.agent_dependencies.items():
-            agent_result = {
+            agent_result: Dict[str, Dict[str, List[str]]] = {
                 "python": {"satisfied": [], "missing": [], "outdated": []},
                 "system": {"satisfied": [], "missing": []},
             }
@@ -415,8 +476,8 @@ class AgentDependencyLoader:
         """
         import sys
 
-        compatible = []
-        incompatible = []
+        compatible: List[str] = []
+        incompatible: List[str] = []
 
         for dep in dependencies:
             try:
@@ -532,20 +593,37 @@ class AgentDependencyLoader:
             try:
                 cmd = [sys.executable, "-m", "pip", "install"]
 
-                # Check for PEP 668 managed environment
+                # Check environment and add appropriate flags
+                import os
                 import sysconfig
 
-                stdlib_path = sysconfig.get_path("stdlib")
-                marker_file = Path(stdlib_path) / "EXTERNALLY-MANAGED"
-                parent_marker = marker_file.parent.parent / "EXTERNALLY-MANAGED"
+                # Check if in virtualenv
+                in_virtualenv = (
+                    (hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix)
+                    or (hasattr(sys, "real_prefix"))
+                    or (os.environ.get("VIRTUAL_ENV") is not None)
+                )
 
-                if marker_file.exists() or parent_marker.exists():
-                    logger.warning(
-                        "PEP 668 managed environment detected. "
-                        "Installing with --break-system-packages --user flags. "
-                        "Consider using a virtual environment instead."
-                    )
-                    cmd.extend(["--break-system-packages", "--user"])
+                if in_virtualenv:
+                    # In virtualenv - no special flags needed
+                    logger.debug("Installing in virtualenv (no special flags)")
+                else:
+                    # Check for PEP 668 managed environment
+                    stdlib_path = sysconfig.get_path("stdlib")
+                    marker_file = Path(stdlib_path) / "EXTERNALLY-MANAGED"
+                    parent_marker = marker_file.parent.parent / "EXTERNALLY-MANAGED"
+
+                    if marker_file.exists() or parent_marker.exists():
+                        logger.warning(
+                            "PEP 668 managed environment detected. "
+                            "Installing with --break-system-packages flag. "
+                            "Consider using a virtual environment instead."
+                        )
+                        cmd.append("--break-system-packages")
+                    else:
+                        # Normal system Python - use --user
+                        cmd.append("--user")
+                        logger.debug("Installing with --user flag")
 
                 cmd.extend(compatible)
 
@@ -600,7 +678,7 @@ class AgentDependencyLoader:
             logger.info(
                 f"Auto-installing {len(results['summary']['missing_python'])} missing dependencies..."
             )
-            success, error = self.install_missing_dependencies(
+            success, _error = self.install_missing_dependencies(
                 results["summary"]["missing_python"]
             )
             if success:
@@ -699,7 +777,7 @@ class AgentDependencyLoader:
             import sys
 
             if sys.version_info >= (3, 13):
-                compatible, incompatible = self.check_python_compatibility(
+                _compatible, incompatible = self.check_python_compatibility(
                     summary["missing_python"]
                 )
                 if incompatible:
@@ -774,7 +852,7 @@ class AgentDependencyLoader:
                 hash_obj.update(str(stat.st_size).encode("utf-8"))
 
                 # Include file content for comprehensive change detection
-                with open(agent_path, "rb") as f:
+                with agent_path.open("rb") as f:
                     hash_obj.update(f.read())
             except Exception as e:
                 logger.debug(f"Could not hash agent file {agent_path}: {e}")
@@ -794,7 +872,7 @@ class AgentDependencyLoader:
             return {}
 
         try:
-            with open(self.deployment_state_file) as f:
+            with self.deployment_state_file.open() as f:
                 return json.load(f)
         except Exception as e:
             logger.debug(f"Could not load deployment state: {e}")
@@ -811,7 +889,7 @@ class AgentDependencyLoader:
             # Ensure directory exists
             self.deployment_state_file.parent.mkdir(parents=True, exist_ok=True)
 
-            with open(self.deployment_state_file, "w") as f:
+            with self.deployment_state_file.open("w") as f:
                 json.dump(state, f, indent=2)
         except Exception as e:
             logger.debug(f"Could not save deployment state: {e}")
@@ -871,7 +949,7 @@ class AgentDependencyLoader:
         Returns:
             Cached results or None if not available/valid.
         """
-        has_changed, current_hash = self.has_agents_changed()
+        has_changed, _current_hash = self.has_agents_changed()
 
         if not has_changed:
             state = self.load_deployment_state()
@@ -885,13 +963,16 @@ class AgentDependencyLoader:
 
 def check_deployed_agent_dependencies(
     auto_install: bool = False, verbose: bool = False
-) -> None:
+) -> int:
     """
     Check dependencies for currently deployed agents.
 
     Args:
         auto_install: If True, automatically install missing Python dependencies
         verbose: If True, enable verbose logging
+
+    Returns:
+        Status code: 0 if all dependencies satisfied, 1 if missing dependencies
     """
     if verbose:
         logging.getLogger().setLevel(logging.DEBUG)