Add label collection to help with multiple label comparisons

pyproject.toml

@@ -13,7 +13,7 @@ exclude = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.9"
 click = "^8"
 dataclasses-json = "^0.5.8"
 tabulate = "^0.9.0"

src/yardstick/__init__.py

@@ -68,8 +68,11 @@ def compare_results_against_labels(  # pylint: disable=too-many-arguments
         for result in results:
             result.matches = matches_filter(result.matches)
 
-    if not label_entries:
-        label_entries = store.labels.load_all(year_max_limit=year_max_limit, year_from_cve_only=year_from_cve_only)
+    if label_entries is None:
+        label_entries = store.labels.load_all(
+            year_max_limit=year_max_limit,
+            year_from_cve_only=year_from_cve_only,
+        )
 
     comparisons_by_result_id, stats_by_image_tool_pair = comparison.of_results_against_label(
         *results,
@@ -91,7 +94,7 @@ def compare_results_against_labels_by_ecosystem(
     results = store.result_set.load_scan_results(result_set, year_max_limit=year_max_limit, skip_sbom_results=True)
     results_by_image = arrange.scan_results_by_image(results)
 
-    if not label_entries:
+    if label_entries is None:
         label_entries = store.labels.load_all(year_max_limit=year_max_limit, year_from_cve_only=year_from_cve_only)
 
     stats = comparison.of_results_against_label_by_ecosystem(

src/yardstick/artifact.py

@@ -1,4 +1,5 @@
 import collections
+import functools
 import getpass
 import hashlib
 import json
@@ -499,6 +500,15 @@ def effective_year(self, by_cve=False) -> Optional[int]:
         return year
 
 
+class LabelEntryCollection:
+    def __init__(self, entries: List[LabelEntry]):
+        self.entries = entries
+
+    @functools.cache
+    def for_image(self, image: str) -> List[LabelEntry]:
+        return [e for e in self.entries if e.matches_image(image)]
+
+
 @dataclass()
 class ScanRequest:
     image: str

src/yardstick/store/labels.py

@@ -114,7 +114,6 @@ def load_label_file(
     # why note take a file path? in this way we control that all input/output data was derived from the same store,
     # and not another store.
     path = store_path(filename=filename, store_root=store_root)
-    logging.debug(f"loading labels location={path}")
 
     try:
         with open(path, "r", encoding="utf-8") as data_file: