used the new refactored policy code

Signed-off-by: NucleonGodX <[email protected]>

Author: NucleonGodX

docs/tutorial_license_policies.rst

@@ -149,7 +149,7 @@ in the project:
     [resources]
      > ERROR: 1
        cuckoo_filter-1.0.6.tar.gz-extract/cuckoo_filter-1.0.6/README.md
-    [License Clarity Compliance]
+    [License Clarity]
      > Alert Level: error
 
 .. tip::

scanpipe/api/views.py

@@ -494,7 +494,7 @@ def clarity_compliance(self, request, *args, **kwargs):
 
         """
         project = self.get_object()
-        clarity_alert = (project.extra_data or {}).get("clarity_compliance_alert")
+        clarity_alert = project.get_clarity_compliance_alert()
         return Response({"clarity_compliance_alert": clarity_alert})
 
 

scanpipe/management/commands/check-compliance.py

@@ -74,7 +74,7 @@ def check_compliance(self, fail_level):
             len(issues) for model in alerts.values() for issues in model.values()
         )
 
-        clarity_alert = self.get_clarity_compliance_alert()
+        clarity_alert = self.project.get_clarity_compliance_alert()
         has_clarity_issue = clarity_alert not in (None, "ok")
 
         total_issues = count + (1 if has_clarity_issue else 0)
@@ -89,19 +89,11 @@ def check_compliance(self, fail_level):
                         self.stderr.write("   " + "\n   ".join(entries))
 
             if has_clarity_issue:
-                self.stderr.write("[License Clarity Compliance]")
+                self.stderr.write("[License Clarity]")
                 self.stderr.write(f" > Alert Level: {clarity_alert}")
 
         return total_issues > 0
 
-    def get_clarity_compliance_alert(self):
-        """
-        Return the clarity compliance alert value for the project,
-        or None if not set.
-        """
-        extra_data = self.project.extra_data or {}
-        return extra_data.get("clarity_compliance_alert")
-
     def check_vulnerabilities(self):
         packages = self.project.discoveredpackages.vulnerable_ordered()
         dependencies = self.project.discovereddependencies.vulnerable_ordered()

scanpipe/models.py

@@ -1514,6 +1514,14 @@ def get_policies_dict(self):
 
         return scanpipe_app.policies
 
+    def get_clarity_compliance_alert(self):
+        """
+        Return the clarity compliance alert value for the project,
+        or None if not set.
+        """
+        extra_data = self.extra_data or {}
+        return extra_data.get("clarity_compliance_alert")
+
     def get_license_policy_index(self):
         """Return the policy license index for this project instance."""
         if policies_dict := self.get_policies_dict():

scanpipe/pipes/license_clarity.py

@@ -41,7 +41,6 @@
 
 from pathlib import Path
 
-from django.conf import settings
 from django.core.exceptions import ValidationError
 
 import saneyaml
@@ -168,23 +167,18 @@ def load_clarity_thresholds_from_file(file_path):
 
 def get_project_clarity_thresholds(project):
     """
-    Get clarity thresholds for a project, checking multiple sources.
+    Get clarity thresholds for a project using the unified policy loading logic.
 
     Returns:
         ClarityThresholdsPolicy or None: Policy object if thresholds are configured
 
     """
-    if hasattr(project, "get_input_policies_file"):
-        policies_file = project.get_input_policies_file()
-        if policies_file:
-            policy = load_clarity_thresholds_from_file(policies_file)
-            if policy:
-                return policy
-
-    global_policies_file = getattr(settings, "SCANCODEIO_POLICIES_FILE", None)
-    if global_policies_file:
-        policy = load_clarity_thresholds_from_file(global_policies_file)
-        if policy:
-            return policy
-
-    return None
+    policies_dict = project.get_policies_dict()
+    if not policies_dict:
+        return None
+
+    clarity_thresholds = policies_dict.get("license_clarity_thresholds")
+    if not clarity_thresholds:
+        return None
+
+    return ClarityThresholdsPolicy(clarity_thresholds)

scanpipe/pipes/scancode.py

@@ -975,9 +975,5 @@ def make_results_summary(project, scan_results_location):
             alert = clarity_policy.get_alert_for_score(clarity_score)
             summary["clarity_compliance_alert"] = alert
 
-            extra_data = project.extra_data or {}
-            extra_data["clarity_compliance_alert"] = alert
-            project.extra_data = extra_data
-            project.save(update_fields=["extra_data"])
-
+            project.update_extra_data({"clarity_compliance_alert": alert})
     return summary

scanpipe/tests/test_commands.py

@@ -1226,8 +1226,7 @@ def test_scanpipe_management_command_check_clarity_compliance_only(self):
         self.assertEqual(cm.exception.code, 1)
         out_value = out.getvalue().strip()
         expected = (
-            "1 compliance issues detected."
-            "\n[License Clarity Compliance]\n > Alert Level: error"
+            "1 compliance issues detected.\n[License Clarity]\n > Alert Level: error"
         )
         self.assertEqual(expected, out_value)
 
@@ -1251,7 +1250,7 @@ def test_scanpipe_management_command_check_both_compliance_and_clarity(self):
         expected = (
             "2 compliance issues detected."
             "\n[packages]\n > ERROR: 1"
-            "\n[License Clarity Compliance]\n > Alert Level: warning"
+            "\n[License Clarity]\n > Alert Level: warning"
         )
         self.assertEqual(expected, out_value)