Refactoring

Author: tkachyna

src/sec_certs/dataset/cc_eucc_common.py

@@ -253,8 +253,7 @@ def compute_heuristics_body(obj: CCDataset | EUCCDataset, skip_schemes: bool = F
         obj.certs.values(),
     )
 
-    if isinstance(obj, CCDataset):
-        compute_normalized_cert_ids(obj.certs.values())
+    compute_normalized_cert_ids(obj.certs.values())
 
     compute_references(obj.certs)
     compute_transitive_vulnerabilities(obj.certs)

src/sec_certs/heuristics/common.py

@@ -191,9 +191,10 @@ def func(cert):
 
 
 @staged(logger, "Computing heuristics: Deriving information about certificate ids from artifacts.")
-def compute_normalized_cert_ids(certs: Iterable[CCCertificate]) -> None:
+def compute_normalized_cert_ids(certs: Iterable[CCCertificate | EUCCCertificate]) -> None:
     for cert in certs:
-        cert.compute_heuristics_cert_id()
+        if isinstance(cert, CCCertificate):
+            cert.compute_heuristics_cert_id()
 
 
 @staged(logger, "Computing heuristics: Matching scheme data.")

src/sec_certs/sample/cc.py

@@ -21,7 +21,6 @@
     set_local_paths,
 )
 from sec_certs.sample.certificate import Certificate, logger
-from sec_certs.sample.eucc import EUCCCertificate
 from sec_certs.sample.sar import SAR
 from sec_certs.serialization.json import ComplexSerializableType
 from sec_certs.serialization.pandas import PandasSerializableType
@@ -427,7 +426,7 @@ def actual_sars(self) -> set[SAR] | None:
     def compute_heuristics_cert_lab(self):
         compute_heuristics_cert_lab(self)
 
-    def compute_heuristics_cert_id(obj: CCCertificate | EUCCCertificate):
+    def compute_heuristics_cert_id(obj: CCCertificate):
         """
         Compute the heuristics cert_id of this cert, using several methods.