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

nautobot/extras/models/groups.py

@@ -1,7 +1,6 @@
 """Dynamic Groups Models."""
 
 import logging
-from typing import Optional
 
 from django import forms
 from django.contrib.contenttypes.fields import GenericForeignKey
@@ -117,7 +116,7 @@ class DynamicGroup(PrimaryModel):
         return self._model
 
     @property
-    def filterset_class(self) -> Optional[type[django_filters.FilterSet]]:
+    def filterset_class(self):
         if getattr(self, "_filterset_class", None) is None:
             try:
                 self._filterset_class = get_filterset_for_model(self.model)
@@ -126,7 +125,7 @@ class DynamicGroup(PrimaryModel):
         return self._filterset_class
 
     @property
-    def filterform_class(self) -> Optional[type[forms.Form]]:
+    def filterform_class(self):
         if getattr(self, "_filterform_class", None) is None:
             try:
                 self._filterform_class = get_form_for_model(self.model, form_prefix="Filter")
@@ -135,7 +134,7 @@ class DynamicGroup(PrimaryModel):
         return self._filterform_class
 
     @property
-    def form_class(self) -> Optional[type[forms.Form]]:
+    def form_class(self):
         if getattr(self, "_form_class", None) is None:
             try:
                 self._form_class = get_form_for_model(self.model)
@@ -148,19 +147,19 @@ class DynamicGroup(PrimaryModel):
         """Return all FilterForm fields in a dictionary."""
 
         # Fail gracefully with an empty dict if nothing is working yet.
-        if self.form_class is None or self.filterform_class is None or self.filterset_class is None:
+        if not self.form_class:
             return {}
 
         # Get model form and fields
-        modelform = self.form_class()  # pylint: disable=not-callable
+        modelform = self.form_class()
         modelform_fields = modelform.fields
 
         # Get filter form and fields
-        filterform = self.filterform_class()  # pylint: disable=not-callable
+        filterform = self.filterform_class()
         filterform_fields = filterform.fields
 
         # Get filterset and fields
-        filterset = self.filterset_class()  # pylint: disable=not-callable
+        filterset = self.filterset_class()
         filterset_fields = filterset.filters
 
         # Get dynamic group filter field mappings (if any)
@@ -304,7 +303,6 @@ class DynamicGroup(PrimaryModel):
         # Since associated_object is a GenericForeignKey, we can't just do:
         #     return self.static_group_associations.values_list("associated_object", flat=True)
         return self.model.objects.filter(
-            # pylint: disable=no-member  # false positive about self.static_group_associations
             pk__in=self.static_group_associations(manager="all_objects").values_list("associated_object_id", flat=True)
         )
 
@@ -613,7 +611,7 @@ class DynamicGroup(PrimaryModel):
                 raise ValidationError({"filter": "Filter can only be set for groups of type `dynamic-filter`."})
         else:
             # Validate against the filterset's internal form validation.
-            filterset = self.filterset_class(self.filter)  # pylint: disable=not-callable
+            filterset = self.filterset_class(self.filter)
             if not filterset.is_valid():
                 raise ValidationError(filterset.errors)
 
@@ -727,7 +725,7 @@ class DynamicGroup(PrimaryModel):
         if self.group_type != DynamicGroupTypeChoices.TYPE_DYNAMIC_FILTER:
             raise RuntimeError(f"{self} is not a dynamic-filter group")
 
-        filterset = self.filterset_class(self.filter, self.model.objects.all())  # pylint: disable=not-callable
+        filterset = self.filterset_class(self.filter, self.model.objects.all())
         query = models.Q()
 
         # In this case we want all filters for a group's filter dict in a set intersection (boolean

nautobot/extras/models/jobs.py

@@ -140,11 +140,6 @@ class Job(PrimaryModel):
         default=True, help_text="Whether this job contains sensitive variables"
     )
 
-    is_singleton = models.BooleanField(
-        default=False,
-        help_text="Whether this job should fail to run if another instance of this job is already running",
-    )
-
     # Additional properties, potentially inherited from the source code
     # See also the docstring of nautobot.extras.jobs.BaseJob.Meta.
     approval_required = models.BooleanField(
@@ -240,10 +235,6 @@ class Job(PrimaryModel):
         default=False,
         help_text="If set, the configured value will remain even if the underlying Job source code changes",
     )
-    is_singleton_override = models.BooleanField(
-        default=False,
-        help_text="If set, the configured value will remain even if the underlying Job source code changes",
-    )
     objects = BaseManager.from_queryset(JobQuerySet)()
 
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
@@ -260,13 +251,13 @@ class Job(PrimaryModel):
     def __str__(self):
         return self.name
 
-    def delete(self, *args, **kwargs):
+    def delete(self):
         if self.module_name.startswith("nautobot."):
             raise ProtectedError(
                 f"Unable to delete Job {self}. System Job cannot be deleted",
                 [],
             )
-        super().delete(*args, **kwargs)
+        super().delete()
 
     @property
     def job_class(self):
@@ -580,8 +571,6 @@ class JobQueue(PrimaryModel):
 
     @property
     def display(self):
-        if self.queue_type != JobQueueTypeChoices.TYPE_CELERY:
-            return f"{self.queue_type}: {self.name}"
         worker_count = get_job_queue_worker_count(job_queue=self)
         workers = "worker" if worker_count == 1 else "workers"
         return f"{self.queue_type}: {self.name} ({worker_count} {workers})"
@@ -742,7 +731,7 @@ class JobResult(BaseModel, CustomFieldModel):
             # Only add metrics if we have a related job model. If we are moving to a terminal state we should always
             # have a related job model, so this shouldn't be too tight of a restriction.
             if self.job_model:
-                duration = self.date_done - self.date_created
+                duration = self.date_done - self.created
                 JOB_RESULT_METRIC.labels(self.job_model.grouping, self.job_model.name, status).observe(
                     duration.total_seconds()
                 )
@@ -790,7 +779,6 @@ class JobResult(BaseModel, CustomFieldModel):
         task_queue=None,
         job_result=None,
         synchronous=False,
-        ignore_singleton_lock=False,
         **job_kwargs,
     ):
         """Create/Modify a JobResult instance and enqueue a job to be executed asynchronously by a Celery worker.
@@ -804,9 +792,6 @@ class JobResult(BaseModel, CustomFieldModel):
             task_queue (str, optional): The celery queue to send the job to. If not set, use the default celery queue.
             job_result (JobResult, optional): Existing JobResult with status PENDING, to be modified and to be used in kubernetes job execution.
             synchronous (bool, optional): If True, run the job in the current process, blocking until the job completes.
-            ignore_singleton_lock (bool, optional): If True, invalidate the singleton lock before running the job.
-              This allows singleton jobs to run twice, or makes it possible to remove the lock when the first instance
-              of the job failed to remove it for any reason.
             *job_args: positional args passed to the job task (UNUSED)
             **job_kwargs: keyword args passed to the job task
 
@@ -851,7 +836,6 @@ class JobResult(BaseModel, CustomFieldModel):
             "nautobot_job_job_model_id": job_model.id,
             "nautobot_job_profile": profile,
             "nautobot_job_user_id": user.id,
-            "nautobot_job_ignore_singleton_lock": ignore_singleton_lock,
             "queue": task_queue,
         }
 
@@ -1305,7 +1289,6 @@ class ScheduledJob(BaseModel):
         profile=False,
         approval_required=False,
         task_queue=None,
-        ignore_singleton_lock=False,
         **job_kwargs,
     ):
         """
@@ -1326,7 +1309,6 @@ class ScheduledJob(BaseModel):
             profile (bool, optional): Flag indicating whether to profile the job. Defaults to False.
             approval_required (bool, optional): Flag indicating if approval is required. Defaults to False.
             task_queue (str, optional): The task queue for the job. Defaults to None, which will use the configured default celery queue.
-            ignore_singleton_lock (bool, optional): Flag indicating whether to ignore singleton locks. Defaults to False.
             **job_kwargs: Additional keyword arguments to pass to the job.
 
         Returns:
@@ -1345,7 +1327,6 @@ class ScheduledJob(BaseModel):
         celery_kwargs = {
             "nautobot_job_profile": profile,
             "queue": task_queue,
-            "nautobot_job_ignore_singleton_lock": ignore_singleton_lock,
         }
         if job_model.soft_time_limit > 0:
             celery_kwargs["soft_time_limit"] = job_model.soft_time_limit
@@ -1380,7 +1361,7 @@ class ScheduledJob(BaseModel):
 
     def to_cron(self):
         tz = self.time_zone
-        t = self.start_time.astimezone(tz)  # pylint: disable=no-member
+        t = self.start_time.astimezone(tz)
         if self.interval == JobExecutionType.TYPE_HOURLY:
             return TzAwareCrontab(minute=t.minute, tz=tz)
         elif self.interval == JobExecutionType.TYPE_DAILY:

nautobot/extras/models/models.py

@@ -207,7 +207,7 @@ class ConfigContextModel(models.Model, ConfigContextSchemaValidationMixin):
             # Annotation not available, so fall back to manually querying for the config context
             config_context_data = ConfigContext.objects.get_for_object(self).values_list("data", flat=True)
         else:
-            config_context_data = self.config_context_data or []  # pylint: disable=no-member
+            config_context_data = self.config_context_data or []
             config_context_data = [
                 c["data"] for c in sorted(config_context_data, key=lambda k: (k["weight"], k["name"]))
             ]
@@ -831,7 +831,7 @@ class Note(ChangeLoggedModel, BaseModel):
         unique_together = [["assigned_object_type", "assigned_object_id", "user_name", "created"]]
 
     def __str__(self):
-        return f"{self.assigned_object} - {self.created.isoformat() if self.created else None}"  # pylint: disable=no-member
+        return f"{self.assigned_object} - {self.created.isoformat() if self.created else None}"
 
     def save(self, *args, **kwargs):
         # Record the user's name as static strings

nautobot/extras/plugins/__init__.py

@@ -554,7 +554,6 @@ class TableExtension:
     """
 
     model = None
-    suffix = None
     table_columns = {}
     add_to_default_columns = ()
     remove_from_default_columns = ()
@@ -630,7 +629,7 @@ def _add_columns_into_model_table(table_extension, app_name):
         logger.error(error)
         return
 
-    table = get_table_for_model(table_extension.model, suffix=table_extension.suffix)
+    table = get_table_for_model(table_extension.model)
     for name, column in table_extension.table_columns.items():
         _validate_table_column_name_is_prefixed_with_app_name(name, app_name)
         _add_column_to_table_base_columns(table, name, column, app_name)
@@ -665,28 +664,18 @@ def _modify_default_table_columns(table_extension, app_name):
     """Add or remove columns from the table default columns."""
     from nautobot.core.utils.lookup import get_table_for_model
 
-    table = get_table_for_model(table_extension.model, suffix=table_extension.suffix)
+    table = get_table_for_model(table_extension.model)
     message = (
         f"{app_name}: Cannot {{action}} column `{{column_name}}` {{preposition}} the default columns for `{table}`."
     )
 
     for column_name in table_extension.add_to_default_columns:
-        if not getattr(table.Meta, "default_columns", None):
-            logger.warning(
-                f"{app_name}: Table `{table}` does not have a `default_columns` attribute. Cannot add column: {column_name}."
-            )
-            continue
         if column_name in table.base_columns:
             table.Meta.default_columns = (*table.Meta.default_columns, column_name)
         else:
             logger.debug(message.format(action="add", column_name=column_name, preposition="to"))
 
     for column_name in table_extension.remove_from_default_columns:
-        if not getattr(table.Meta, "default_columns", None):
-            logger.warning(
-                f"{app_name}: Table `{table}` does not have a `default_columns` attribute. Cannot remove column: {column_name}."
-            )
-            continue
         if column_name in table.Meta.default_columns:
             table.Meta.default_columns = tuple(name for name in table.Meta.default_columns if name != column_name)
         else: