nautobot 2.0.0a2__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/core/models/generics.py

@@ -1,14 +1,11 @@
 import logging
-import sys
-
-from taggit.managers import TaggableManager, _TaggableManager
 
 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.extras.models.tags import TaggedItem
 from nautobot.core.models import BaseModel
+from nautobot.core.models.fields import TagsField
 
 
 logger = logging.getLogger(__name__)
@@ -31,47 +28,6 @@ class OrganizationalModel(
         abstract = True
 
 
-# 2.0 TODO: remove this, force migration to the newer django-taggit API.
-class _NautobotTaggableManager(_TaggableManager):
-    """Extend _TaggableManager to work around a breaking API change between django-taggit 1.x and 2.x.
-
-    This is a bit confusing, as there's also a related `TaggableManager` class as well.
-    `TaggableManager` is the *model field* (subclass of `models.fields.related.RelatedField`),
-    while `_TaggableManager` is the *associated manager* (subclass of `models.Manager`).
-
-    For `TaggableManager`, we chose to monkey-patch rather than subclass to override its `formfield` method;
-    replacing it with a subclass would create database migrations for every PrimaryModel with a `tags` field.
-    In 2.0 we'll want to bite the bullet and make the cutover (#1633).
-
-    For `_TaggableManager`, we can subclass rather than monkey-patching because replacing it *doesn't* require
-    a database migration, and this is cleaner than a monkey-patch.
-    """
-
-    def set(self, *tags, through_defaults=None, **kwargs):
-        """
-        Patch model.tags.set() to be backwards-compatible with django-taggit 1.x and forward-compatible with later.
-
-        Both of these approaches are supported:
-
-        - tags.set("tag 1", "tag 2")  # django-taggit 1.x
-        - tags.set(["tag 1", "tag 2"])  # django-taggit 2.x and later
-        """
-        if len(tags) == 1 and not isinstance(tags[0], (self.through.tag_model(), str)):
-            # taggit 2.x+ style, i.e. `set([tag, tag, tag])`
-            tags = tags[0]
-        else:
-            # taggit 1.x style, i.e. `set(tag, tag, tag)`
-            # Note: logger.warning() only supports a `stacklevel` parameter in Python 3.8 and later
-            tags_unpacked = ", ".join([repr(tag) for tag in tags])
-            tags_list = list(tags)
-            message = "Deprecated `tags.set(%s)` was called, please change to `tags.set(%s)` instead"
-            if sys.version_info >= (3, 8):
-                logger.warning(message, tags_unpacked, tags_list, stacklevel=2)
-            else:  # Python 3.7
-                logger.warning(message, tags_unpacked, tags_list)
-        return super().set(tags, through_defaults=through_defaults, **kwargs)
-
-
 class PrimaryModel(BaseModel, ChangeLoggedModel, CustomFieldModel, RelationshipModel, DynamicGroupMixin, NotesMixin):
     """
     Base abstract model for all primary models.
@@ -82,7 +38,7 @@ class PrimaryModel(BaseModel, ChangeLoggedModel, CustomFieldModel, RelationshipM
     tangible or logical resources on the network, or within the organization.
     """
 
-    tags = TaggableManager(through=TaggedItem, manager=_NautobotTaggableManager, ordering=["name"])
+    tags = TagsField()
 
     class Meta:
         abstract = True

nautobot/core/models/managers.py

@@ -1,4 +1,5 @@
 from django.db.models import Manager
+from taggit.managers import _TaggableManager
 
 
 class BaseManager(Manager):
@@ -43,3 +44,7 @@ class BaseManager(Manager):
                 raise self.model.DoesNotExist() from exc
 
         return self.get(**kwargs)
+
+
+class TagsManager(_TaggableManager, BaseManager):
+    """Manager class for model 'tags' fields."""

nautobot/core/models/name_color_content_types.py

@@ -1,11 +1,10 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.db.models import Q
-from django.urls import reverse
 
 from nautobot.core.choices import ColorChoices
 from nautobot.core.models import BaseManager, BaseModel
-from nautobot.core.models.fields import AutoSlugField, ColorField
+from nautobot.core.models.fields import ColorField
 from nautobot.core.models.querysets import RestrictedQuerySet
 
 # Importing CustomFieldModel, ChangeLoggedModel, RelationshipModel from  nautobot.extras.models
@@ -58,8 +57,6 @@ class NameColorContentTypesModel(
         help_text="The content type(s) to which this model applies.",
     )
     name = models.CharField(max_length=100, unique=True)
-    # TODO (timizuo): Remove slug
-    slug = AutoSlugField(populate_from="name", max_length=100)
     color = ColorField(default=ColorChoices.COLOR_GREY)
     description = models.CharField(
         max_length=200,
@@ -68,7 +65,6 @@ class NameColorContentTypesModel(
 
     objects = BaseManager.from_queryset(ContentTypeRelatedQuerySet)()
 
-    csv_headers = ["name", "slug", "color", "content_types", "description"]
     clone_fields = ["color", "content_types"]
 
     class Meta:
@@ -78,19 +74,5 @@ class NameColorContentTypesModel(
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        ct = f"{self._meta.app_label}:{self._meta.model_name}"
-        # TODO(timizuo): Replace self.slug with natural key or pk
-        return reverse(ct, args=[self.slug])
-
     def get_content_types(self):
         return ",".join(f"{ct.app_label}.{ct.model}" for ct in self.content_types.all())
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.color,
-            self.get_content_types(),
-            self.description,
-        )

nautobot/core/models/tree_queries.py

@@ -1,3 +1,5 @@
+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_
@@ -41,16 +43,24 @@ class TreeModel(TreeNode):
 
     @property
     def display(self):
-        """By default, TreeModels display their full ancestry for clarity."""
+        """
+        By default, TreeModels display their full ancestry for clarity.
+
+        As this is an expensive thing to calculate, we cache it for a few seconds in the case of repeated lookups.
+        """
         if not hasattr(self, "name"):
             raise NotImplementedError("default TreeModel.display implementation requires a `name` attribute!")
-        display_str = ""
+        cache_key = f"{self.__class__.__name__}.{self.id}.display"
+        display_str = cache.get(cache_key, "")
+        if display_str:
+            return display_str
         try:
-            for ancestor in self.ancestors():
-                display_str += ancestor.name + " → "
+            if self.parent is not None:
+                display_str = self.parent.display + " → "
         except self.DoesNotExist:
             # Expected to occur at times during bulk-delete operations
             pass
         finally:
             display_str += self.name
+            cache.set(cache_key, display_str, 5)
             return display_str  # pylint: disable=lost-exception

nautobot/core/models/utils.py

@@ -1,12 +1,12 @@
-from itertools import count, groupby
 import json
+
+from itertools import count, groupby
 from urllib.parse import quote_plus, unquote_plus
 
 from django.apps import apps
 from django.core.exceptions import FieldDoesNotExist
 from django.core.serializers import serialize
 from django.utils.tree import Node
-from taggit.managers import _TaggableManager
 
 from nautobot.core.models.constants import NATURAL_KEY_SLUG_SEPARATOR
 
@@ -35,10 +35,9 @@ def is_taggable(obj):
     """
     Return True if the instance can have Tags assigned to it; False otherwise.
     """
-    if hasattr(obj, "tags"):
-        if issubclass(obj.tags.__class__, _TaggableManager):
-            return True
-    return False
+    from nautobot.core.models.managers import TagsManager
+
+    return hasattr(obj, "tags") and isinstance(obj.tags, TagsManager)
 
 
 def pretty_print_query(query):
@@ -54,11 +53,11 @@ def pretty_print_query(query):
     Example:
         >>> print(pretty_print_query(Q))
         (
-          site__slug='ams01' OR site__slug='bkk01' OR (
-            site__slug='can01' AND status__slug='active'
+          location__name='Campus-01' OR location__name='Campus-02' OR (
+            location__name='Room-01' AND status__name='Active'
           ) OR (
-            site__slug='del01' AND (
-              NOT (site__slug='del01' AND status__slug='decommissioning')
+            location__name='Building-01' AND (
+              NOT (location__name='Building-01' AND status__name='Decommissioning')
             )
           )
         )

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, URLValidator, _lazy_re_compile
+from django.core.validators import BaseValidator, RegexValidator, URLValidator, _lazy_re_compile
 
 
 class EnhancedURLValidator(URLValidator):
@@ -41,12 +41,21 @@ class ExclusionValidator(BaseValidator):
         return a in b
 
 
-def validate_regex(value):
+class ValidRegexValidator(RegexValidator):
     """
-    Checks that the value is a valid regular expression. (Don't confuse this with RegexValidator, which *uses* a regex
-    to validate a value.)
+    Checks that the value is a valid regular expression.
+
+    Don't confuse this with `RegexValidator`, which *uses* a regex to validate a value.
     """
-    try:
-        re.compile(value)
-    except re.error:
-        raise ValidationError(f"{value} is not a valid regular expression.")
+
+    message = "%(value)r is not a valid regular expression."
+    code = "regex_invalid"
+
+    def __call__(self, value):
+        try:
+            return re.compile(value)
+        except (re.error, TypeError):
+            raise ValidationError(self.message, code=self.code, params={"value": value})
+
+
+validate_regex = ValidRegexValidator()

nautobot/core/releases.py

@@ -1,6 +1,6 @@
 import logging
 
-from cacheops import CacheMiss, cache
+from django.core.cache import cache
 
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.tasks import get_releases
@@ -18,15 +18,13 @@ def get_latest_release(pre_releases=False):
     """
     if get_settings_or_config("RELEASE_CHECK_URL"):
         logger.debug("Checking for most recent release")
-        try:
-            latest_release = cache.get("latest_release")
-            if latest_release:
-                logger.debug(f"Found cached release: {latest_release}")
-                return latest_release
-        except CacheMiss:
-            # Get the releases in the background worker, it will fill the cache
-            logger.info("Initiating background task to retrieve updated releases list")
-            get_releases.delay(pre_releases=pre_releases)
+        latest_release = cache.get("latest_release")
+        if latest_release is not None:
+            logger.debug(f"Found cached release: {latest_release}")
+            return latest_release
+        # Get the releases in the background worker, it will fill the cache
+        logger.info("Initiating background task to retrieve updated releases list")
+        get_releases.delay(pre_releases=pre_releases)
 
     else:
         logger.debug("Skipping release check; RELEASE_CHECK_URL not defined")

nautobot/core/settings.py

@@ -13,7 +13,7 @@ from nautobot.core.settings_funcs import is_truthy, parse_redis_connection, Cons
 # Environment setup
 #
 
-# This is used for display in the UI.
+# This is used for display in the UI. There are also VERSION_MAJOR and VERSION_MINOR derived from this later.
 VERSION = __version__
 
 # Hostname of the system. This is displayed in the web UI footers along with the
@@ -59,15 +59,13 @@ ALLOWED_URL_SCHEMES = (
 # Base directory wherein all created files (jobs, git repositories, file uploads, static files) will be stored)
 NAUTOBOT_ROOT = os.getenv("NAUTOBOT_ROOT", os.path.expanduser("~/.nautobot"))
 
+# The directory where the Nautobot UI packaging is stored.
+NAUTOBOT_UI_DIR = os.path.join(NAUTOBOT_ROOT, "ui")
+
 # Disable linking of Config Context objects via Dynamic Groups by default. This could cause performance impacts
 # when a large number of dynamic groups are present
 CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED = is_truthy(os.getenv("NAUTOBOT_CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED", "False"))
 
-# By default, Nautobot will permit users to create duplicate prefixes and IP addresses in the global
-# table (that is, those which are not assigned to any VRF). This behavior can be disabled by setting
-# ENFORCE_GLOBAL_UNIQUE to True.
-ENFORCE_GLOBAL_UNIQUE = is_truthy(os.getenv("NAUTOBOT_ENFORCE_GLOBAL_UNIQUE", "False"))
-
 # Exclude potentially sensitive models from wildcard view exemption. These may still be exempted
 # by specifying the model individually in the EXEMPT_VIEW_PERMISSIONS configuration parameter.
 EXEMPT_EXCLUDE_MODELS = (
@@ -115,7 +113,7 @@ SOCIAL_AUTH_BACKEND_PREFIX = "social_core.backends"
 SANITIZER_PATTERNS = [
     # General removal of username-like and password-like tokens
     (re.compile(r"(https?://)?\S+\s*@", re.IGNORECASE), r"\1{replacement}@"),
-    (re.compile(r"(username|password|passwd|pwd)(\s*i?s?\s*:?\s*)?\S+", re.IGNORECASE), r"\1\2{replacement}"),
+    (re.compile(r"(username|password|passwd|pwd)((?:\s+is.?|:)?\s+)\S+", re.IGNORECASE), r"\1\2{replacement}"),
 ]
 
 # Storage
@@ -166,11 +164,11 @@ STRICT_FILTERING = is_truthy(os.getenv("NAUTOBOT_STRICT_FILTERING", "True"))
 #
 
 REST_FRAMEWORK_VERSION = VERSION.rsplit(".", 1)[0]  # Use major.minor as API version
-current_major, current_minor = REST_FRAMEWORK_VERSION.split(".")
+VERSION_MAJOR, VERSION_MINOR = [int(v) for v in REST_FRAMEWORK_VERSION.split(".")]
 # We support all major.minor API versions from 2.0 to the present latest version.
 # Similar logic exists in tasks.py, please keep them in sync!
-assert current_major == "2", f"REST_FRAMEWORK_ALLOWED_VERSIONS needs to be updated to handle version {current_major}"
-REST_FRAMEWORK_ALLOWED_VERSIONS = [f"{current_major}.{minor}" for minor in range(0, int(current_minor) + 1)]
+assert VERSION_MAJOR == 2, f"REST_FRAMEWORK_ALLOWED_VERSIONS needs to be updated to handle version {VERSION_MAJOR}"
+REST_FRAMEWORK_ALLOWED_VERSIONS = [f"{VERSION_MAJOR}.{minor}" for minor in range(0, VERSION_MINOR + 1)]
 
 REST_FRAMEWORK = {
     "ALLOWED_VERSIONS": REST_FRAMEWORK_ALLOWED_VERSIONS,
@@ -178,20 +176,27 @@ REST_FRAMEWORK = {
         "rest_framework.authentication.SessionAuthentication",
         "nautobot.core.api.authentication.TokenAuthentication",
     ),
-    "DEFAULT_FILTER_BACKENDS": ("nautobot.core.api.filter_backends.NautobotFilterBackend",),
+    "DEFAULT_FILTER_BACKENDS": (
+        "nautobot.core.api.filter_backends.NautobotFilterBackend",
+        "rest_framework.filters.OrderingFilter",
+    ),
     "DEFAULT_METADATA_CLASS": "nautobot.core.api.metadata.NautobotMetadata",
     "DEFAULT_PAGINATION_CLASS": "nautobot.core.api.pagination.OptionalLimitOffsetPagination",
     "DEFAULT_PERMISSION_CLASSES": ("nautobot.core.api.authentication.TokenPermissions",),
     "DEFAULT_RENDERER_CLASSES": (
-        "rest_framework.renderers.JSONRenderer",
+        "nautobot.core.api.renderers.NautobotJSONRenderer",
         "nautobot.core.api.renderers.FormlessBrowsableAPIRenderer",
+        "nautobot.core.api.renderers.NautobotCSVRenderer",
+    ),
+    "DEFAULT_PARSER_CLASSES": (
+        "rest_framework.parsers.JSONParser",
+        "nautobot.core.api.parsers.NautobotCSVParser",
     ),
-    "DEFAULT_PARSER_CLASSES": ("rest_framework.parsers.JSONParser",),
     "DEFAULT_SCHEMA_CLASS": "nautobot.core.api.schema.NautobotAutoSchema",
-    # Version to use if the client doesn't request otherwise.
-    # This should only change (if at all) with Nautobot major (breaking) releases.
-    "DEFAULT_VERSION": "2.0",
+    # Version to use if the client doesn't request otherwise. Default to current (i.e. latest)
+    "DEFAULT_VERSION": REST_FRAMEWORK_VERSION,
     "DEFAULT_VERSIONING_CLASS": "nautobot.core.api.versioning.NautobotAPIVersioning",
+    "ORDERING_PARAM": "sort",  # This is not meant to be changed by users, but is used internally by the API
     "PAGE_SIZE": None,
     "SCHEMA_COERCE_METHOD_NAMES": {
         # Default mappings
@@ -271,7 +276,10 @@ DATABASES = {
         "HOST": os.getenv("NAUTOBOT_DB_HOST", "localhost"),
         "PORT": os.getenv("NAUTOBOT_DB_PORT", ""),
         "CONN_MAX_AGE": int(os.getenv("NAUTOBOT_DB_TIMEOUT", "300")),
-        "ENGINE": os.getenv("NAUTOBOT_DB_ENGINE", "django.db.backends.postgresql"),
+        "ENGINE": os.getenv(
+            "NAUTOBOT_DB_ENGINE",
+            "django_prometheus.db.backends.postgresql" if METRICS_ENABLED else "django.db.backends.postgresql",
+        ),
     }
 }
 
@@ -292,13 +300,18 @@ DEBUG = is_truthy(os.getenv("NAUTOBOT_DEBUG", "False"))
 INTERNAL_IPS = ("127.0.0.1", "::1")
 FORCE_SCRIPT_NAME = None
 
-TESTING = len(sys.argv) > 1 and sys.argv[1] == "test"
+TESTING = "test" in sys.argv
 
 LOG_LEVEL = "DEBUG" if DEBUG else "INFO"
 
 if TESTING:
-    # keep log quiet by default when running unit/integration tests
-    LOGGING = {}
+    # Log to null handler instead of stderr during testing
+    LOGGING = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "handlers": {"console": {"level": "INFO", "class": "logging.NullHandler"}},
+        "loggers": {"nautobot": {"handlers": ["console"], "level": "INFO"}},
+    }
 else:
     LOGGING = {
         "version": 1,
@@ -355,7 +368,6 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.humanize",
-    "cacheops",  # v2 TODO(jathan); Remove cacheops.
     "corsheaders",
     "django_filters",
     "django_jinja",
@@ -470,7 +482,10 @@ X_FRAME_OPTIONS = "DENY"
 # Static files (CSS, JavaScript, Images)
 STATIC_ROOT = os.path.join(NAUTOBOT_ROOT, "static")
 STATIC_URL = "static/"
-STATICFILES_DIRS = (os.path.join(BASE_DIR, "project-static"),)
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, "project-static"),
+    os.path.join(NAUTOBOT_UI_DIR, "build", "static"),
+)
 
 # Media
 MEDIA_URL = "media/"
@@ -538,11 +553,6 @@ CONSTANCE_CONFIG = {
         help_text="Number of days to retain object changelog history.\nSet this to 0 to retain changes indefinitely.",
         field_type=int,
     ),
-    "DISABLE_PREFIX_LIST_HIERARCHY": ConstanceConfigItem(
-        default=False,
-        help_text="Disable rendering parent/child relationships in the IPAM Prefix list view and instead show a flat list.",
-        field_type=bool,
-    ),
     "HIDE_RESTRICTED_UI": ConstanceConfigItem(
         default=False,
         help_text="If set to True, users with limited permissions will not be shown menu items and home-page elements that "
@@ -602,7 +612,7 @@ CONSTANCE_CONFIG_FIELDSETS = {
     "Pagination": ["PAGINATE_COUNT", "MAX_PAGE_SIZE", "PER_PAGE_DEFAULTS"],
     "Rack Elevation Rendering": ["RACK_ELEVATION_DEFAULT_UNIT_HEIGHT", "RACK_ELEVATION_DEFAULT_UNIT_WIDTH"],
     "Release Checking": ["RELEASE_CHECK_URL", "RELEASE_CHECK_TIMEOUT"],
-    "User Interface": ["DISABLE_PREFIX_LIST_HIERARCHY", "HIDE_RESTRICTED_UI"],
+    "User Interface": ["HIDE_RESTRICTED_UI"],
 }
 
 #
@@ -639,31 +649,14 @@ GRAPHQL_COMPUTED_FIELD_PREFIX = "cpf"
 # Caching
 #
 
-# v2 TODO(jathan): Remove all cacheops settings.
-# The django-cacheops plugin is used to cache querysets. The built-in Django
-# caching is not used.
-CACHEOPS = {
-    "auth.user": {"ops": "get", "timeout": 60 * 15},
-    "auth.*": {"ops": ("fetch", "get")},
-    "auth.permission": {"ops": "all"},
-    "circuits.*": {"ops": "all"},
-    "dcim.*": {"ops": "all"},
-    "ipam.*": {"ops": "all"},
-    "extras.*": {"ops": "all"},
-    "users.*": {"ops": "all"},
-    "tenancy.*": {"ops": "all"},
-    "virtualization.*": {"ops": "all"},
-}
-CACHEOPS_DEGRADE_ON_FAILURE = True
-CACHEOPS_ENABLED = is_truthy(os.getenv("NAUTOBOT_CACHEOPS_ENABLED", "False"))
-CACHEOPS_REDIS = os.getenv("NAUTOBOT_CACHEOPS_REDIS", parse_redis_connection(redis_database=1))
-CACHEOPS_DEFAULTS = {"timeout": int(os.getenv("NAUTOBOT_CACHEOPS_TIMEOUT", "900"))}
-
 # The django-redis cache is used to establish concurrent locks using Redis.
 CACHES = {
     "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": parse_redis_connection(redis_database=0),
+        "BACKEND": os.getenv(
+            "NAUTOBOT_CACHES_BACKEND",
+            "django_prometheus.cache.backends.redis.RedisCache" if METRICS_ENABLED else "django_redis.cache.RedisCache",
+        ),
+        "LOCATION": parse_redis_connection(redis_database=1),
         "TIMEOUT": 300,
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
@@ -688,15 +681,18 @@ CELERY_RESULT_EXTENDED = True
 # A value of None or 0 means results will never expire (depending on backend specifications).
 CELERY_RESULT_EXPIRES = None
 
-# If set to True, result messages will be persistent. This means the messages won’t be lost after a broker restart.
-CELERY_RESULT_PERSISTENT = True
-
 # Instruct celery to report the started status of a job, instead of just `pending`, `finished`, or `failed`
 CELERY_TASK_TRACK_STARTED = True
 
 # If enabled, a `task-sent` event will be sent for every task so tasks can be tracked before they’re consumed by a worker.
 CELERY_TASK_SEND_SENT_EVENT = True
 
+# If enabled stdout and stderr of running jobs will be redirected to the task logger.
+CELERY_WORKER_REDIRECT_STDOUTS = is_truthy(os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS", "True"))
+
+# The log level of log messages generated by redirected job stdout and stderr. Can be one of `DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`.
+CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS_LEVEL", "WARNING")
+
 # Send task-related events so that tasks can be monitored using tools like flower. Sets the default value for the workers -E argument.
 CELERY_WORKER_SEND_TASK_EVENTS = True
 
@@ -793,3 +789,35 @@ def UI_RACK_VIEW_TRUNCATE_FUNCTION(device_display_name):
     :type: str
     """
     return str(device_display_name).split(".")[0]
+
+
+# Custom JSON schema serializer field type mappingss. These will be added to
+# `NautobotProcessingMixin.TYPE_MAP`.
+# Format: `{serializer_field_class.__name__}` => `{json_schema_type}`
+# See: https://github.com/yoyowallet/drf-react-template-framework#settings
+DRF_REACT_TEMPLATE_TYPE_MAP = {
+    "ContentTypeField": {"type": "string", "enum": "choices"},
+    "CustomFieldsDataField": {"type": "object", "widget": "textarea"},
+    "DateTimeField": {"type": "string", "format": "date-time", "widget": "date-time"},
+    "ImageField": {"type": "string", "format": "data-url"},
+    "IPFieldSerializer": {"type": "string"},
+    "JSONField": {"type": "string", "widget": "textarea"},
+    "MultipleChoiceJSONField": {"type": "array", "required": [], "enum": "choices"},
+    "ManyRelatedField": {"type": "array", "required": []},
+    #
+    # Foreign Key fields
+    #
+    # enum=choices is the one that works in the UI as a related field but it
+    # includes ALL related objects in the schema.
+    # "NautobotHyperlinkedRelatedField": {"type": "string", "enum": "choices"},
+    # readOnly=True disables the fields in the UI; not what we want.
+    # "NautobotHyperlinkedRelatedField": {"type": "string", "readOnly": True},
+    # type=string results in a free text field; also not what we want. For now,
+    # however, this will keep things moving so the unit tests pass.
+    "NautobotHyperlinkedRelatedField": {"type": "string", "format": "uuid"},
+    "PrimaryKeyRelatedField": {"type": "string", "enum": "choices"},
+    "RelationshipsDataField": {"type": "object"},
+    "SlugField": {"type": "string"},
+    "TimeZoneSerializerField": {"type": "string"},
+    "UUIDField": {"type": "string", "format": "uuid"},
+}

nautobot/core/tables.py

@@ -37,21 +37,21 @@ class BaseTable(django_tables2.Table):
             self.base_columns[name] = CustomFieldColumn(cf)
 
         for cpf in models.ComputedField.objects.filter(content_type=obj_type):
-            self.base_columns[f"cpf_{cpf.slug}"] = ComputedFieldColumn(cpf)
+            self.base_columns[f"cpf_{cpf.key}"] = ComputedFieldColumn(cpf)
 
         for relationship in models.Relationship.objects.filter(source_type=obj_type):
             if not relationship.symmetric:
-                self.base_columns[f"cr_{relationship.slug}_src"] = RelationshipColumn(
+                self.base_columns[f"cr_{relationship.key}_src"] = RelationshipColumn(
                     relationship, side=choices.RelationshipSideChoices.SIDE_SOURCE
                 )
             else:
-                self.base_columns[f"cr_{relationship.slug}_peer"] = RelationshipColumn(
+                self.base_columns[f"cr_{relationship.key}_peer"] = RelationshipColumn(
                     relationship, side=choices.RelationshipSideChoices.SIDE_PEER
                 )
 
         for relationship in models.Relationship.objects.filter(destination_type=obj_type):
             if not relationship.symmetric:
-                self.base_columns[f"cr_{relationship.slug}_dst"] = RelationshipColumn(
+                self.base_columns[f"cr_{relationship.key}_dst"] = RelationshipColumn(
                     relationship, side=choices.RelationshipSideChoices.SIDE_DESTINATION
                 )
             # symmetric relationships are already handled above in the source_type case
@@ -443,7 +443,7 @@ class RelationshipColumn(django_tables2.Column):
                 template += format_html(
                     '<a href="{}?relationship={}&{}_id={}">{} {}</a>',
                     reverse("extras:relationshipassociation_list"),
-                    self.relationship.slug,
+                    self.relationship.key,
                     self.side,
                     record.id,
                     len(value),

nautobot/core/tasks.py

@@ -1,7 +1,7 @@
 import logging
 
-from cacheops.simple import CacheMiss, cache
 from django.conf import settings
+from django.core.cache import cache
 from packaging import version
 import requests
 
@@ -21,12 +21,9 @@ def get_releases(pre_releases=False):
     releases = []
 
     # Check whether this URL has failed recently and shouldn't be retried yet
-    try:
-        if url == cache.get("latest_release_no_retry"):
-            logger.info(f"Skipping release check; URL failed recently: {url}")
-            return []
-    except CacheMiss:
-        pass
+    if url == cache.get("latest_release_no_retry"):
+        logger.info(f"Skipping release check; URL failed recently: {url}")
+        return []
 
     try:
         logger.debug(f"Fetching new releases from {url}")

nautobot/core/templates/base.html

@@ -1,49 +1 @@
-{% load static %}
-{% load helpers %}
-{% load plugins %}
-
-<!DOCTYPE html>
-<html lang="en"{% if request.COOKIES|get_item:"theme" == 'dark' %} data-theme="dark"{% endif %}>
-<head>
-    <title>{% block title %}Home{% endblock %} - {{ settings.BRANDING_TITLE }}</title>
-    {% include 'inc/media.html' %}
-    {% block extra_styles %}{% endblock %}
-</head>
-<body>
-    {% include 'inc/nav_menu.html' %}
-    <div class="container-fluid wrapper">
-        {% if "BANNER_TOP"|settings_or_config %}
-            <div class="alert alert-info text-center" role="alert">
-                {{ "BANNER_TOP"|settings_or_config|safe }}
-            </div>
-        {% endif %}
-        {% if settings.MAINTENANCE_MODE %}
-            <div class="alert alert-warning text-center" role="alert">
-                <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
-                <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
-            </div>
-        {% endif %}
-        {% plugin_banners %}
-        {% for message in messages %}
-            <div class="alert alert-{{ message.tags }} alert-dismissable" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span>&times;</span>
-                </button>
-                {{ message }}
-            </div>
-        {% endfor %}
-        {% block header %}{% endblock header %}
-        {% block content %}{% endblock content %}
-        <div class="push"></div>
-        {% if "BANNER_BOTTOM"|settings_or_config %}
-            <div class="alert alert-info text-center banner-bottom" role="alert">
-                {{ "BANNER_BOTTOM"|settings_or_config|safe }}
-            </div>
-        {% endif %}
-    </div>
-    {% include 'modals/modal_theme.html' with name='theme'%}
-    {% include 'inc/footer.html' %}
-    {% include 'inc/javascript.html' %}
-{% block javascript %}{% endblock %}
-</body>
-</html>
+{% extends root_template|default:'base_django.html' %}