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

nautobot/__init__.py

@@ -1,7 +1,5 @@
-import logging
-
 from importlib import metadata
-
+import logging
 
 # Primary package version
 __version__ = metadata.version(__name__)

nautobot/apps/__init__.py

@@ -1,10 +1,9 @@
 """Core app functionality."""
 
-from nautobot.core.signals import nautobot_database_ready
 from nautobot.core.settings_funcs import ConstanceConfigItem
+from nautobot.core.signals import nautobot_database_ready
 from nautobot.extras.plugins import NautobotAppConfig
 
-
 __all__ = (
     "ConstanceConfigItem",
     "nautobot_database_ready",

nautobot/apps/admin.py

@@ -2,5 +2,4 @@
 
 from nautobot.core.admin import NautobotModelAdmin
 
-
 __all__ = ("NautobotModelAdmin",)

nautobot/apps/api.py

@@ -48,7 +48,6 @@ from nautobot.extras.api.fields import MultipleChoiceJSONField
 from nautobot.extras.api.mixins import TaggedModelSerializerMixin
 from nautobot.extras.api.views import CustomFieldModelViewSet, NautobotModelViewSet, NotesViewSetMixin
 
-
 __all__ = (
     "APIRootView",
     "BaseModelSerializer",

nautobot/apps/change_logging.py

@@ -10,7 +10,6 @@ from nautobot.extras.context_managers import (
     WebChangeContext,
 )
 
-
 __all__ = (
     "change_logging",
     "ChangeContext",

nautobot/apps/choices.py

@@ -39,7 +39,6 @@ from nautobot.extras.choices import (
     DynamicGroupOperatorChoices,
     JobExecutionType,
     JobResultStatusChoices,
-    JobSourceChoices,
     LogLevelChoices,
     ObjectChangeActionChoices,
     ObjectChangeEventContextChoices,
@@ -58,7 +57,6 @@ from nautobot.ipam.choices import (
     ServiceProtocolChoices,
 )
 
-
 __all__ = (
     "BannerClassChoices",
     "ButtonActionColorChoices",
@@ -84,7 +82,6 @@ __all__ = (
     "IPAddressVersionChoices",
     "JobExecutionType",
     "JobResultStatusChoices",
-    "JobSourceChoices",
     "LogLevelChoices",
     "ObjectChangeActionChoices",
     "ObjectChangeEventContextChoices",

nautobot/apps/datasources.py

@@ -1,6 +1,6 @@
 """Utilities for an app to register datasource contents (for Git, etc.)."""
 
+from nautobot.extras.datasources import get_repo_access_url
 from nautobot.extras.registry import DatasourceContent
 
-
-__all__ = ("DatasourceContent",)
+__all__ = ("DatasourceContent", "get_repo_access_url")

nautobot/apps/exceptions.py

@@ -15,7 +15,6 @@ from nautobot.extras.secrets.exceptions import (
     SecretValueNotFoundError,
 )
 
-
 __all__ = (
     "AbortTransaction",
     "CeleryWorkerNotRunningException",

nautobot/apps/factory.py

@@ -11,7 +11,6 @@ from nautobot.core.factory import (
     UniqueFaker,
 )
 
-
 __all__ = (
     "BaseModelFactory",
     "get_random_instances",

nautobot/apps/filters.py

@@ -1,6 +1,7 @@
 """Filterset base classes and mixins for app implementation."""
 
 from nautobot.core.filters import (
+    BaseFilterSet,
     ContentTypeChoiceFilter,
     ContentTypeFilter,
     ContentTypeFilterMixin,
@@ -9,6 +10,7 @@ from nautobot.core.filters import (
     MappedPredicatesFilterMixin,
     multivalue_field_factory,
     MultiValueBigNumberFilter,
+    MultiValueCharFilter,
     MultiValueDateFilter,
     MultiValueDateTimeFilter,
     MultiValueDecimalFilter,
@@ -18,8 +20,12 @@ from nautobot.core.filters import (
     MultiValueTimeFilter,
     MultiValueUUIDFilter,
     NameSearchFilterSet,
+    NaturalKeyOrPKMultipleChoiceFilter,
     NumericArrayFilter,
+    RelatedMembershipBooleanFilter,
+    SearchFilter,
     TagFilter,
+    TreeNodeMultipleChoiceFilter,
 )
 from nautobot.extras.filters import (
     CreatedUpdatedModelFilterSetMixin,
@@ -38,15 +44,6 @@ from nautobot.extras.filters.mixins import (
 )
 from nautobot.extras.plugins import FilterExtension
 from nautobot.tenancy.filters import TenancyModelFilterSetMixin
-from nautobot.core.filters import (
-    BaseFilterSet,
-    MultiValueCharFilter,
-    NaturalKeyOrPKMultipleChoiceFilter,
-    RelatedMembershipBooleanFilter,
-    SearchFilter,
-    TreeNodeMultipleChoiceFilter,
-)
-
 
 __all__ = (
     "BaseFilterSet",

nautobot/apps/forms.py

@@ -14,7 +14,6 @@ from nautobot.core.forms import (
     ReturnURLForm,
     TableConfigForm,
 )
-from nautobot.core.forms.forms import dynamic_formset_factory
 from nautobot.core.forms.fields import (
     CommentField,
     CSVChoiceField,
@@ -41,6 +40,7 @@ from nautobot.core.forms.fields import (
     SlugField,
     TagFilterField,
 )
+from nautobot.core.forms.forms import dynamic_formset_factory
 from nautobot.core.forms.utils import (
     add_field_to_filter_form_class,
     expand_alphanumeric_pattern,
@@ -96,7 +96,6 @@ from nautobot.extras.forms.mixins import (
 )
 from nautobot.ipam.formfields import IPAddressFormField, IPNetworkFormField
 
-
 __all__ = (
     "add_blank_choice",
     "add_field_to_filter_form_class",

nautobot/apps/graphql.py

@@ -4,7 +4,6 @@ from nautobot.core.graphql import BigInteger, execute_query, execute_saved_query
 from nautobot.core.graphql.types import ContentTypeType, OptimizedNautobotObjectType
 from nautobot.core.graphql.utils import construct_resolver, get_filtering_args_from_filterset, str_to_var_name
 
-
 __all__ = (
     "BigInteger",
     "construct_resolver",

nautobot/apps/jobs.py

@@ -21,6 +21,7 @@ from nautobot.extras.jobs import (
     Job,
     JobButtonReceiver,
     JobHookReceiver,
+    JSONVar,
     MultiChoiceVar,
     MultiObjectVar,
     ObjectVar,
@@ -30,7 +31,6 @@ from nautobot.extras.jobs import (
     TextVar,
 )
 
-
 __all__ = (
     "BaseJob",
     "BooleanVar",
@@ -51,6 +51,7 @@ __all__ = (
     "Job",
     "JobButtonReceiver",
     "JobHookReceiver",
+    "JSONVar",
     "MultiChoiceVar",
     "MultiObjectVar",
     "NautobotKombuJSONEncoder",

nautobot/apps/models.py

@@ -15,9 +15,9 @@ from nautobot.core.models.fields import (
     slugify_dots_to_dashes,
     TagsField,
 )
+from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.managers import BaseManager, TagsManager
 from nautobot.core.models.name_color_content_types import ContentTypeRelatedQuerySet, NameColorContentTypesModel
-from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.ordering import naturalize, naturalize_interface
 from nautobot.core.models.query_functions import CollateAsChar, EmptyGroupByJSONBAgg, JSONBAgg
 from nautobot.core.models.querysets import CompositeKeyQuerySetMixin, count_related, RestrictedQuerySet
@@ -48,7 +48,7 @@ from nautobot.extras.models.models import ConfigContextSchemaValidationMixin
 from nautobot.extras.plugins import CustomValidator
 from nautobot.extras.utils import extras_features
 from nautobot.ipam.fields import VarbinaryIPField
-
+from nautobot.ipam.models import get_default_namespace, get_default_namespace_pk
 
 __all__ = (
     "array_to_string",
@@ -78,6 +78,8 @@ __all__ = (
     "ForeignKeyLimitedByContentTypes",
     "ForeignKeyWithAutoRelatedName",
     "get_all_concrete_models",
+    "get_default_namespace",
+    "get_default_namespace_pk",
     "is_taggable",
     "JSONArrayField",
     "JSONBAgg",

nautobot/apps/querysets.py

@@ -2,5 +2,4 @@
 
 from nautobot.extras.querysets import ConfigContextModelQuerySet
 
-
 __all__ = ("ConfigContextModelQuerySet",)

nautobot/apps/secrets.py

@@ -2,5 +2,4 @@
 
 from nautobot.extras.secrets import SecretsProvider
 
-
 __all__ = ("SecretsProvider",)

nautobot/apps/tables.py

@@ -17,7 +17,6 @@ from nautobot.core.tables import (
 )
 from nautobot.extras.tables import RoleTableMixin, StatusTableMixin
 
-
 __all__ = (
     "BaseTable",
     "BooleanColumn",

nautobot/apps/testing.py

@@ -24,7 +24,6 @@ from nautobot.core.testing.utils import (
 )
 from nautobot.core.testing.views import ModelTestCase, ModelViewTestCase, TestCase, ViewTestCases
 
-
 __all__ = (
     "APITestCase",
     "APITransactionTestCase",

nautobot/apps/ui.py

@@ -19,9 +19,7 @@ from nautobot.core.apps import (
 )
 from nautobot.core.choices import ButtonColorChoices
 from nautobot.extras.choices import BannerClassChoices
-from nautobot.extras.plugins import Banner
-from nautobot.extras.plugins import TemplateExtension
-
+from nautobot.extras.plugins import Banner, TemplateExtension
 
 __all__ = (
     "Banner",

nautobot/apps/urls.py

@@ -2,5 +2,4 @@
 
 from nautobot.core.views.routers import NautobotUIViewSetRouter
 
-
 __all__ = ("NautobotUIViewSetRouter",)

nautobot/apps/utils.py

@@ -72,7 +72,6 @@ from nautobot.extras.utils import (
     task_queues_as_choices,
 )
 
-
 __all__ = (
     "BranchDoesNotExist",
     "build_lookup_label",

nautobot/apps/views.py

@@ -42,7 +42,6 @@ from nautobot.core.views.utils import (
 from nautobot.core.views.viewsets import NautobotUIViewSet
 from nautobot.extras.views import check_and_call_git_repository_function, ObjectDynamicGroupsView, ObjectNotesView
 
-
 __all__ = (
     "AdminRequiredMixin",
     "BulkComponentCreateView",

nautobot/circuits/api/serializers.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from nautobot.circuits.models import Provider, Circuit, CircuitTermination, CircuitType, ProviderNetwork
+from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.api import NautobotModelSerializer
 from nautobot.dcim.api.serializers import (
     CableTerminationModelSerializerMixin,

nautobot/circuits/api/urls.py

@@ -1,6 +1,6 @@
 from nautobot.core.api.routers import OrderedDefaultRouter
-from . import views
 
+from . import views
 
 router = OrderedDefaultRouter()
 router.APIRootView = views.CircuitsRootView

nautobot/circuits/api/views.py

@@ -1,10 +1,11 @@
 from rest_framework.routers import APIRootView
 
 from nautobot.circuits import filters
-from nautobot.circuits.models import Provider, CircuitTermination, CircuitType, Circuit, ProviderNetwork
+from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.models.querysets import count_related
 from nautobot.dcim.api.views import PathEndpointMixin
 from nautobot.extras.api.views import NautobotModelViewSet
+
 from . import serializers
 
 

nautobot/circuits/apps.py

@@ -12,4 +12,4 @@ class CircuitsConfig(NautobotConfig):
 
     def ready(self):
         super().ready()
-        import nautobot.circuits.signals  # noqa: F401
+        import nautobot.circuits.signals  # noqa: F401  # unused-import -- but this import installs the signals

nautobot/circuits/choices.py

@@ -1,6 +1,5 @@
 from nautobot.core.choices import ChoiceSet
 
-
 #
 # Circuits
 #

nautobot/circuits/factory.py

@@ -7,8 +7,8 @@ from nautobot.core.factory import (
     NautobotBoolIterator,
     OrganizationalModelFactory,
     PrimaryModelFactory,
-    UniqueFaker,
     random_instance,
+    UniqueFaker,
 )
 from nautobot.dcim import models as dcim_models
 from nautobot.extras.models import Status

nautobot/circuits/filters.py

@@ -1,5 +1,5 @@
-import django_filters
 from django.db.models import Q
+import django_filters
 
 from nautobot.core.filters import (
     BaseFilterSet,
@@ -17,6 +17,7 @@ from nautobot.dcim.filters import (
 from nautobot.dcim.models import Location
 from nautobot.extras.filters import NautobotFilterSet, StatusModelFilterSetMixin
 from nautobot.tenancy.filters import TenancyModelFilterSetMixin
+
 from .models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 
 __all__ = (

nautobot/circuits/forms.py

@@ -13,8 +13,8 @@ from nautobot.dcim.form_mixins import (
     LocatableModelFormMixin,
 )
 from nautobot.extras.forms import (
-    NautobotFilterForm,
     NautobotBulkEditForm,
+    NautobotFilterForm,
     NautobotModelForm,
     StatusModelBulkEditFormMixin,
     StatusModelFilterFormMixin,
@@ -22,8 +22,8 @@ from nautobot.extras.forms import (
 )
 from nautobot.tenancy.forms import TenancyFilterForm, TenancyForm
 from nautobot.tenancy.models import Tenant
-from .models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 
+from .models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 
 #
 # Providers

nautobot/circuits/homepage.py

@@ -1,7 +1,6 @@
 from nautobot.circuits.models import Circuit, Provider
 from nautobot.core.apps import HomePageItem, HomePagePanel
 
-
 layout = (
     HomePagePanel(
         name="Circuits",

nautobot/circuits/migrations/0001_initial_part_1.py

@@ -1,9 +1,11 @@
 # Generated by Django 3.1.7 on 2021-04-01 06:35
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
+
 import nautobot.dcim.fields
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/circuits/migrations/0002_initial_part_2.py

@@ -2,9 +2,10 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import nautobot.extras.models.statuses
 import taggit.managers
 
+import nautobot.extras.models.statuses
+
 
 class Migration(migrations.Migration):
     initial = True

nautobot/circuits/migrations/0003_auto_slug.py

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

nautobot/circuits/migrations/0005_providernetwork.py

@@ -1,11 +1,13 @@
 # Generated by Django 3.1.14 on 2022-01-20 17:12
 
+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/circuits/migrations/0013_alter_circuittermination__path.py

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

nautobot/circuits/migrations/0014_related_name_changes.py

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

nautobot/circuits/migrations/0016_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/circuits/migrations/0018_status_nonnullable.py

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

nautobot/circuits/models.py

@@ -6,10 +6,10 @@ from nautobot.dcim.fields import ASNField
 from nautobot.dcim.models import CableTermination, PathEndpoint
 from nautobot.extras.models import StatusField
 from nautobot.extras.utils import extras_features
-from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 
-from .choices import CircuitTerminationSideChoices
+from nautobot.core.models.generics import OrganizationalModel, PrimaryModel  # isort: skip - avoid circular imports
 
+from .choices import CircuitTerminationSideChoices
 
 __all__ = (
     "Circuit",

nautobot/circuits/navigation.py

@@ -8,7 +8,6 @@ from nautobot.core.apps import (
     NavMenuTab,
 )
 
-
 menu_items = (
     NavMenuTab(
         name="Circuits",

nautobot/circuits/signals.py

@@ -5,11 +5,12 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import timezone
 
-from .choices import CircuitTerminationSideChoices
-from .models import CircuitTermination
 from nautobot.dcim.models import CablePath
 from nautobot.dcim.signals import create_cablepath
 
+from .choices import CircuitTerminationSideChoices
+from .models import CircuitTermination
+
 
 def rebuild_paths_circuits(obj):
     """

nautobot/circuits/tables.py

@@ -9,6 +9,7 @@ from nautobot.core.tables import (
 )
 from nautobot.extras.tables import StatusTableMixin
 from nautobot.tenancy.tables import TenantColumn
+
 from .models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 
 CIRCUIT_TERMINATION_PARENT = """

nautobot/circuits/tests/integration/test_relationships.py

@@ -4,7 +4,7 @@ from django.contrib.contenttypes.models import ContentType
 
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider
 from nautobot.core.testing.integration import SeleniumTestCase
-from nautobot.dcim.models import PowerPanel, Location, LocationType
+from nautobot.dcim.models import Location, LocationType, PowerPanel
 from nautobot.extras.choices import RelationshipTypeChoices
 from nautobot.extras.models import Relationship, RelationshipAssociation, Status
 

nautobot/circuits/tests/test_api.py

@@ -4,7 +4,7 @@ from nautobot.circuits.choices import CircuitTerminationSideChoices
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.testing import APITestCase, APIViewTestCases
 from nautobot.dcim.choices import InterfaceTypeChoices
-from nautobot.dcim.models import Cable, Device, DeviceType, FrontPort, Interface, RearPort, Location
+from nautobot.dcim.models import Cable, Device, DeviceType, FrontPort, Interface, Location, RearPort
 from nautobot.extras.models import Role, Status
 
 

nautobot/circuits/tests/test_urls.py

@@ -1,8 +1,8 @@
 from django.urls import reverse
 
 from nautobot.circuits.models import Circuit, CircuitType, Provider
-from nautobot.extras.models import Status
 from nautobot.core.testing.views import TestCase
+from nautobot.extras.models import Status
 
 
 class URLTestCase(TestCase):

nautobot/circuits/tests/test_views.py

@@ -1,4 +1,5 @@
 import datetime
+
 from django.urls import reverse
 
 from nautobot.circuits.models import (

nautobot/circuits/urls.py

@@ -2,10 +2,10 @@ from django.urls import path
 
 from nautobot.core.views.routers import NautobotUIViewSetRouter
 from nautobot.dcim.views import CableCreateView, PathTraceView
+
 from . import views
 from .models import CircuitTermination
 
-
 app_name = "circuits"
 router = NautobotUIViewSetRouter()
 router.register("providers", views.ProviderUIViewSet)

nautobot/circuits/views.py

@@ -2,17 +2,14 @@ from django.contrib import messages
 from django.db import transaction
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.http import is_safe_url
 from django_tables2 import RequestConfig
 
-
 from nautobot.core.forms import ConfirmationForm
 from nautobot.core.models.querysets import count_related
 from nautobot.core.views import generic, mixins as view_mixins
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.viewsets import NautobotUIViewSet
 
-
 from . import filters, forms, tables
 from .api import serializers
 from .choices import CircuitTerminationSideChoices
@@ -82,14 +79,8 @@ class CircuitTerminationUIViewSet(
         return obj
 
     def get_return_url(self, request, obj=None):
-        # First, see if `return_url` was specified as a query parameter or form data. Use this URL only if it's
-        # considered safe.
-        query_param = request.GET.get("return_url") or request.POST.get("return_url")
-        if query_param and is_safe_url(url=query_param, allowed_hosts=request.get_host()):
-            return query_param
-
         if obj is not None and obj.present_in_database and obj.pk:
-            return obj.circuit.get_absolute_url()
+            return super().get_return_url(request, obj=obj.circuit)
 
         return super().get_return_url(request, obj=obj)
 

nautobot/core/__init__.py

@@ -4,7 +4,6 @@ from nautobot.core import checks
 # Django starts so that shared_task will use this app.
 from nautobot.core.celery import app as celery_app
 
-
 default_app_config = "nautobot.core.apps.CoreConfig"
 
 

nautobot/core/admin.py

@@ -1,8 +1,7 @@
-from django.contrib.admin import site as admin_site, ModelAdmin
+from constance.admin import Config, ConstanceAdmin, ConstanceForm
+from django.contrib.admin import ModelAdmin, site as admin_site
 from django.db import models
-
-from constance.admin import ConstanceAdmin, ConstanceForm, Config
-from django_celery_beat import admin  # noqa: F401
+from django_celery_beat import admin  # noqa: F401  # unused-import -- but this import installs the beat admin
 from django_celery_beat.models import (
     ClockedSchedule,
     CrontabSchedule,
@@ -16,7 +15,6 @@ from taggit.models import Tag
 from nautobot.core.forms import BootstrapMixin
 import nautobot.core.forms.widgets as widgets
 
-
 # Override default AdminSite attributes so we can avoid creating and
 # registering our own class
 admin_site.site_header = "Nautobot Administration"