nautobot 2.4.0__py3-none-any.whl → 2.4.0b1__py3-none-any.whl

nautobot/extras/api/serializers.py

@@ -19,6 +19,7 @@ from nautobot.core.api import (
     ValidatedModelSerializer,
 )
 from nautobot.core.api.exceptions import SerializerNotFound
+from nautobot.core.api.fields import NautobotHyperlinkedRelatedField
 from nautobot.core.api.serializers import PolymorphicProxySerializer
 from nautobot.core.api.utils import (
     get_nested_serializer_depth,
@@ -135,12 +136,12 @@ class ConfigContextSerializer(ValidatedModelSerializer, TaggedModelSerializerMix
     owner = serializers.SerializerMethodField(read_only=True)
 
     # Conditional enablement of dynamic groups filtering
-    @property
-    def fields(self):
-        fields = super().fields
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
         if not settings.CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED:
-            fields.pop("dynamic_groups", None)
-        return fields
+            # In the case of a nested serializer, we won't have a `dynamic_groups` field at all.
+            self.fields.pop("dynamic_groups", None)
 
     class Meta:
         model = ConfigContext
@@ -199,7 +200,10 @@ class ConfigContextSchemaSerializer(NautobotModelSerializer):
 #
 
 
-class ContactSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
+class ContactSerializer(NautobotModelSerializer):
+    # needed since this is the reverse side of the M2M field.
+    teams = NautobotHyperlinkedRelatedField(queryset=Team.objects.all(), many=True, required=False)
+
     class Meta:
         model = Contact
         fields = "__all__"
@@ -208,22 +212,15 @@ class ContactSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
         extra_kwargs = {
             "email": {"default": ""},
             "phone": {"default": ""},
-            "teams": {"required": False},
         }
 
-    def get_field_names(self, declared_fields, info):
-        """Add reverse M2M for teams to the fields for this serializer."""
-        field_names = list(super().get_field_names(declared_fields, info))
-        self.extend_field_names(field_names, "teams")
-        return field_names
-
-    def validate(self, attrs):
-        local_attrs = attrs.copy()
-        local_attrs.pop("teams", None)
+    def validate(self, data):
+        attrs = data.copy()
+        attrs.pop("teams", None)
         validator = UniqueTogetherValidator(queryset=Contact.objects.all(), fields=("name", "phone", "email"))
-        validator(local_attrs, self)
-        super().validate(local_attrs)
-        return attrs
+        validator(attrs, self)
+        super().validate(attrs)
+        return data
 
 
 class ContactAssociationSerializer(NautobotModelSerializer):
@@ -238,18 +235,18 @@ class ContactAssociationSerializer(NautobotModelSerializer):
             "team": {"required": False},
         }
 
-    def validate(self, attrs):
+    def validate(self, data):
         # Validate uniqueness of (associated object, associated object type, contact/team, role)
         unique_together_fields = None
 
-        if attrs.get("contact") and attrs.get("role"):
+        if data.get("contact") and data.get("role"):
             unique_together_fields = (
                 "associated_object_type",
                 "associated_object_id",
                 "contact",
                 "role",
             )
-        elif attrs.get("team") and attrs.get("role"):
+        elif data.get("team") and data.get("role"):
             unique_together_fields = (
                 "associated_object_type",
                 "associated_object_id",
@@ -262,11 +259,11 @@ class ContactAssociationSerializer(NautobotModelSerializer):
                 queryset=ContactAssociation.objects.all(),
                 fields=unique_together_fields,
             )
-            validator(attrs, self)
+            validator(data, self)
 
-        super().validate(attrs)
+        super().validate(data)
 
-        return attrs
+        return data
 
 
 #
@@ -275,7 +272,6 @@ class ContactAssociationSerializer(NautobotModelSerializer):
 
 
 class ContentTypeSerializer(BaseModelSerializer):
-    id = serializers.IntegerField(read_only=True)
     url = serializers.HyperlinkedIdentityField(view_name="extras-api:contenttype-detail")
     display = serializers.SerializerMethodField()
 
@@ -284,8 +280,8 @@ class ContentTypeSerializer(BaseModelSerializer):
         fields = "__all__"
 
     @extend_schema_field(serializers.CharField)
-    def get_display(self, instance):
-        return instance.app_labeled_name
+    def get_display(self, obj):
+        return obj.app_labeled_name
 
 
 #
@@ -437,7 +433,7 @@ class ExportTemplateSerializer(RelationshipModelSerializerMixin, ValidatedModelS
 #
 
 
-class ExternalIntegrationSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
+class ExternalIntegrationSerializer(NautobotModelSerializer):
     class Meta:
         model = ExternalIntegration
         fields = "__all__"
@@ -459,7 +455,7 @@ class FileProxySerializer(BaseModelSerializer):
 #
 
 
-class GitRepositorySerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
+class GitRepositorySerializer(NautobotModelSerializer):
     """Git repositories defined as a data source."""
 
     provided_contents = MultipleChoiceJSONField(
@@ -506,17 +502,17 @@ class ImageAttachmentSerializer(ValidatedModelSerializer):
         model = ImageAttachment
         fields = "__all__"
 
-    def validate(self, attrs):
+    def validate(self, data):
         # Validate that the parent object exists
         try:
-            attrs["content_type"].get_object_for_this_type(id=attrs["object_id"])
+            data["content_type"].get_object_for_this_type(id=data["object_id"])
         except ObjectDoesNotExist:
-            raise serializers.ValidationError(f"Invalid parent object: {attrs['content_type']} ID {attrs['object_id']}")
+            raise serializers.ValidationError(f"Invalid parent object: {data['content_type']} ID {data['object_id']}")
 
         # Enforce model validation
-        super().validate(attrs)
+        super().validate(data)
 
-        return attrs
+        return data
 
     @extend_schema_field(
         PolymorphicProxySerializer(
@@ -548,24 +544,24 @@ class JobSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
         model = Job
         fields = "__all__"
 
-    def validate(self, attrs):
+    def validate(self, data):
         # note no validation for on creation of jobs because we do not support user creation of Job records via API
         if self.instance:
-            has_sensitive_variables = attrs.get("has_sensitive_variables", self.instance.has_sensitive_variables)
-            approval_required = attrs.get("approval_required", self.instance.approval_required)
+            has_sensitive_variables = data.get("has_sensitive_variables", self.instance.has_sensitive_variables)
+            approval_required = data.get("approval_required", self.instance.approval_required)
 
             if approval_required and has_sensitive_variables:
                 error_message = "A job with sensitive variables cannot also be marked as requiring approval"
                 errors = {}
 
-                if "approval_required" in attrs:
+                if "approval_required" in data:
                     errors["approval_required"] = [error_message]
-                if "has_sensitive_variables" in attrs:
+                if "has_sensitive_variables" in data:
                     errors["has_sensitive_variables"] = [error_message]
 
                 raise serializers.ValidationError(errors)
 
-        return super().validate(attrs)
+        return super().validate(data)
 
 
 class JobQueueSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
@@ -691,22 +687,22 @@ class JobHookSerializer(NautobotModelSerializer):
         model = JobHook
         fields = "__all__"
 
-    def validate(self, attrs):
-        validated_attrs = super().validate(attrs)
+    def validate(self, data):
+        validated_data = super().validate(data)
 
         conflicts = JobHook.check_for_conflicts(
             instance=self.instance,
-            content_types=attrs.get("content_types"),
-            job=attrs.get("job"),
-            type_create=attrs.get("type_create"),
-            type_update=attrs.get("type_update"),
-            type_delete=attrs.get("type_delete"),
+            content_types=data.get("content_types"),
+            job=data.get("job"),
+            type_create=data.get("type_create"),
+            type_update=data.get("type_update"),
+            type_delete=data.get("type_delete"),
         )
 
         if conflicts:
             raise serializers.ValidationError(conflicts)
 
-        return validated_attrs
+        return validated_data
 
 
 class JobCreationSerializer(BaseModelSerializer):
@@ -725,15 +721,15 @@ class JobCreationSerializer(BaseModelSerializer):
         model = ScheduledJob
         fields = ["url", "name", "start_time", "interval", "crontab"]
 
-    def validate(self, attrs):
-        attrs = super().validate(attrs)
+    def validate(self, data):
+        data = super().validate(data)
 
-        if attrs["interval"] in choices.JobExecutionType.SCHEDULE_CHOICES:
-            if "name" not in attrs:
+        if data["interval"] in choices.JobExecutionType.SCHEDULE_CHOICES:
+            if "name" not in data:
                 raise serializers.ValidationError({"name": "Please provide a name for the job schedule."})
 
-            if ("start_time" not in attrs and attrs["interval"] != choices.JobExecutionType.TYPE_CUSTOM) or (
-                "start_time" in attrs and attrs["start_time"] < models.ScheduledJob.earliest_possible_time()
+            if ("start_time" not in data and data["interval"] != choices.JobExecutionType.TYPE_CUSTOM) or (
+                "start_time" in data and data["start_time"] < models.ScheduledJob.earliest_possible_time()
             ):
                 raise serializers.ValidationError(
                     {
@@ -741,15 +737,15 @@ class JobCreationSerializer(BaseModelSerializer):
                     }
                 )
 
-            if attrs["interval"] == choices.JobExecutionType.TYPE_CUSTOM:
-                if attrs.get("crontab") is None:
+            if data["interval"] == choices.JobExecutionType.TYPE_CUSTOM:
+                if data.get("crontab") is None:
                     raise serializers.ValidationError({"crontab": "Please enter a valid crontab."})
                 try:
-                    models.ScheduledJob.get_crontab(attrs["crontab"])
+                    models.ScheduledJob.get_crontab(data["crontab"])
                 except Exception as e:
                     raise serializers.ValidationError({"crontab": e})
 
-        return attrs
+        return data
 
 
 class JobInputSerializer(serializers.Serializer):
@@ -769,18 +765,15 @@ class JobMultiPartInputSerializer(serializers.Serializer):
     _task_queue = serializers.CharField(required=False, allow_blank=True)
     _job_queue = serializers.CharField(required=False, allow_blank=True)
 
-    def validate(self, attrs):
-        attrs = super().validate(attrs)
+    def validate(self, data):
+        data = super().validate(data)
 
-        if "_schedule_interval" in attrs and attrs["_schedule_interval"] != JobExecutionType.TYPE_IMMEDIATELY:
-            if "_schedule_name" not in attrs:
+        if "_schedule_interval" in data and data["_schedule_interval"] != JobExecutionType.TYPE_IMMEDIATELY:
+            if "_schedule_name" not in data:
                 raise serializers.ValidationError({"_schedule_name": "Please provide a name for the job schedule."})
 
-            if (
-                "_schedule_start_time" not in attrs and attrs["_schedule_interval"] != JobExecutionType.TYPE_CUSTOM
-            ) or (
-                "_schedule_start_time" in attrs
-                and attrs["_schedule_start_time"] < ScheduledJob.earliest_possible_time()
+            if ("_schedule_start_time" not in data and data["_schedule_interval"] != JobExecutionType.TYPE_CUSTOM) or (
+                "_schedule_start_time" in data and data["_schedule_start_time"] < ScheduledJob.earliest_possible_time()
             ):
                 raise serializers.ValidationError(
                     {
@@ -788,15 +781,15 @@ class JobMultiPartInputSerializer(serializers.Serializer):
                     }
                 )
 
-            if attrs["_schedule_interval"] == JobExecutionType.TYPE_CUSTOM:
-                if attrs.get("_schedule_crontab") is None:
+            if data["_schedule_interval"] == JobExecutionType.TYPE_CUSTOM:
+                if data.get("_schedule_crontab") is None:
                     raise serializers.ValidationError({"_schedule_crontab": "Please enter a valid crontab."})
                 try:
-                    ScheduledJob.get_crontab(attrs["_schedule_crontab"])
+                    ScheduledJob.get_crontab(data["_schedule_crontab"])
                 except Exception as e:
                     raise serializers.ValidationError({"_schedule_crontab": e})
 
-        return attrs
+        return data
 
 
 class JobLogEntrySerializer(BaseModelSerializer):
@@ -823,7 +816,7 @@ class JobButtonSerializer(ValidatedModelSerializer, NotesSerializerMixin):
 #
 
 
-class MetadataTypeSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
+class MetadataTypeSerializer(NautobotModelSerializer):
     content_types = ContentTypeField(
         queryset=ContentType.objects.filter(FeatureQuery("metadata").get_query()),
         many=True,
@@ -1080,18 +1073,18 @@ class TagSerializer(NautobotModelSerializer):
             "color": {"help_text": "RGB color in hexadecimal (e.g. 00ff00)"},
         }
 
-    def validate(self, attrs):
-        attrs = super().validate(attrs)
+    def validate(self, data):
+        data = super().validate(data)
 
         # check if tag is assigned to any of the removed content_types
-        if self.instance is not None and self.instance.present_in_database and "content_types" in attrs:
-            content_types_id = [content_type.id for content_type in attrs["content_types"]]
+        if self.instance is not None and self.instance.present_in_database and "content_types" in data:
+            content_types_id = [content_type.id for content_type in data["content_types"]]
             errors = self.instance.validate_content_types_removal(content_types_id)
 
             if errors:
                 raise serializers.ValidationError(errors)
 
-        return attrs
+        return data
 
 
 #
@@ -1099,7 +1092,9 @@ class TagSerializer(NautobotModelSerializer):
 #
 
 
-class TeamSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
+class TeamSerializer(NautobotModelSerializer):
+    contacts = NautobotHyperlinkedRelatedField(queryset=Contact.objects.all(), many=True, required=False)
+
     class Meta:
         model = Team
         fields = "__all__"
@@ -1111,10 +1106,10 @@ class TeamSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
         # https://www.django-rest-framework.org/api-guide/validators/#optional-fields
         validators = []
 
-    def validate(self, attrs):
+    def validate(self, data):
         validator = UniqueTogetherValidator(queryset=Team.objects.all(), fields=("name", "phone", "email"))
-        validator(attrs, self)
-        return super().validate(attrs)
+        validator(data, self)
+        return super().validate(data)
 
 
 #
@@ -1132,19 +1127,19 @@ class WebhookSerializer(ValidatedModelSerializer, NotesSerializerMixin):
         model = Webhook
         fields = "__all__"
 
-    def validate(self, attrs):
-        validated_attrs = super().validate(attrs)
+    def validate(self, data):
+        validated_data = super().validate(data)
 
         conflicts = Webhook.check_for_conflicts(
             instance=self.instance,
-            content_types=attrs.get("content_types"),
-            payload_url=attrs.get("payload_url"),
-            type_create=attrs.get("type_create"),
-            type_update=attrs.get("type_update"),
-            type_delete=attrs.get("type_delete"),
+            content_types=data.get("content_types"),
+            payload_url=data.get("payload_url"),
+            type_create=data.get("type_create"),
+            type_update=data.get("type_update"),
+            type_delete=data.get("type_delete"),
         )
 
         if conflicts:
             raise serializers.ValidationError(conflicts)
 
-        return validated_attrs
+        return validated_data

nautobot/extras/api/views.py

@@ -17,7 +17,6 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from nautobot.core.api.authentication import TokenPermissions
-from nautobot.core.api.parsers import NautobotCSVParser
 from nautobot.core.api.utils import get_serializer_for_model
 from nautobot.core.api.views import (
     BulkDestroyModelMixin,
@@ -181,7 +180,14 @@ class ConfigContextQuerySetMixin:
 
 
 class ConfigContextViewSet(NotesViewSetMixin, ModelViewSet):
-    queryset = ConfigContext.objects.all()
+    queryset = ConfigContext.objects.prefetch_related(
+        "locations",
+        "roles",
+        "device_types",
+        "platforms",
+        "tenant_groups",
+        "tenants",
+    )
     serializer_class = serializers.ConfigContextSerializer
     filterset_class = filters.ConfigContextFilterSet
 
@@ -298,7 +304,7 @@ class DynamicGroupViewSet(NotesViewSetMixin, ModelViewSet):
     Manage Dynamic Groups through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = DynamicGroup.objects.all()
+    queryset = DynamicGroup.objects.select_related("content_type")
     serializer_class = serializers.DynamicGroupSerializer
     filterset_class = filters.DynamicGroupFilterSet
 
@@ -323,7 +329,7 @@ class DynamicGroupMembershipViewSet(ModelViewSet):
     Manage Dynamic Group Memberships through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = DynamicGroupMembership.objects.all()
+    queryset = DynamicGroupMembership.objects.select_related("group", "parent_group")
     serializer_class = serializers.DynamicGroupMembershipSerializer
     filterset_class = filters.DynamicGroupMembershipFilterSet
 
@@ -334,13 +340,13 @@ class DynamicGroupMembershipViewSet(ModelViewSet):
 
 
 class SavedViewViewSet(ModelViewSet):
-    queryset = SavedView.objects.all()
+    queryset = SavedView.objects.select_related("owner")
     serializer_class = serializers.SavedViewSerializer
     filterset_class = filters.SavedViewFilterSet
 
 
 class UserSavedViewAssociationViewSet(ModelViewSet):
-    queryset = UserSavedViewAssociation.objects.all()
+    queryset = UserSavedViewAssociation.objects.select_related("user", "saved_view")
     serializer_class = serializers.UserSavedViewAssociationSerializer
     filterset_class = filters.UserSavedViewAssociationFilterSet
 
@@ -350,7 +356,7 @@ class StaticGroupAssociationViewSet(NautobotModelViewSet):
     Manage Static Group Associations through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = StaticGroupAssociation.objects.all()
+    queryset = StaticGroupAssociation.objects.select_related("associated_object_type", "dynamic_group")
     serializer_class = serializers.StaticGroupAssociationSerializer
     filterset_class = filters.StaticGroupAssociationFilterSet
 
@@ -361,7 +367,7 @@ class StaticGroupAssociationViewSet(NautobotModelViewSet):
             and "dynamic_group" in self.request.GET
             and self.action in ["list", "retrieve"]
         ):
-            self.queryset = StaticGroupAssociation.all_objects.all()
+            self.queryset = StaticGroupAssociation.all_objects.select_related("associated_object_type", "dynamic_group")
         return super().get_queryset()
 
 
@@ -382,7 +388,7 @@ class ExportTemplateViewSet(NotesViewSetMixin, ModelViewSet):
 
 
 class ExternalIntegrationViewSet(NautobotModelViewSet):
-    queryset = ExternalIntegration.objects.all()
+    queryset = ExternalIntegration.objects.select_related("secrets_group")
     serializer_class = serializers.ExternalIntegrationSerializer
     filterset_class = filters.ExternalIntegrationFilterSet
 
@@ -393,7 +399,7 @@ class ExternalIntegrationViewSet(NautobotModelViewSet):
 
 
 class FileProxyViewSet(ReadOnlyModelViewSet):
-    queryset = FileProxy.objects.all()
+    queryset = FileProxy.objects.select_related("job_result")
     serializer_class = serializers.FileProxySerializer
     filterset_class = filters.FileProxyFilterSet
 
@@ -482,7 +488,6 @@ class ImageAttachmentViewSet(ModelViewSet):
     queryset = ImageAttachment.objects.all()
     serializer_class = serializers.ImageAttachmentSerializer
     filterset_class = filters.ImageAttachmentFilterSet
-    parser_classes = [JSONParser, NautobotCSVParser, MultiPartParser]
 
 
 #
@@ -761,13 +766,13 @@ class JobViewSet(
 ):
     lookup_value_regex = r"[-0-9a-fA-F]+"
 
-    def perform_destroy(self, instance):
-        if instance.module_name.startswith("nautobot."):
+    def perform_destroy(self, obj):
+        if obj.module_name.startswith("nautobot."):
             raise ProtectedError(
-                f"Unable to delete Job {instance}. System Job cannot be deleted",
+                f"Unable to delete Job {obj}. System Job cannot be deleted",
                 [],
             )
-        super().perform_destroy(instance)
+        super().perform_destroy(obj)
 
 
 @extend_schema_view(
@@ -833,7 +838,7 @@ class JobQueueAssignmentViewSet(NautobotModelViewSet):
     Manage job queue assignments through DELETE, GET, POST, PUT, and PATCH requests.
     """
 
-    queryset = JobQueueAssignment.objects.all()
+    queryset = JobQueueAssignment.objects.select_related("job", "job_queue")
     serializer_class = serializers.JobQueueAssignmentSerializer
     filterset_class = filters.JobQueueAssignmentFilterSet
 
@@ -848,7 +853,7 @@ class JobLogEntryViewSet(ReadOnlyModelViewSet):
     Retrieve a list of job log entries.
     """
 
-    queryset = JobLogEntry.objects.all()
+    queryset = JobLogEntry.objects.select_related("job_result")
     serializer_class = serializers.JobLogEntrySerializer
     filterset_class = filters.JobLogEntryFilterSet
 
@@ -866,7 +871,7 @@ class JobResultViewSet(
     Retrieve a list of job results
     """
 
-    queryset = JobResult.objects.all()
+    queryset = JobResult.objects.select_related("job_model", "user")
     serializer_class = serializers.JobResultSerializer
     filterset_class = filters.JobResultFilterSet
 
@@ -903,7 +908,7 @@ class ScheduledJobViewSet(ReadOnlyModelViewSet):
     Retrieve a list of scheduled jobs
     """
 
-    queryset = ScheduledJob.objects.all()
+    queryset = ScheduledJob.objects.select_related("user")
     serializer_class = serializers.ScheduledJobSerializer
     filterset_class = filters.ScheduledJobFilterSet
 
@@ -1056,7 +1061,7 @@ class MetadataTypeViewSet(NautobotModelViewSet):
 
 
 class MetadataChoiceViewSet(ModelViewSet):
-    queryset = MetadataChoice.objects.all()
+    queryset = MetadataChoice.objects.select_related("metadata_type")
     serializer_class = serializers.MetadataChoiceSerializer
     filterset_class = filters.MetadataChoiceFilterSet
 
@@ -1073,7 +1078,7 @@ class ObjectMetadataViewSet(NautobotModelViewSet):
 
 
 class NoteViewSet(ModelViewSet):
-    queryset = Note.objects.all()
+    queryset = Note.objects.select_related("user")
     serializer_class = serializers.NoteSerializer
     filterset_class = filters.NoteFilterSet
 
@@ -1092,7 +1097,7 @@ class ObjectChangeViewSet(ReadOnlyModelViewSet):
     Retrieve a list of recent changes.
     """
 
-    queryset = ObjectChange.objects.all()
+    queryset = ObjectChange.objects.select_related("user")
     serializer_class = serializers.ObjectChangeSerializer
     filterset_class = filters.ObjectChangeFilterSet
 

nautobot/extras/constants.py

@@ -30,7 +30,6 @@ JOB_OVERRIDABLE_FIELDS = (
     "soft_time_limit",
     "time_limit",
     "has_sensitive_variables",
-    "is_singleton",
 )
 
 
@@ -53,5 +52,4 @@ JOB_RESULT_CUSTOM_CELERY_KWARGS = (
     "nautobot_job_job_model_id",
     "nautobot_job_scheduled_job_id",
     "nautobot_job_user_id",
-    "nautobot_job_ignore_singleton_lock",
 )

nautobot/extras/filters/__init__.py

@@ -119,13 +119,13 @@ __all__ = (
     "CustomFieldDateFilter",
     "CustomFieldFilterMixin",
     "CustomFieldJSONFilter",
-    "CustomFieldModelFilterSet",
-    "CustomFieldModelFilterSetMixin",
     "CustomFieldMultiSelectFilter",
     "CustomFieldMultiValueCharFilter",
     "CustomFieldMultiValueDateFilter",
     "CustomFieldMultiValueNumberFilter",
     "CustomFieldNumberFilter",
+    "CustomFieldModelFilterSet",
+    "CustomFieldModelFilterSetMixin",
     "CustomLinkFilterSet",
     "DynamicGroupFilterSet",
     "DynamicGroupMembershipFilterSet",
@@ -136,25 +136,25 @@ __all__ = (
     "ImageAttachmentFilterSet",
     "JobFilterSet",
     "JobLogEntryFilterSet",
-    "JobQueueAssignmentFilterSet",
     "JobQueueFilterSet",
+    "JobQueueAssignmentFilterSet",
     "JobResultFilterSet",
     "LocalContextFilterSet",
     "LocalContextModelFilterSetMixin",
-    "MetadataChoiceFilterSet",
     "MetadataTypeFilterSet",
+    "MetadataChoiceFilterSet",
     "NautobotFilterSet",
     "NoteFilterSet",
     "ObjectChangeFilterSet",
-    "RelationshipAssociationFilterSet",
     "RelationshipFilter",
     "RelationshipFilterSet",
+    "RelationshipAssociationFilterSet",
     "RoleFilterSet",
     "RoleModelFilterSetMixin",
     "ScheduledJobFilterSet",
     "SecretFilterSet",
-    "SecretsGroupAssociationFilterSet",
     "SecretsGroupFilterSet",
+    "SecretsGroupAssociationFilterSet",
     "StatusFilter",
     "StatusFilterSet",
     "StatusModelFilterSetMixin",
@@ -874,7 +874,6 @@ class JobFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
             "is_job_button_receiver",
             "soft_time_limit",
             "time_limit",
-            "is_singleton",
             "grouping_override",
             "name_override",
             "approval_required_override",
@@ -884,7 +883,6 @@ class JobFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
             "soft_time_limit_override",
             "time_limit_override",
             "has_sensitive_variables_override",
-            "is_singleton_override",
             "tags",
         ]
 

nautobot/extras/forms/base.py

@@ -14,9 +14,9 @@ from .mixins import (
 )
 
 __all__ = (
-    "NautobotBulkEditForm",
-    "NautobotFilterForm",
     "NautobotModelForm",
+    "NautobotFilterForm",
+    "NautobotBulkEditForm",
 )