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

nautobot/extras/forms/forms.py

@@ -1,7 +1,5 @@
 import inspect
-import logging
 
-from celery import chain
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -9,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db.models.fields import TextField
-from django.forms import inlineformset_factory, ModelMultipleChoiceField, MultipleHiddenInput
+from django.forms import inlineformset_factory, ModelMultipleChoiceField
 from django.urls.base import reverse
 from django.utils.timezone import get_current_timezone_name
 
@@ -37,7 +35,6 @@ from nautobot.core.forms import (
     TagFilterField,
 )
 from nautobot.core.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
-from nautobot.core.forms.forms import ConfirmationForm
 from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.dcim.models import Device, DeviceRedundancyGroup, DeviceType, Location, Platform
 from nautobot.extras.choices import (
@@ -91,12 +88,9 @@ from nautobot.extras.models import (
     Webhook,
 )
 from nautobot.extras.registry import registry
-from nautobot.extras.signals import change_context_state
-from nautobot.extras.tasks import delete_custom_field_data
 from nautobot.extras.utils import (
     ChangeLoggedModelsQuery,
     FeatureQuery,
-    get_worker_count,
     RoleModelsQuery,
     TaggableClassesQuery,
 )
@@ -117,90 +111,87 @@ from .mixins import (
     TagsBulkEditFormMixin,
 )
 
-logger = logging.getLogger(__name__)
-
 __all__ = (
     "BaseDynamicGroupMembershipFormSet",
-    "ComputedFieldFilterForm",
     "ComputedFieldForm",
+    "ComputedFieldFilterForm",
+    "ConfigContextForm",
     "ConfigContextBulkEditForm",
     "ConfigContextFilterForm",
-    "ConfigContextForm",
+    "ConfigContextSchemaForm",
     "ConfigContextSchemaBulkEditForm",
     "ConfigContextSchemaFilterForm",
-    "ConfigContextSchemaForm",
-    "CustomFieldBulkCreateForm",  # 2.0 TODO remove this deprecated class
-    "CustomFieldBulkDeleteForm",
-    "CustomFieldChoiceFormSet",
-    "CustomFieldFilterForm",
     "CustomFieldForm",
+    "CustomFieldFilterForm",
     "CustomFieldModelCSVForm",
-    "CustomLinkFilterForm",
+    "CustomFieldBulkCreateForm",  # 2.0 TODO remove this deprecated class
+    "CustomFieldChoiceFormSet",
     "CustomLinkForm",
+    "CustomLinkFilterForm",
     "DynamicGroupBulkAssignForm",
-    "DynamicGroupFilterForm",
     "DynamicGroupForm",
+    "DynamicGroupFilterForm",
     "DynamicGroupMembershipFormSet",
-    "ExportTemplateFilterForm",
     "ExportTemplateForm",
-    "ExternalIntegrationBulkEditForm",
+    "ExportTemplateFilterForm",
     "ExternalIntegrationFilterForm",
     "ExternalIntegrationForm",
+    "ExternalIntegrationBulkEditForm",
+    "GitRepositoryForm",
     "GitRepositoryBulkEditForm",
     "GitRepositoryFilterForm",
-    "GitRepositoryForm",
-    "GraphQLQueryFilterForm",
     "GraphQLQueryForm",
+    "GraphQLQueryFilterForm",
     "ImageAttachmentForm",
+    "JobForm",
     "JobBulkEditForm",
+    "JobButtonForm",
     "JobButtonBulkEditForm",
     "JobButtonFilterForm",
-    "JobButtonForm",
     "JobEditForm",
     "JobFilterForm",
-    "JobForm",
-    "JobHookFilterForm",
     "JobHookForm",
+    "JobHookFilterForm",
     "JobQueueBulkEditForm",
     "JobQueueFilterForm",
     "JobQueueForm",
-    "JobResultFilterForm",
     "JobScheduleForm",
+    "JobResultFilterForm",
     "LocalContextFilterForm",
-    "LocalContextModelBulkEditForm",
     "LocalContextModelForm",
-    "MetadataChoiceFormSet",
+    "LocalContextModelBulkEditForm",
     "MetadataTypeBulkEditForm",
-    "MetadataTypeFilterForm",
     "MetadataTypeForm",
-    "NoteFilterForm",
+    "MetadataTypeFilterForm",
+    "MetadataChoiceFormSet",
     "NoteForm",
+    "NoteFilterForm",
     "ObjectChangeFilterForm",
     "ObjectMetadataFilterForm",
     "PasswordInputWithPlaceholder",
-    "RelationshipAssociationFilterForm",
-    "RelationshipFilterForm",
     "RelationshipForm",
+    "RelationshipFilterForm",
+    "RelationshipAssociationFilterForm",
     "RoleBulkEditForm",
     "RoleFilterForm",
     "RoleForm",
     "SavedViewForm",
     "SavedViewModalForm",
     "ScheduledJobFilterForm",
-    "SecretFilterForm",
     "SecretForm",
-    "SecretsGroupAssociationFormSet",
-    "SecretsGroupFilterForm",
+    "SecretFilterForm",
     "SecretsGroupForm",
+    "SecretsGroupFilterForm",
+    "SecretsGroupAssociationFormSet",
     "StaticGroupAssociationFilterForm",
-    "StatusBulkEditForm",
-    "StatusFilterForm",
     "StatusForm",
-    "TagBulkEditForm",
-    "TagFilterForm",
+    "StatusFilterForm",
+    "StatusBulkEditForm",
     "TagForm",
-    "WebhookFilterForm",
+    "TagFilterForm",
+    "TagBulkEditForm",
     "WebhookForm",
+    "WebhookFilterForm",
 )
 
 
@@ -500,44 +491,6 @@ class CustomFieldBulkCreateForm(CustomFieldModelBulkEditFormMixin):
     """No longer needed as a separate class - use CustomFieldModelBulkEditFormMixin instead."""
 
 
-class CustomFieldBulkDeleteForm(ConfirmationForm):
-    def __init__(self, *args, delete_all=False, **kwargs):
-        super().__init__(*args, **kwargs)
-        queryset = CustomField.objects.all()
-        self.fields["pk"] = ModelMultipleChoiceField(
-            queryset=queryset, widget=MultipleHiddenInput, required=not delete_all
-        )
-
-    def construct_custom_field_delete_tasks(self, queryset):
-        """
-        Helper method to construct a list of celery tasks to execute when bulk deleting custom fields.
-        """
-        change_context = change_context_state.get()
-        if change_context is None:
-            context = None
-        else:
-            context = change_context.as_dict(queryset)
-            context["context_detail"] = "bulk delete custom field data"
-        tasks = [
-            delete_custom_field_data.si(obj.key, set(obj.content_types.values_list("pk", flat=True)), context)
-            for obj in queryset
-        ]
-        return tasks
-
-    def perform_pre_delete(self, queryset):
-        """
-        Remove all Custom Field Keys/Values from _custom_field_data of the related ContentType in the background.
-        """
-        if not get_worker_count():
-            logger.error("Celery worker process not running. Object custom fields may fail to reflect this deletion.")
-            return
-        tasks = self.construct_custom_field_delete_tasks(queryset)
-        # Executing the tasks in the background sequentially using chain() aligns with how a single
-        # CustomField object is deleted.  We decided to not check the result because it needs at least one worker
-        # to be active and comes with extra performance penalty.
-        chain(*tasks).apply_async()
-
-
 #
 # Custom Links
 #
@@ -1037,8 +990,6 @@ class JobEditForm(NautobotModelForm):
             "job_queues",
             "default_job_queue_override",
             "default_job_queue",
-            "is_singleton",
-            "is_singleton_override",
             "tags",
         ]
 
@@ -1138,11 +1089,6 @@ class JobBulkEditForm(NautobotBulkEditForm):
         required=False,
         help_text="Default Job Queue the job runs on if no Job Queue is specified",
     )
-    is_singleton = forms.NullBooleanField(
-        required=False,
-        widget=BulkEditNullBooleanSelect,
-        help_text="Whether this job should fail to run if another instance of this job is already running",
-    )
     # Flags to indicate whether the above properties are inherited from the source code or overridden by the database
     # Text field overrides
     clear_grouping_override = forms.BooleanField(
@@ -1186,62 +1132,10 @@ class JobBulkEditForm(NautobotBulkEditForm):
         required=False,
         help_text="If checked, the values of has sensitive variables will be reverted to the default values defined in each Job's source code",
     )
-    is_singleton_override = forms.BooleanField(
-        required=False,
-        help_text="If checked, the values of is singleton will be reverted to the default values defined in each Job's source code",
-    )
 
     class Meta:
         model = Job
 
-    def post_save(self, obj):
-        super().post_save(obj)
-
-        cleaned_data = self.cleaned_data
-
-        # Handle text related fields
-        for overridable_field in JOB_OVERRIDABLE_FIELDS:
-            override_field = overridable_field + "_override"
-            clear_override_field = "clear_" + overridable_field + "_override"
-            reset_override = cleaned_data.get(clear_override_field, False)
-            override_value = cleaned_data.get(overridable_field)
-            if reset_override:
-                setattr(obj, override_field, False)
-            elif not reset_override and override_value not in [None, ""]:
-                setattr(obj, override_field, True)
-                setattr(obj, overridable_field, override_value)
-
-        # Handle job queues
-        clear_override_field = "clear_job_queues_override"
-        reset_override = cleaned_data.get(clear_override_field, False)
-        if reset_override:
-            meta_task_queues = obj.job_class.task_queues
-            job_queues = []
-            for queue_name in meta_task_queues:
-                try:
-                    job_queues.append(JobQueue.objects.get(name=queue_name))
-                except JobQueue.DoesNotExist:
-                    # Do we want to create the Job Queue for the users here if we do not have it in the database?
-                    pass
-            obj.job_queues_override = False
-            obj.job_queues.set(job_queues)
-        elif cleaned_data["job_queues"]:
-            obj.job_queues_override = True
-
-        # Handle default job queue
-        clear_override_field = "clear_default_job_queue_override"
-        reset_override = cleaned_data.get(clear_override_field, False)
-        if reset_override:
-            meta_task_queues = obj.job_class.task_queues
-            obj.default_job_queue_override = False
-            obj.default_job_queue, _ = JobQueue.objects.get_or_create(
-                name=meta_task_queues[0] if meta_task_queues else settings.CELERY_TASK_DEFAULT_QUEUE
-            )
-        elif cleaned_data["default_job_queue"]:
-            obj.default_job_queue_override = True
-
-        obj.validated_save()
-
 
 class JobFilterForm(BootstrapMixin, forms.Form):
     model = Job
@@ -1885,8 +1779,6 @@ class RoleBulkEditForm(NautobotBulkEditForm):
 
     pk = forms.ModelMultipleChoiceField(queryset=Role.objects.all(), widget=forms.MultipleHiddenInput)
     color = forms.CharField(max_length=6, required=False, widget=ColorSelect())
-    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
-    weight = forms.IntegerField(required=False)
     content_types = MultipleContentTypeField(
         queryset=RoleModelsQuery().as_queryset(), required=False, label="Content Type(s)"
     )

nautobot/extras/forms/mixins.py

@@ -34,7 +34,7 @@ from nautobot.extras.utils import remove_prefix_from_cf_key
 logger = logging.getLogger(__name__)
 
 
-__all__ = (  # noqa:RUF022
+__all__ = (
     "ContactTeamModelFilterFormMixin",
     "CustomFieldModelBulkEditFormMixin",
     "CustomFieldModelFilterFormMixin",
@@ -673,7 +673,7 @@ class RelationshipModelFormMixin(forms.ModelForm):
             for peer_id in target_peer_ids:
                 relationship = self.fields[field_name].model
                 if not relationship.symmetric:
-                    association = RelationshipAssociation(  # pylint: disable=repeated-keyword
+                    association = RelationshipAssociation(
                         relationship=relationship,
                         **{
                             f"{side}_type": self.obj_type,
@@ -837,21 +837,13 @@ class StatusModelFilterFormMixin(forms.Form):
         self.order_fields(self.field_order)  # Reorder fields again
 
 
-class TagsBulkEditFormMixin(BulkEditForm):
+class TagsBulkEditFormMixin(forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         # Add add/remove tags fields
-        self.fields["add_tags"] = DynamicModelMultipleChoiceField(
-            queryset=Tag.objects.all(),
-            query_params={"content_types": self.model._meta.label_lower},
-            required=False,
-        )
-        self.fields["remove_tags"] = DynamicModelMultipleChoiceField(
-            queryset=Tag.objects.all(),
-            query_params={"content_types": self.model._meta.label_lower},
-            required=False,
-        )
+        self.fields["add_tags"] = DynamicModelMultipleChoiceField(queryset=Tag.objects.all(), required=False)
+        self.fields["remove_tags"] = DynamicModelMultipleChoiceField(queryset=Tag.objects.all(), required=False)
 
 
 # 2.2 TODO: Names below are only for backward compatibility with Nautobot 1.3 and earlier. Remove in 2.2

nautobot/extras/group_sync.py

@@ -8,15 +8,15 @@ from django.contrib.auth.models import Group
 logger = logging.getLogger(__name__)
 
 
-CLAIMS_GROUP_NAME = getattr(settings, "SSO_CLAIMS_GROUP", "groups")
+CLAIMS_GROUP_NAME = getattr(settings, "NAUTOBOT_SSO_CLAIMS_GROUP", "groups")
 """ Which claim to look at in the OAuth2/OIDC response
 
     For Okta you can look at `Okta -> Authorization Servers -> Claims`. And a reasonable
     default is "groups". For Azure a reasonable default is "roles".
 """
 
-SUPERUSER_GROUPS = getattr(settings, "SSO_SUPERUSER_GROUPS", [])
-STAFF_GROUPS = getattr(settings, "SSO_STAFF_GROUPS", [])
+SUPERUSER_GROUPS = getattr(settings, "NAUTOBOT_SSO_SUPERUSER_GROUPS", [])
+STAFF_GROUPS = getattr(settings, "NAUTOBOT_SSO_STAFF_GROUPS", [])
 
 
 def group_sync(uid, user=None, response=None, *args, **kwargs):

nautobot/extras/health_checks.py

@@ -160,4 +160,5 @@ class RedisBackend(RedisHealthCheck):
         elif client_class == "django_redis.client.DefaultClient":
             self.check_redis(redis_url=location, **options.get("CONNECTION_POOL_KWARGS", {}))
         else:
-            self.add_error(ServiceUnavailable(f"{client_class} is an unsupported CLIENT_CLASS!"))
+            if self.redis_url is None:
+                self.add_error(ServiceUnavailable(f"{client_class} is an unsupported CLIENT_CLASS!"))

nautobot/extras/jobs.py

@@ -18,7 +18,6 @@ from db_file_storage.form_widgets import DBClearableFileInput
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import UploadedFile
@@ -68,15 +67,15 @@ User = get_user_model()
 
 
 __all__ = [
+    "Job",
     "BooleanVar",
     "ChoiceVar",
     "FileVar",
+    "IntegerVar",
     "IPAddressVar",
     "IPAddressWithMaskVar",
     "IPNetworkVar",
-    "IntegerVar",
     "JSONVar",
-    "Job",
     "MultiChoiceVar",
     "MultiObjectVar",
     "ObjectVar",
@@ -106,16 +105,13 @@ class BaseJob:
 
         - name (str)
         - description (str)
-        - approval_required (bool)
-        - dryrun_default (bool)
-        - field_order (list)
-        - has_sensitive_variables (bool)
         - hidden (bool)
+        - field_order (list)
+        - approval_required (bool)
         - soft_time_limit (int)
-        - task_queues (list)
-        - template_name (str)
         - time_limit (int)
-        - is_singleton (bool)
+        - has_sensitive_variables (bool)
+        - task_queues (list)
         """
 
     def __init__(self):
@@ -193,31 +189,6 @@ class BaseJob:
             )
             raise RunJobTaskFailed(f"Job {self.job_model} is not enabled to be run!")
 
-        ignore_singleton_lock = self.celery_kwargs.get("nautobot_job_ignore_singleton_lock", False)
-        if self.job_model.is_singleton:
-            is_running = cache.get(self.singleton_cache_key)
-            if is_running:
-                if ignore_singleton_lock:
-                    self.logger.info(
-                        "Job %s is a singleton and already running, but singleton will be ignored because"
-                        " `ignore_singleton_lock` is set.",
-                        self.job_model,
-                        extra={"object": self.job_model, "grouping": "initialization"},
-                    )
-                else:
-                    self.logger.error(
-                        "Job %s is a singleton and already running.",
-                        self.job_model,
-                        extra={"object": self.job_model, "grouping": "initialization"},
-                    )
-                    raise RunJobTaskFailed(f"Job '{self.job_model}' is a singleton and already running.")
-            cache_parameters = {
-                "key": self.singleton_cache_key,
-                "value": 1,
-                "timeout": self.job_model.time_limit or settings.CELERY_TASK_TIME_LIMIT,
-            }
-            cache.set(**cache_parameters)
-
         soft_time_limit = self.job_model.soft_time_limit or settings.CELERY_TASK_SOFT_TIME_LIMIT
         time_limit = self.job_model.time_limit or settings.CELERY_TASK_TIME_LIMIT
         if time_limit <= soft_time_limit:
@@ -311,14 +282,6 @@ class BaseJob:
         if status == JobResultStatusChoices.STATUS_SUCCESS:
             self.logger.success("Job completed", extra={"grouping": "post_run"})
 
-        cache.delete(self.singleton_cache_key)
-
-    @final
-    @classproperty
-    def singleton_cache_key(cls) -> str:  # pylint: disable=no-self-argument
-        """Cache key for singleton jobs."""
-        return f"nautobot.extras.jobs.running.{cls.class_path}"
-
     @final
     @classproperty
     def file_path(cls) -> str:  # pylint: disable=no-self-argument
@@ -337,7 +300,7 @@ class BaseJob:
         - my_plugin.jobs.MyPluginJob - App-provided Job
         - git_repository.jobs.myjob.MyJob - GitRepository Job
         """
-        return f"{cls.__module__}.{cls.__name__}"  # pylint: disable=no-member
+        return f"{cls.__module__}.{cls.__name__}"
 
     @final
     @classproperty
@@ -374,7 +337,7 @@ class BaseJob:
     @final
     @classproperty
     def name(cls) -> str:  # pylint: disable=no-self-argument
-        return cls._get_meta_attr_and_assert_type("name", cls.__name__, expected_type=str)  # pylint: disable=no-member
+        return cls._get_meta_attr_and_assert_type("name", cls.__name__, expected_type=str)
 
     @final
     @classproperty
@@ -438,11 +401,6 @@ class BaseJob:
     def task_queues(cls) -> list:  # pylint: disable=no-self-argument
         return cls._get_meta_attr_and_assert_type("task_queues", [], expected_type=(list, tuple))
 
-    @final
-    @classproperty
-    def is_singleton(cls) -> bool:  # pylint: disable=no-self-argument
-        return cls._get_meta_attr_and_assert_type("is_singleton", False, expected_type=bool)
-
     @final
     @classproperty
     def properties_dict(cls) -> dict:  # pylint: disable=no-self-argument
@@ -461,14 +419,13 @@ class BaseJob:
             "time_limit": cls.time_limit,
             "has_sensitive_variables": cls.has_sensitive_variables,
             "task_queues": cls.task_queues,
-            "is_singleton": cls.is_singleton,
         }
 
     @final
     @classproperty
     def registered_name(cls) -> str:  # pylint: disable=no-self-argument
         """Deprecated - use class_path classproperty instead."""
-        return f"{cls.__module__}.{cls.__name__}"  # pylint: disable=no-member
+        return f"{cls.__module__}.{cls.__name__}"
 
     @classmethod
     def _get_vars(cls):
@@ -529,19 +486,6 @@ class BaseJob:
             label="Profile job execution",
             help_text="Profiles the job execution using cProfile and outputs a report to /tmp/",
         )
-        # If the class already exists there may be overrides, so we have to check this.
-        try:
-            job_model = JobModel.objects.get(module_name=cls.__module__, job_class_name=cls.__name__)
-            is_singleton = job_model.is_singleton
-        except JobModel.DoesNotExist:
-            is_singleton = cls.is_singleton
-        if is_singleton:
-            form.fields["_ignore_singleton_lock"] = forms.BooleanField(
-                required=False,
-                initial=False,
-                label="Ignore singleton lock",
-                help_text="Allow this singleton job to run even when another instance is already running",
-            )
 
         job_model = JobModel.objects.get_for_class_path(cls.class_path)
         dryrun_default = job_model.dryrun_default if job_model.dryrun_default_override else cls.dryrun_default
@@ -575,9 +519,7 @@ class BaseJob:
                 field.disabled = True
 
         # Ensure non-Job-specific fields are still last after applying field_order
-        for field in ["_job_queue", "_profile", "_ignore_singleton_lock"]:
-            if field not in form.fields:
-                continue
+        for field in ["_job_queue", "_profile"]:
             value = form.fields.pop(field)
             form.fields[field] = value
 
@@ -1089,7 +1031,7 @@ class JobHookReceiver(Job):
 
     object_change = ObjectVar(model=ObjectChange)
 
-    def run(self, object_change):  # pylint: disable=arguments-differ
+    def run(self, object_change):
         """JobHookReceiver subclasses generally shouldn't need to override this method."""
         self.receive_job_hook(
             change=object_change,
@@ -1118,7 +1060,7 @@ class JobButtonReceiver(Job):
     object_pk = StringVar()
     object_model_name = StringVar()
 
-    def run(self, object_pk, object_model_name):  # pylint: disable=arguments-differ
+    def run(self, object_pk, object_model_name):
         """JobButtonReceiver subclasses generally shouldn't need to override this method."""
         model = get_model_from_name(object_model_name)
         obj = model.objects.get(pk=object_pk)

nautobot/extras/managers.py

@@ -22,9 +22,8 @@ class JobResultManager(BaseManager.from_queryset(RestrictedQuerySet), TaskResult
             return self.model(id=task_id)
 
     @transaction_retry(max_retries=2)
-    def store_result(  # pylint:disable=arguments-differ  # Nautobot adds kwargs like job_model_id and scheduled_job_id
+    def store_result(
         self,
-        *,
         task_id,
         result,
         status,
@@ -42,7 +41,6 @@ class JobResultManager(BaseManager.from_queryset(RestrictedQuerySet), TaskResult
         using=None,
         content_type=None,
         content_encoding=None,
-        **kwargs,
     ):
         """
         Store the result and status of a Celery task.

nautobot/extras/migrations/0018_joblog_data_migration.py

@@ -2,6 +2,7 @@ from collections import OrderedDict
 
 from django.db import migrations
 
+from nautobot.extras.choices import LogLevelChoices
 from nautobot.extras.constants import (
     JOB_LOG_MAX_ABSOLUTE_URL_LENGTH,
     JOB_LOG_MAX_GROUPING_LENGTH,
@@ -122,13 +123,14 @@ def reverse_migrate_params(apps, schema_editor):
                 ]
             )
 
-            job_result.data[entry.grouping].setdefault(entry.log_level, 0)
-            job_result.data[entry.grouping][entry.log_level] += 1
-            if "total" not in job_result.data:
-                job_result.data["total"] = _data_grouping_struct()
-                del job_result.data["total"]["log"]
-            job_result.data["total"].setdefault(entry.log_level, 0)
-            job_result.data["total"][entry.log_level] += 1
+            if entry.log_level != LogLevelChoices.LOG_DEFAULT:
+                job_result.data[entry.grouping].setdefault(entry.log_level, 0)
+                job_result.data[entry.grouping][entry.log_level] += 1
+                if "total" not in job_result.data:
+                    job_result.data["total"] = _data_grouping_struct()
+                    del job_result.data["total"]["log"]
+                job_result.data["total"].setdefault(entry.log_level, 0)
+                job_result.data["total"][entry.log_level] += 1
 
             job_result.save()
 

nautobot/extras/models/__init__.py

@@ -77,8 +77,8 @@ __all__ = (
     "ObjectChange",
     "ObjectMetadata",
     "Relationship",
-    "RelationshipAssociation",
     "RelationshipModel",
+    "RelationshipAssociation",
     "Role",
     "RoleField",
     "SavedView",

nautobot/extras/models/contacts.py

@@ -61,7 +61,7 @@ class Contact(ContactTeamSharedBase):
 class Team(ContactTeamSharedBase):
     """A group of Contacts, usable interchangeably with a single Contact in most cases."""
 
-    contacts = models.ManyToManyField(to=Contact, related_name="teams", blank=True)
+    contacts = models.ManyToManyField(to=Contact, related_name="teams")
 
     class Meta(ContactTeamSharedBase.Meta):
         abstract = False

nautobot/extras/models/customfields.py

@@ -578,13 +578,7 @@ class CustomField(
             )
 
     def to_form_field(
-        self,
-        set_initial=True,
-        enforce_required=True,
-        for_csv_import=False,
-        simple_json_filter=False,
-        label=None,
-        for_filter_form=False,
+        self, set_initial=True, enforce_required=True, for_csv_import=False, simple_json_filter=False, label=None
     ):
         """
         Return a form field suitable for setting a CustomField's value for an object.
@@ -596,7 +590,6 @@ class CustomField(
                 this is *not* used for CSV imports since 2.0, but it *is* used for JSON/YAML import of DeviceTypes.
             simple_json_filter: Return a TextInput widget for JSON filtering instead of the default TextArea widget.
             label: Set the input label manually (if required); otherwise, defaults to field's __str__() implementation.
-            for_filter_form: If True return the relevant form field for filter form
         """
         initial = self.default if set_initial else None
         required = self.required if enforce_required else False
@@ -683,7 +676,7 @@ class CustomField(
             default_choice = self.custom_field_choices.filter(value=self.default).first()
 
             # Set the initial value to the first available choice (if any)
-            if self.type == CustomFieldTypeChoices.TYPE_SELECT and not for_filter_form:
+            if self.type == CustomFieldTypeChoices.TYPE_SELECT:
                 if not required or default_choice is None:
                     choices = add_blank_choice(choices)
                 field_class = CSVChoiceField if for_csv_import else forms.ChoiceField
@@ -711,10 +704,16 @@ class CustomField(
 
     def to_filter_form_field(self, lookup_expr="exact", *args, **kwargs):
         """Return a filter form field suitable for filtering a CustomField's value for an object."""
-        form_field = self.to_form_field(*args, **kwargs, for_filter_form=True)
-        # We would handle type selection differently because: If lookup_type is not the same as exact, use MultiValueCharInput
+        form_field = self.to_form_field(*args, **kwargs)
+        # We would handle type selection differently because:
+        # 1. We'd need to use StaticSelect2Multiple for lookup_type 'exact' because self.type `select` uses StaticSelect2 by default.
+        # 2. Remove the blank choice since StaticSelect2Multiple is always blank and interprets the blank choice as an extra option.
+        # 3. If lookup_type is not the same as exact, use MultiValueCharInput
         if self.type == CustomFieldTypeChoices.TYPE_SELECT:
-            if lookup_expr not in ["exact", "contains"]:
+            if lookup_expr in ["exact", "contains"]:
+                choices = form_field.choices[1:]
+                form_field.widget = StaticSelect2Multiple(choices=choices)
+            else:
                 form_field.widget = MultiValueCharInput()
         return form_field