test file added in data and suggestions applied

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

Author: NucleonGodX

scanpipe/apps.py

@@ -37,8 +37,8 @@
 
 from licensedcode.models import load_licenses
 
-from scanpipe.license_policies import load_policies_file
-from scanpipe.license_policies import make_license_policy_index
+from scanpipe.policies import load_policies_file
+from scanpipe.policies import make_license_policy_index
 
 try:
     from importlib import metadata as importlib_metadata

scanpipe/forms.py

@@ -29,13 +29,13 @@
 from taggit.forms import TagField
 from taggit.forms import TagWidget
 
-from scanpipe.license_policies import load_policies_yaml
-from scanpipe.license_policies import validate_policies
 from scanpipe.models import Project
 from scanpipe.models import Run
 from scanpipe.models import WebhookSubscription
 from scanpipe.pipelines import convert_markdown_to_html
 from scanpipe.pipes import fetch
+from scanpipe.policies import load_policies_yaml
+from scanpipe.policies import validate_policies
 
 scanpipe_app = apps.get_app_config("scanpipe")
 

scanpipe/models.py

@@ -94,7 +94,7 @@
 
 import scancodeio
 from scanpipe import humanize_time
-from scanpipe import license_policies
+from scanpipe import policies
 from scanpipe import tasks
 
 logger = logging.getLogger(__name__)
@@ -1508,14 +1508,12 @@ def get_policy_index(self):
         if policies_from_settings := self.get_env("policies"):
             policies_dict = policies_from_settings
             if isinstance(policies_from_settings, str):
-                policies_dict = license_policies.load_policies_yaml(
-                    policies_from_settings
-                )
-            return license_policies.make_license_policy_index(policies_dict)
+                policies_dict = policies.load_policies_yaml(policies_from_settings)
+            return policies.make_license_policy_index(policies_dict)
 
         elif policies_file := self.get_input_policies_file():
-            policies_dict = license_policies.load_policies_file(policies_file)
-            return license_policies.make_license_policy_index(policies_dict)
+            policies_dict = policies.load_policies_file(policies_file)
+            return policies.make_license_policy_index(policies_dict)
 
         else:
             return scanpipe_app.license_policies_index

scanpipe/pipes/license_clarity.py

@@ -20,7 +20,6 @@
 # ScanCode.io is a free software code scanning tool from nexB Inc. and others.
 # Visit https://github.com/nexB/scancode.io for support and download.
 
-# clarity_thresholds.py (updated)
 """
 License Clarity Thresholds Management
 
@@ -40,6 +39,8 @@
   50: warning # Scores 50-79 get 'warning' alert
 """
 
+from pathlib import Path
+
 from django.core.exceptions import ValidationError
 
 import saneyaml
@@ -152,8 +153,6 @@ def load_clarity_thresholds_from_file(file_path):
         ClarityThresholdsPolicy: Configured policy object or None if file not found
 
     """
-    from pathlib import Path
-
     file_path = Path(file_path)
 
     if not file_path.exists():

scanpipe/license_policies.py renamed to scanpipe/policies.py

@@ -25,21 +25,14 @@
 import saneyaml
 
 
-def load_yaml_content(yaml_content):
-    """Load and parse YAML content into a Python dictionary."""
+def load_policies_yaml(policies_yaml):
+    """Load provided ``policies_yaml``."""
     try:
-        return saneyaml.load(yaml_content)
+        return saneyaml.load(policies_yaml)
     except saneyaml.YAMLError as e:
         raise ValidationError(f"Policies file format error: {e}")
 
 
-def load_policies_yaml(policies_yaml):
-    """Load provided ``policies_yaml``."""
-    data = load_yaml_content(policies_yaml)
-    validate_policies(data)
-    return data
-
-
 def load_policies_file(policies_file, validate=True):
     """
     Load provided ``policies_file`` into a Python dictionary.

scanpipe/tests/data/license_clarity/sample_thresholds.yml

@@ -0,0 +1,4 @@
+license_clarity_thresholds:
+  90: ok
+  70: warning
+  40: error

scanpipe/tests/pipes/test_license_clarity.py

@@ -20,17 +20,18 @@
 # ScanCode.io is a free software code scanning tool from nexB Inc. and others.
 # Visit https://github.com/nexB/scancode.io for support and download.
 
-import tempfile
 from pathlib import Path
 
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 
 from scanpipe.pipes.license_clarity import ClarityThresholdsPolicy
-from scanpipe.pipes.license_clarity import load_clarity_thresholds_from_yaml
 from scanpipe.pipes.license_clarity import load_clarity_thresholds_from_file
+from scanpipe.pipes.license_clarity import load_clarity_thresholds_from_yaml
+
 
 class ClarityThresholdsPolicyTest(TestCase):
+    data = Path(__file__).parent.parent / "data"
     """Test ClarityThresholdsPolicy class functionality."""
 
     def test_valid_thresholds_initialization(self):
@@ -149,22 +150,13 @@ def test_yaml_string_invalid_yaml(self):
             load_clarity_thresholds_from_yaml(yaml_content)
 
     def test_load_from_existing_file(self):
-        yaml_content = """
-license_clarity_thresholds:
-    90: ok
-    70: warning
-"""
-        with tempfile.NamedTemporaryFile(mode="w", suffix=".yml", delete=False) as f:
-            f.write(yaml_content)
-            temp_path = f.name
-
-        try:
-            policy = load_clarity_thresholds_from_file(temp_path)
-            self.assertIsNotNone(policy)
-            self.assertEqual(policy.get_alert_for_score(95), "ok")
-        finally:
-            Path(temp_path).unlink()
+        test_file = self.data / "license_clarity" / "sample_thresholds.yml"
+        policy = load_clarity_thresholds_from_file(test_file)
+        self.assertIsNotNone(policy)
+        self.assertEqual(policy.get_alert_for_score(95), "ok")
+        self.assertEqual(policy.get_alert_for_score(75), "warning")
+        self.assertEqual(policy.get_alert_for_score(50), "error")
 
     def test_load_from_nonexistent_file(self):
         policy = load_clarity_thresholds_from_file("/nonexistent/file.yml")
-        self.assertIsNone(policy)
+        self.assertIsNone(policy)

scanpipe/tests/test_license_policies.py

@@ -27,11 +27,11 @@
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 
-from scanpipe.license_policies import load_policies_file
-from scanpipe.license_policies import load_policies_yaml
-from scanpipe.license_policies import make_license_policy_index
-from scanpipe.license_policies import validate_policies
 from scanpipe.pipes.input import copy_input
+from scanpipe.policies import load_policies_file
+from scanpipe.policies import load_policies_yaml
+from scanpipe.policies import make_license_policy_index
+from scanpipe.policies import validate_policies
 from scanpipe.tests import global_policies
 from scanpipe.tests import license_policies_index
 from scanpipe.tests import make_project