nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/core/checks.py

@@ -6,6 +6,9 @@ from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
 from django.db import connections
 
+from nautobot.core.utils.config import get_settings_or_config
+from nautobot.dcim.choices import DeviceUniquenessChoices
+
 E002 = Error(
     "'nautobot.core.authentication.ObjectPermissionBackend' must be included in AUTHENTICATION_BACKENDS",
     id="nautobot.core.E002",
@@ -42,6 +45,19 @@ W005 = Warning(
     obj=settings,
 )
 
+W006 = Warning(
+    "The deprecated setting DEVICE_NAME_AS_NATURAL_KEY is still defined.",
+    hint="This setting has been superseded by DEVICE_UNIQUENESS (see Device Constraints).",
+    id="nautobot.core.W006",
+    obj=settings,
+)
+
+W007 = Warning(
+    "Invalid DEVICE_UNIQUENESS configuration value.",
+    hint=f"DEVICE_UNIQUENESS must be one of: {', '.join(DeviceUniquenessChoices.values())}.",
+    id="nautobot.core.W007",
+)
+
 MIN_POSTGRESQL_MAJOR_VERSION = 12
 MIN_POSTGRESQL_MINOR_VERSION = 0
 
@@ -153,3 +169,33 @@ def check_data_validation_engine_installed(app_configs, **kwargs):
     if app_name in settings.PLUGINS or app_name in settings.PLUGINS_CONFIG:
         return [E006]
     return []
+
+
+@register(Tags.compatibility)
+def check_deprecated_device_name_as_natural_key(app_configs, **kwargs):
+    """
+    Warn if the deprecated DEVICE_NAME_AS_NATURAL_KEY setting is still defined.
+
+    This setting existed prior to 3.0 and has been replaced by the
+    DEVICE_UNIQUENESS Constance configuration.
+    """
+    try:
+        get_settings_or_config("DEVICE_NAME_AS_NATURAL_KEY")
+        return [W006]
+    except AttributeError:
+        pass
+    return []
+
+
+@register(Tags.compatibility)
+def check_valid_value_for_device_uniqueness(app_configs, **kwargs):
+    """
+    Warn if the invalid value for DEVICE_UNIQUENESS is set.
+    """
+    try:
+        device_uniqueness = get_settings_or_config("DEVICE_UNIQUENESS")
+        if device_uniqueness not in DeviceUniquenessChoices.values():
+            return [W007]
+    except AttributeError:
+        return [W007]
+    return []

nautobot/core/choices.py

@@ -238,7 +238,7 @@ class ButtonActionIconChoices(ChoiceSet):
     LOCK = "mdi-lock"
     MAGNIFY = "mdi-magnify"
     NOTE = "mdi-note-text"
-    RENAME = "mdi-pencil"
+    RENAME = "mdi-rename"
     SWAP = "mdi-swap-vertical"
     TRASH = "mdi-trash-can-outline"
 

nautobot/core/cli/bootstrap_v3_to_v5.py

@@ -3,6 +3,8 @@ import logging
 import os
 import re
 
+from .migrate_deprecated_templates import replace_deprecated_templates
+
 logger = logging.getLogger(__name__)
 
 
@@ -135,6 +137,61 @@ def _fix_nav_tabs_items(html: str, stats: dict, file_path=None) -> str:
     return pattern.sub(ul_replacer, html)
 
 
+def _fix_dropdown_lis(html: str, stats: dict, file_path=None) -> str:
+    """Adds 'dropdown-item' class to all <li><a>...</a></li> tags in the given HTML string."""
+
+    def a_replacer(match):
+        a_tag = match.group(0)
+        # If Django template logic is found, notify user and skip auto-fix
+        if re.search(r"{%.*%}", a_tag):
+            if "manual_nav_template_lines" not in stats:
+                stats["manual_nav_template_lines"] = []
+            # Get line number and character position of li_tag
+            html_lines = html.splitlines()
+            for i, line in enumerate(html_lines):
+                if a_tag in line:
+                    # Append line number, character position and file path for easier identification
+                    stats["manual_nav_template_lines"].append(
+                        f"{file_path}:{i + 1}:{line.index(a_tag)} - Please review manually '{a_tag}'"
+                    )
+                    break
+            else:
+                stats["manual_nav_template_lines"].append(f"{file_path} - Please review manually '{a_tag}'")
+            return a_tag
+
+        # Add dropdown-item to <a>
+        class_attr_match = re.search(r"""class=(["'])(.*?)\1""", a_tag)
+        if class_attr_match:
+            classes = class_attr_match.group(2).split()
+            if not any("dropdown-item" in _class for _class in classes):
+                classes.append("dropdown-item")
+                stats["dropdown_items"] += 1
+            new_class_attr = f'class="{" ".join(classes)}"'
+            a_tag = re.sub(r"""class=(["'])(.*?)\1""", new_class_attr, a_tag, count=1)
+        else:
+            a_tag = re.sub(r"<a(\s|>)", r'<a class="dropdown-item"\1', a_tag, count=1)
+            stats["dropdown_items"] += 1
+
+        return a_tag
+
+    return re.sub("<a[^>]*>.*?</a>", a_replacer, html, flags=re.DOTALL)
+
+
+def _fix_dropdown_items(html: str, stats: dict, file_path=None) -> str:
+    """Ensures that all <li> elements within <ul class="dropdown-menu"> have class="dropdown-item" as appropriate."""
+
+    def ul_replacer(ul_match):
+        ul_tag = ul_match.group(0)
+        ul_tag_new = _fix_dropdown_lis(ul_tag, stats, file_path=file_path)
+        return ul_tag_new
+
+    pattern = re.compile(
+        r"""<ul\s+class=(["'])(?:[^"']*\s)?dropdown-menu(?:\s[^"']*)?\1[^>]*>.*?</ul>""",
+        re.DOTALL | re.IGNORECASE,
+    )
+    return pattern.sub(ul_replacer, html)
+
+
 def _fix_extra_nav_tabs_block(html_string: str, stats: dict, file_path: str) -> str:
     """
     Finds {% block extra_nav_tabs %} blocks and adds nav-item/nav-link to <li> tags inside using regex.
@@ -505,6 +562,7 @@ def convert_bootstrap_classes(html_input: str, file_path: str) -> tuple[str, dic
         "extra_breadcrumbs": 0,
         "breadcrumb_items": 0,
         "nav_items": 0,
+        "dropdown_items": 0,
         "panel_classes": 0,
         "manual_nav_template_lines": [],
     }
@@ -521,6 +579,7 @@ def convert_bootstrap_classes(html_input: str, file_path: str) -> tuple[str, dic
         "checkbox-inline": "form-check-input",
         "close": "btn-close",
         "control-label": "col-form-label",
+        "dropdown-menu-right": "dropdown-menu-end",
         "form-control-static": "form-control-plaintext",
         "form-group": "mb-10 d-flex justify-content-center",
         "help-block": "form-text",
@@ -582,6 +641,7 @@ def convert_bootstrap_classes(html_input: str, file_path: str) -> tuple[str, dic
     current_html = _convert_caret_in_span_to_mdi(current_html, stats)
     current_html = _convert_hover_copy_buttons(current_html, stats)
     current_html = _fix_nav_tabs_items(current_html, stats, file_path=file_path)
+    current_html = _fix_dropdown_items(current_html, stats, file_path=file_path)
 
     return current_html, stats
 
@@ -589,7 +649,7 @@ def convert_bootstrap_classes(html_input: str, file_path: str) -> tuple[str, dic
 # --- File Processing ---
 
 
-def fix_html_files_in_directory(directory: str, resize=False) -> None:
+def fix_html_files_in_directory(directory: str, resize=False, dry_run=False, skip_templates=False) -> None:
     """
     Recursively finds all .html files in the given directory, applies convert_bootstrap_classes,
     and overwrites each file with the fixed content. If resize is True, it will only change the
@@ -598,11 +658,22 @@ def fix_html_files_in_directory(directory: str, resize=False) -> None:
 
     totals = {
         k: 0
-        for k in ["replacements", "extra_breadcrumbs", "breadcrumb_items", "nav_items", "panel_classes", "resizing_xs"]
+        for k in [
+            "replacements",
+            "extra_breadcrumbs",
+            "breadcrumb_items",
+            "nav_items",
+            "dropdown_items",
+            "panel_classes",
+            "resizing_xs",
+        ]
     }
     # Breakpoints that are not xs do not count as failures in djlint, so we keep a separate counter
     resizing_other = 0
 
+    if not os.path.exists(directory):
+        raise FileNotFoundError(directory)
+
     if os.path.isfile(directory):
         only_filename = os.path.basename(directory)
         directory = os.path.dirname(directory)
@@ -649,9 +720,12 @@ def fix_html_files_in_directory(directory: str, resize=False) -> None:
 
                 fixed_content, stats = convert_bootstrap_classes(content, file_path=file_path)
 
-                with open(file_path, "w", encoding="utf-8") as f:
-                    f.write(fixed_content)
-                logger.info("Fixed: %s", file_path)
+                if dry_run:
+                    logger.info("Would fix: %s", file_path)
+                else:
+                    with open(file_path, "w", encoding="utf-8") as f:
+                        f.write(fixed_content)
+                    logger.info("Fixed: %s", file_path)
 
                 if any(stats.values()):
                     print(f"→ {os.path.relpath(file_path, directory)}: ", end="")
@@ -663,6 +737,8 @@ def fix_html_files_in_directory(directory: str, resize=False) -> None:
                         print(f"{stats['breadcrumb_items']} breadcrumb-items, ", end="")
                     if stats["nav_items"]:
                         print(f"{stats['nav_items']} nav-items, ", end="")
+                    if stats["dropdown_items"]:
+                        print(f"{stats['dropdown_items']} dropdown-items, ", end="")
                     if stats["panel_classes"]:
                         print(f"{stats['panel_classes']} panel replacements, ", end="")
                     print()
@@ -675,18 +751,23 @@ def fix_html_files_in_directory(directory: str, resize=False) -> None:
                     if k in totals:
                         totals[k] += v
 
+    templates_replaced = replace_deprecated_templates(directory, dry_run=dry_run) if not skip_templates else 0
+
     # Global summary
     total_issues = sum(totals.values())
     print("=== Global Summary ===")
     print(f"Total issues fixed: {total_issues}")
-    print(f"- Class replacements:          {totals['replacements']}")
-    print(f"- Extra-breadcrumb fixes:      {totals['extra_breadcrumbs']}")
-    print(f"- <li> in <ol.breadcrumb>:     {totals['breadcrumb_items']}")
-    print(f"- <li> in <ul.nav-tabs>:       {totals['nav_items']}")
-    print(f"- Panel class replacements:    {totals['panel_classes']}")
-    print(f"- Resizing breakpoint xs:      {totals['resizing_xs']}")
+    print(f"- Class replacements:            {totals['replacements']}")
+    print(f"- Extra-breadcrumb fixes:        {totals['extra_breadcrumbs']}")
+    print(f"- <li> in <ol.breadcrumb>:       {totals['breadcrumb_items']}")
+    print(f"- <li> in <ul.nav-tabs>:         {totals['nav_items']}")
+    print(f"- <a> in <ul.dropdown-menu>:     {totals['dropdown_items']}")
+    print(f"- Panel class replacements:      {totals['panel_classes']}")
+    print(f"- Resizing breakpoint xs:        {totals['resizing_xs']}")
     print("-------------------------------------")
-    print(f"- Resizing other breakpoints:  {resizing_other}")
+    print(f"- Resizing other breakpoints:    {resizing_other}")
+    print("-------------------------------------")
+    print(f"- Deprecated templates replaced: {templates_replaced}")
 
 
 def main():
@@ -697,10 +778,21 @@ def main():
         action="store_true",
         help="Change column breakpoints to be one level higher, such as 'col-xs-*' to 'col-sm-*'",
     )
+    parser.add_argument(
+        "-d",
+        "--dry-run",
+        action="store_true",
+        help="Show which files would be modified without making any changes.",
+    )
     parser.add_argument("path", type=str, help="Path to directory in which to recursively fix all .html files.")
+    parser.add_argument(
+        "-st", "--skip-template-replacement", action="store_true", help="Skip replacing deprecated templates."
+    )
     args = parser.parse_args()
 
-    fix_html_files_in_directory(args.path, resize=args.resize)
+    fix_html_files_in_directory(
+        args.path, resize=args.resize, dry_run=args.dry_run, skip_templates=args.skip_template_replacement
+    )
 
 
 if __name__ == "__main__":

nautobot/core/cli/migrate_deprecated_templates.py

@@ -0,0 +1,227 @@
+import argparse
+import os
+import re
+
+TEMPLATE_REPLACEMENTS = {
+    # Format: new_template: [old_template1, old_template2, ...]
+    "circuits/circuit_create.html": ["circuits/circuit_edit.html", "circuits/circuit_update.html"],
+    "circuits/circuittermination_create.html": [
+        "circuits/circuittermination_edit.html",
+        "circuits/circuittermination_update.html",
+    ],
+    "circuits/provider_create.html": ["circuits/provider_edit.html", "circuits/provider_update.html"],
+    "dcim/cable_retrieve.html": ["dcim/cable.html"],
+    "dcim/cable_update.html": ["dcim/cable_edit.html"],
+    "dcim/device_create.html": ["dcim/device_edit.html"],
+    "dcim/devicetype_update.html": ["dcim/devicetype_edit.html"],
+    "dcim/location_update.html": ["dcim/location_edit.html"],
+    "dcim/rack_retrieve.html": ["dcim/rack.html"],
+    "dcim/rack_update.html": ["dcim/rack_edit.html"],
+    "dcim/rackreservation_retrieve.html": ["dcim/rackreservation.html"],
+    "dcim/virtualchassis_create.html": ["dcim/virtualchassis_add.html"],
+    "extras/configcontext_update.html": ["extras/configcontext_edit.html"],
+    "extras/configcontextschema_retrieve.html": ["extras/configcontextschema.html"],
+    "extras/configcontextschema_update.html": ["extras/configcontextschema_edit.html"],
+    "extras/customfield_update.html": ["extras/customfield_edit.html"],
+    "extras/dynamicgroup_retrieve.html": ["extras/dynamicgroup.html"],
+    "extras/dynamicgroup_update.html": ["extras/dynamicgroup_edit.html"],
+    "extras/gitrepository_retrieve.html": ["extras/gitrepository.html"],
+    "extras/gitrepository_update.html": ["extras/gitrepository_object_edit.html"],
+    "extras/jobresult_retrieve.html": ["extras/jobresult.html"],
+    "extras/objectchange_retrieve.html": ["extras/objectchange.html"],
+    "extras/secret_create.html": ["extras/secret_edit.html"],
+    "extras/secretsgroup_update.html": ["extras/secretsgroup_edit.html"],
+    "extras/tag_update.html": ["extras/tag_edit.html"],
+    "generic/object_bulk_create.html": ["generic/object_bulk_import.html"],
+    "generic/object_bulk_destroy.html": ["generic/object_bulk_delete.html"],
+    "generic/object_bulk_update.html": ["generic/object_bulk_edit.html"],
+    "generic/object_changelog.html": ["extras/object_changelog.html"],
+    "generic/object_create.html": ["dcim/powerpanel_edit.html", "generic/object_edit.html", "ipam/service_edit.html"],
+    "generic/object_destroy.html": ["generic/object_delete.html"],
+    "generic/object_list.html": ["extras/graphqlquery_list.html", "extras/objectchange_list.html"],
+    "generic/object_notes.html": ["extras/object_notes.html"],
+    "generic/object_retrieve.html": [
+        "circuits/circuit.html",
+        "circuits/circuit_retrieve.html",
+        "circuits/circuittermination.html",
+        "circuits/circuittermination_retrieve.html",
+        "circuits/circuittype.html",
+        "circuits/circuittype_retrieve.html",
+        "circuits/provider.html",
+        "circuits/provider_retrieve.html",
+        "circuits/providernetwork.html",
+        "circuits/providernetwork_retrieve.html",
+        "cloud/cloudaccount_retrieve.html",
+        "cloud/cloudnetwork_retrieve.html",
+        "cloud/cloudresourcetype_retrieve.html",
+        "cloud/cloudservice_retrieve.html",
+        "dcim/controller/base.html",
+        "dcim/controller_retrieve.html",
+        "dcim/controller_wirelessnetworks.html",
+        "dcim/controllermanageddevicegroup_retrieve.html",
+        "dcim/device/base.html",
+        "dcim/device/consoleports.html",
+        "dcim/device/consoleserverports.html",
+        "dcim/device/devicebays.html",
+        "dcim/device/frontports.html",
+        "dcim/device/interfaces.html",
+        "dcim/device/inventory.html",
+        "dcim/device/modulebays.html",
+        "dcim/device/poweroutlets.html",
+        "dcim/device/powerports.html",
+        "dcim/device/rearports.html",
+        "dcim/device/wireless.html",
+        "dcim/device_component.html",
+        "dcim/devicefamily_retrieve.html",
+        "dcim/deviceredundancygroup_retrieve.html",
+        "dcim/devicetype.html",
+        "dcim/devicetype_retrieve.html",
+        "dcim/interfaceredundancygroup_retrieve.html",
+        "dcim/location.html",
+        "dcim/location_retrieve.html",
+        "dcim/locationtype.html",
+        "dcim/locationtype_retrieve.html",
+        "dcim/manufacturer.html",
+        "dcim/modulebay_retrieve.html",
+        "dcim/platform.html",
+        "dcim/powerfeed.html",
+        "dcim/powerfeed_retrieve.html",
+        "dcim/powerpanel.html",
+        "dcim/powerpanel_retrieve.html",
+        "dcim/rackgroup.html",
+        "dcim/softwareimagefile_retrieve.html",
+        "dcim/softwareversion_retrieve.html",
+        "dcim/virtualchassis.html",
+        "dcim/virtualchassis_retrieve.html",
+        "dcim/virtualdevicecontext_retrieve.html",
+        "extras/computedfield.html",
+        "extras/computedfield_retrieve.html",
+        "extras/configcontext.html",
+        "extras/configcontext_retrieve.html",
+        "extras/contact_retrieve.html",
+        "extras/customfield.html",
+        "extras/customfield_retrieve.html",
+        "extras/customlink.html",
+        "extras/exporttemplate.html",
+        "extras/graphqlquery.html",
+        "extras/graphqlquery_retrieve.html",
+        "extras/job_detail.html",
+        "extras/jobbutton_retrieve.html",
+        "extras/jobhook.html",
+        "extras/jobqueue_retrieve.html",
+        "extras/metadatatype_retrieve.html",
+        "extras/note.html",
+        "extras/note_retrieve.html",
+        "extras/relationship.html",
+        "extras/secret.html",
+        "extras/secretsgroup.html",
+        "extras/secretsgroup_retrieve.html",
+        "extras/status.html",
+        "extras/tag.html",
+        "extras/tag_retrieve.html",
+        "extras/team_retrieve.html",
+        "generic/object_detail.html",
+        "ipam/namespace_retrieve.html",
+        "ipam/prefix.html",
+        "ipam/prefix_retrieve.html",
+        "ipam/rir.html",
+        "ipam/routetarget.html",
+        "ipam/service.html",
+        "ipam/service_retrieve.html",
+        "ipam/vlan.html",
+        "ipam/vlan_retrieve.html",
+        "ipam/vlangroup.html",
+        "ipam/vrf.html",
+        "tenancy/tenant.html",
+        "tenancy/tenantgroup.html",
+        "tenancy/tenantgroup_retrieve.html",
+        "virtualization/clustergroup.html",
+        "virtualization/clustertype.html",
+        "virtualization/virtualmachine.html",
+        "virtualization/virtualmachine_retrieve.html",
+        "wireless/radioprofile_retrieve.html",
+        "wireless/supporteddatarate_retrieve.html",
+        "wireless/wirelessnetwork_retrieve.html",
+    ],
+    "ipam/prefix_create.html": ["ipam/prefix_edit.html"],
+    "ipam/vlan_update.html": ["ipam/vlan_edit.html"],
+    "tenancy/tenant_create.html": ["tenancy/tenant_edit.html"],
+    "virtualchassis_update.html": ["dcim/virtualchassis_edit.html"],
+    "virtualization/virtualmachine_update.html": ["virtualization/virtualmachine_edit.html"],
+}
+
+
+def replace_template_references(content: str) -> tuple[str, bool]:
+    """
+    Replaces references to deprecated templates with new ones.
+
+    Args:
+        content: The content of the file to replace references in.
+
+    Returns:
+        A tuple containing the updated content and a boolean indicating if any changes were made.
+    """
+    for new_template, old_templates in TEMPLATE_REPLACEMENTS.items():
+        for old_template in old_templates:
+            pattern = rf"(\{{%\s*extends\s*['\"]){re.escape(old_template)}(['\"]\s*%\}})"
+            new_content, count = re.subn(pattern, rf"\1{new_template}\2", content)
+            if count > 0:
+                # A django template can only have one extends statement, so we can return as soon as we find a match.
+                return new_content, True
+
+    return content, False
+
+
+def replace_deprecated_templates(path: str, dry_run: bool = False):
+    """
+    Recursively finds all .html files in the given directory,
+    and replaces references to deprecated templates with new ones.
+    """
+
+    if os.path.isfile(path):
+        only_filename = os.path.basename(path)
+        path = os.path.dirname(path)
+    else:
+        only_filename = None
+    print("Finding deprecated templates to replace...")
+    count = 0
+
+    for root, _, files in os.walk(path):
+        for filename in files:
+            if only_filename and only_filename != filename:
+                continue
+            if filename.endswith((".html")):
+                file_path = os.path.join(root, filename)
+                with open(file_path, "r", encoding="utf-8") as f:
+                    original_content = f.read()
+
+                content = original_content
+
+                fixed_content, was_updated = replace_template_references(content)
+
+                if was_updated:
+                    count += 1
+                    if dry_run:
+                        print(f"Detected deprecated template reference in {file_path}")
+                        continue
+                    with open(file_path, "w", encoding="utf-8") as f:
+                        f.write(fixed_content)
+                    print(f"Updated: {file_path}")
+    if not count:
+        print("No deprecated templates found.")
+    else:
+        print(f"Found {count} deprecated templates.")
+    return count
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Replace deprecated templates with new ones")
+    parser.add_argument("path", type=str, help="Path to directory in which to recursively fix all .html files.")
+    parser.add_argument("--dry-run", action="store_true", help="Do not make any changes to the files.")
+    args = parser.parse_args()
+
+    replace_deprecated_templates(args.path, args.dry_run)
+
+
+if __name__ == "__main__":
+    main()

nautobot/core/constants.py

@@ -210,3 +210,6 @@ GLOBAL_SEARCH_EXCLUDE_LIST = [
     "vrfprefixassignment",
     "webhook",
 ]
+
+# M2M fields that are included by default in API responses if exclude_m2m is not provided
+DEFAULT_M2M_FIELDS = ["tags", "content_types", "object_types"]

nautobot/core/context_processors.py

@@ -1,3 +1,5 @@
+from urllib.parse import urlparse
+
 from django.conf import settings as django_settings
 from django.urls import NoReverseMatch, reverse
 
@@ -78,6 +80,12 @@ def nav_menu(request):
             pass
 
     nav_menu_object = {"tabs": {}}
+
+    if htmx_current_url := request.headers.get("HX-Current-URL"):
+        current_url = urlparse(htmx_current_url).path
+    else:
+        current_url = request.path
+
     for tab_name, tab_details in registry["nav_menu"]["tabs"].items():
         if not tab_details["permissions"] or has_one_or_more_perms(request.user, tab_details["permissions"]):
             nav_menu_object["tabs"][tab_name] = {"groups": {}, "icon": tab_details["icon"]}
@@ -93,7 +101,7 @@ def nav_menu(request):
                             if has_identified_active_link:
                                 is_active = False
                             else:
-                                is_active = item_link in [request.path, related_list_view_link]
+                                is_active = item_link in [current_url, related_list_view_link]
                                 if is_active:
                                     has_identified_active_link = True
 

nautobot/core/filters.py

@@ -101,6 +101,10 @@ class MultiValueDateTimeFilter(django_filters.DateTimeFilter, django_filters.Mul
 class MultiValueNumberFilter(django_filters.NumberFilter, django_filters.MultipleChoiceFilter):
     field_class = multivalue_field_factory(django_forms.IntegerField)
 
+    def __init__(self, *args, choices=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.choices = list(choices) if choices is not None else None
+
 
 class MultiValueBigNumberFilter(MultiValueNumberFilter):
     """Subclass of MultiValueNumberFilter used for BigInteger model fields."""

nautobot/core/forms/__init__.py

@@ -69,6 +69,7 @@ from nautobot.core.forms.widgets import (
     DatePicker,
     DateTimePicker,
     MultiValueCharInput,
+    NumberWithSelect,
     SelectWithDisabled,
     SelectWithPK,
     SlugWidget,
@@ -126,6 +127,7 @@ __all__ = (
     "MultiValueCharInput",
     "MultipleContentTypeField",
     "NullableDateField",
+    "NumberWithSelect",
     "NumericArrayField",
     "PrefixFieldMixin",
     "ReturnURLForm",

nautobot/core/forms/forms.py

@@ -377,7 +377,7 @@ class DynamicFilterForm(BootstrapMixin, forms.Form):
 
     def _get_lookup_field_choices(self):
         """Get choices for lookup_fields i.e filterset parameters without a lookup expr"""
-        from nautobot.extras.filters.mixins import RelationshipFilter  # Avoid circular import
+        from nautobot.extras.filter_mixins import RelationshipFilter  # Avoid circular import
 
         filterset_without_lookup = (
             (

nautobot/core/forms/widgets.py

@@ -6,7 +6,7 @@ from django import forms
 from django.forms.models import ModelChoiceIterator
 from django.urls import get_script_prefix
 
-from nautobot.core import choices
+from nautobot.core import choices as core_choices
 from nautobot.core.forms import utils
 
 __all__ = (
@@ -19,6 +19,7 @@ __all__ = (
     "ContentTypeSelect",
     "DatePicker",
     "DateTimePicker",
+    "NumberWithSelect",
     "SelectWithDisabled",
     "SelectWithPK",
     "SlugWidget",
@@ -68,7 +69,7 @@ class ColorSelect(forms.Select):
     option_template_name = "widgets/colorselect_option.html"
 
     def __init__(self, *args, **kwargs):
-        kwargs["choices"] = utils.add_blank_choice(choices.ColorChoices)
+        kwargs["choices"] = utils.add_blank_choice(core_choices.ColorChoices)
         super().__init__(*args, **kwargs)
         self.attrs["class"] = "nautobot-select2-color-picker"
 
@@ -283,3 +284,21 @@ class ClearableFileInput(forms.ClearableFileInput):
 
     class Media:
         js = ["bootstrap-filestyle-1.2.3/bootstrap-filestyle.min.js"]
+
+
+class NumberWithSelect(forms.NumberInput):
+    template_name = "widgets/number_input_with_choices.html"
+
+    def __init__(self, choices=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if choices is None:
+            self.choices = []
+        elif hasattr(choices, "CHOICES"):
+            self.choices = core_choices.unpack_grouped_choices(choices.CHOICES)
+        else:
+            self.choices = core_choices.unpack_grouped_choices(choices)
+
+    def get_context(self, name, value, attrs):
+        context = super().get_context(name, value, attrs)
+        context["widget"]["choices"] = self.choices
+        return context