nautobot 3.0.0rc2__py3-none-any.whl → 3.0.2__py3-none-any.whl

nautobot/apps/views.py

@@ -24,6 +24,7 @@ from nautobot.core.views.mixins import (
     ObjectBulkDestroyViewMixin,
     ObjectBulkUpdateViewMixin,
     ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
     ObjectDestroyViewMixin,
     ObjectDetailViewMixin,
     ObjectEditViewMixin,
@@ -72,6 +73,7 @@ __all__ = (
     "ObjectBulkDestroyViewMixin",
     "ObjectBulkUpdateViewMixin",
     "ObjectChangeLogViewMixin",
+    "ObjectDataComplianceViewMixin",
     "ObjectDeleteView",
     "ObjectDestroyViewMixin",
     "ObjectDetailViewMixin",

nautobot/core/celery/__init__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 import shutil
 import sys
 
-from celery import Celery, shared_task, signals
+from celery import bootsteps, Celery, shared_task, signals
 from celery.app.log import TaskFormatter
 from celery.utils.log import get_logger
 from django.apps import apps
@@ -268,3 +268,48 @@ def register_jobs(*jobs):
     for job in jobs:
         if job.class_path not in registry["jobs"]:
             registry["jobs"][job.class_path] = job
+
+
+@signals.worker_ready.connect
+def worker_ready(**_):
+    if not settings.CELERY_HEALTH_PROBES_AS_FILES:
+        return
+    WORKER_READINESS_FILE = Path(settings.CELERY_WORKER_READINESS_FILE)
+    WORKER_READINESS_FILE.touch(exist_ok=True)
+
+
+@signals.worker_shutdown.connect
+def worker_shutdown(**_):
+    if not settings.CELERY_HEALTH_PROBES_AS_FILES:
+        return
+    WORKER_READINESS_FILE = Path(settings.CELERY_WORKER_READINESS_FILE)
+    WORKER_READINESS_FILE.unlink(missing_ok=True)
+
+
+class LivenessProbe(bootsteps.StartStopStep):
+    requires = {"celery.worker.components:Timer"}
+
+    def __init__(self, parent, **kwargs):
+        self.requests = []
+        self.tref = None
+        self.WORKER_HEARTBEAT_FILE = Path(settings.CELERY_WORKER_HEARTBEAT_FILE)
+
+    def start(self, parent):
+        if not settings.CELERY_HEALTH_PROBES_AS_FILES:
+            return
+        # This is a 1-second interval.
+        self.tref = parent.timer.call_repeatedly(
+            1.0,
+            self.update_worker_heartbeat_file,
+            (parent,),
+            priority=10,
+        )
+
+    def stop(self, parent):
+        self.WORKER_HEARTBEAT_FILE.unlink(missing_ok=True)
+
+    def update_worker_heartbeat_file(self, parent):
+        self.WORKER_HEARTBEAT_FILE.touch(exist_ok=True)
+
+
+app.steps["worker"].add(LivenessProbe)

nautobot/core/cli/bootstrap_v3_to_v5.py

@@ -549,6 +549,97 @@ def _fix_breadcrumbs_block(html_string: str, stats: dict) -> str:
     return block_pattern.sub(process_match, html_string)
 
 
+# --- Grid Breakpoints Resize Function ---
+
+
+def _resize_grid_breakpoints(html_string: str, class_combinations: list[str], stats: dict, file_path: str) -> str:
+    """
+    Resizes grid breakpoints in `col-*` and `offset-*` classes one step up. Uses given `class_combinations` for known
+    class pattern replacements and otherwise does generic xs → sm and md → lg breakpoint resize. In case class list
+    contains grid breakpoints other than xs and md, flags it for manual review.
+    """
+    # Define the breakpoint mapping
+    breakpoint_map = {"xs": "sm", "sm": "md", "md": "lg", "lg": "xl", "xl": "xxl"}
+    breakpoint_map_keys = list(breakpoint_map.keys())
+
+    if "manual_grid_template_lines" not in stats:
+        stats["manual_grid_template_lines"] = []
+
+    def create_grid_class_regex(breakpoints=breakpoint_map_keys):  # pylint: disable=dangerous-default-value
+        # Create regex matching Bootstrap grid classes, i.e. `col-*` and `offset-*`, within given breakpoints.
+        return re.compile(rf"\b(col|offset)-({'|'.join(breakpoints)})([a-zA-Z0-9-]*)")
+
+    # Resize all given grid `breakpoints` in `string` according to defined `breakpoint_map`
+    def resize_breakpoints(string, breakpoints=breakpoint_map_keys, count_stats=False):  # pylint: disable=dangerous-default-value
+        def regex_repl(match):
+            new_breakpoint = breakpoint_map[match.group(2)]
+            if count_stats:
+                stats["grid_breakpoints"] += 1
+            return f"{match.group(1)}-{new_breakpoint}{match.group(3)}"
+
+        # Replace with regex, e.g., col-xs-12 → col-sm-12
+        regex = create_grid_class_regex(breakpoints)
+        return regex.sub(regex_repl, string)
+
+    # Resize given `class_combinations` and create an additional joint array from the two. This is required to determine
+    # whether a known class combination is present in certain element class list and handle one of the following cases:
+    #   1. No, but identified grid breakpoints other than xs and md: flag for manual review.
+    #   2. No, and only xs and md grid breakpoints found: generic xs → sm and md → lg replacement.
+    #   3. Yes, but has not been resized yet: resize with proper combination.
+    #   4. Yes, and has already been resized: do nothing.
+    resized_class_combinations = [resize_breakpoints(class_combination) for class_combination in class_combinations]
+    known_class_combinations = [*class_combinations, *resized_class_combinations]
+
+    def grid_breakpoints_replacer(match):
+        classes = match.group(1)
+        # Remove Django template tag blocks, variables and comments and split individual classes into separate strings.
+        raw_classes = re.compile(r"{{?((?!{|}).)*}}?").sub(" ", classes).split()
+        # Filter out all non-grid classes, keep only `col-*` and `offset-*`.
+        grid_class_regex = create_grid_class_regex()
+        grid_classes = [cls for cls in raw_classes if grid_class_regex.search(cls)]
+
+        # Check whether given class list consists of any of the known class combinations.
+        known_class_combination = None
+        for class_combination in known_class_combinations:
+            # Look for an exact match, when all classes from given combination are included in element classes and vice versa.
+            if all(cls in classes for cls in class_combination.split()) and all(
+                grid_class in class_combination for grid_class in grid_classes
+            ):
+                known_class_combination = class_combination
+                break
+
+        if known_class_combination is None:
+            # Class combination has not been found.
+            if any("xs" not in grid_class and "md" not in grid_class for grid_class in grid_classes):
+                # Class list contains grid breakpoints other than xs and md, require manual review.
+                linenum = match.string.count("\n", 0, match.start()) + 1
+                stats["manual_grid_template_lines"].append(
+                    f"{file_path}:{linenum} - Please review manually '{match.group(0)}'"
+                )
+            else:
+                # Class list contains only xs and md grid breakpoints, do generic xs → sm and md → lg replacement
+                return f'class="{resize_breakpoints(classes, breakpoints=["xs", "md"], count_stats=True)}"'
+
+        elif known_class_combination not in resized_class_combinations:
+            # Class combination has been found, but has not been resized yet: resize with proper combination.
+            resized_classes = resized_class_combinations[class_combinations.index(known_class_combination)].split()
+
+            def class_replacer(m):
+                current_class = m.group(0)
+                stats["grid_breakpoints"] += 1
+                return resized_classes[known_class_combination.split().index(current_class)]
+
+            # Replace all classes from given combination by mapping them individually to their resized equivalents.
+            return f'class="{re.compile("|".join(known_class_combination.split())).sub(class_replacer, classes)}"'
+
+        # Return unchanged string if conditions above are not satisfied, i.e. do nothing.
+        return match.group(0)
+
+    # Find all `class="..."` matches and execute grid breakpoint replacement on them.
+    pattern = re.compile(r'class="([^"]*)"')
+    return pattern.sub(grid_breakpoints_replacer, html_string)
+
+
 # --- Main Conversion Function ---
 
 
@@ -566,7 +657,9 @@ def convert_bootstrap_classes(html_input: str, file_path: str) -> tuple[str, dic
         "nav_items": 0,
         "dropdown_items": 0,
         "panel_classes": 0,
+        "grid_breakpoints": 0,
         "manual_nav_template_lines": [],
+        "manual_grid_template_lines": [],
     }
 
     # --- Stage 1: Apply rules that work directly on the HTML string (simple string/regex replacements) ---
@@ -630,6 +723,26 @@ def convert_bootstrap_classes(html_input: str, file_path: str) -> tuple[str, dic
         "data-backdrop": "data-bs-backdrop",  # Bootstrap 5 uses data-bs-* attributes
     }
 
+    standard_grid_breakpoint_combinations = [
+        "col-md-6 col-sm-6 col-xs-12",  # Rack elevation container: nautobot/dcim/templates/dcim/rack_elevation.html:2
+        "col-sm-3 col-md-2 col-md-offset-1",  # Legacy user page nav pills container: nautobot/users/templates/users/base.html:10
+        "col-sm-3 col-md-2 offset-md-1",
+        "col-sm-4 col-sm-offset-4",  # Selected centered panel containers, e.g. on 404 and 500 error pages and legacy login page: nautobot/core/templates/login.html:54
+        "col-sm-4 offset-sm-4",
+        "col-sm-4 col-md-3",  # Legacy header search form container: nautobot/core/templates/generic/object_list.html:32
+        "col-sm-8 col-md-9 col-sm-12 col-md-12",  # Legacy breadcrumbs container variation on change list page: nautobot/core/templates/admin/change_list.html:33
+        "col-sm-8 col-md-9 col-md-12",  # Legacy breadcrumbs container variation on generic object list view page: nautobot/core/templates/generic/object_list.html:13
+        "col-sm-8 col-md-9",  # Legacy breadcrumbs container: nautobot/core/templates/generic/object_retrieve.html:16
+        "col-sm-9 col-md-8",  # Legacy user page content container: nautobot/users/templates/users/base.html:31
+        "col-md-5 col-sm-12",  # Cable trace form left-hand side container: nautobot/dcim/templates/dcim/cable_trace.html:10
+        "col-md-7 col-sm-12",  # Cable trace form right-hand side container: nautobot/dcim/templates/dcim/cable_trace.html:86
+        "col-lg-6 col-md-6",  # Jinja template/rendered template panel containers: nautobot/core/templates/utilities/render_jinja2.html:29
+        "col-md-4 col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1",  # Standard centered form container variation on generic object bulk update page: nautobot/core/templates/generic/object_bulk_update.html:39
+        "col-md-4 col-lg-8 col-lg-offset-2 col-md-10 offset-md-1",
+        "col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1",  # Standard centered form container, e.g. on generic object create page: nautobot/core/templates/generic/object_create.html:12
+        "col-lg-8 offset-lg-2 col-md-10 offset-md-1",
+    ]
+
     current_html = _replace_attributes(current_html, attribute_replacements, stats)
     current_html = _replace_classes(current_html, class_replacements, stats, file_path=file_path)
     current_html = _fix_extra_breadcrumbs_block(current_html, stats)
@@ -644,6 +757,7 @@ def convert_bootstrap_classes(html_input: str, file_path: str) -> tuple[str, dic
     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)
+    current_html = _resize_grid_breakpoints(current_html, standard_grid_breakpoint_combinations, stats, file_path)
 
     return current_html, stats
 
@@ -651,11 +765,10 @@ 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, dry_run=False, skip_templates=False) -> None:
+def fix_html_files_in_directory(directory: str, 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
-    breakpoints (This should only be done once.).
+    and overwrites each file with the fixed content.
     """
 
     totals = {
@@ -667,11 +780,9 @@ def fix_html_files_in_directory(directory: str, resize=False, dry_run=False, ski
             "nav_items",
             "dropdown_items",
             "panel_classes",
-            "resizing_xs",
+            "grid_breakpoints",
         ]
     }
-    # 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)
@@ -682,9 +793,6 @@ def fix_html_files_in_directory(directory: str, resize=False, dry_run=False, ski
     else:
         only_filename = None
 
-    # Define the breakpoint mapping
-    breakpoint_map = {"xs": "sm", "sm": "md", "md": "lg", "lg": "xl", "xl": "xxl"}
-
     for root, _, files in os.walk(directory):
         for filename in files:
             if only_filename and only_filename != filename:
@@ -697,29 +805,6 @@ def fix_html_files_in_directory(directory: str, resize=False, dry_run=False, ski
 
                 content = original_content
 
-                if resize:
-                    # If resize is True, we only change the breakpoints
-                    # This is a one-time operation to adjust the breakpoints.
-                    logger.info("Resizing Breakpoints: %s", file_path)
-
-                    resizing_other = 0
-
-                    # Iterate from the highest breakpoint to the lowest
-                    for bkpt in ["xl", "lg", "md", "sm", "xs"]:
-                        # Replace with regex, e.g., col-xs-12 → col-sm-12
-                        regex = re.compile(rf"(\bcol-{bkpt})([a-zA-Z0-9-]*)")
-
-                        def regex_repl(m, captured_bkpt=bkpt):
-                            nonlocal resizing_other
-                            if captured_bkpt == "xs":
-                                totals["resizing_xs"] += 1
-                            else:
-                                resizing_other += 1
-                            new_bkpt = breakpoint_map[captured_bkpt]
-                            return f"col-{new_bkpt}{m.group(2)}"
-
-                        content = regex.sub(regex_repl, content)
-
                 fixed_content, stats = convert_bootstrap_classes(content, file_path=file_path)
 
                 if dry_run:
@@ -743,12 +828,18 @@ def fix_html_files_in_directory(directory: str, resize=False, dry_run=False, ski
                         print(f"{stats['dropdown_items']} dropdown-items, ", end="")
                     if stats["panel_classes"]:
                         print(f"{stats['panel_classes']} panel replacements, ", end="")
+                    if stats["grid_breakpoints"]:
+                        print(f"{stats['grid_breakpoints']} grid breakpoint replacements, ", end="")
                     print()
 
                 if stats.get("manual_nav_template_lines"):
                     print("  !!! Manual review needed for nav-item fixes at:")
                     for line in stats["manual_nav_template_lines"]:
                         print(f"    - {line}")
+                if stats.get("manual_grid_template_lines"):
+                    print("  !!! Manual review needed for non-standard grid breakpoints at:")
+                    for line in stats["manual_grid_template_lines"]:
+                        print(f"    - {line}")
                 for k, v in stats.items():
                     if k in totals:
                         totals[k] += v
@@ -765,9 +856,7 @@ def fix_html_files_in_directory(directory: str, resize=False, dry_run=False, ski
     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"- Grid breakpoint resizes:       {totals['grid_breakpoints']}")
     print("-------------------------------------")
     print(f"- Deprecated templates replaced: {templates_replaced}")
 
@@ -824,12 +913,6 @@ def check_python_files_for_legacy_html(directory: str):
 
 def main():
     parser = argparse.ArgumentParser(description="Bootstrap 3 to 5 HTML fixer.")
-    parser.add_argument(
-        "-r",
-        "--resize",
-        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",
@@ -848,9 +931,7 @@ def main():
     if args.check_python_files:
         exit_code = check_python_files_for_legacy_html(args.path)
     if not args.no_fix_html_templates:
-        fix_html_files_in_directory(
-            args.path, resize=args.resize, dry_run=args.dry_run, skip_templates=args.skip_template_replacement
-        )
+        fix_html_files_in_directory(args.path, dry_run=args.dry_run, skip_templates=args.skip_template_replacement)
 
     return exit_code
 

nautobot/core/jobs/bulk_actions.py

@@ -31,11 +31,14 @@ class BulkEditObjects(Job):
         model=ContentType,
         description="Type of objects to update",
     )
+    # The names of the job inputs must match the parameters of `key_params` and get_bulk_queryset_from_view
+    # This may be confusing for the saved_view_id since the job input is an ObjectVar but the key_param is a PK
+    # But it is the lesser of two evils.
     form_data = JSONVar(description="BulkEditForm data")
     pk_list = JSONVar(description="List of objects pks to edit", required=False)
     edit_all = BooleanVar(description="Bulk Edit all object / all filtered objects", required=False)
     filter_query_params = JSONVar(label="Filter Query Params", required=False)
-    saved_view = ObjectVar(model=SavedView, required=False)
+    saved_view_id = ObjectVar(model=SavedView, required=False)
 
     class Meta:
         name = "Bulk Edit Objects"
@@ -127,9 +130,9 @@ class BulkEditObjects(Job):
         raise RunJobTaskFailed("Bulk Edit not fully successful, see logs")
 
     def run(  # pylint: disable=arguments-differ
-        self, *, content_type, form_data, pk_list=None, edit_all=False, filter_query_params=None, saved_view=None
+        self, *, content_type, form_data, pk_list=None, edit_all=False, filter_query_params=None, saved_view_id=None
     ):
-        saved_view_id = saved_view.pk if saved_view is not None else None
+        saved_view_id = saved_view_id.pk if saved_view_id is not None else None
         if not filter_query_params:
             filter_query_params = {}
 
@@ -186,10 +189,13 @@ class BulkDeleteObjects(Job):
         model=ContentType,
         description="Type of objects to delete",
     )
+    # The names of the job inputs must match the parameters of `key_params` and get_bulk_queryset_from_view
+    # This may be confusing for the saved_view_id since the job input is an ObjectVar but the key_param is a PK
+    # But it is the lesser of two evils.
     pk_list = JSONVar(description="List of objects pks to delete", required=False)
     delete_all = BooleanVar(description="Delete all (filtered) objects instead of a list of PKs", required=False)
     filter_query_params = JSONVar(label="Filter Query Params", required=False)
-    saved_view = ObjectVar(model=SavedView, required=False)
+    saved_view_id = ObjectVar(model=SavedView, required=False)
 
     class Meta:
         name = "Bulk Delete Objects"
@@ -200,9 +206,9 @@ class BulkDeleteObjects(Job):
         hidden = True
 
     def run(  # pylint: disable=arguments-differ
-        self, *, content_type, pk_list=None, delete_all=False, filter_query_params=None, saved_view=None
+        self, *, content_type, pk_list=None, delete_all=False, filter_query_params=None, saved_view_id=None
     ):
-        saved_view_id = saved_view.pk if saved_view is not None else None
+        saved_view_id = saved_view_id.pk if saved_view_id is not None else None
         if not filter_query_params:
             filter_query_params = {}
         if not self.user.has_perm(f"{content_type.app_label}.delete_{content_type.model}"):

nautobot/core/settings.py

@@ -959,6 +959,19 @@ CELERY_BEAT_HEARTBEAT_FILE = os.getenv(
     os.path.join(tempfile.gettempdir(), "nautobot_celery_beat_heartbeat"),
 )
 
+# Celery Worker heartbeat file path - will be touched by each worker process as a proof-of-health.
+CELERY_WORKER_HEARTBEAT_FILE = os.getenv(
+    "NAUTOBOT_CELERY_WORKER_HEARTBEAT_FILE", os.path.join(tempfile.gettempdir(), "nautobot_celery_worker_heartbeat")
+)
+
+# Celery Worker readiness file path - will be created by each worker process once it's ready to accept tasks.
+CELERY_WORKER_READINESS_FILE = os.getenv(
+    "NAUTOBOT_CELERY_WORKER_READINESS_FILE", os.path.join(tempfile.gettempdir(), "nautobot_celery_worker_ready")
+)
+
+# Celery health probes as files - if enabled, Celery worker health probes will be implemented as files
+CELERY_HEALTH_PROBES_AS_FILES = is_truthy(os.getenv("NAUTOBOT_CELERY_HEALTH_PROBES_AS_FILES", "False"))
+
 # Celery broker URL used to tell workers where queues are located
 CELERY_BROKER_URL = os.getenv("NAUTOBOT_CELERY_BROKER_URL", parse_redis_connection(redis_database=0))
 

nautobot/core/settings.yaml

@@ -383,6 +383,14 @@ properties:
     see_also:
       "Celery documentation": "https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-broker_use_ssl"
     type: "object"
+  CELERY_HEALTH_PROBES_AS_FILES:
+    default: false
+    description: "Optional configuration for Celery workers to use file-based health probes."
+    environment_variable: "NAUTOBOT_CELERY_HEALTH_PROBES_AS_FILES"
+    see_also:
+      "`CELERY_WORKER_HEARTBEAT_FILE`": "#celery_worker_heartbeat_file"
+      "`CELERY_WORKER_READINESS_FILE`": "#celery_worker_readiness_file"
+    type: "boolean"
   CELERY_REDIS_BACKEND_USE_SSL:
     default: false
     description: "Optional configuration for Celery to use custom SSL certificates to connect to Redis."
@@ -425,6 +433,13 @@ properties:
     see_also:
       "`CELERY_TASK_SOFT_TIME_LIMIT`": "#celery_task_soft_time_limit"
     type: "integer"
+  CELERY_WORKER_HEARTBEAT_FILE:
+    default: "/tmp/nautobot_celery_worker_heartbeat"
+    description: "A file touched by the Celery worker every second while it is alive, suitable for health checks."
+    environment_variable: "NAUTOBOT_CELERY_WORKER_HEARTBEAT_FILE"
+    see_also:
+      "`CELERY_HEALTH_PROBES_AS_FILES`": "#celery_health_probes_as_files"
+    type: "string"
   CELERY_WORKER_PREFETCH_MULTIPLIER:
     default: 4
     description: "How many tasks a worker is allowed to reserve for its own consumption and execution."
@@ -453,6 +468,13 @@ properties:
       type: "integer"
     type: "array"
     version_added: "1.5.10"
+  CELERY_WORKER_READINESS_FILE:
+    default: "/tmp/nautobot_celery_worker_ready"
+    description: "A file touched by the Celery worker when it starts and is ready to accept tasks."
+    environment_variable: "NAUTOBOT_CELERY_WORKER_READINESS_FILE"
+    see_also:
+      "`CELERY_HEALTH_PROBES_AS_FILES`": "#celery_health_probes_as_files"
+    type: "string"
   CELERY_WORKER_REDIRECT_STDOUTS:
     default: true
     description: "If enabled stdout and stderr of running jobs will be redirected to the task logger."

nautobot/core/templates/components/panel/body_wrapper_generic_table.html

@@ -1,3 +1,3 @@
-<table class="collapse show table table-hover card-body"{% if body_id %} id="{{ body_id }}"{% endif %}>
+<table class="collapse show table table-hover"{% if body_id %} id="{{ body_id }}"{% endif %}>
     {{ body_content }}
 </table>

nautobot/core/templates/nautobot_config.py.j2

@@ -43,6 +43,19 @@ from nautobot.core.settings_funcs import is_truthy, parse_redis_connection
 #     os.path.join(tempfile.gettempdir(), "nautobot_celery_beat_heartbeat"),
 # )
 
+# Celery Worker heartbeat file path - will be touched by each worker process as a proof-of-health.
+# CELERY_WORKER_HEARTBEAT_FILE = os.getenv(
+#     "NAUTOBOT_CELERY_BEAT_READINESS_FILE", os.path.join(tempfile.gettempdir(), "nautobot_celery_worker_heartbeat")
+# )
+
+# Celery Worker readiness file path - will be created by each worker process once it's ready to accept tasks.
+# CELERY_WORKER_READINESS_FILE = os.getenv(
+#     "NAUTOBOT_CELERY_WORKER_READINESS_FILE", os.path.join(tempfile.gettempdir(), "nautobot_celery_worker_ready")
+# )
+
+# Celery health probes as files - if enabled, Celery worker health probes will be implemented as files
+# CELERY_HEALTH_PROBES_AS_FILES = is_truthy(os.getenv("NAUTOBOT_CELERY_HEALTH_PROBES_AS_FILES", "False"))
+
 # Celery broker URL used to tell workers where queues are located
 #
 # CELERY_BROKER_URL = os.getenv("NAUTOBOT_CELERY_BROKER_URL", parse_redis_connection(redis_database=0))
@@ -94,7 +107,7 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 # FQDNs that are considered trusted origins for secure, cross-domain, requests such as HTTPS POST.
 # If running Nautobot under a single domain, you may not need to set this variable;
 # if running on multiple domains, you *may* need to set this variable to more or less the same as ALLOWED_HOSTS above.
-# You also want to set this variable if you are facing CSRF validation issues such as 
+# You also want to set this variable if you are facing CSRF validation issues such as
 # 'CSRF failure has occured' or 'Origin checking failed - https://subdomain.example.com does not match any trusted origins.'
 # https://docs.djangoproject.com/en/stable/ref/settings/#csrf-trusted-origins
 #

nautobot/core/templates/redoc_ui.html

@@ -58,6 +58,9 @@
         [data-bs-theme="dark"] .redoc-wrap .menu-content .operation-type {
             filter: hue-rotate(180deg) invert(1);
         }
+
+        {# Revert default Nautobot `<code>` element styles in `<div class="redoc-json">` blocks. #}
+        div.redoc-json code { background: none; color: inherit; border-radius: 0; padding: 0; }
     </style>
 {% endblock extra_styles %}
 

nautobot/core/testing/filters.py

@@ -65,8 +65,8 @@ class FilterTestCases:
 
             if len(test_values) < 2:
                 raise ValueError(
-                    f"Cannot find enough valid test data for {queryset.model._meta.object_name} field {field_name} "
-                    f"(found {len(test_values)} option(s): {test_values}) but need at least 2 of them"
+                    f"Cannot find enough valid test data for {queryset.model._meta.object_name} field {field_name}. "
+                    "At least 3 unique values are required to test multivalue filters."
                 )
             return test_values
 

nautobot/core/testing/views.py

@@ -402,7 +402,7 @@ class ViewTestCases:
                             self.assertHttpStatus(self.client.get(url), [403, 404])
 
                         self.add_permissions(required_permissions[-1])
-                        self.assertHttpStatus(self.client.get(url), 200)
+                        self.assertHttpStatus(self.client.get(url, follow=True), 200)
                     finally:
                         # delete the permissions here so that we start from a clean slate on the next loop
                         self.remove_permissions(*required_permissions)

nautobot/core/tests/test_jobs.py

@@ -1060,6 +1060,70 @@ class BulkEditTestCase(TransactionTestCase):
         )
         self.assertEqual(IPAddress.objects.all().count(), IPAddress.objects.filter(status=active_status).count())
 
+    def test_bulk_edit_objects_with_saved_view(self):
+        """
+        Bulk edit Status objects using a SavedView filter.
+        """
+        self.add_permissions("extras.change_status", "extras.view_status")
+        saved_view = SavedView.objects.create(
+            name="Save View for Statuses",
+            owner=self.user,
+            view="extras:status_list",
+            config={"filter_params": {"name__isw": ["A"]}},
+        )
+
+        # Confirm the SavedView filter matches some but not all Statuses
+        self.assertTrue(
+            0 < saved_view.get_filtered_queryset(self.user).count() < Status.objects.exclude(color="aa1409").count()
+        )
+        delta_count = (
+            Status.objects.exclude(color="aa1409").count() - saved_view.get_filtered_queryset(self.user).count()
+        )
+
+        create_job_result_and_run_job(
+            "nautobot.core.jobs.bulk_actions",
+            "BulkEditObjects",
+            username=self.user.username,
+            content_type=self.status_ct.id,
+            edit_all=True,
+            filter_query_params={},
+            pk_list=[],
+            saved_view_id=saved_view.id,
+            form_data={"color": "aa1409", "_all": "True"},
+        )
+
+        self.assertEqual(delta_count, Status.objects.exclude(color="aa1409").count())
+
+    def test_bulk_edit_objects_with_saved_view_with_all_filters_removed(self):
+        """
+        Bulk edit Status objects using a SavedView filter but overwriting the saved field.
+        """
+        self.add_permissions("extras.change_status", "extras.view_status")
+        saved_view = SavedView.objects.create(
+            name="Save View for Statuses",
+            owner=self.user,
+            view="extras:status_list",
+            config={"filter_params": {"name__isw": ["A"]}},
+        )
+
+        self.assertTrue(
+            0 < saved_view.get_filtered_queryset(self.user).count() < Status.objects.exclude(color="aa1409").count()
+        )
+
+        create_job_result_and_run_job(
+            "nautobot.core.jobs.bulk_actions",
+            "BulkEditObjects",
+            username=self.user.username,
+            content_type=self.status_ct.id,
+            edit_all=True,
+            filter_query_params={"all_filters_removed": [True]},
+            pk_list=[],
+            saved_view_id=saved_view.id,
+            form_data={"color": "aa1409", "_all": "True"},
+        )
+
+        self.assertEqual(0, Status.objects.exclude(color="aa1409").count())
+
 
 class BulkDeleteTestCase(TransactionTestCase):
     """
@@ -1099,6 +1163,19 @@ class BulkDeleteTestCase(TransactionTestCase):
             circuit_type=circuit_type,
             status=statuses[0],
         )
+        Circuit.objects.create(
+            cid="Not Circuit",
+            provider=provider,
+            circuit_type=circuit_type,
+            status=statuses[0],
+        )
+
+        self.saved_view = SavedView.objects.create(
+            name="Save View for Circuits",
+            owner=self.user,
+            view="circuits:circuit_list",
+            config={"filter_params": {"cid__isw": "Circuit "}},
+        )
 
     def _common_no_error_test_assertion(self, model, job_result, **filter_params):
         self.assertJobResultStatus(job_result)
@@ -1250,6 +1327,47 @@ class BulkDeleteTestCase(TransactionTestCase):
         )
         self._common_no_error_test_assertion(Role, job_result, name__istartswith="Example Status")
 
+    def test_bulk_delete_objects_with_saved_view(self):
+        """
+        Delete objects using a SavedView filter.
+        """
+        self.add_permissions("circuits.delete_circuit", "circuits.view_circuit")
+
+        # we assert that the saved view filter actually filters some circuits and there are others not filtered out
+        self.assertTrue(0 < self.saved_view.get_filtered_queryset(self.user).count() < Circuit.objects.all().count())
+        create_job_result_and_run_job(
+            "nautobot.core.jobs.bulk_actions",
+            "BulkDeleteObjects",
+            username=self.user.username,
+            content_type=ContentType.objects.get_for_model(Circuit).id,
+            delete_all=True,
+            filter_query_params={},
+            pk_list=[],
+            saved_view_id=self.saved_view.id,
+        )
+        self.assertTrue(Circuit.objects.exists())
+        self.assertFalse(self.saved_view.get_filtered_queryset(self.user).exists())
+
+    def test_bulk_delete_objects_with_saved_view_with_all_filters_removed(self):
+        """
+        Delete Objects using a SavedView filter, but ignore the filter if all_filters_removed is set.
+        """
+        self.add_permissions("circuits.delete_circuit", "circuits.view_circuit")
+
+        # we assert that the saved view filter actually filters some circuits and there are others not filtered out
+        self.assertTrue(0 < self.saved_view.get_filtered_queryset(self.user).count() < Circuit.objects.all().count())
+        create_job_result_and_run_job(
+            "nautobot.core.jobs.bulk_actions",
+            "BulkDeleteObjects",
+            username=self.user.username,
+            content_type=ContentType.objects.get_for_model(Circuit).id,
+            delete_all=True,
+            filter_query_params={"all_filters_removed": [True]},
+            pk_list=[],
+            saved_view_id=self.saved_view.id,
+        )
+        self.assertFalse(Circuit.objects.all().exists())
+
 
 class RefreshDynamicGroupCacheJobButtonReceiverTestCase(TransactionTestCase):
     job_module = "nautobot.core.jobs.groups"