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

nautobot/core/tests/test_filters.py

@@ -7,7 +7,6 @@ from django.db import models as django_models
 from django.shortcuts import reverse
 from django.test import TestCase
 from django.test.utils import isolate_apps
-
 import django_filters
 from tree_queries.models import TreeNodeForeignKey
 
@@ -16,14 +15,11 @@ from nautobot.circuits.models import Circuit, CircuitType, Provider
 from nautobot.core import filters, testing
 from nautobot.core.models import fields as core_fields
 from nautobot.core.utils import lookup
-from nautobot.dcim import choices as dcim_choices
-from nautobot.dcim import filters as dcim_filters
-from nautobot.dcim import models as dcim_models
+from nautobot.dcim import choices as dcim_choices, filters as dcim_filters, models as dcim_models
 from nautobot.dcim.models import Device
 from nautobot.extras import models as extras_models
 from nautobot.extras.utils import FeatureQuery
-from nautobot.ipam import factory as ipam_factory
-from nautobot.ipam import models as ipam_models
+from nautobot.ipam import factory as ipam_factory, models as ipam_models
 
 
 class TreeNodeMultipleChoiceFilterTest(TestCase):
@@ -416,7 +412,7 @@ class BaseFilterSetTest(TestCase):
     class TestFilterSet(filters.BaseFilterSet):
         """Filterset for testing various fields."""
 
-        class TestModel(django_models.Model):
+        class TestModel(django_models.Model):  # noqa: DJ008  # django-model-without-dunder-str -- fine since this isn't a "real" model
             """
             Test model used by BaseFilterSetTest for filter validation. Should never appear in a schema migration.
             """
@@ -833,6 +829,7 @@ class DynamicFilterLookupExpressionTest(TestCase):
     @classmethod
     def setUpTestData(cls):
         manufacturers = dcim_models.Manufacturer.objects.all()[:3]
+        Device.objects.all().delete()
 
         device_types = (
             dcim_models.DeviceType(

nautobot/core/tests/test_forms.py

@@ -9,13 +9,10 @@ from netaddr import IPNetwork
 
 from nautobot.core import filters, forms, testing
 from nautobot.core.utils import requests
-from nautobot.dcim import filters as dcim_filters, forms as dcim_forms
-from nautobot.dcim import models as dcim_models
+from nautobot.dcim import filters as dcim_filters, forms as dcim_forms, models as dcim_models
 from nautobot.dcim.tests import test_views
-from nautobot.extras import filters as extras_filters
-from nautobot.extras import models as extras_models
-from nautobot.ipam import forms as ipam_forms
-from nautobot.ipam import models as ipam_models
+from nautobot.extras import filters as extras_filters, models as extras_models
+from nautobot.ipam import forms as ipam_forms, models as ipam_models
 
 
 class SearchFormTestCase(TestCase):

nautobot/core/tests/test_graphql.py

@@ -8,18 +8,17 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
-from django.test import TestCase, override_settings
+from django.test import override_settings, TestCase
 from django.test.client import RequestFactory
 from django.urls import reverse
-from graphql import GraphQLError
 import graphene.types
-from graphene_django.settings import graphene_settings
 from graphene_django.registry import get_global_registry
+from graphene_django.settings import graphene_settings
+from graphql import get_default_backend, GraphQLError
 from graphql.error.located_error import GraphQLLocatedError
-from graphql import get_default_backend
 from rest_framework import status
 
-from nautobot.circuits.models import Provider, CircuitTermination
+from nautobot.circuits.models import CircuitTermination, Provider
 from nautobot.core.graphql import execute_query, execute_saved_query
 from nautobot.core.graphql.generators import (
     generate_list_search_parameters,
@@ -27,16 +26,16 @@ from nautobot.core.graphql.generators import (
 )
 from nautobot.core.graphql.schema import (
     extend_schema_type,
-    extend_schema_type_custom_field,
-    extend_schema_type_tags,
     extend_schema_type_config_context,
-    extend_schema_type_relationships,
+    extend_schema_type_custom_field,
     extend_schema_type_null_field_choice,
+    extend_schema_type_relationships,
+    extend_schema_type_tags,
 )
 from nautobot.core.graphql.types import OptimizedNautobotObjectType
 from nautobot.core.graphql.utils import str_to_var_name
-from nautobot.core.testing import NautobotTestClient, create_test_user
-from nautobot.dcim.choices import InterfaceTypeChoices, InterfaceModeChoices, PortTypeChoices, ConsolePortTypeChoices
+from nautobot.core.testing import create_test_user, NautobotTestClient
+from nautobot.dcim.choices import ConsolePortTypeChoices, InterfaceModeChoices, InterfaceTypeChoices, PortTypeChoices
 from nautobot.dcim.filters import DeviceFilterSet, LocationFilterSet
 from nautobot.dcim.graphql.types import DeviceType as DeviceTypeGraphQL
 from nautobot.dcim.models import (
@@ -52,17 +51,17 @@ from nautobot.dcim.models import (
     Location,
     LocationType,
     PowerFeed,
-    PowerPort,
     PowerOutlet,
     PowerPanel,
+    PowerPort,
     Rack,
     RearPort,
 )
 from nautobot.extras.choices import CustomFieldTypeChoices
 from nautobot.extras.models import (
     ChangeLoggedModel,
-    CustomField,
     ConfigContext,
+    CustomField,
     GraphQLQuery,
     Relationship,
     RelationshipAssociation,
@@ -82,8 +81,8 @@ from nautobot.ipam.models import (
     VRFDeviceAssignment,
     VRFPrefixAssignment,
 )
-from nautobot.users.models import ObjectPermission, Token
 from nautobot.tenancy.models import Tenant
+from nautobot.users.models import ObjectPermission, Token
 from nautobot.virtualization.factory import ClusterTypeFactory
 from nautobot.virtualization.models import Cluster, VirtualMachine, VMInterface
 
@@ -111,6 +110,22 @@ class GraphQLTestCase(TestCase):
         self.assertFalse(resp["data"].get("error"))
         self.assertEqual(len(resp["data"]["query"]), Location.objects.all().count())
 
+    @skip("Works in isolation, fails as part of the overall test suite due to issue #446")
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_execute_query_with_custom_field_type_json(self):
+        """Test Custom Field with JSON type returns valid JSON object and not string. Fix for bug #4627"""
+        custom_field = CustomField(
+            type=CustomFieldTypeChoices.TYPE_JSON, label="custom_json_field", key="custom_json_field"
+        )
+        custom_field.validated_save()
+        custom_field.content_types.set([ContentType.objects.get_for_model(Location)])
+        custom_field_data = {"custom_json_field": {"name": "Custom Example", "is_customfield": True}}
+        self.locations[0]._custom_field_data = custom_field_data
+        self.locations[0].save()
+        query = "query ($name: [String!]) { locations(name:$name) {name, _custom_field_data, cf_custom_json_field} }"
+        resp = execute_query(query, user=self.user, variables={"name": "Location-1"}).to_dict()
+        self.assertEqual(resp["data"]["locations"]["cf_custom_json_field"], custom_field_data)
+
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_execute_query_with_variable(self):
         query = "query ($name: [String!]) { locations(name:$name) {name} }"
@@ -677,8 +692,9 @@ class GraphQLQueryTest(TestCase):
         super().setUpTestData()
         cls.user = User.objects.create(username="Super User", is_active=True, is_superuser=True)
 
-        # Remove random IPAddress fixtures for this custom test
+        # Remove random IPAddress and Device fixtures for this custom test
         IPAddress.objects.all().delete()
+        Device.objects.all().delete()
 
         # Initialize fake request that will be required to execute GraphQL query
         cls.request = RequestFactory().request(SERVER_NAME="WebRequestContext")
@@ -691,7 +707,7 @@ class GraphQLQueryTest(TestCase):
         roles = Role.objects.get_for_model(Device)
         cls.device_role1 = roles[0]
         cls.device_role2 = roles[1]
-        cls.device_role3 = random.choice(roles)
+        cls.device_role3 = random.choice(roles)  # noqa: S311  # suspicious-non-cryptographic-random-usage
         cls.location_statuses = list(Status.objects.get_for_model(Location))[:2]
         cls.location_type = LocationType.objects.get(name="Campus")
         cls.location1 = Location.objects.filter(location_type=cls.location_type).first()
@@ -1612,8 +1628,8 @@ query {
                 IPAddress.objects.net_host_contained("10.0.0.0/16").count(),
             ),
             (
-                'prefix: "10.0.2.0/24"',
-                IPAddress.objects.net_host_contained("10.0.2.0/24").count(),
+                'prefix: ["10.0.1.0/24", "10.0.2.0/24"]',
+                IPAddress.objects.net_host_contained("10.0.1.0/24", "10.0.2.0/24").count(),
             ),
         )
 

nautobot/core/tests/test_jinja_filters.py

@@ -29,6 +29,7 @@ class NautobotJinjaFilterTest(TestCase):
             "meta",
             "viewname",
             "validated_viewname",
+            "validated_api_viewname",
             "bettertitle",
             "humanize_speed",
             "tzoffset",
@@ -46,17 +47,17 @@ class NautobotJinjaFilterTest(TestCase):
             "slugify",
         ]
 
-        # For each helper, try to render a jinja template with render_jinja2 and fail if TemplateAssertionError is raised
+        # For each helper, try to render jinja template with render_jinja2 and fail if TemplateAssertionError is raised
         for helper in helpers_to_validate:
             try:
                 data.render_jinja2("{{ data | " + helper + " }}", {"data": None})
             except TemplateAssertionError:
                 raise
-            except Exception:
+            except Exception:  # noqa: S110  # try-except-pass -- an antipattern in general, but OK here
                 pass
 
     def test_netutils_filters_in_jinja(self):
-        """Import the list of all Jinja filters from Netutils and validate that all of them have been properly loaded in Django Jinja"""
+        """Import all Jinja filters from Netutils and validate that all have been properly loaded in Django Jinja."""
         filters = jinja2_convenience_function()
 
         for filter_ in filters.keys():
@@ -64,7 +65,7 @@ class NautobotJinjaFilterTest(TestCase):
                 data.render_jinja2("{{ data | " + filter_ + " }}", {"data": None})
             except TemplateAssertionError:
                 raise
-            except Exception:
+            except Exception:  # noqa: S110  # try-except-pass -- an antipattern in general, but OK here
                 pass
 
     def test_sandboxed_render(self):

nautobot/core/tests/test_jobs.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from django.contrib.contenttypes.models import ContentType
 import yaml
 
-from nautobot.core.testing import TransactionTestCase, create_job_result_and_run_job
+from nautobot.core.testing import create_job_result_and_run_job, TransactionTestCase
 from nautobot.dcim.models import DeviceType, Manufacturer
 from nautobot.extras.choices import JobResultStatusChoices, LogLevelChoices
 from nautobot.extras.models import ExportTemplate, JobLogEntry, Status

nautobot/core/tests/test_models.py

@@ -1,8 +1,7 @@
 import time
-import uuid
-
 from unittest import skip
 from unittest.mock import patch
+import uuid
 
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
@@ -12,7 +11,7 @@ from django.test.utils import isolate_apps
 from nautobot.core.models import BaseModel
 from nautobot.core.models.utils import construct_composite_key, construct_natural_slug, deconstruct_composite_key
 from nautobot.core.testing import TestCase
-from nautobot.dcim.models import DeviceType, Manufacturer
+from nautobot.dcim.models import DeviceType, Location, Manufacturer
 
 
 @isolate_apps("nautobot.core.tests")
@@ -142,3 +141,29 @@ class NaturalKeyTestCase(BaseModelTest):
             self.FakeBaseModel._content_type_cached
             self.FakeBaseModel._content_type_cached
             self.assertEqual(mock__content_type.call_count, 2)
+
+
+class TreeModelTestCase(TestCase):
+    """Tests for the behavior of tree models, using Location as a representative model."""
+
+    def test_values(self):
+        """Test that `.values()` works properly (https://github.com/nautobot/nautobot/issues/4812)."""
+        queryset = Location.objects.filter(name="Campus-01")
+        instance = queryset.first()
+        values_dict = queryset.values().first()
+        model_dict = queryset.first().__dict__
+        values_subset_dict = queryset.values("id", "name", "last_updated").first()
+
+        for key, value in values_dict.items():
+            with self.subTest(description="values()", key=key):
+                self.assertEqual(value, getattr(instance, key))
+
+        for key, value in model_dict.items():
+            if key.startswith("_"):
+                continue
+            with self.subTest(description="__dict__", key=key):
+                self.assertEqual(value, getattr(instance, key))
+
+        for key, value in values_subset_dict.items():
+            with self.subTest(description="values(key, key, key...)", key=key):
+                self.assertEqual(value, getattr(instance, key))

nautobot/core/tests/test_navigations.py

@@ -1,6 +1,7 @@
-from django.test import TestCase
 from unittest.mock import patch
 
+from django.test import TestCase
+
 from nautobot.core.apps import NAV_CONTEXT_NAMES, NavContext, NavGrouping, NavItem, register_new_ui_menu_items
 
 

nautobot/core/tests/test_openapi.py

@@ -1,6 +1,5 @@
 from drf_spectacular.renderers import OpenApiYamlRenderer
 from drf_spectacular.settings import spectacular_settings
-
 import yaml
 
 from nautobot.core.testing import TestCase

nautobot/core/tests/test_paginator.py

@@ -3,13 +3,13 @@
 from constance.test import override_config
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.test import RequestFactory, override_settings
+from django.test import override_settings, RequestFactory
 from django.urls import reverse
 
 from nautobot.circuits import models as circuits_models
-from nautobot.dcim import models as dcim_models
 from nautobot.core import testing
 from nautobot.core.views import paginator
+from nautobot.dcim import models as dcim_models
 from nautobot.extras import models as extras_models
 
 

nautobot/core/tests/test_releases.py

@@ -2,11 +2,11 @@ from io import BytesIO
 from logging import ERROR
 from unittest.mock import Mock, patch
 
-import requests
 from django.conf import settings
 from django.core.cache import cache
-from django.test import SimpleTestCase, override_settings
+from django.test import override_settings, SimpleTestCase
 from packaging import version
+import requests
 from requests import Response
 
 from nautobot.core.tasks import get_releases

nautobot/core/tests/test_tables.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from nautobot.dcim.tables import ManufacturerTable, DeviceTypeTable, LocationTable, LocationTypeTable, RackGroupTable
+from nautobot.dcim.tables import DeviceTypeTable, LocationTable, LocationTypeTable, ManufacturerTable, RackGroupTable
 
 
 class TableTestCase(TestCase):

nautobot/core/tests/test_templatetags_helpers.py

@@ -3,13 +3,14 @@ from unittest import skipIf
 from constance.test import override_config
 from django.conf import settings
 from django.templatetags.static import static
-from django.test import TestCase, override_settings
-from example_plugin.models import AnotherExampleModel, ExampleModel
+from django.test import override_settings, TestCase
 
 from nautobot.core.templatetags import helpers
 from nautobot.dcim import models
 from nautobot.ipam.models import VLAN
 
+from example_plugin.models import AnotherExampleModel, ExampleModel
+
 
 @skipIf(
     "example_plugin" not in settings.PLUGINS,
@@ -118,6 +119,20 @@ class NautobotTemplatetagsHelperTest(TestCase):
         self.assertEqual(helpers.validated_viewname(ExampleModel, "list"), "plugins:example_plugin:examplemodel_list")
         self.assertIsNone(helpers.validated_viewname(ExampleModel, "notvalid"))
 
+    def test_validated_api_viewname(self):
+        location = models.Location.objects.first()
+
+        self.assertEqual(helpers.validated_api_viewname(location, "list"), "dcim-api:location-list")
+        self.assertIsNone(helpers.validated_api_viewname(models.Location, "notvalid"))
+
+        self.assertEqual(
+            helpers.validated_api_viewname(ExampleModel, "list"), "plugins-api:example_plugin-api:examplemodel-list"
+        )
+        self.assertIsNone(helpers.validated_api_viewname(ExampleModel, "notvalid"))
+
+        # Assert detail views get validated as well
+        self.assertEqual(helpers.validated_api_viewname(location, "detail"), "dcim-api:location-detail")
+
     def test_bettertitle(self):
         self.assertEqual(helpers.bettertitle("myTITle"), "MyTITle")
         self.assertEqual(helpers.bettertitle("mytitle"), "Mytitle")

nautobot/core/tests/test_templatetags_netutils.py

@@ -3,7 +3,6 @@ import inspect
 from django.template import Context, Engine
 from django.template.exceptions import TemplateSyntaxError
 from django.test import TestCase
-
 from netutils.utils import jinja2_convenience_function
 
 
@@ -47,6 +46,6 @@ class NautobotTemplateTagsNetutilsTest(TestCase):
                 except ConnectionError:
                     # Yes, some netutils functions such as tcp_ping actually make network calls when invoked. Eeek.
                     pass
-                except Exception:
+                except Exception:  # noqa: S110  # try-except-pass -- an antipattern in general, but OK here
                     # Catch-all - at least it wasn't a TemplateSyntaxError, so good enough for now.
                     pass

nautobot/core/tests/test_utils.py

@@ -8,24 +8,20 @@ from django.db.models import Q
 from django.http import QueryDict
 from django.test import TestCase
 
-from example_plugin.models import ExampleModel
-
 from nautobot.circuits import models as circuits_models
 from nautobot.core import exceptions, forms, settings_funcs
 from nautobot.core.api import utils as api_utils
 from nautobot.core.models import fields as core_fields, utils as models_utils
 from nautobot.core.utils import data as data_utils, filtering, lookup, requests
 from nautobot.core.utils.migrations import update_object_change_ct_for_replaced_models
-from nautobot.dcim import filters as dcim_filters
-from nautobot.dcim import forms as dcim_forms
-from nautobot.dcim import models as dcim_models
-from nautobot.dcim import tables
-from nautobot.extras import models as extras_models
-from nautobot.extras import utils as extras_utils
+from nautobot.dcim import filters as dcim_filters, forms as dcim_forms, models as dcim_models, tables
+from nautobot.extras import models as extras_models, utils as extras_utils
 from nautobot.extras.choices import ObjectChangeActionChoices, RelationshipTypeChoices
 from nautobot.extras.models import ObjectChange
 from nautobot.extras.registry import registry
 
+from example_plugin.models import ExampleModel
+
 
 class DictToFilterParamsTest(TestCase):
     """

nautobot/core/tests/test_views.py

@@ -3,16 +3,54 @@ from unittest import mock
 import urllib.parse
 
 from django.contrib.contenttypes.models import ContentType
-from django.test import override_settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import override_settings, RequestFactory
 from django.test.utils import override_script_prefix
 from django.urls import get_script_prefix, reverse
 from prometheus_client.parser import text_string_to_metric_families
 
 from nautobot.core.testing import TestCase
+from nautobot.core.utils.permissions import get_permission_for_model
+from nautobot.core.views.mixins import GetReturnURLMixin
 from nautobot.dcim.models.locations import Location
 from nautobot.extras.choices import CustomFieldTypeChoices
+from nautobot.extras.models import FileProxy
 from nautobot.extras.models.customfields import CustomField, CustomFieldChoice
 from nautobot.extras.registry import registry
+from nautobot.users.models import ObjectPermission
+
+
+class GetReturnURLMixinTestCase(TestCase):
+    """Tests for the API of GetReturnURLMixin."""
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.factory = RequestFactory(SERVER_NAME="nautobot.example.com")
+        cls.mixin = GetReturnURLMixin()
+
+    def test_get_return_url_explicit(self):
+        request = self.factory.get("/", {"return_url": "/dcim/devices/"})
+        self.assertEqual(self.mixin.get_return_url(request=request, obj=None), "/dcim/devices/")
+        self.assertEqual(self.mixin.get_return_url(request=request, obj=Location.objects.first()), "/dcim/devices/")
+
+        request = self.factory.get("/", {"return_url": "/dcim/devices/?status=Active"})
+        self.assertEqual(self.mixin.get_return_url(request=request, obj=None), "/dcim/devices/?status=Active")
+
+    def test_get_return_url_explicit_unsafe(self):
+        request = self.factory.get("/", {"return_url": "http://example.com"})
+        self.assertEqual(self.mixin.get_return_url(request=request, obj=None), reverse("home"))
+
+    def test_get_return_url_explicit_punycode(self):
+        """
+        Replace the 'i' in '/dcim/' with a unicode dotless 'ı' and make sure we're not fooled by it.
+        """  # noqa: RUF002  # ambiguous-unicode-character-docstring -- fully intentional here!
+        request = self.factory.get("/", {"return_url": "/dcım/devices/"})  # noqa: RUF001  # ambiguous-unicode-character-string -- fully intentional here!
+        self.assertEqual(self.mixin.get_return_url(request=request, obj=None), "/dc%C4%B1m/devices/")
+
+    def test_get_return_url_default_with_obj(self):
+        request = self.factory.get("/")
+        location = Location.objects.first()
+        self.assertEqual(self.mixin.get_return_url(request=request, obj=location), location.get_absolute_url())
 
 
 class HomeViewTestCase(TestCase):
@@ -371,3 +409,59 @@ class ErrorPagesTestCase(TestCase):
         self.assertNotContains(response, "Network to Code", status_code=500)
         response_content = response.content.decode(response.charset)
         self.assertInHTML("Hello world!", response_content)
+
+
+class DBFileStorageViewTestCase(TestCase):
+    """Test authentication/permission enforcement for django_db_file_storage views."""
+
+    def setUp(self):
+        super().setUp()
+        self.test_file_1 = SimpleUploadedFile(name="test_file_1.txt", content=b"I am content.\n")
+        self.file_proxy_1 = FileProxy.objects.create(name=self.test_file_1.name, file=self.test_file_1)
+        self.test_file_2 = SimpleUploadedFile(name="test_file_2.txt", content=b"I am content.\n")
+        self.file_proxy_2 = FileProxy.objects.create(name=self.test_file_2.name, file=self.test_file_2)
+        self.urls = [
+            f"{reverse('db_file_storage.download_file')}?name={self.file_proxy_1.file.name}",
+            f"{reverse('db_file_storage.get_file')}?name={self.file_proxy_1.file.name}",
+        ]
+
+    def test_get_file_anonymous(self):
+        self.client.logout()
+        for url in self.urls:
+            with self.subTest(url):
+                response = self.client.get(url)
+                self.assertHttpStatus(response, 403)
+
+    def test_get_file_without_permission(self):
+        for url in self.urls:
+            with self.subTest(url):
+                response = self.client.get(url)
+                self.assertHttpStatus(response, 403)
+
+    def test_get_object_with_permission(self):
+        self.add_permissions(get_permission_for_model(FileProxy, "view"))
+        for url in self.urls:
+            with self.subTest(url):
+                response = self.client.get(url)
+                self.assertHttpStatus(response, 200)
+
+    def test_get_object_with_constrained_permission(self):
+        obj_perm = ObjectPermission(
+            name="Test permission",
+            constraints={"pk": self.file_proxy_1.pk},
+            actions=["view"],
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.object_types.add(ContentType.objects.get_for_model(FileProxy))
+        for url in self.urls:
+            with self.subTest(url):
+                response = self.client.get(url)
+                self.assertHttpStatus(response, 200)
+        for url in [
+            f"{reverse('db_file_storage.download_file')}?name={self.file_proxy_2.file.name}",
+            f"{reverse('db_file_storage.get_file')}?name={self.file_proxy_2.file.name}",
+        ]:
+            with self.subTest(url):
+                response = self.client.get(url)
+                self.assertHttpStatus(response, 404)

nautobot/core/tests/test_views_utils.py

@@ -3,7 +3,6 @@ from django.test import TestCase
 
 from nautobot.core.models.querysets import count_related
 from nautobot.core.views.utils import check_filter_for_display
-
 from nautobot.dcim.filters import DeviceFilterSet
 from nautobot.dcim.models import Device, DeviceRedundancyGroup, DeviceType, InventoryItem, Location, Manufacturer
 from nautobot.extras.models import Role, Status

nautobot/core/urls.py

@@ -1,17 +1,25 @@
 from django.conf import settings
-from django.conf.urls import include
+from django.conf.urls import include, url
 from django.urls import path
 from django.views.generic import TemplateView
 from django.views.static import serve
 
-from nautobot.core.views import CustomGraphQLView, HomeView, StaticMediaFailureView, SearchView, nautobot_metrics_view
+from nautobot.core.views import (
+    CustomGraphQLView,
+    get_file_with_authorization,
+    HomeView,
+    nautobot_metrics_view,
+    SearchView,
+    StaticMediaFailureView,
+    ThemePreviewView,
+)
 from nautobot.extras.plugins.urls import (
     plugin_admin_patterns,
     plugin_patterns,
 )
 from nautobot.users.views import LoginView, LogoutView
-from .admin import admin_site
 
+from .admin import admin_site
 
 urlpatterns = [
     # Base views
@@ -46,7 +54,18 @@ urlpatterns = [
     # django-health-check
     path(r"health/", include("health_check.urls")),
     # FileProxy attachments download/get URLs used in admin views only
-    path("files/", include("db_file_storage.urls")),
+    url(
+        "files/download/",
+        get_file_with_authorization,
+        {"add_attachment_headers": True},
+        name="db_file_storage.download_file",
+    ),
+    url(
+        "files/get/",
+        get_file_with_authorization,
+        {"add_attachment_headers": False},
+        name="db_file_storage.get_file",
+    ),
     # Templated css file
     path(
         "template.css", TemplateView.as_view(template_name="template.css", content_type="text/css"), name="template_css"
@@ -60,6 +79,7 @@ if settings.DEBUG:
 
         urlpatterns += [
             path("__debug__/", include(debug_toolbar.urls)),
+            path("theme-preview/", ThemePreviewView.as_view(), name="theme_preview"),
         ]
     except ImportError:
         pass

nautobot/core/utils/color.py

@@ -5,7 +5,7 @@ def hex_to_rgb(hex_str):
     """
     Map a hex string like "00ff00" to individual r, g, b integer values.
     """
-    return [int(hex_str[c : c + 2], 16) for c in (0, 2, 4)]  # noqa: E203
+    return [int(hex_str[c : c + 2], 16) for c in (0, 2, 4)]
 
 
 def rgb_to_hex(r, g, b):

nautobot/core/utils/data.py

@@ -1,4 +1,4 @@
-from collections import OrderedDict, namedtuple
+from collections import namedtuple, OrderedDict
 from decimal import Decimal
 import uuid
 
@@ -7,7 +7,6 @@ from django.template import engines
 
 from nautobot.dcim import choices  # TODO move dcim.choices.CableLengthUnitChoices into core
 
-
 # Setup UtilizationData named tuple for use by multiple methods
 UtilizationData = namedtuple("UtilizationData", ["numerator", "denominator"])
 

nautobot/core/utils/filtering.py

@@ -13,7 +13,6 @@ from django_filters.utils import verbose_lookup_expr
 from nautobot.core import exceptions
 from nautobot.core.utils.lookup import get_filterset_for_model
 
-
 # Check if field name contains a lookup expr
 # e.g `name__ic` has lookup expr `ic (icontains)` while `name` has no lookup expr
 CONTAINS_LOOKUP_EXPR_RE = re.compile(r"(?<=__)\w+")
@@ -88,10 +87,6 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
     Return the relevant form field instance for a filterset parameter e.g DynamicModelMultipleChoiceField, forms.IntegerField e.t.c
     """
     # Avoid circular import
-    from nautobot.dcim.models import Device
-    from nautobot.extras.filters import ContentTypeMultipleChoiceFilter, CustomFieldFilterMixin, StatusFilter
-    from nautobot.extras.models import ConfigContext, Role, Status, Tag
-    from nautobot.extras.utils import ChangeLoggedModelsQuery, RoleModelsQuery, TaggableClassesQuery
     from nautobot.core.filters import MultiValueDecimalFilter, MultiValueFloatFilter
     from nautobot.core.forms import (
         BOOLEAN_CHOICES,
@@ -100,6 +95,10 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
         StaticSelect2,
         StaticSelect2Multiple,
     )
+    from nautobot.dcim.models import Device
+    from nautobot.extras.filters import ContentTypeMultipleChoiceFilter, CustomFieldFilterMixin, StatusFilter
+    from nautobot.extras.models import ConfigContext, Role, Status, Tag
+    from nautobot.extras.utils import ChangeLoggedModelsQuery, RoleModelsQuery, TaggableClassesQuery
     from nautobot.virtualization.models import VirtualMachine
 
     if filterset is None or filterset.Meta.model != model: