nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/extras/management/__init__.py

@@ -10,7 +10,9 @@ from nautobot.core.choices import ColorChoices
 from nautobot.dcim import choices as dcim_choices
 from nautobot.extras import choices as extras_choices
 from nautobot.ipam import choices as ipam_choices
+from nautobot.load_balancers import choices as load_balancer_choices
 from nautobot.virtualization import choices as vm_choices
+from nautobot.vpn import choices as vpn_choices
 
 # List of 2-tuples of (model_path, choiceset)
 # Add new mappings here as other models are supported.
@@ -34,8 +36,10 @@ STATUS_CHOICESET_MAP = {
     "ipam.Prefix": ipam_choices.PrefixStatusChoices,
     "ipam.VLAN": ipam_choices.VLANStatusChoices,
     "ipam.VRF": ipam_choices.VRFStatusChoices,
+    "load_balancers.LoadBalancerPoolMember": load_balancer_choices.LoadBalancerPoolMemberStatusChoices,
     "virtualization.VirtualMachine": vm_choices.VirtualMachineStatusChoices,
     "virtualization.VMInterface": vm_choices.VMInterfaceStatusChoices,
+    "vpn.VPNTunnel": vpn_choices.VPNTunnelStatusChoices,
 }
 
 
@@ -101,6 +105,7 @@ STATUS_DESCRIPTION_MAP = {
 # Add new mappings here as other models are supported.
 ROLE_CHOICESET_MAP = {
     "extras.ContactAssociation": extras_choices.ContactAssociationRoleChoices,
+    "vpn.VPNTunnelEndpoint": vpn_choices.VPNTunnelEndpointRoleChoices,
 }
 
 # Map of role name -> default hex_color used when importing color choices in `export_roles_from_choiceset()`.
@@ -110,6 +115,9 @@ ROLE_COLOR_MAP = {
     "Billing": ColorChoices.COLOR_GREEN,
     "Support": ColorChoices.COLOR_YELLOW,
     "On Site": ColorChoices.COLOR_BLACK,
+    "Hub": ColorChoices.COLOR_DARK_GREEN,
+    "Spoke": ColorChoices.COLOR_LIGHT_GREEN,
+    "Peer": ColorChoices.COLOR_ORANGE,
 }
 
 # Map of role name -> description used when importing role choices in `export_roles_from_choiceset()`.
@@ -118,6 +126,9 @@ ROLE_DESCRIPTION_MAP = {
     "Billing": "Unit plays a billing role",
     "Support": "Unit plays a support role",
     "On Site": "Unit plays an on site role",
+    "Hub": "Unit plays a Hub role",
+    "Spoke": "Unit plays a Spoke role",
+    "Peer": "Unit plays a Peer role",
 }
 
 

nautobot/extras/management/commands/refresh_dynamic_group_member_caches.py

@@ -14,4 +14,7 @@ class Command(BaseCommand):
         dynamic_groups = DynamicGroup.objects.all()
 
         for dynamic_group in dynamic_groups:
-            dynamic_group.update_cached_members()
+            try:
+                dynamic_group.update_cached_members()
+            except Exception as err:
+                self.stderr.write(self.style.ERROR(f"Error while refreshing {dynamic_group}: {err}"))

nautobot/extras/migrations/0127_approval_workflow_models.py

@@ -68,7 +68,7 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=255, unique=True)),
                 ("model_constraints", models.JSONField(blank=True, default=dict)),
-                ("priority", models.IntegerField(default=0)),
+                ("weight", models.IntegerField(default=0)),
                 (
                     "model_content_type",
                     models.ForeignKey(
@@ -83,7 +83,7 @@ class Migration(migrations.Migration):
             options={
                 "verbose_name": "Approval Workflow Definition",
                 "ordering": ["name"],
-                "unique_together": {("model_content_type", "priority")},
+                "unique_together": {("model_content_type", "weight")},
             },
             bases=(
                 nautobot.extras.models.mixins.DynamicGroupMixin,
@@ -122,7 +122,7 @@ class Migration(migrations.Migration):
             ],
             options={
                 "verbose_name": "Approval Workflow Stage",
-                "ordering": ["approval_workflow", "approval_workflow_stage_definition__weight"],
+                "ordering": ["approval_workflow", "approval_workflow_stage_definition__sequence"],
             },
             bases=(
                 nautobot.extras.models.mixins.DynamicGroupMixin,
@@ -179,7 +179,7 @@ class Migration(migrations.Migration):
                     "_custom_field_data",
                     models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
                 ),
-                ("weight", models.PositiveIntegerField()),
+                ("sequence", models.PositiveIntegerField()),
                 ("name", models.CharField(max_length=255)),
                 ("min_approvers", models.PositiveIntegerField()),
                 ("denial_message", models.CharField(blank=True, max_length=255)),
@@ -202,10 +202,10 @@ class Migration(migrations.Migration):
             ],
             options={
                 "verbose_name": "Approval Workflow Stage Definition",
-                "ordering": ["approval_workflow_definition", "weight"],
+                "ordering": ["approval_workflow_definition", "sequence"],
                 "unique_together": {
                     ("approval_workflow_definition", "name"),
-                    ("approval_workflow_definition", "weight"),
+                    ("approval_workflow_definition", "sequence"),
                 },
             },
             bases=(

nautobot/extras/migrations/0129_jobresult_debug_log_count_jobresult_error_log_count_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.24 on 2025-10-04 00:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0128_remove_job_approval_required_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="jobresult",
+            name="debug_log_count",
+            field=models.PositiveIntegerField(blank=True, editable=False, null=True),
+        ),
+        migrations.AddField(
+            model_name="jobresult",
+            name="error_log_count",
+            field=models.PositiveIntegerField(blank=True, editable=False, null=True),
+        ),
+        migrations.AddField(
+            model_name="jobresult",
+            name="info_log_count",
+            field=models.PositiveIntegerField(blank=True, editable=False, null=True),
+        ),
+        migrations.AddField(
+            model_name="jobresult",
+            name="success_log_count",
+            field=models.PositiveIntegerField(blank=True, editable=False, null=True),
+        ),
+        migrations.AddField(
+            model_name="jobresult",
+            name="warning_log_count",
+            field=models.PositiveIntegerField(blank=True, editable=False, null=True),
+        ),
+    ]

nautobot/extras/migrations/0130_jobresult_generate_log_entry_counts.py

@@ -0,0 +1,42 @@
+"""Migration to populate job_results.*_log_counts on existing JobResults."""
+
+from django.db import migrations
+from django.db.models import Count, Q
+
+
+def _populate_log_counts(apps, *_):
+    JobResult = apps.get_model("extras", "JobResult")
+    job_results_missing_counts = JobResult.objects.filter(
+        Q(debug_log_count=None)
+        | Q(success_log_count=None)
+        | Q(info_log_count=None)
+        | Q(warning_log_count=None)
+        | Q(error_log_count=None)
+    )
+    for job_result in job_results_missing_counts:
+        db_log_counts = job_result.job_log_entries.aggregate(
+            debug_log_count=Count("pk", filter=Q(log_level="debug")),
+            success_log_count=Count("pk", filter=Q(log_level="success")),
+            info_log_count=Count("pk", filter=Q(log_level="info")),
+            warning_log_count=Count("pk", filter=Q(log_level="warning")),
+            error_log_count=Count(
+                "pk",
+                filter=Q(log_level__in=["failure", "error", "critical"]),
+            ),
+        )
+        job_result.debug_log_count = db_log_counts["debug_log_count"]
+        job_result.success_log_count = db_log_counts["success_log_count"]
+        job_result.info_log_count = db_log_counts["info_log_count"]
+        job_result.warning_log_count = db_log_counts["warning_log_count"]
+        job_result.error_log_count = db_log_counts["error_log_count"]
+        job_result.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0129_jobresult_debug_log_count_jobresult_error_log_count_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(code=_populate_log_counts, reverse_code=migrations.RunPython.noop),
+    ]

nautobot/extras/migrations/0131_configcontext_device_families.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-26 19:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("dcim", "0074_alter_rack_u_height"),
+        ("extras", "0130_jobresult_generate_log_entry_counts"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="configcontext",
+            name="device_families",
+            field=models.ManyToManyField(blank=True, related_name="+", to="dcim.devicefamily"),
+        ),
+    ]

nautobot/extras/models/__init__.py

@@ -43,7 +43,7 @@ from .models import (
 from .relationships import Relationship, RelationshipAssociation, RelationshipModel
 from .roles import Role, RoleField
 from .secrets import Secret, SecretsGroup, SecretsGroupAssociation
-from .statuses import Status, StatusField, StatusModel
+from .statuses import Status, StatusField
 from .tags import Tag, TaggedItem
 
 __all__ = (
@@ -103,7 +103,6 @@ __all__ = (
     "StaticGroupAssociation",
     "Status",
     "StatusField",
-    "StatusModel",
     "Tag",
     "TaggedItem",
     "Team",

nautobot/extras/models/approvals.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError
+from django.core.exceptions import FieldError, ValidationError
 from django.db import models
 from django.utils import timezone
 
@@ -28,8 +28,8 @@ class ApprovalWorkflowDefinitionManager(BaseManager.from_queryset(RestrictedQuer
         """
         content_type = ContentType.objects.get_for_model(model_instance)
 
-        # Get all workflow definitions for this content type, ordered by priority (lowest first = highest priority)
-        workflow_definitions = self.get_queryset().filter(model_content_type=content_type).order_by("priority")
+        # Get all workflow definitions for this content type, ordered by weight (highest wins)
+        workflow_definitions = self.get_queryset().filter(model_content_type=content_type).order_by("-weight")
 
         for workflow_definition in workflow_definitions:
             if not workflow_definition.model_constraints:
@@ -77,11 +77,12 @@ class ApprovalWorkflowDefinition(PrimaryModel):
         default=dict,
         help_text="Constraints to filter the objects that can be approved using this workflow.",
     )
-    priority = models.IntegerField(
-        default=0, help_text="Determines workflow relevance when multiple apply. Lower values indicate higher priority."
+    weight = models.IntegerField(
+        default=0, help_text="Determines workflow relevance when multiple apply. Higher weight wins."
     )
     documentation_static_path = "docs/user-guide/platform-functionality/approval-workflow.html"
     is_dynamic_group_associable = False
+    is_data_compliance_model = False
     objects = ApprovalWorkflowDefinitionManager()
     is_version_controlled = False
 
@@ -90,12 +91,22 @@ class ApprovalWorkflowDefinition(PrimaryModel):
 
         verbose_name = "Approval Workflow Definition"
         ordering = ["name"]
-        unique_together = [["model_content_type", "priority"]]
+        unique_together = [["model_content_type", "weight"]]
 
     def __str__(self):
         """Stringify instance."""
         return self.name
 
+    def clean(self):
+        super().clean()
+        model_class = self.model_content_type.model_class()
+        if model_class is None:
+            raise ValidationError({"model_content_type": "Couldn't find corresponding model class. Is it installed?"})
+        try:
+            model_class.objects.filter(**self.model_constraints)
+        except (FieldError, AttributeError) as exc:
+            raise ValidationError({"model_constraints": f"Invalid query filter: {exc}"})
+
 
 @extras_features(
     "custom_links",
@@ -114,12 +125,13 @@ class ApprovalWorkflowStageDefinition(OrganizationalModel):
         on_delete=models.CASCADE,
         help_text="Approval workflow definition to which this stage belongs.",
     )
-    weight = models.PositiveIntegerField(
-        help_text="The weight dictates the order in which this stage will need to be approved. The lower the number, the earlier it will be.",
+    sequence = models.PositiveIntegerField(
+        help_text="The sequence dictates the order in which this stage will need to be approved. The lower the number, the earlier it will be.",
     )
     name = models.CharField(max_length=CHARFIELD_MAX_LENGTH)
     min_approvers = models.PositiveIntegerField(
-        help_text="Number of minimum approvers required to approve this stage.",
+        verbose_name="Minimum approvers",
+        help_text="Minimum number of approvers required to approve this stage.",
     )
     denial_message = models.CharField(
         max_length=CHARFIELD_MAX_LENGTH, blank=True, help_text="Message to show when the stage is denied."
@@ -128,18 +140,20 @@ class ApprovalWorkflowStageDefinition(OrganizationalModel):
         to=Group,
         related_name="approval_workflow_stage_definitions",
         verbose_name="Group",
-        help_text="Group of users who are eligible to approve this stage.",
+        help_text="Group of users who are eligible to approve this stage. Only admin users can create new groups.",
         on_delete=models.PROTECT,
     )
     documentation_static_path = "docs/user-guide/platform-functionality/approval-workflow.html"
     is_version_controlled = False
 
+    is_data_compliance_model = False
+
     class Meta:
         """Meta class for ApprovalWorkflowStage."""
 
         verbose_name = "Approval Workflow Stage Definition"
-        unique_together = [["approval_workflow_definition", "name"], ["approval_workflow_definition", "weight"]]
-        ordering = ["approval_workflow_definition", "weight"]
+        unique_together = [["approval_workflow_definition", "name"], ["approval_workflow_definition", "sequence"]]
+        ordering = ["approval_workflow_definition", "sequence"]
 
     def __str__(self):
         """Stringify instance."""
@@ -195,6 +209,7 @@ class ApprovalWorkflow(OrganizationalModel):
     user_name = models.CharField(max_length=150, editable=False, db_index=True)
     documentation_static_path = "docs/user-guide/platform-functionality/approval-workflow.html"
 
+    is_data_compliance_model = False
     is_version_controlled = False
 
     class Meta:
@@ -225,7 +240,7 @@ class ApprovalWorkflow(OrganizationalModel):
         """
         first_nonapproved_stage = (
             self.approval_workflow_stages.exclude(state=ApprovalWorkflowStateChoices.APPROVED)
-            .order_by("approval_workflow_stage_definition__weight")
+            .order_by("approval_workflow_stage_definition__sequence")
             .first()
         )
         return first_nonapproved_stage
@@ -317,12 +332,14 @@ class ApprovalWorkflowStage(OrganizationalModel):
     documentation_static_path = "docs/user-guide/platform-functionality/approval-workflow.html"
     is_version_controlled = False
 
+    is_data_compliance_model = False
+
     class Meta:
         """Meta class for ApprovalWorkflowStage."""
 
         verbose_name = "Approval Workflow Stage"
         unique_together = [["approval_workflow", "approval_workflow_stage_definition"]]
-        ordering = ["approval_workflow", "approval_workflow_stage_definition__weight"]
+        ordering = ["approval_workflow", "approval_workflow_stage_definition__sequence"]
 
     def __str__(self):
         """Stringify instance."""
@@ -506,6 +523,8 @@ class ApprovalWorkflowStageResponse(BaseModel):
     documentation_static_path = "docs/user-guide/platform-functionality/approval-workflow.html"
     is_version_controlled = False
 
+    is_data_compliance_model = False
+
     class Meta:
         """Meta class for ApprovalWorkflowStageResponse."""
 

nautobot/extras/models/change_logging.py

@@ -154,6 +154,10 @@ class ObjectChange(BaseModel):
     def __str__(self):
         return f"{self.changed_object_type} {self.object_repr} {self.get_action_display().lower()} by {self.user_name}"
 
+    @property
+    def page_title(self):
+        return f"{self.object_repr} - {self.time.strftime('%Y-%m-%d %H:%M')}"
+
     def save(self, *args, **kwargs):
         # Record the user's name and the object's representation as static strings
         if not self.user_name:

nautobot/extras/models/contacts.py

@@ -20,6 +20,7 @@ class ContactTeamSharedBase(PrimaryModel):
 
     comments = models.TextField(blank=True)
     is_contact_associable_model = False
+    is_data_compliance_model = False
 
     class Meta:
         abstract = True
@@ -94,6 +95,7 @@ class ContactAssociation(OrganizationalModel):
     is_contact_associable_model = False
     is_dynamic_group_associable_model = False
     is_saved_view_model = False
+    is_data_compliance_model = False
 
     class Meta:
         unique_together = (

nautobot/extras/models/groups.py

@@ -76,6 +76,7 @@ class DynamicGroup(PrimaryModel):
 
     objects = BaseManager.from_queryset(DynamicGroupQuerySet)()
     is_dynamic_group_associable_model = False
+    is_data_compliance_model = False
 
     clone_fields = ["content_type", "group_type", "filter", "tenant"]
 
@@ -628,6 +629,10 @@ class DynamicGroup(PrimaryModel):
         else:
             # Validate against the filterset's internal form validation.
             filterset = self.filterset_class(self.filter)  # pylint: disable=not-callable
+            # TODO: the below is more generous than one might expect. For example, passing a list of strings ["foo"]
+            # to a (single-input) CharFilter will quietly normalize the list to a string '["foo"]' instead of reporting
+            # any failure of is_valid(). We've had cases of such "should be invalid but isn't caught" DynamicGroups causing
+            # exceptions when trying to evaluate their membership; it would be good to be stricter here instead!
             if not filterset.is_valid():
                 raise ValidationError(filterset.errors)
 
@@ -661,6 +666,22 @@ class DynamicGroup(PrimaryModel):
 
             # TODO limit most changes to self.group_type as well.
 
+    def save(self, *args, update_cached_members=True, **kwargs):
+        """
+        Save the DynamicGroup record.
+
+        Args:
+            update_cached_members (bool): If True, (re)calculate the cached members set of the related group(s) immediately.
+                Note that this is potentially quite expensive if there will be a large change in the members set!
+                If False (recommended), you can call `self.update_cached_members()` explicitly when ready.
+        """
+        super().save(*args, **kwargs)
+
+        if update_cached_members:
+            self.update_cached_members()
+            for ancestor in self.get_ancestors():
+                ancestor.update_cached_members()
+
     def _generate_query_for_filter(self, filter_field, value):
         """
         Return a `Q` object generated from a `filter_field` and `value`.
@@ -703,9 +724,12 @@ class DynamicGroup(PrimaryModel):
             # "ams02"]}`, the value being a list of location names (`["ams01", "ams02"]`).
             if value and isinstance(value, list) and isinstance(value[0], str) and not is_uuid(value[0]):
                 model_field = django_filters.utils.get_model_field(self._model, filter_field.field_name)
-                related_model = model_field.related_model
-                lookup_kwargs = {f"{to_field_name}__in": value}
-                gq_value = related_model.objects.filter(**lookup_kwargs)
+                if model_field is None:
+                    gq_value = value
+                else:
+                    related_model = model_field.related_model
+                    lookup_kwargs = {f"{to_field_name}__in": value}
+                    gq_value = related_model.objects.filter(**lookup_kwargs)
             else:
                 gq_value = value
             query |= filter_field.generate_query(gq_value)
@@ -1172,12 +1196,26 @@ class DynamicGroupMembership(BaseModel):
         if self.group in self.parent_group.get_ancestors():
             raise ValidationError({"group": "Cannot add ancestor as a child"})
 
-    def save(self, *args, **kwargs):
+    def save(self, *args, update_cached_members=True, **kwargs):
+        """
+        Save the DynamicGroupMembership record.
+
+        Args:
+            update_cached_members (bool): If True, (re)calculate the cached members set of the related group(s) immediately.
+                Note that this is potentially quite expensive if there will be a large change in the members set!
+                If False (recommended), you can call `self.parent_group.update_cached_members()` explicitly when ready.
+        """
         # For backwards compatibility
         if self.parent_group.group_type == DynamicGroupTypeChoices.TYPE_DYNAMIC_FILTER and not self.parent_group.filter:
             self.parent_group.group_type = DynamicGroupTypeChoices.TYPE_DYNAMIC_SET
             self.parent_group.save()
-        return super().save(*args, **kwargs)
+
+        super().save(*args, **kwargs)
+
+        if update_cached_members:
+            self.parent_group.update_cached_members()
+            for ancestor in self.parent_group.get_ancestors():
+                ancestor.update_cached_members()
 
 
 class StaticGroupAssociationManager(BaseManager.from_queryset(RestrictedQuerySet)):
@@ -1218,6 +1256,7 @@ class StaticGroupAssociation(OrganizationalModel):
     is_contact_associable_model = False
     is_dynamic_group_associable_model = False
     is_saved_view_model = False
+    is_data_compliance_model = False
 
     class Meta:
         unique_together = [["dynamic_group", "associated_object_type", "associated_object_id"]]

nautobot/extras/models/jobs.py

@@ -15,7 +15,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models, transaction
-from django.db.models import ProtectedError, signals
+from django.db.models import Count, ProtectedError, Q, signals
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django_celery_beat.clockedschedule import clocked
@@ -252,6 +252,7 @@ class Job(PrimaryModel):
         help_text="If set, the configured value will remain even if the underlying Job source code changes",
     )
     objects = BaseManager.from_queryset(JobQuerySet)()
+    is_data_compliance_model = False
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
 
@@ -439,6 +440,8 @@ class JobHook(OrganizationalModel):
     type_delete = models.BooleanField(default=False, help_text="Call this job hook when a matching object is deleted.")
     type_update = models.BooleanField(default=False, help_text="Call this job hook when a matching object is updated.")
 
+    is_data_compliance_model = False
+
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/jobhook.html"
 
     class Meta:
@@ -529,6 +532,7 @@ class JobLogEntry(BaseModel):
     absolute_url = models.CharField(max_length=JOB_LOG_MAX_ABSOLUTE_URL_LENGTH, blank=True, default="")
 
     is_metadata_associable_model = False
+    is_data_compliance_model = False
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
     hide_in_diff_view = True
@@ -580,6 +584,7 @@ class JobQueue(PrimaryModel):
     )
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/jobqueue.html"
+    is_data_compliance_model = False
 
     class Meta:
         ordering = ["name"]
@@ -610,6 +615,7 @@ class JobQueueAssignment(BaseModel):
     job = models.ForeignKey(Job, on_delete=models.CASCADE, related_name="job_queue_assignments")
     job_queue = models.ForeignKey(JobQueue, on_delete=models.CASCADE, related_name="job_assignments")
     is_metadata_associable_model = False
+    is_data_compliance_model = False
 
     class Meta:
         unique_together = ["job", "job_queue"]
@@ -678,11 +684,17 @@ class JobResult(SavedViewMixin, BaseModel, CustomFieldModel):
     traceback = models.TextField(blank=True, null=True)  # noqa: DJ001  # django-nullable-model-string-field -- TODO: can we remove null=True?
     meta = models.JSONField(null=True, default=None, editable=False)
     scheduled_job = models.ForeignKey(to="extras.ScheduledJob", on_delete=models.SET_NULL, null=True, blank=True)
+    debug_log_count = models.PositiveIntegerField(blank=True, null=True, editable=False)
+    success_log_count = models.PositiveIntegerField(blank=True, null=True, editable=False)
+    info_log_count = models.PositiveIntegerField(blank=True, null=True, editable=False)
+    warning_log_count = models.PositiveIntegerField(blank=True, null=True, editable=False)
+    error_log_count = models.PositiveIntegerField(blank=True, null=True, editable=False)
 
     objects = JobResultManager()
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
     hide_in_diff_view = True
+    is_data_compliance_model = False
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -762,6 +774,30 @@ class JobResult(SavedViewMixin, BaseModel, CustomFieldModel):
 
     set_status.alters_data = True
 
+    def count_logs_by_level(self):
+        """Helper method to count JobLogEntries after a Job is run, or update these values when missing or changed."""
+        db_log_counts = self.job_log_entries.aggregate(
+            debug_log_count=Count("pk", filter=Q(log_level=LogLevelChoices.LOG_DEBUG)),
+            success_log_count=Count("pk", filter=Q(log_level=LogLevelChoices.LOG_SUCCESS)),
+            info_log_count=Count("pk", filter=Q(log_level=LogLevelChoices.LOG_INFO)),
+            warning_log_count=Count("pk", filter=Q(log_level=LogLevelChoices.LOG_WARNING)),
+            error_log_count=Count(
+                "pk",
+                filter=Q(
+                    log_level__in=[
+                        LogLevelChoices.LOG_FAILURE,
+                        LogLevelChoices.LOG_ERROR,
+                        LogLevelChoices.LOG_CRITICAL,
+                    ]
+                ),
+            ),
+        )
+        self.debug_log_count = db_log_counts["debug_log_count"]
+        self.success_log_count = db_log_counts["success_log_count"]
+        self.info_log_count = db_log_counts["info_log_count"]
+        self.warning_log_count = db_log_counts["warning_log_count"]
+        self.error_log_count = db_log_counts["error_log_count"]
+
     @classmethod
     def execute_job(cls, *args, **kwargs):
         """
@@ -1006,6 +1042,18 @@ class JobResult(SavedViewMixin, BaseModel, CustomFieldModel):
 
     log.alters_data = True
 
+    def save(self, *args, **kwargs):
+        """When a JobResult is saved and in a terminal state, store missing log counts for summary."""
+        if self.status in JobResultStatusChoices.READY_STATES and None in [
+            self.debug_log_count,
+            self.info_log_count,
+            self.success_log_count,
+            self.warning_log_count,
+            self.error_log_count,
+        ]:
+            self.count_logs_by_level()
+        super().save(*args, **kwargs)
+
 
 #
 # Job Button
@@ -1055,10 +1103,18 @@ class JobButton(ContactMixin, ChangeLoggedModel, DynamicGroupsModelMixin, NotesM
     )
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/jobbutton.html"
+    is_data_compliance_model = False
 
     class Meta:
         ordering = ["group_name", "weight", "name"]
 
+    @property
+    def button_class_css_class(self):
+        """Map self.button_class database value to the correct CSS class for buttons."""
+        if self.button_class == ButtonClassChoices.CLASS_DEFAULT:
+            return "secondary"
+        return self.button_class
+
     def __str__(self):
         return self.name
 
@@ -1081,6 +1137,7 @@ class ScheduledJobs(models.Model):
     last_update = models.DateTimeField(null=False)
 
     objects = ScheduledJobsManager()
+    is_data_compliance_model = False
 
     def __str__(self):
         return str(self.ident)
@@ -1218,6 +1275,7 @@ class ScheduledJob(ApprovableModelMixin, BaseModel):
     no_changes = False
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/job-scheduling-and-approvals.html"
+    is_data_compliance_model = False
 
     def __str__(self):
         return f"{self.name}: {self.interval}"
@@ -1355,7 +1413,6 @@ class ScheduledJob(ApprovableModelMixin, BaseModel):
         job_queue: Optional[JobQueue] = None,
         task_queue: Optional[str] = None,  # deprecated!
         ignore_singleton_lock: bool = False,
-        validated_save: bool = True,
         **job_kwargs,
     ):
         """
@@ -1445,8 +1502,7 @@ class ScheduledJob(ApprovableModelMixin, BaseModel):
             crontab=crontab,
             job_queue=job_queue,
         )
-        if validated_save:
-            scheduled_job.validated_save()
+        scheduled_job.validated_save()
         return scheduled_job
 
     create_schedule.__func__.alters_data = True