wbcompliance 1.59.11__tar.gz → 1.59.13__tar.gz

{wbcompliance-1.59.11 → wbcompliance-1.59.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcompliance
-Version: 1.59.11
+Version: 1.59.13
 Summary: A workbench module for managing compliance.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: wbcore

{wbcompliance-1.59.11 → wbcompliance-1.59.13}/wbcompliance/models/risk_management/backend.py

@@ -117,18 +117,26 @@ class AbstractRuleBackend:
         """
         raise NotImplementedError()
 
-    def check_rule(self, *dto_args, **kwargs) -> Generator[IncidentResult, None, None]:
+    def check_rule(
+        self, *dto_args, ignore_breached_objects: Iterable[models.Model] | None = None, **kwargs
+    ) -> Generator[IncidentResult, None, None]:
         """
         Build and Check the rule against the instantiated backend given its attributes
 
         Returns:
             yield the breach object, its string representation, the incident report and the severity as IncidentResult
         """
+        if not ignore_breached_objects:
+            ignore_breached_objects = []
         if not dto_args:
             # We build the data transfer object if it is not provided.
             dto_args = self._build_dto_args()
         if any(dto_args):
-            yield from self._process_dto(*dto_args, **kwargs)
+            incident = list(self._process_dto(*dto_args, **kwargs))
+            yield from filter(
+                lambda incident: incident.breached_object not in ignore_breached_objects,
+                incident,
+            )
 
     def is_passive_evaluation_valid(self) -> bool:
         """

{wbcompliance-1.59.11 → wbcompliance-1.59.13}/wbcompliance/models/risk_management/checks.py

@@ -159,7 +159,7 @@ class RiskCheck(ComplexToStringMixin, WBModel):
         )
 
     def evaluate(
-        self, *explicit_dto, override_incident: bool = False, ignore_informational_threshold: bool = False
+        self, *explicit_dto, override_incident: bool = False, ignore_informational_threshold: bool = False, **kwargs
     ) -> list[models.Model]:
         """
         Evaluate the check and returns tuple of incidents information
@@ -177,7 +177,7 @@ class RiskCheck(ComplexToStringMixin, WBModel):
         self.status = self.CheckStatus.SUCCESS
         incidents = []
         report_template = Template(self.rule.rule_backend.incident_report_template)
-        for incident_result in rule_backend.check_rule(*explicit_dto):
+        for incident_result in rule_backend.check_rule(*explicit_dto, **kwargs):
             if (
                 ignore_informational_threshold
                 and incident_result.severity.is_ignorable
@@ -296,11 +296,25 @@ class RiskCheck(ComplexToStringMixin, WBModel):
         return "id"
 
 
-@shared_task(queue=Queue.BACKGROUND.value)
+@shared_task(queue=Queue.HIGH_PRIORITY.value)
 def evaluate_as_task(
-    check_id: int, *dto, override_incident: bool = False, ignore_informational_threshold: bool = False
+    check_id: int,
+    *dto,
+    override_incident: bool = False,
+    ignore_informational_threshold: bool = False,
+    ignore_breached_object_content_types: list[tuple[int, int]] | None = None,
 ):
+    if ignore_breached_object_content_types:
+        ignore_breached_objects = [
+            ContentType.objects.get(id=r[1]).get_object_for_this_type(id=r[0])
+            for r in ignore_breached_object_content_types
+        ]
+    else:
+        ignore_breached_objects = []
     check = RiskCheck.all_objects.get(id=check_id)
     check.evaluate(
-        *dto, override_incident=override_incident, ignore_informational_threshold=ignore_informational_threshold
+        *dto,
+        override_incident=override_incident,
+        ignore_informational_threshold=ignore_informational_threshold,
+        ignore_breached_objects=ignore_breached_objects,
     )

{wbcompliance-1.59.11 → wbcompliance-1.59.13}/wbcompliance/models/risk_management/mixins.py

@@ -1,5 +1,5 @@
 from datetime import date
-from typing import Any
+from typing import Any, Iterable
 
 from django.contrib.contenttypes.models import ContentType
 from django.db import models, transaction
@@ -84,7 +84,17 @@ class RiskCheckMixin(models.Model):
                 return status
         return RiskCheck.CheckStatus.SUCCESS
 
-    def evaluate_active_rules(self, evaluation_date: date, *dto, asynchronously: bool = True):
+    def evaluate_active_rules(
+        self,
+        evaluation_date: date,
+        *dto,
+        asynchronously: bool = True,
+        ignore_breached_objects: Iterable[models.Model] | None = None,
+    ):
+        # serialize the ignore breached object list into a (id, content_type.id) list of tuple
+        ignore_breached_object_content_types = [
+            (o.id, ContentType.objects.get_for_model(o).id) for o in ignore_breached_objects
+        ]
         for rule in RiskRule.objects.get_active_rules_for_object(self.checked_object):
             check = RiskCheck.all_objects.update_or_create(
                 rule=rule,
@@ -98,11 +108,20 @@ class RiskCheckMixin(models.Model):
             if asynchronously:
                 transaction.on_commit(
                     lambda check_id=check.id: evaluate_as_task.delay(
-                        check_id, *dto, override_incident=True, ignore_informational_threshold=True
+                        check_id,
+                        *dto,
+                        override_incident=True,
+                        ignore_informational_threshold=True,
+                        ignore_breached_object_content_types=ignore_breached_object_content_types,
                     )
                 )
             else:
-                check.evaluate(*dto, override_incident=True, ignore_informational_threshold=True)
+                check.evaluate(
+                    *dto,
+                    override_incident=True,
+                    ignore_informational_threshold=True,
+                    ignore_breached_objects=ignore_breached_objects,
+                )
 
     class Meta:
         abstract = True