Generate location-based hash also for system pip and npm packages

Author: davidkopp

dependency_resolver/detectors/npm_detector.py

@@ -50,8 +50,7 @@ def get_dependencies(
 
         # Build result with desired field order: scope, location, hash, dependencies
         result: dict[str, Any] = {"scope": scope}
-        if scope == "project":
-            result["location"] = location
+        result["location"] = location
 
         if exit_code != 0:
             result["dependencies"] = dependencies

dependency_resolver/detectors/pip_detector.py

@@ -44,11 +44,7 @@ def get_dependencies(
         if exit_code != 0:
             location = self._get_pip_location(executor, working_dir)
             scope = "system" if self._is_system_location(location) else "project"
-            result: dict[str, Any] = {"scope": scope}
-            if scope == "project":
-                result["location"] = location
-            result["dependencies"] = {}
-            return result
+            return {"scope": scope, "location": location, "dependencies": {}}
 
         dependencies = {}
         for line in stdout.strip().split("\n"):
@@ -65,17 +61,14 @@ def get_dependencies(
         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}
+        result: dict[str, Any] = {"scope": scope, "location": location}
 
-        if scope == "project":
-            final_result["location"] = location
-            # Generate location-based hash if appropriate
-            if dependencies and not skip_hash_collection:
-                final_result["hash"] = self._generate_location_hash(executor, location)
+        # Generate location-based hash if appropriate
+        if dependencies and not skip_hash_collection:
+            result["hash"] = self._generate_location_hash(executor, location)
 
-        final_result["dependencies"] = dependencies
-
-        return final_result
+        result["dependencies"] = dependencies
+        return result
 
     def _is_system_location(self, location: str) -> bool:
         """Check if a location path represents a system-wide installation."""

tests/detectors/pip/test_pip_venv_detection.py

@@ -404,10 +404,8 @@ def _validate_venv_detection(self, result: Dict[str, Any], expected_scope: str)
 
         assert len(found_packages) >= 1, f"Should find at least 1 test package, found: {found_packages}"
 
-        # Should have a hash for project scope
-        if expected_scope == "project":
-            assert "hash" in result, "Project scope should include hash"
-            assert isinstance(result["hash"], str), f"Hash should be string, got {type(result['hash'])}"
+        assert "hash" in result, "Hash should be included"
+        assert isinstance(result["hash"], str), f"Hash should be string, got {type(result['hash'])}"
 
 
 if __name__ == "__main__":