Fix linting and format errors in resolve.py

Signed-off-by: pradhyum6144 <pradhyum314@gmail.com>

Author: pradhyum6144

scanpipe/pipes/resolve.py

@@ -81,63 +81,62 @@ def get_dependencies_from_manifest(resource):
     return dependencies
 
 
-def get_data_from_manifests(project, package_registry, manifest_resources, model=None):
-    """
-    Get package and dependency data from package manifests/lockfiles/SBOMs or
-    for resolved packages from package requirements.
-    """
-    resolved_packages = []
-    resolved_dependencies = []
-    sboms_headers = {}
-
-    if not manifest_resources.exists():
-        project.add_warning(
-            description="No resources containing package data found in codebase.",
-            model=model,
-        )
-        return []
-
+def _group_manifests_by_type(manifest_resources):
+    """Group manifest resources by their package type."""
     manifests_by_type = {}
     for resource in manifest_resources:
         package_type = get_default_package_type(resource.location)
         if package_type:
             if package_type not in manifests_by_type:
                 manifests_by_type[package_type] = []
             manifests_by_type[package_type].append(resource)
+    return manifests_by_type
 
-    if "pypi" in manifests_by_type:
-        pypi_resources = manifests_by_type["pypi"]
-        pypi_locations = [resource.location for resource in pypi_resources]
-        
-        resolver = package_registry.get("pypi")
-        if resolver:
-            try:
-                packages = resolver(input_locations=pypi_locations)
-                if packages:
-                    for package_data in packages:
-                        package_data["codebase_resources"] = pypi_resources
-                    resolved_packages.extend(packages)
-                    
-                    for resource in pypi_resources:
-                        if headers := get_manifest_headers(resource):
-                            sboms_headers[resource.name] = headers
-                else:
-                    for resource in pypi_resources:
-                        project.add_error(
-                            description="No packages could be resolved",
-                            model=model,
-                            object_instance=resource,
-                        )
-            except Exception as e:
-                for resource in pypi_resources:
-                    project.add_error(
-                        description=f"Error resolving packages: {e}",
-                        model=model,
-                        object_instance=resource,
-                    )
-        
-        del manifests_by_type["pypi"]
 
+def _resolve_pypi_manifests(
+    project, package_registry, pypi_resources, model, resolved_packages, sboms_headers
+):
+    """Resolve PyPI packages from requirement files."""
+    pypi_locations = [resource.location for resource in pypi_resources]
+    resolver = package_registry.get("pypi")
+    if not resolver:
+        return
+
+    try:
+        packages = resolver(input_locations=pypi_locations)
+        if packages:
+            for package_data in packages:
+                package_data["codebase_resources"] = pypi_resources
+            resolved_packages.extend(packages)
+            for resource in pypi_resources:
+                if headers := get_manifest_headers(resource):
+                    sboms_headers[resource.name] = headers
+        else:
+            for resource in pypi_resources:
+                project.add_error(
+                    description="No packages could be resolved",
+                    model=model,
+                    object_instance=resource,
+                )
+    except Exception as e:
+        for resource in pypi_resources:
+            project.add_error(
+                description=f"Error resolving packages: {e}",
+                model=model,
+                object_instance=resource,
+            )
+
+
+def _resolve_other_manifests(
+    project,
+    package_registry,
+    manifests_by_type,
+    model,
+    resolved_packages,
+    resolved_dependencies,
+    sboms_headers,
+):
+    """Resolve non-PyPI packages from manifest files."""
     for package_type, resources in manifests_by_type.items():
         for resource in resources:
             packages = resolve_manifest_resources(resource, package_registry)
@@ -156,6 +155,46 @@ def get_data_from_manifests(project, package_registry, manifest_resources, model
             if dependencies:
                 resolved_dependencies.extend(dependencies)
 
+
+def get_data_from_manifests(project, package_registry, manifest_resources, model=None):
+    """
+    Get package and dependency data from package manifests/lockfiles/SBOMs or
+    for resolved packages from package requirements.
+    """
+    resolved_packages = []
+    resolved_dependencies = []
+    sboms_headers = {}
+
+    if not manifest_resources.exists():
+        project.add_warning(
+            description="No resources containing package data found in codebase.",
+            model=model,
+        )
+        return []
+
+    manifests_by_type = _group_manifests_by_type(manifest_resources)
+
+    if "pypi" in manifests_by_type:
+        _resolve_pypi_manifests(
+            project,
+            package_registry,
+            manifests_by_type["pypi"],
+            model,
+            resolved_packages,
+            sboms_headers,
+        )
+        del manifests_by_type["pypi"]
+
+    _resolve_other_manifests(
+        project,
+        package_registry,
+        manifests_by_type,
+        model,
+        resolved_packages,
+        resolved_dependencies,
+        sboms_headers,
+    )
+
     if sboms_headers:
         project.update_extra_data({"sboms_headers": sboms_headers})
 
@@ -267,13 +306,14 @@ def get_manifest_resources(project):
 def resolve_pypi_packages(input_location=None, input_locations=None):
     """
     Resolve the PyPI packages from requirement file(s).
-    
+
     Args:
         input_location: Single requirement file path (for backward compatibility)
         input_locations: List of requirement file paths (for batch processing)
-    
+
     Returns:
         List of resolved package data dictionaries
+
     """
     # Handle both single file and multiple files
     if input_locations:
@@ -282,7 +322,7 @@ def resolve_pypi_packages(input_location=None, input_locations=None):
         requirement_files = [input_location]
     else:
         raise ValueError("Either input_location or input_locations must be provided")
-    
+
     python_version = f"{sys.version_info.major}{sys.version_info.minor}"
     operating_system = "linux"
 

scanpipe/tests/pipes/test_resolve.py

@@ -390,19 +390,19 @@ def test_scanpipe_pipes_resolve_pypi_packages_multiple_files(self, mock_resolve)
 
         req_files = ["requirements1.txt", "requirements2.txt"]
         packages = resolve.resolve_pypi_packages(input_locations=req_files)
-        
+
         mock_resolve.assert_called_once()
         call_args = mock_resolve.call_args
         self.assertEqual(req_files, call_args.kwargs["requirement_files"])
-        
+
         self.assertEqual(2, len(packages))
         self.assertEqual("pip", packages[0]["name"])
 
     @mock.patch("scanpipe.pipes.resolve.python_inspector.resolve_dependencies")
     def test_scanpipe_pipes_resolve_pypi_packages_backward_compatibility(
         self, mock_resolve
     ):
-        """Test that resolve_pypi_packages still works with single file (backward compatibility)."""
+        """Test resolve_pypi_packages with single file (backward compatibility)."""
         inspector_output_location = (
             self.data / "resolve" / "python_inspector_resolve_dependencies.json"
         )
@@ -412,10 +412,9 @@ def test_scanpipe_pipes_resolve_pypi_packages_backward_compatibility(
         mock_resolve.return_value = mock.Mock(packages=inspector_output["packages"])
 
         packages = resolve.resolve_pypi_packages(input_location="requirements.txt")
-        
+
         mock_resolve.assert_called_once()
         call_args = mock_resolve.call_args
         self.assertEqual(["requirements.txt"], call_args.kwargs["requirement_files"])
-        
-        self.assertEqual(2, len(packages))
 
+        self.assertEqual(2, len(packages))