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

nautobot/core/cli/__init__.py

@@ -2,7 +2,6 @@
 Utilities and primitives for the `nautobot-server` CLI command.
 """
 
-from pathlib import Path
 import os
 
 from django.core.exceptions import ImproperlyConfigured
@@ -12,7 +11,6 @@ from jinja2 import BaseLoader, Environment
 from nautobot.core.runner import run_app
 from nautobot.extras.plugins.utils import load_plugins
 
-
 # Default file location for the generated config emitted by `init`
 NAUTOBOT_ROOT = os.getenv("NAUTOBOT_ROOT", os.path.expanduser("~/.nautobot"))
 DEFAULT_CONFIG_PATH = os.path.join(NAUTOBOT_ROOT, "nautobot_config.py")
@@ -74,7 +72,8 @@ def generate_settings(config_template=CONFIG_TEMPLATE, **kwargs):
     }
 
     with open(config_template) as fh:
-        environment = Environment(loader=BaseLoader, keep_trailing_newline=True)
+        # We don't need autoescape=True since we control the template file
+        environment = Environment(loader=BaseLoader, keep_trailing_newline=True)  # noqa: S701  # jinja2-autoescape-false
         config = environment.from_string(fh.read())
 
     return config.render(**template_vars)
@@ -111,20 +110,12 @@ def _configure_settings(config):
     #
     # Storage directories
     #
-    if not os.path.exists(settings.GIT_ROOT):
-        os.makedirs(settings.GIT_ROOT)
-    if not os.path.exists(settings.JOBS_ROOT):
-        os.makedirs(settings.JOBS_ROOT)
-    if not os.path.exists(os.path.join(settings.JOBS_ROOT, "__init__.py")):
-        Path(os.path.join(settings.JOBS_ROOT, "__init__.py")).touch()
-    if not os.path.exists(settings.MEDIA_ROOT):
-        os.makedirs(settings.MEDIA_ROOT)
-    if not os.path.exists(os.path.join(settings.MEDIA_ROOT, "devicetype-images")):
-        os.makedirs(os.path.join(settings.MEDIA_ROOT, "devicetype-images"))
-    if not os.path.exists(os.path.join(settings.MEDIA_ROOT, "image-attachments")):
-        os.makedirs(os.path.join(settings.MEDIA_ROOT, "image-attachments"))
-    if not os.path.exists(settings.STATIC_ROOT):
-        os.makedirs(settings.STATIC_ROOT)
+    os.makedirs(settings.GIT_ROOT, exist_ok=True)
+    os.makedirs(settings.JOBS_ROOT, exist_ok=True)
+    os.makedirs(settings.MEDIA_ROOT, exist_ok=True)
+    os.makedirs(os.path.join(settings.MEDIA_ROOT, "devicetype-images"), exist_ok=True)
+    os.makedirs(os.path.join(settings.MEDIA_ROOT, "image-attachments"), exist_ok=True)
+    os.makedirs(settings.STATIC_ROOT, exist_ok=True)
 
     #
     # Databases

nautobot/core/context_processors.py

@@ -1,7 +1,6 @@
 from django.conf import settings as django_settings
 
 from nautobot.core.settings_funcs import sso_auth_enabled
-from nautobot.core.utils.navigation import is_route_new_ui_ready
 
 
 def get_saml_idp():
@@ -21,7 +20,7 @@ def get_saml_idp():
     value = ""
     if idp_map is not None:
         try:
-            idp = list(idp_map.keys())[0]
+            idp = next(iter(idp_map.keys()))
         except IndexError:
             pass
         else:
@@ -35,9 +34,6 @@ def settings(request):
     Expose Django settings in the template context. Example: {{ settings.DEBUG }}
     """
     root_template = "base_django.html"
-    if django_settings.ENABLE_ALPHA_UI:
-        use_new_ui = request.COOKIES.get("newui", False) and is_route_new_ui_ready(request.path)
-        root_template = "base_react.html" if use_new_ui else "base_django.html"
     return {
         "settings": django_settings,
         "root_template": root_template,

nautobot/core/factory.py

@@ -1,11 +1,11 @@
 from ipaddress import IPv6Address, IPV6LENGTH, IPv6Network
+import itertools
 
 from django.db.models import Model
 import factory
 from factory.django import DjangoModelFactory
-from faker.providers import BaseProvider
 import factory.random
-import itertools
+from faker.providers import BaseProvider
 
 from nautobot.core import constants
 from nautobot.extras.models import Tag

nautobot/core/filters.py

@@ -634,7 +634,7 @@ class BaseFilterSet(django_filters.FilterSet):
         if getattr(field, "null", None):
             # Use this method vs extend as the `lookup_map` variable is generally one of
             # the constants which we do not want to update
-            lookup_map = dict(lookup_map, **{"isnull": "isnull"})
+            lookup_map = dict(lookup_map, isnull="isnull")
 
         # Create new filters for each lookup expression in the map
         for lookup_name, lookup_expr in lookup_map.items():

nautobot/core/forms/fields.py

@@ -8,15 +8,13 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.forms import SimpleArrayField
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist, ValidationError
 from django.db.models import Q
-from django.forms.fields import BoundField, InvalidJSONInput
-from django.forms.fields import JSONField as _JSONField
+from django.forms.fields import BoundField, InvalidJSONInput, JSONField as _JSONField
 from django.urls import reverse
 import django_filters
 from netaddr import EUI
 from netaddr.core import AddrFormatError
 
-from nautobot.core import choices as core_choices
-from nautobot.core import forms
+from nautobot.core import choices as core_choices, forms
 from nautobot.core.forms import widgets
 from nautobot.core.models import validators
 from nautobot.core.utils import data as data_utils, lookup

nautobot/core/forms/forms.py

@@ -7,7 +7,7 @@ from django.forms import formset_factory
 from django.urls import reverse
 import yaml
 
-from nautobot.core.utils.filtering import build_lookup_label, get_filterset_parameter_form_field, get_filter_field_label
+from nautobot.core.utils.filtering import build_lookup_label, get_filter_field_label, get_filterset_parameter_form_field
 from nautobot.ipam import formfields
 
 __all__ = (

nautobot/core/forms/search.py

@@ -1,5 +1,5 @@
-from django.apps import apps
 from django import forms
+from django.apps import apps
 
 from nautobot.core.forms import BootstrapMixin
 

nautobot/core/forms/utils.py

@@ -113,7 +113,7 @@ def add_blank_choice(choices):
     """
     Add a blank choice to the beginning of a choices list.
     """
-    return ((None, "---------"),) + tuple(choices)
+    return ((None, "---------"), *tuple(choices))
 
 
 def form_from_model(model, fields):

nautobot/core/graphql/__init__.py

@@ -1,12 +1,11 @@
 from django.test.client import RequestFactory
-
-from nautobot.extras.models import GraphQLQuery
-
 from graphene.types import Scalar
 from graphene_django.settings import graphene_settings
 from graphql import get_default_backend
 from graphql.language import ast
 
+from nautobot.extras.models import GraphQLQuery
+
 
 def execute_query(query, variables=None, request=None, user=None):
     """Execute a query from the ORM.

nautobot/core/graphql/generators.py

@@ -7,7 +7,7 @@ import graphene_django_optimizer as gql_optimizer
 from graphql import GraphQLError
 
 from nautobot.core.graphql.types import OptimizedNautobotObjectType
-from nautobot.core.graphql.utils import str_to_var_name, get_filtering_args_from_filterset
+from nautobot.core.graphql.utils import get_filtering_args_from_filterset, str_to_var_name
 from nautobot.core.utils.lookup import get_filterset_for_model
 from nautobot.extras.choices import RelationshipSideChoices
 from nautobot.extras.models import RelationshipAssociation
@@ -116,7 +116,7 @@ def generate_computed_field_resolver(name, resolver_name):
     """
 
     def resolve_computed_field(self, info, **kwargs):
-        return self.get_computed_field(slug=name)
+        return self.get_computed_field(key=name)
 
     resolve_computed_field.__name__ = resolver_name
     return resolve_computed_field

nautobot/core/graphql/schema.py

@@ -4,28 +4,28 @@ import logging
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
+from django.core.validators import ValidationError
 from django.db.models.fields.reverse_related import ManyToOneRel, OneToOneRel
-
 import graphene
 from graphene.types import generic
 
 from nautobot.circuits.graphql.types import CircuitTerminationType
-from nautobot.core.graphql.utils import str_to_var_name
 from nautobot.core.graphql.generators import (
     generate_attrs_for_schema_type,
     generate_computed_field_resolver,
     generate_custom_field_resolver,
     generate_filter_resolver,
     generate_list_search_parameters,
+    generate_null_choices_resolver,
     generate_relationship_resolver,
     generate_restricted_queryset,
     generate_schema_type,
-    generate_null_choices_resolver,
 )
-from nautobot.core.graphql.types import ContentTypeType
+from nautobot.core.graphql.types import ContentTypeType, JSON
+from nautobot.core.graphql.utils import str_to_var_name
 from nautobot.dcim.graphql.types import (
-    CableType,
     CablePathType,
+    CableType,
     ConsolePortType,
     ConsoleServerPortType,
     DeviceType,
@@ -39,10 +39,11 @@ from nautobot.dcim.graphql.types import (
     RackType,
     RearPortType,
 )
-from nautobot.extras.registry import registry
-from nautobot.extras.models import ComputedField, CustomField, Relationship
 from nautobot.extras.choices import CustomFieldTypeChoices, RelationshipSideChoices
-from nautobot.extras.graphql.types import TagType, DynamicGroupType
+from nautobot.extras.graphql.types import DynamicGroupType, TagType
+from nautobot.extras.models import ComputedField, CustomField, Relationship
+from nautobot.extras.registry import registry
+from nautobot.extras.utils import check_if_key_is_graphql_safe
 from nautobot.ipam.graphql.types import IPAddressType, PrefixType
 from nautobot.virtualization.graphql.types import VirtualMachineType, VMInterfaceType
 
@@ -82,6 +83,7 @@ CUSTOM_FIELD_MAPPING = {
     CustomFieldTypeChoices.TYPE_DATE: graphene.Date(),
     CustomFieldTypeChoices.TYPE_URL: graphene.String(),
     CustomFieldTypeChoices.TYPE_SELECT: graphene.String(),
+    CustomFieldTypeChoices.TYPE_JSON: JSON(),
 }
 
 
@@ -278,6 +280,17 @@ def extend_schema_type_computed_field(schema_type, model):
 
     for field in cfs:
         field_name = f"{prefix}{field.key}"
+        try:
+            check_if_key_is_graphql_safe("Computed Field", field.key)
+        except ValidationError:
+            logger.warning(
+                'Unable to add the computed field "%s" to %s because computed field key "%s" is not GraphQL safe',
+                field,
+                schema_type._meta.name,
+                field_name,
+            )
+            continue
+
         resolver_name = f"resolve_{field_name}"
 
         if hasattr(schema_type, resolver_name):

nautobot/core/graphql/schema_init.py

@@ -3,7 +3,6 @@ from graphene_django.types import ObjectType
 
 from .schema import generate_query_mixin
 
-
 DynamicGraphQL = generate_query_mixin()
 
 

nautobot/core/graphql/types.py

@@ -22,3 +22,13 @@ class ContentTypeType(OptimizedNautobotObjectType):
 
     class Meta:
         model = ContentType
+
+
+class JSON(graphene.Scalar):
+    @staticmethod
+    def serialize_data(dt):
+        return dt
+
+    serialize = serialize_data
+    parse_value = serialize_data
+    parse_literal = serialize_data

nautobot/core/graphql/utils.py

@@ -1,6 +1,6 @@
 import logging
 
-from django_filters.filters import BooleanFilter, NumberFilter, MultipleChoiceFilter
+from django_filters.filters import BooleanFilter, MultipleChoiceFilter, NumberFilter
 import graphene
 
 from nautobot.core.filters import (
@@ -12,7 +12,6 @@ from nautobot.core.filters import (
 from nautobot.core.graphql import BigInteger
 from nautobot.core.models.fields import slugify_dashes_to_underscores
 
-
 logger = logging.getLogger(__name__)
 
 

nautobot/core/management/commands/generate_test_data.py

@@ -5,7 +5,7 @@ import os
 from django.core.management import call_command
 from django.core.management.base import BaseCommand, CommandError
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db import DEFAULT_DB_ALIAS, connections
+from django.db import connections, DEFAULT_DB_ALIAS
 from django.utils.crypto import get_random_string
 
 from nautobot.core.settings_funcs import is_truthy
@@ -58,17 +58,16 @@ class Command(BaseCommand):
                 ProviderNetworkFactory,
             )
             from nautobot.dcim.factory import (
+                DeviceFactory,
                 DeviceRedundancyGroupFactory,
                 DeviceTypeFactory,
+                LocationFactory,
+                LocationTypeFactory,
                 ManufacturerFactory,
                 PlatformFactory,
             )
             from nautobot.extras.factory import ExternalIntegrationFactory, RoleFactory, StatusFactory, TagFactory
             from nautobot.extras.management import populate_status_choices
-            from nautobot.dcim.factory import (
-                LocationTypeFactory,
-                LocationFactory,
-            )
             from nautobot.extras.utils import TaggableClassesQuery
             from nautobot.ipam.choices import PrefixTypeChoices
             from nautobot.ipam.factory import (
@@ -77,8 +76,8 @@ class Command(BaseCommand):
                 PrefixFactory,
                 RIRFactory,
                 RouteTargetFactory,
-                VLANGroupFactory,
                 VLANFactory,
+                VLANGroupFactory,
                 VRFFactory,
             )
             from nautobot.tenancy.factory import TenantFactory, TenantGroupFactory
@@ -146,6 +145,8 @@ class Command(BaseCommand):
         ManufacturerFactory.create_batch(2, using=db_name)  # Last 2 hard-coded Manufacturers
         self.stdout.write("Creating DeviceRedundancyGroups...")
         DeviceRedundancyGroupFactory.create_batch(20, using=db_name)
+        self.stdout.write("Creating Devices...")
+        DeviceFactory.create_batch(20, using=db_name)
         self.stdout.write("Creating CircuitTypes...")
         CircuitTypeFactory.create_batch(20, using=db_name)
         self.stdout.write("Creating Providers...")

nautobot/core/management/commands/makemigrations.py

@@ -1,5 +1,5 @@
 # noinspection PyUnresolvedReferences
-from django.core.management.commands.makemigrations import Command  # noqa: F401
+from django.core.management.commands.makemigrations import Command  # noqa: F401  # unused-import
 from django.db import models
 
 from nautobot.core.management import commands

nautobot/core/management/commands/migrate.py

@@ -1,5 +1,5 @@
 # noinspection PyUnresolvedReferences
-from django.core.management.commands.migrate import Command  # noqa: F401
+from django.core.management.commands.migrate import Command  # noqa: F401  # unused-import
 from django.db import models
 
 from nautobot.core.management import commands

nautobot/core/management/commands/post_upgrade.py

@@ -3,7 +3,6 @@ import argparse
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
-
 HELP_TEXT = """
 Performs Nautobot common server upgrade operations using a single entrypoint.
 
@@ -11,7 +10,6 @@ This will run the following management commands with default settings, in order:
 
 - migrate
 - trace_paths
-- build_ui --npm-install
 - collectstatic
 - remove_stale_contenttypes
 - clearsessions
@@ -29,13 +27,6 @@ class Command(BaseCommand):
         return parser
 
     def add_arguments(self, parser):
-        parser.add_argument(
-            "--build-ui",
-            action="store_true",
-            dest="build_ui",
-            default=False,
-            help="Build the user interface.",
-        )
         parser.add_argument(
             "--no-clearsessions",
             action="store_false",
@@ -99,6 +90,7 @@ class Command(BaseCommand):
             self.stdout.write("Performing database migrations...")
             call_command(
                 "migrate",
+                skip_checks=False,  # make sure Postgres version check and others are applied
                 interactive=False,
                 traceback=options["traceback"],
                 verbosity=options["verbosity"],
@@ -111,12 +103,6 @@ class Command(BaseCommand):
             call_command("trace_paths", no_input=True)
             self.stdout.write()
 
-        # Run build
-        if options.get("build_ui"):
-            self.stdout.write("Building user interface...")
-            call_command("build_ui", npm_install=True)
-            self.stdout.write()
-
         # Run collectstatic
         if options.get("collectstatic"):
             self.stdout.write("Collecting static files...")

nautobot/core/management/commands/refresh_content_type_cache.py

@@ -1,9 +1,8 @@
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
 from django.core.management.base import BaseCommand
 
-from django.contrib.contenttypes.models import ContentType
-
 
 class Command(BaseCommand):
     help = "Update the cached content type for all model classes."

nautobot/core/management/commands/send_installation_metrics.py

@@ -1,18 +1,17 @@
 import hashlib
 import json
 import platform
-import requests
-import requests.exceptions
 import uuid
 
 from constance import config
 from django.apps import apps
 from django.conf import settings
 from django.core.management.base import BaseCommand
+import requests
+import requests.exceptions
 
 from nautobot.core.utils.config import get_settings_or_config
 
-
 METRICS_ENDPOINT = "https://nautobot.cloud/api/nautobot/installation-metric/"
 
 

nautobot/core/management/commands/validate_models.py

@@ -1,7 +1,7 @@
 from django.apps import apps
 from django.contrib.auth import get_user_model
-from django.core.management.base import BaseCommand, CommandError
 from django.core.exceptions import ValidationError
+from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):

nautobot/core/middleware.py

@@ -12,9 +12,9 @@ from nautobot.core.authentication import (
     assign_permissions_to_user,
 )
 from nautobot.core.settings_funcs import (
-    sso_auth_enabled,
-    remote_auth_enabled,
     ldap_auth_enabled,
+    remote_auth_enabled,
+    sso_auth_enabled,
 )
 from nautobot.core.views import server_error
 from nautobot.extras.choices import ObjectChangeEventContextChoices

nautobot/core/models/__init__.py

@@ -1,12 +1,12 @@
 import uuid
 
+from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
+from django.core.cache import cache
 from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 from django.urls import NoReverseMatch, reverse
 from django.utils.encoding import is_protected_type
-from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
-from django.core.cache import cache
 from django.utils.functional import classproperty
 
 from nautobot.core.models.managers import BaseManager
@@ -47,12 +47,8 @@ class BaseModel(models.Model):
 
     objects = BaseManager.from_queryset(RestrictedQuerySet)()
 
-    @property
-    def present_in_database(self):
-        """
-        True if the record exists in the database, False if it does not.
-        """
-        return not self._state.adding
+    class Meta:
+        abstract = True
 
     def get_absolute_url(self, api=False):
         """
@@ -77,6 +73,13 @@ class BaseModel(models.Model):
 
         raise AttributeError(f"Cannot find a URL for {self} ({self._meta.app_label}.{self._meta.model_name})")
 
+    @property
+    def present_in_database(self):
+        """
+        True if the record exists in the database, False if it does not.
+        """
+        return not self._state.adding
+
     @classproperty  # https://github.com/PyCQA/pylint-django/issues/240
     def _content_type(cls):  # pylint: disable=no-self-argument
         """
@@ -101,9 +104,6 @@ class BaseModel(models.Model):
 
         return cache.get_or_set(cls._content_type_cache_key, cls._content_type, settings.CONTENT_TYPE_CACHE_TIMEOUT)
 
-    class Meta:
-        abstract = True
-
     def validated_save(self, *args, **kwargs):
         """
         Perform model validation during instance save.

nautobot/core/models/fields.py

@@ -2,7 +2,7 @@ import json
 import re
 
 from django.core import exceptions
-from django.core.validators import RegexValidator, MaxLengthValidator
+from django.core.validators import MaxLengthValidator, RegexValidator
 from django.db import models
 from django.utils.text import slugify
 from django_extensions.db.fields import AutoSlugField as _AutoSlugField

nautobot/core/models/generics.py

@@ -1,12 +1,11 @@
 import logging
 
+from nautobot.core.models import BaseModel
+from nautobot.core.models.fields import TagsField
 from nautobot.extras.models.change_logging import ChangeLoggedModel
 from nautobot.extras.models.customfields import CustomFieldModel
 from nautobot.extras.models.mixins import DynamicGroupMixin, NotesMixin
 from nautobot.extras.models.relationships import RelationshipModel
-from nautobot.core.models import BaseModel
-from nautobot.core.models.fields import TagsField
-
 
 logger = logging.getLogger(__name__)
 

nautobot/core/models/managers.py

@@ -3,7 +3,6 @@ import logging
 from django.db.models import Manager
 from taggit.managers import _TaggableManager
 
-
 logger = logging.getLogger(__name__)
 
 

nautobot/core/models/name_color_content_types.py

@@ -6,13 +6,13 @@ from nautobot.core.choices import ColorChoices
 from nautobot.core.models import BaseManager, BaseModel
 from nautobot.core.models.fields import ColorField
 from nautobot.core.models.querysets import RestrictedQuerySet
+from nautobot.extras.models.change_logging import ChangeLoggedModel
 
 # Importing CustomFieldModel, ChangeLoggedModel, RelationshipModel from  nautobot.extras.models
 # caused circular import error
 from nautobot.extras.models.customfields import CustomFieldModel
-from nautobot.extras.models.change_logging import ChangeLoggedModel
-from nautobot.extras.models.relationships import RelationshipModel
 from nautobot.extras.models.mixins import DynamicGroupMixin, NotesMixin
+from nautobot.extras.models.relationships import RelationshipModel
 
 
 class ContentTypeRelatedQuerySet(RestrictedQuerySet):

nautobot/core/models/tree_queries.py

@@ -1,10 +1,8 @@
 from django.core.cache import cache
-
 from tree_queries.models import TreeNode
-from tree_queries.query import TreeManager as TreeManager_
-from tree_queries.query import TreeQuerySet as TreeQuerySet_
+from tree_queries.query import TreeManager as TreeManager_, TreeQuerySet as TreeQuerySet_
 
-from nautobot.core.models import querysets, BaseManager
+from nautobot.core.models import BaseManager, querysets
 
 
 class TreeQuerySet(TreeQuerySet_, querysets.RestrictedQuerySet):

nautobot/core/models/validators.py

@@ -2,7 +2,7 @@ import re
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.core.validators import BaseValidator, RegexValidator, URLValidator, _lazy_re_compile
+from django.core.validators import _lazy_re_compile, BaseValidator, RegexValidator, URLValidator
 
 
 class EnhancedURLValidator(URLValidator):

nautobot/core/releases.py

@@ -2,8 +2,8 @@ import logging
 
 from django.core.cache import cache
 
-from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.tasks import get_releases
+from nautobot.core.utils.config import get_settings_or_config
 
 logger = logging.getLogger(__name__)