Refactoring to set correct system location for pip and npm

Author: davidkopp

dependency_resolver/detectors/npm_detector.py

@@ -45,7 +45,7 @@ def get_dependencies(
         stdout, _, exit_code = executor.execute_command("npm list --json --depth=0", working_dir)
 
         location = self._get_npm_location(executor, working_dir)
-        scope = "system" if location == "system" else "project"
+        scope = "system" if self._is_system_location(location) else "project"
         dependencies: dict[str, dict[str, str]] = {}
 
         # Build result with desired field order: scope, location, hash, dependencies
@@ -76,8 +76,16 @@ def get_dependencies(
 
         return result
 
+    def _is_system_location(self, location: str) -> bool:
+        """Check if a location represents a system-wide npm installation.
+
+        For npm, system scope means no local package.json or node_modules found.
+        This is determined by the special 'system' marker returned by _get_npm_location.
+        """
+        return location == "system"
+
     def _get_npm_location(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> str:
-        """Get the location of the npm project."""
+        """Get the actual location path of the npm project or global installation."""
         search_dir = working_dir or "."
 
         package_json_path = f"{search_dir}/package.json"
@@ -88,6 +96,12 @@ def _get_npm_location(self, executor: EnvironmentExecutor, working_dir: Optional
         if executor.path_exists(node_modules_path):
             return self._resolve_absolute_path(executor, search_dir)
 
+        # Fallback: get npm global location when no local project found
+        stdout, _, exit_code = executor.execute_command("npm config get prefix")
+        if exit_code == 0 and stdout.strip():
+            return stdout.strip()
+
+        # Final fallback: return "system" marker for system scope identification
         return "system"
 
     def _resolve_absolute_path(self, executor: EnvironmentExecutor, path: str) -> str:
@@ -140,4 +154,5 @@ def _generate_location_hash(self, executor: EnvironmentExecutor, location: str)
 
     def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
         """NPM has system scope when no local package.json or node_modules exists."""
-        return self._get_npm_location(executor, working_dir) == "system"
+        location = self._get_npm_location(executor, working_dir)
+        return self._is_system_location(location)

dependency_resolver/detectors/pip_detector.py

@@ -43,7 +43,7 @@ def get_dependencies(
 
         if exit_code != 0:
             location = self._get_pip_location(executor, working_dir)
-            scope = "system" if location == "system" else "project"
+            scope = "system" if self._is_system_location(location) else "project"
             result: dict[str, Any] = {"scope": scope}
             if scope == "project":
                 result["location"] = location
@@ -62,7 +62,7 @@ def get_dependencies(
                 }
 
         location = self._get_pip_location(executor, working_dir)
-        scope = "system" if location == "system" else "project"
+        scope = "system" if self._is_system_location(location) else "project"
 
         # Build result with desired field order: scope, location, hash, dependencies
         final_result: dict[str, Any] = {"scope": scope}
@@ -77,23 +77,23 @@ def get_dependencies(
 
         return final_result
 
+    def _is_system_location(self, location: str) -> bool:
+        """Check if a location path represents a system-wide installation."""
+        return location.startswith(("/usr/lib", "/usr/local/lib"))
+
     def _get_pip_location(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> str:
-        """Get the location of the pip environment, properly classifying system vs project scope."""
+        """Get the actual location path of the pip environment."""
         pip_command = self._get_pip_command(executor, working_dir)
         stdout, _, exit_code = executor.execute_command(f"{pip_command} show pip", working_dir)
 
         if exit_code == 0:
             for line in stdout.split("\n"):
                 if line.startswith("Location:"):
                     location = line.split(":", 1)[1].strip()
-
-                    # Check if this is a system location
-                    if location.startswith(("/usr/lib", "/usr/local/lib")):
-                        return "system"
-
                     return location
 
-        return "system"
+        # Fallback: return a default system location when pip location cannot be determined
+        return "/usr/lib/python3/dist-packages"
 
     def _get_pip_command(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> str:
         """Get the appropriate pip command, activating venv if available."""
@@ -291,5 +291,6 @@ def _generate_location_hash(self, executor: EnvironmentExecutor, location: str)
             return ""
 
     def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
-        """PIP has system scope when no virtual environment is found."""
-        return self._get_pip_location(executor, working_dir) == "system"
+        """PIP has system scope when pip is installed in a system location."""
+        location = self._get_pip_location(executor, working_dir)
+        return self._is_system_location(location)