changes as per review comments

Author: jaspals

nodescraper/plugins/inband/package/analyzer_args.py

@@ -37,7 +37,15 @@ class PackageAnalyzerArgs(AnalyzerArgs):
     rocm_regex: str = (
         r"ocl-icd|kfdtest|llvm-amd|miopen|half|hip|hcc|hsa|rocm|atmi|comgr|composa|amd-smi|aomp|amdgpu|rock|mivision|migraph|rocprofiler|roctracer|rocbl|hipify|rocsol|rocthr|rocff|rocalu|rocprim|rocrand|rccl|rocspar|rdc|rocwmma|rpp|openmp|amdfwflash|ocl|opencl"
     )
+    enable_rocm_regex: bool = False
 
     @classmethod
     def build_from_model(cls, datamodel: PackageDataModel) -> "PackageAnalyzerArgs":
-        return cls(exp_package_ver=datamodel.version_info)
+        # Use custom rocm_regex from collection_args if enable_rocm_regex is true
+        if datamodel.enable_rocm_regex and datamodel.rocm_regex:
+            rocm_regex = datamodel.rocm_regex
+        else:
+            # Use default rocm_regex
+            rocm_regex = PackageAnalyzerArgs().rocm_regex
+
+        return cls(exp_package_ver=datamodel.version_info, rocm_regex=rocm_regex)

nodescraper/plugins/inband/package/package_collector.py

@@ -236,21 +236,26 @@ def collect_data(
         if self.system_info.os_family == OSFamily.LINUX and packages:
             # Get ROCm pattern from args or use default
             rocm_pattern = args.rocm_regex if args else PackageAnalyzerArgs().rocm_regex
+            self.logger.info("Using rocm_pattern: %s", rocm_pattern)
             rocm_packages = self._filter_rocm_packages(packages, rocm_pattern)
             if rocm_packages:
-                self.result.message = (
-                    f"Found {len(rocm_packages)} ROCm-related packages installed as per given regex"
-                )
+                self.result.message = f"Found {len(rocm_packages)} ROCm-related packages installed"
                 self.result.status = ExecutionStatus.OK
                 self._log_event(
                     category=EventCategory.OS,
-                    description=f"Found {len(rocm_packages)} ROCm-related packages installed as per given regex: {rocm_pattern}",
+                    description=f"Found {len(rocm_packages)} ROCm-related packages installed",
                     priority=EventPriority.INFO,
                     data={"rocm_packages": sorted(rocm_packages.keys())},
                 )
 
+        # Extract rocm_regex and enable_rocm_regex from args if provided
+        rocm_regex = args.rocm_regex if args else ""
+        enable_rocm_regex = getattr(args, "enable_rocm_regex", False) if args else False
+
         try:
-            package_model = PackageDataModel(version_info=packages)
+            package_model = PackageDataModel(
+                version_info=packages, rocm_regex=rocm_regex, enable_rocm_regex=enable_rocm_regex
+            )
         except ValidationError as val_err:
             self._log_event(
                 category=EventCategory.RUNTIME,

nodescraper/plugins/inband/package/packagedata.py

@@ -32,6 +32,10 @@ class PackageDataModel(DataModel):
     Attributes:
         version_info (dict[str, str]): The version information for the package
             Key is the package name and value is the version of the package
+        rocm_regex (str): Regular expression pattern for ROCm package filtering
+        enable_rocm_regex (bool): Whether to use custom ROCm regex from collection_args
     """
 
     version_info: dict[str, str]
+    rocm_regex: str = ""
+    enable_rocm_regex: bool = False

test/functional/fixtures/package_plugin_config.json

@@ -3,7 +3,8 @@
   "plugins": {
     "PackagePlugin": {
       "collection_args": {
-        "rocm_regex": "rocm|hip|hsa|amdgpu"
+        "rocm_regex": "rocm|hip|hsa|amdgpu",
+        "enable_rocm_regex": true
       },
       "analysis_args": {
         "exp_package_ver": {