nautobot 2.1.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/extras/migrations/0014_auto_slug.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.13 on 2021-08-05 19:24
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/extras/migrations/0015_scheduled_job.py

@@ -1,10 +1,12 @@
 # Generated by Django 3.1.13 on 2021-08-18 08:55
 
+import uuid
+
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.celery
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0016_secret.py

@@ -1,11 +1,13 @@
 # Generated by Django 3.1.13 on 2021-11-15 13:10
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
-import nautobot.core.models.fields
 import taggit.managers
-import uuid
+
+import nautobot.core.models.fields
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0017_joblogentry.py

@@ -1,9 +1,10 @@
 # Generated by Django 3.1.13 on 2021-10-18 02:47
 
+import uuid
+
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0018_joblog_data_migration.py

@@ -1,11 +1,12 @@
 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_LOG_OBJECT_LENGTH,
     JOB_LOG_MAX_GROUPING_LENGTH,
+    JOB_LOG_MAX_LOG_OBJECT_LENGTH,
 )
 
 """

nautobot/extras/migrations/0021_customfield_changelog_data.py

@@ -1,8 +1,9 @@
+import json
+import uuid
+
 from django.db import migrations
 from django.utils.text import get_text_list
 from django.utils.translation import gettext
-import json
-import uuid
 
 from nautobot.core.models.utils import serialize_object
 from nautobot.extras.choices import ObjectChangeActionChoices

nautobot/extras/migrations/0022_objectchange_object_datav2.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.14 on 2022-02-18 17:25
 
 from django.db import migrations, models
+
 import nautobot.core.celery
 
 

nautobot/extras/migrations/0023_job_model.py

@@ -1,12 +1,14 @@
 # Generated by Django 3.1.14 on 2022-02-16 17:38
 
+import uuid
+
 import django.core.serializers.json
 from django.core.validators import MinValueValidator
 from django.db import migrations, models
 import django.db.models.deletion
-import nautobot.core.models.fields
 import taggit.managers
-import uuid
+
+import nautobot.core.models.fields
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0026_job_add_gitrepository_fk.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.fields
 
 

nautobot/extras/migrations/0029_dynamicgroup.py

@@ -1,10 +1,12 @@
 # Generated by Django 3.1.13 on 2021-10-31 18:38
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.fields
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0031_tag_content_types.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.14 on 2022-03-19 23:21
 
 from django.db import migrations, models
+
 import nautobot.extras.utils
 
 

nautobot/extras/migrations/0032_tag_content_types_data_migration.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.14 on 2022-03-19 23:21
 
 from django.db import migrations
+
 import nautobot.extras.utils
 
 

nautobot/extras/migrations/0040_dynamicgroup__dynamicgroupmembership.py

@@ -1,8 +1,9 @@
 # Generated by Django 3.2.13 on 2022-06-09 16:24
 
+import uuid
+
 from django.db import migrations, models
 import django.db.models.deletion
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0041_jobresult_job_kwargs.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.13 on 2022-07-04 08:19
 
 from django.db import migrations, models
+
 import nautobot.core.celery
 
 

nautobot/extras/migrations/0043_note.py

@@ -1,10 +1,12 @@
 # Generated by Django 3.2.14 on 2022-07-25 21:50
 
+import uuid
+
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.fields
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0044_add_job_hook.py

@@ -1,12 +1,14 @@
 # Generated by Django 3.2.14 on 2022-07-29 21:39
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.fields
 import nautobot.extras.models.mixins
 import nautobot.extras.utils
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0046_populate_custom_field_slug_label.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.14 on 2022-08-01 18:52
 
 from django.db import migrations, models
+
 from nautobot.core.models.fields import slugify_dashes_to_underscores
 
 

nautobot/extras/migrations/0047_enforce_custom_field_slug.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.14 on 2022-08-01 18:52
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/extras/migrations/0051_add_job_task_queues.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.15 on 2022-09-12 17:38
 
 from django.db import migrations, models
+
 import nautobot.core.models.fields
 
 

nautobot/extras/migrations/0055_configcontext_dynamic_groups.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-03-03 18:39
 
 from django.db import migrations, models
+
 import nautobot.extras.models.models
 
 

nautobot/extras/migrations/0057_jobbutton.py

@@ -1,9 +1,11 @@
 # Generated by Django 3.2.18 on 2023-03-14 18:07
 
+import uuid
+
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.extras.models.mixins
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/extras/migrations/0065_configcontext_data_migrations.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.16 on 2022-11-25 11:45
 
 from django.db import migrations
+
 from nautobot.extras.utils import migrate_role_data
 
 

nautobot/extras/migrations/0067_migrate_job_result_status.py

@@ -1,7 +1,6 @@
 from celery import states
 from django.db import migrations
 
-
 LEGACY_TO_NEW_JOB_RESULT_STATUS_MAPPING = [
     ["pending", states.PENDING],
     ["running", states.STARTED],

nautobot/extras/migrations/0068_jobresult__add_celery_fields.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.celery
 import nautobot.extras.utils
 

nautobot/extras/migrations/0071_replace_related_names.py

@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.extras.utils
 
 

nautobot/extras/migrations/0077_migrate_custom_field_data.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-03-17 17:25
 
 from django.db import migrations
+
 from nautobot.core.models.fields import slugify_dashes_to_underscores
 from nautobot.extras.utils import FeatureQuery
 

nautobot/extras/migrations/0078_remove_name_field_and_make_label_field_non_nullable.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-03-17 17:29
 
 from django.db import migrations, models
+
 import nautobot.core.models.fields
 
 

nautobot/extras/migrations/0080_tagsfield.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-04-21 13:59
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/extras/migrations/0082_rename_relationship_name_to_label.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-05-09 16:35
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/extras/migrations/0083_ensure_relationship_keys_are_unique.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-05-09 16:38
 
 from django.db import migrations
+
 from nautobot.core.models.fields import slugify_dashes_to_underscores
 
 

nautobot/extras/migrations/0090_joblogentry__log_level_data_migration.py

@@ -1,6 +1,5 @@
 from django.db import migrations
 
-
 LOG_LEVEL_MAPPING = {
     "default": "debug",
     "success": "info",

nautobot/extras/migrations/0095_ensure_note_timestamps_are_unique.py

@@ -1,10 +1,9 @@
 # Generated by Django 3.2.20 on 2023-07-18 14:50
 
-import random
-
 from datetime import timedelta
-from django.db import migrations
-from django.db import models
+import secrets
+
+from django.db import migrations, models
 
 
 def ensure_note_created_timestamps_are_unique(apps, schema_editor):
@@ -20,7 +19,7 @@ def ensure_note_created_timestamps_are_unique(apps, schema_editor):
         duplicate_record.pop("count")
         duplicate_notes = Note.objects.filter(**duplicate_record)
         for note in duplicate_notes:
-            random_milliseconds = random.randint(1, 1000)
+            random_milliseconds = secrets.randbelow(1000)
             note.created += timedelta(milliseconds=random_milliseconds)
             note.save()
 

nautobot/extras/migrations/0097_alter_job_result_remove_result.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.20 on 2023-07-19 06:21
 
 from django.db import migrations, models
+
 import nautobot.core.celery
 
 

nautobot/extras/migrations/0100_fileproxy_job_result.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.extras.models.models
 
 

nautobot/extras/migrations/0101_externalintegration.py

@@ -1,13 +1,15 @@
 # Generated by Django 3.2.22 on 2023-11-01 21:29
 
+import uuid
+
 import django.core.serializers.json
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.fields
 import nautobot.core.models.validators
 import nautobot.extras.models.mixins
-import uuid
 
 
 class Migration(migrations.Migration):
@@ -48,6 +50,12 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("tags", nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag")),
+                ("ca_file_path", models.CharField(blank=True, max_length=255)),
+                (
+                    "headers",
+                    models.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True),
+                ),
+                ("http_method", models.CharField(blank=True, max_length=10)),
             ],
             options={
                 "ordering": ["name"],

nautobot/extras/models/__init__.py

@@ -1,6 +1,4 @@
 from .change_logging import ChangeLoggedModel, ObjectChange
-from .roles import Role, RoleField
-from .statuses import Status, StatusField, StatusModel
 from .customfields import ComputedField, CustomField, CustomFieldChoice, CustomFieldModel
 from .datasources import GitRepository
 from .groups import DynamicGroup, DynamicGroupMembership
@@ -29,10 +27,11 @@ from .models import (
     Webhook,
 )
 from .relationships import Relationship, RelationshipAssociation, RelationshipModel
+from .roles import Role, RoleField
 from .secrets import Secret, SecretsGroup, SecretsGroupAssociation
+from .statuses import Status, StatusField, StatusModel
 from .tags import Tag, TaggedItem
 
-
 __all__ = (
     "ChangeLoggedModel",
     "ComputedField",

nautobot/extras/models/change_logging.py

@@ -14,7 +14,6 @@ from nautobot.extras.choices import ObjectChangeActionChoices, ObjectChangeEvent
 from nautobot.extras.constants import CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL, CHANGELOG_MAX_OBJECT_REPR
 from nautobot.extras.utils import extras_features
 
-
 #
 # Change logging
 #

nautobot/extras/models/customfields.py

@@ -1,14 +1,14 @@
+from collections import OrderedDict
+from datetime import date, datetime
 import logging
 import re
-from collections import OrderedDict
-from datetime import datetime, date
 
 from django import forms
-from django.db import models, transaction
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.serializers.json import DjangoJSONEncoder
 from django.core.validators import RegexValidator, ValidationError
+from django.db import models, transaction
 from django.forms.widgets import TextInput
 from django.utils.html import format_html
 
@@ -37,7 +37,7 @@ from nautobot.extras.choices import CustomFieldFilterLogicChoices, CustomFieldTy
 from nautobot.extras.models import ChangeLoggedModel
 from nautobot.extras.models.mixins import NotesMixin
 from nautobot.extras.tasks import delete_custom_field_data, update_custom_field_choice_data
-from nautobot.extras.utils import check_if_key_is_graphql_safe, FeatureQuery, extras_features
+from nautobot.extras.utils import check_if_key_is_graphql_safe, extras_features, FeatureQuery
 
 logger = logging.getLogger(__name__)
 
@@ -112,6 +112,10 @@ class ComputedField(BaseModel, ChangeLoggedModel, NotesMixin):
             logger.warning("Failed to render computed field %s: %s", self.key, exc)
             return self.fallback_value
 
+    def save(self, *args, **kwargs):
+        self.clean()
+        super().save(*args, **kwargs)
+
     def clean(self):
         super().clean()
         if self.key != "":
@@ -408,11 +412,16 @@ class CustomField(BaseModel, ChangeLoggedModel, NotesMixin):
     def __str__(self):
         return self.label
 
+    def save(self, *args, **kwargs):
+        self.clean()
+        super().save(*args, **kwargs)
+
     def clean(self):
         super().clean()
 
         if self.key != "":
             check_if_key_is_graphql_safe(self.__class__.__name__, self.key)
+
         if self.present_in_database:
             # Check immutable fields
             database_object = self.__class__.objects.get(pk=self.pk)

nautobot/extras/models/datasources.py

@@ -10,7 +10,7 @@ from django.db import models
 
 from nautobot.core.models.fields import AutoSlugField, slugify_dashes_to_underscores
 from nautobot.core.models.generics import PrimaryModel
-from nautobot.extras.utils import extras_features, check_if_key_is_graphql_safe
+from nautobot.extras.utils import check_if_key_is_graphql_safe, extras_features
 
 
 @extras_features(
@@ -152,8 +152,8 @@ class GitRepository(PrimaryModel):
             JobResult
         """
         from nautobot.extras.datasources import (
-            enqueue_pull_git_repository_and_refresh_data,
             enqueue_git_repository_diff_origin_and_local,
+            enqueue_pull_git_repository_and_refresh_data,
         )
 
         if dry_run:

nautobot/extras/models/groups.py

@@ -3,7 +3,6 @@
 import logging
 import pickle
 
-import django_filters
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
@@ -11,6 +10,7 @@ from django.core.exceptions import ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
 from django.utils.functional import cached_property
+import django_filters
 
 from nautobot.core.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
 from nautobot.core.forms.fields import DynamicModelChoiceField
@@ -20,10 +20,9 @@ from nautobot.core.models.generics import OrganizationalModel
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.utils.lookup import get_filterset_for_model, get_form_for_model
 from nautobot.extras.choices import DynamicGroupOperatorChoices
-from nautobot.extras.querysets import DynamicGroupQuerySet, DynamicGroupMembershipQuerySet
+from nautobot.extras.querysets import DynamicGroupMembershipQuerySet, DynamicGroupQuerySet
 from nautobot.extras.utils import extras_features
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -336,7 +335,7 @@ class DynamicGroup(OrganizationalModel):
         try:
             cached_query = cache.get(self.members_cache_key)
             if cached_query is not None:
-                unpickled_query = pickle.loads(cached_query)
+                unpickled_query = pickle.loads(cached_query)  # noqa: S301  # suspicious-pickle-usage -- we know, but we control what's in the DB
         except pickle.UnpicklingError:
             logger.warning("Failed to unpickle cached members for %s", self)
         finally:

nautobot/extras/models/jobs.py

@@ -41,9 +41,9 @@ from nautobot.extras.constants import (
     JOB_MAX_NAME_LENGTH,
     JOB_OVERRIDABLE_FIELDS,
 )
+from nautobot.extras.managers import JobResultManager, ScheduledJobsManager
 from nautobot.extras.models import ChangeLoggedModel, GitRepository
 from nautobot.extras.models.mixins import NotesMixin
-from nautobot.extras.managers import JobResultManager, ScheduledJobsManager
 from nautobot.extras.querysets import JobQuerySet, ScheduledJobExtendedQuerySet
 from nautobot.extras.utils import (
     ChangeLoggedModelsQuery,
@@ -52,7 +52,6 @@ from nautobot.extras.utils import (
 
 from .customfields import CustomFieldModel
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -453,9 +452,9 @@ class JobResult(BaseModel, CustomFieldModel):
         to="extras.Job", null=True, blank=True, on_delete=models.SET_NULL, related_name="job_results"
     )
     name = models.CharField(max_length=255, db_index=True)
-    task_name = models.CharField(
+    task_name = models.CharField(  # noqa: DJ001  # django-nullable-model-string-field
         max_length=255,
-        null=True,
+        null=True,  # TODO: should this be blank=True instead?
         db_index=True,
         help_text="Registered name of the Celery task for this job. Internal use only.",
     )
@@ -479,11 +478,15 @@ class JobResult(BaseModel, CustomFieldModel):
         verbose_name="Result Data",
         help_text="The data returned by the task",
     )
-    worker = models.CharField(max_length=100, default=None, null=True)
+    worker = models.CharField(  # noqa: DJ001  # django-nullable-model-string-field
+        max_length=100,
+        default=None,
+        null=True,  # TODO: should this be default="", blank=True instead?
+    )
     task_args = models.JSONField(blank=True, default=list, encoder=NautobotKombuJSONEncoder)
     task_kwargs = models.JSONField(blank=True, default=dict, encoder=NautobotKombuJSONEncoder)
     celery_kwargs = models.JSONField(blank=True, default=dict, encoder=NautobotKombuJSONEncoder)
-    traceback = models.TextField(blank=True, null=True)
+    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)
 
@@ -710,7 +713,7 @@ class JobResult(BaseModel, CustomFieldModel):
                 if hasattr(obj, "get_absolute_url")
                 else "",
             )
-        except NotImplementedError:
+        except (AttributeError, NotImplementedError):
             log = JobLogEntry(
                 job_result=self,
                 log_level=level_choice,
@@ -797,6 +800,9 @@ class ScheduledJobs(models.Model):
 
     objects = ScheduledJobsManager()
 
+    def __str__(self):
+        return str(self.ident)
+
     @classmethod
     def changed(cls, instance, raw=False, **kwargs):
         """This function acts as a signal handler to track changes to the scheduled job that is triggered before a change"""