Simplify find_parent_prefix method

Still outstanding:

* IPAddress and IPRange triggers
* Triggers for VRF changes on Prefix
* Triggers for changing to "container" on Prefix
* Rework logic for saving on all models

.github/ISSUE_TEMPLATE/01-feature_request.yaml

@@ -15,7 +15,7 @@ body:
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-      placeholder: v4.5.5
+      placeholder: v4.5.2
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/02-bug_report.yaml

@@ -27,7 +27,7 @@ body:
     attributes:
       label: NetBox Version
       description: What version of NetBox are you currently running?
-      placeholder: v4.5.5
+      placeholder: v4.5.2
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/03-performance.yaml

@@ -8,7 +8,7 @@ body:
     attributes:
       label: NetBox Version
       description: What version of NetBox are you currently running?
-      placeholder: v4.5.5
+      placeholder: v4.5.2
     validations:
       required: true
   - type: dropdown

.github/workflows/ci.yml

@@ -55,13 +55,6 @@ jobs:
     - name: Check out repo
       uses: actions/checkout@v4
 
-    - name: Check Python linting & PEP8 compliance
-      uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6 # v3.6.1
-      with:
-        version: "0.15.2"
-        args: "check --output-format=github"
-        src: "netbox/"
-
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
@@ -89,10 +82,10 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install coverage tblib
+        pip install ruff coverage tblib
 
     - name: Build documentation
-      run: zensical build
+      run: mkdocs build
 
     - name: Collect static files
       run: python netbox/manage.py collectstatic --no-input
@@ -100,6 +93,9 @@ jobs:
     - name: Check for missing migrations
       run: python netbox/manage.py makemigrations --check
 
+    - name: Check PEP8 compliance
+      run: ruff check netbox/
+
     - name: Check UI ESLint, TypeScript, and Prettier Compliance
       run: yarn --cwd netbox/project-static validate
     

.github/workflows/claude-code-review.yml

@@ -1,37 +0,0 @@
-name: Claude Code Review
-
-on:
-  pull_request:
-    types: [opened, synchronize, ready_for_review, reopened]
-
-jobs:
-  claude-review:
-    # Only run for PRs submitted by organization members or owners
-    if: |
-      github.repository == 'netbox-community/netbox' &&
-      (github.event.pull_request.author_association == 'MEMBER' ||
-      github.event.pull_request.author_association == 'OWNER')
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code Review
-        id: claude-review
-        uses: anthropics/claude-code-action@e763fe78de2db7389e04818a00b5ff8ba13d1360 # v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
-          plugins: 'code-review@claude-code-plugins'
-          prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }}'
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://code.claude.com/docs/en/cli-reference for available options

.github/workflows/claude.yml

@@ -1,80 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      # Workaround for claude-code-action bug with fork PRs: The action fetches by branch name
-      # (git fetch origin --depth=N <branch>), but fork PR branches don't exist on origin.
-      # Fix: redirect origin to the fork's URL so the action can fetch the branch directly.
-      - name: Configure git remote for fork PRs
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Determine PR number based on event type
-          if [ "${{ github.event_name }}" = "issue_comment" ]; then
-            PR_NUMBER="${{ github.event.issue.number }}"
-          elif [ "${{ github.event_name }}" = "pull_request_review_comment" ] || [ "${{ github.event_name }}" = "pull_request_review" ]; then
-            PR_NUMBER="${{ github.event.pull_request.number }}"
-          else
-            exit 0  # issues event — no PR branch to worry about
-          fi
-
-          # Fetch fork info in one API call; silently skip if this is not a PR
-          PR_INFO=$(gh pr view "${PR_NUMBER}" --json isCrossRepository,headRepositoryOwner,headRepository 2>/dev/null || echo "")
-          if [ -z "$PR_INFO" ]; then
-            exit 0
-          fi
-
-          IS_FORK=$(echo "$PR_INFO" | jq -r '.isCrossRepository')
-          if [ "$IS_FORK" = "true" ]; then
-            FORK_OWNER=$(echo "$PR_INFO" | jq -r '.headRepositoryOwner.login')
-            FORK_REPO=$(echo "$PR_INFO" | jq -r '.headRepository.name')
-            echo "Fork PR detected from ${FORK_OWNER}/${FORK_REPO}: updating origin to fork URL"
-            git remote set-url origin "https://github.com/${FORK_OWNER}/${FORK_REPO}.git"
-          fi
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@e763fe78de2db7389e04818a00b5ff8ba13d1360 # v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-
-          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
-          # prompt: 'Update the pull request description to include a summary of changes.'
-
-          # Optional: Add claude_args to customize behavior and configuration
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://code.claude.com/docs/en/cli-reference for available options
-          # claude_args: '--allowed-tools Bash(gh pr:*)'
-

.github/workflows/lock-threads.yml

@@ -11,14 +11,14 @@ permissions:
   pull-requests: write
   discussions: write
 
-concurrency:
-  group: lock-threads
-
 jobs:
   lock:
     if: github.repository == 'netbox-community/netbox'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v6.0.0
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
         with:
+          issue-inactive-days: 90
+          pr-inactive-days: 30
           discussion-inactive-days: 180
+          issue-lock-reason: 'resolved'

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.15.2
+  rev: v0.14.1
   hooks:
     - id: ruff
       name: "Ruff linter"
@@ -21,11 +21,11 @@ repos:
       language: system
       pass_filenames: false
       types: [python]
-    - id: zensical-build
+    - id: mkdocs-build
       name: "Build documentation"
-      description: "Build the documentation with Zensical"
+      description: "Build the documentation with mkdocs"
       files: 'docs/'
-      entry: zensical build
+      entry: mkdocs build
       language: system
       pass_filenames: false
     - id: yarn-validate

.readthedocs.yaml

@@ -1,10 +1,10 @@
 version: 2
 build:
-  os: ubuntu-24.04
+  os: ubuntu-22.04
   tools:
     python: "3.12"
-  commands:
-    - pip install -r requirements.txt
-    - python -m zensical build --config-file mkdocs.yml
-    - mkdir -p $READTHEDOCS_OUTPUT/html/
-    - cp -r netbox/project-static/docs/* $READTHEDOCS_OUTPUT/html/
+mkdocs:
+  configuration: mkdocs.yml
+python:
+   install:
+   - requirements: requirements.txt

CLAUDE.md

@@ -1,84 +0,0 @@
-# NetBox
-
-Network source-of-truth and infrastructure resource modeling (IRM) tool combining DCIM and IPAM. Built on Django + PostgreSQL + Redis.
-
-## Tech Stack
-- Python 3.12+ / Django / Django REST Framework
-- PostgreSQL (required), Redis (required for caching/queuing)
-- GraphQL via Strawberry, background jobs via RQ
-- Docs: MkDocs (in `docs/`)
-
-## Repository Layout
-- `netbox/` — Django project root; run all `manage.py` commands from here
-- `netbox/netbox/` — Core settings, URLs, WSGI entrypoint
-- `netbox/<app>/` — Django apps: `circuits`, `core`, `dcim`, `ipam`, `extras`, `tenancy`, `virtualization`, `wireless`, `users`, `vpn`
-- `docs/` — MkDocs documentation source
-- `contrib/` — Example configs (systemd, nginx, etc.) and other resources
-
-## Development Setup
-```bash
-python -m venv ~/.venv/netbox
-source ~/.venv/netbox/bin/activate
-pip install -r requirements.txt
-
-# Copy and configure
-cp netbox/netbox/configuration.example.py netbox/netbox/configuration.py
-# Edit configuration.py: set DATABASE, REDIS, SECRET_KEY, ALLOWED_HOSTS
-
-cd netbox/
-python manage.py migrate
-python manage.py runserver
-```
-
-## Key Commands
-All commands run from the `netbox/` subdirectory with venv active.
-
-```bash
-# Development server
-python manage.py runserver
-
-# Run full test suite
-export NETBOX_CONFIGURATION=netbox.configuration_testing
-python manage.py test
-
-# Faster test runs (no DB rebuild, parallel)
-python manage.py test --keepdb --parallel 4
-
-# Migrations
-python manage.py makemigrations
-python manage.py migrate
-
-# Shell
-python manage.py nbshell   # NetBox-enhanced shell
-```
-
-## Architecture Conventions
-- **Apps**: Each Django app owns its models, views, API serializers, filtersets, forms, and tests.
-- **REST API**: DRF serializers live in `<app>/api/serializers.py`; viewsets in `<app>/api/views.py`; URLs auto-registered in `<app>/api/urls.py`.
-- **GraphQL**: Strawberry types in `<app>/graphql/types.py`.
-- **Filtersets**: `<app>/filtersets.py` — used for both UI filtering and API `?filter=` params.
-- **Tables**: `django-tables2` used for all object list views (`<app>/tables.py`).
-- **Templates**: Django templates in `netbox/templates/<app>/`.
-- **Tests**: Mirror the app structure in `<app>/tests/`. Use `netbox.configuration_testing` for test config.
-
-## Coding Standards
-- Follow existing Django conventions; don't reinvent patterns already present in the codebase.
-- New models must include `created`, `last_updated` fields (inherit from `NetBoxModel` where appropriate).
-- Every model exposed in the UI needs: model, serializer, filterset, form, table, views, URL route, and tests.
-- API serializers must include a `url` field (absolute URL of the object).
-- Use `FeatureQuery` for generic relations (config contexts, custom fields, tags, etc.).
-- Avoid adding new dependencies without strong justification.
-
-## Branch & PR Conventions
-- Branch naming: `<issue-number>-short-description` (e.g., `1234-device-typerror`)
-- Use the `main` branch for patch releases; `feature` tracks work for the upcoming minor/major release.
-- Every PR must reference an approved GitHub issue.
-- PRs must include tests for new functionality.
-
-## Gotchas
-- `configuration.py` is gitignored — never commit it.
-- `manage.py` lives in `netbox/`, NOT the repo root. Running from the wrong directory is a common mistake.
-- `NETBOX_CONFIGURATION` env var controls which settings module loads; set to `netbox.configuration_testing` for tests.
-- The `extras` app is a catch-all for cross-cutting features (custom fields, tags, webhooks, scripts).
-- Plugins API: only documented public APIs are stable. Internal NetBox code is subject to change without notice.
-- See `docs/development/` for the full contributing guide and code style details.

CONTRIBUTING.md

@@ -84,8 +84,6 @@ intake policy](https://github.com/netbox-community/netbox/wiki/Issue-Intake-Poli
 
 * It's very important that you not submit a pull request until a relevant issue has been opened **and** assigned to you. Otherwise, you risk wasting time on work that may ultimately not be needed.
 
-* Community members are limited to a maximum of **three open PRs** at any time. This is to avoid the accumulation of too much parallel work and maintain focus on already PRs under review. If you already have three NetBox PRs open, please wait for at least one of them to be merged (or closed) before opening another.
-
 * New pull requests should generally be based off of the `main` branch. This branch, in keeping with the [trunk-based development](https://trunkbaseddevelopment.com/) approach, is used for ongoing development and bug fixes and always represents the newest stable code, from which releases are periodically branched. (If you're developing for an upcoming minor release, use `feature` instead.)
 
 * In most cases, it is not necessary to add a changelog entry: A maintainer will take care of this when the PR is merged. (This helps avoid merge conflicts resulting from multiple PRs being submitted simultaneously.)
@@ -98,10 +96,10 @@ intake policy](https://github.com/netbox-community/netbox/wiki/Issue-Intake-Poli
       greater than 80 characters in length
 
 > [!CAUTION]
-> Any contributions which include solely AI-generated or reproduced content will be rejected. All PRs must be submitted by a human.
+> Any contributions which include AI-generated or reproduced content will be rejected.
 
 * Some other tips to keep in mind:
-  * If you'd like to volunteer for someone else's issue, please post a comment on that issue letting us know. (GitHub allows only people who have commented on an issue to be assigned as its owner.)
+  * If you'd like to volunteer for someone else's issue, please post a comment on that issue letting us know. (This will allow the maintainers to assign it to you.)
   * Check out our [developer docs](https://docs.netbox.dev/en/stable/development/getting-started/) for tips on setting up your development environment.
   * All new functionality must include relevant tests where applicable.
 

base_requirements.txt

@@ -4,7 +4,7 @@ colorama
 
 # The Python web framework on which NetBox is built
 # https://docs.djangoproject.com/en/stable/releases/
-Django==6.0.*
+Django==5.2.*
 
 # Django middleware which permits cross-domain API requests
 # https://github.com/adamchainz/django-cors-headers/blob/main/CHANGELOG.rst
@@ -27,17 +27,22 @@ django-graphiql-debug-toolbar
 django-htmx
 
 # Modified Preorder Tree Traversal (recursive nesting of objects)
-django-mptt
+# https://github.com/django-mptt/django-mptt/blob/main/CHANGELOG.rst
+# v0.18.0 introduces errant migrations which need to be resolved
+django-mptt==0.17.0
 
 # Context managers for PostgreSQL advisory locks
 # https://github.com/Xof/django-pglocks/blob/master/CHANGES.txt
 django-pglocks
 
+
+# Manager for managing PostgreSQL triggers
+# https://github.com/AmbitionEng/django-pgtrigger/blob/main/CHANGELOG.md
+django-pgtrigger
+
 # Prometheus metrics library for Django
 # https://github.com/korfuri/django-prometheus/blob/master/CHANGELOG.md
-# TODO: 2.4.1 is incompatible with Django>=6.0, but a fixed release is expected
-# https://github.com/django-commons/django-prometheus/issues/494
-django-prometheus>=2.4.0,<2.5.0,!=2.4.1
+django-prometheus
 
 # Django caching backend using Redis
 # https://github.com/jazzband/django-redis/blob/master/CHANGELOG.rst
@@ -49,8 +54,7 @@ django-rich
 
 # Django integration for RQ (Reqis queuing)
 # https://github.com/rq/django-rq/blob/master/CHANGELOG.md
-# See https://github.com/netbox-community/netbox/issues/21696
-django-rq<4.0
+django-rq
 
 # Provides a variety of storage backends
 # https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst
@@ -174,7 +178,3 @@ tablib
 # Timezone data (required by django-timezone-field on Python 3.9+)
 # https://github.com/python/tzdata/blob/master/NEWS.md
 tzdata
-
-# Documentation builder (succeeds mkdocs)
-# https://github.com/zensical/zensical
-zensical

contrib/generated_schema.json

@@ -349,7 +349,6 @@
                         "5gbase-t",
                         "10gbase-br-d",
                         "10gbase-br-u",
-                        "10gbase-cu",
                         "10gbase-cx4",
                         "10gbase-er",
                         "10gbase-lr",
@@ -368,7 +367,6 @@
                         "40gbase-fr4",
                         "40gbase-lr4",
                         "40gbase-sr4",
-                        "40gbase-sr4-bd",
                         "50gbase-cr",
                         "50gbase-er",
                         "50gbase-fr",

docs/_theme/partials/copyright.html

@@ -0,0 +1,18 @@
+<div class="md-copyright">
+  {% if config.copyright %}
+    <div class="md-copyright__highlight">
+      {{ config.copyright }}
+    </div>
+  {% endif %}
+  {% if not config.extra.generator == false %}
+    Made with
+    <a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener">
+      Material for MkDocs
+    </a>
+  {% endif %}
+</div>
+{% if not config.extra.build_public %}
+  <div class="md-copyright">
+    ℹ️ Documentation is being served locally
+  </div>
+{% endif %}

docs/configuration/index.md

@@ -21,7 +21,6 @@ Some configuration parameters are primarily controlled via NetBox's admin interf
 * [`BANNER_BOTTOM`](./miscellaneous.md#banner_bottom)
 * [`BANNER_LOGIN`](./miscellaneous.md#banner_login)
 * [`BANNER_TOP`](./miscellaneous.md#banner_top)
-* [`CHANGELOG_RETAIN_CREATE_LAST_UPDATE`](./miscellaneous.md#changelog_retain_create_last_update)
 * [`CHANGELOG_RETENTION`](./miscellaneous.md#changelog_retention)
 * [`CUSTOM_VALIDATORS`](./data-validation.md#custom_validators)
 * [`DEFAULT_USER_PREFERENCES`](./default-values.md#default_user_preferences)

docs/configuration/miscellaneous.md

@@ -73,27 +73,6 @@ This data enables the project maintainers to estimate how many NetBox deployment
 
 ---
 
-## CHANGELOG_RETAIN_CREATE_LAST_UPDATE
-
-!!! tip "Dynamic Configuration Parameter"
-
-Default: `True`
-
-When pruning expired changelog entries (per `CHANGELOG_RETENTION`), retain each non-deleted object's original `create`
-change record and its most recent `update` change record. If an object has a `delete` change record, its changelog
-entries are pruned normally according to `CHANGELOG_RETENTION`.
-
-!!! note
-    For objects without a `delete` change record, the original `create` record and most recent `update` record are
-    exempt from pruning. All other changelog records (including intermediate `update` records and all `delete` records)
-    remain subject to pruning per `CHANGELOG_RETENTION`.
-
-!!! warning
-    This setting is enabled by default. Upgrading deployments that rely on complete pruning of expired changelog entries
-    should explicitly set `CHANGELOG_RETAIN_CREATE_LAST_UPDATE = False` to preserve the previous behavior.
-
----
-
 ## CHANGELOG_RETENTION
 
 !!! tip "Dynamic Configuration Parameter"

docs/configuration/required-parameters.md

@@ -200,48 +200,6 @@ REDIS = {
 !!! note
     It is permissible to use Sentinel for only one database and not the other.
 
-### SSL Configuration
-
-If you need to configure SSL/TLS for Redis beyond the basic `SSL`, `CA_CERT_PATH`, and `INSECURE_SKIP_TLS_VERIFY` options (for example, client certificates, a specific TLS version, or custom ciphers), you can pass additional parameters via the `KWARGS` key in either the `tasks` or `caching` subsection.
-
-NetBox already maps `CA_CERT_PATH` to `ssl_ca_certs` and (for caching) `INSECURE_SKIP_TLS_VERIFY` to `ssl_cert_reqs`; only add `KWARGS` when you need to override or extend those settings (for example, to supply client certificates or restrict TLS version or ciphers).
-
-* `KWARGS` - Optional dictionary of additional SSL/TLS (or other) parameters passed to the Redis client. These are passed directly to the underlying Redis client: for `tasks` to [redis-py](https://redis-py.readthedocs.io/en/stable/connections.html), and for `caching` to the [django-redis](https://github.com/jazzband/django-redis#configure-as-cache-backend) connection pool.
-
-Example:
-
-```python
-REDIS = {
-    'tasks': {
-        'HOST': 'redis.example.com',
-        'PORT': 1234,
-        'SSL': True,
-        'CA_CERT_PATH': '/etc/ssl/certs/ca.crt',
-        'KWARGS': {
-            'ssl_certfile': '/path/to/client-cert.pem',
-            'ssl_keyfile': '/path/to/client-key.pem',
-            'ssl_min_version': ssl.TLSVersion.TLSv1_2,
-            'ssl_ciphers': 'HIGH:!aNULL',
-        },
-    },
-    'caching': {
-        'HOST': 'redis.example.com',
-        'PORT': 1234,
-        'SSL': True,
-        'CA_CERT_PATH': '/etc/ssl/certs/ca.crt',
-        'KWARGS': {
-            'ssl_certfile': '/path/to/client-cert.pem',
-            'ssl_keyfile': '/path/to/client-key.pem',
-            'ssl_min_version': ssl.TLSVersion.TLSv1_2,
-            'ssl_ciphers': 'HIGH:!aNULL',
-        },
-    }
-}
-```
-
-!!! note
-    If you use `ssl.TLSVersion` in your configuration (e.g. `ssl_min_version`), add `import ssl` at the top of your configuration file.
-
 ---
 
 ## SECRET_KEY

docs/customization/custom-scripts.md

@@ -18,8 +18,7 @@ They can also be used as a mechanism for validating the integrity of data within
 Custom scripts are Python code which exists outside the NetBox code base, so they can be updated and changed without interfering with the core NetBox installation. And because they're completely custom, there is no inherent limitation on what a script can accomplish.
 
 !!! danger "Only install trusted scripts"
-    Custom scripts have unrestricted access to change anything in the database and are inherently unsafe and should only be installed and run from trusted sources.  You should also review and set permissions for who can run scripts if the script can modify any data.
-
+    Custom scripts have unrestricted access to change anything in the databse and are inherently unsafe and should only be installed and run from trusted sources.  You should also review and set permissions for who can run scripts if the script can modify any data.
 
 ## Writing Custom Scripts
 
@@ -215,7 +214,6 @@ if obj.pk and hasattr(obj, 'snapshot'):
     obj.snapshot()
 
 obj.property = "New Value"
-obj._changelog_message = 'Example Message Text' # Optional
 obj.full_clean()
 obj.save()
 ```

docs/development/getting-started.md

@@ -97,7 +97,7 @@ NetBox uses [`pre-commit`](https://pre-commit.com/) to automatically validate co
 * Run the `ruff` Python linter
 * Run Django's internal system check
 * Check for missing database migrations
-* Validate any changes to the documentation with `zensical`
+* Validate any changes to the documentation with `mkdocs`
 * Validate Typescript & Sass styling with `yarn`
 * Ensure that any modified static front end assets have been recompiled
 

docs/development/models.md

@@ -45,7 +45,6 @@ These are considered the "core" application models which are used to model netwo
 * [core.DataSource](../models/core/datasource.md)
 * [core.Job](../models/core/job.md)
 * [dcim.Cable](../models/dcim/cable.md)
-* [dcim.CableBundle](../models/dcim/cablebundle.md)
 * [dcim.Device](../models/dcim/device.md)
 * [dcim.DeviceType](../models/dcim/devicetype.md)
 * [dcim.Module](../models/dcim/module.md)

docs/development/release-checklist.md

@@ -47,7 +47,7 @@ If a new Django release is adopted or other major dependencies (Python, PostgreS
 Start the documentation server and navigate to the current version of the installation docs:
 
 ```no-highlight
-zensical serve
+mkdocs serve
 ```
 
 Follow these instructions to perform a new installation of NetBox in a temporary environment. This process must not be automated: The goal of this step is to catch any errors or omissions in the documentation and ensure that it is kept up to date for each release. Make any necessary changes to the documentation before proceeding with the release.
@@ -168,14 +168,6 @@ Update the static OpenAPI schema definition at `contrib/openapi.json` with the m
 ./manage.py spectacular --format openapi-json > ../contrib/openapi.json
 ```
 
-### Update Development Dependencies
-
-Keep development tooling versions consistent across the project. If you upgrade a dev-only dependency, update all places where it’s pinned so local tooling and CI run the same versions.
-
-* Ruff:
-  * `.pre-commit-config.yaml`
-  * `.github/workflows/ci.yml`
-
 ### Submit a Pull Request
 
 Commit the above changes and submit a pull request titled **"Release vX.Y.Z"** to merge the current release branch (e.g. `release-vX.Y.Z`) into `main`. Copy the documented release notes into the pull request's body.

docs/development/style-guide.md

@@ -34,8 +34,7 @@ The following rules are ignored when linting.
 
 ##### [E501](https://docs.astral.sh/ruff/rules/line-too-long/): Line too long
 
-NetBox enforces a maximum line length of 120 characters for Python code using Ruff (E501).
-The maximum length does not apply to HTML templates or to automatically generated code (e.g. database migrations).
+NetBox does not enforce a hard restriction on line length, although a maximum length of 120 characters is strongly encouraged for Python code where possible. The maximum length does not apply to HTML templates or to automatically generated code (e.g. database migrations).
 
 ##### [F403](https://docs.astral.sh/ruff/rules/undefined-local-with-import-star/): Undefined local with import star
 
@@ -48,14 +47,6 @@ Wildcard imports (for example, `from .constants import *`) are acceptable under
 
 The justification for ignoring this rule is the same as F403 above.
 
-##### [RET504](https://docs.astral.sh/ruff/rules/unnecessary-assign/): Unnecessary assign
-
-There are multiple instances where it is more readable and clearer to first assign to a variable and then return it.
-
-##### [UP032](https://docs.astral.sh/ruff/rules/f-string/): f-string
-
-For localizable strings, it is necessary to not use the `f-string` syntax, as Django's translation functions (e.g. `gettext_lazy`) require plain string literals.
-
 ### Introducing New Dependencies
 
 The introduction of a new dependency is best avoided unless it is absolutely necessary. For small features, it's generally preferable to replicate functionality within the NetBox code base rather than to introduce reliance on an external project. This reduces both the burden of tracking new releases and our exposure to outside bugs and supply chain attacks.

docs/extra.css

@@ -5,6 +5,10 @@ img {
     margin-right: auto;
 }
 
+.md-content img {
+    background-color: rgba(255, 255, 255, 0.64);
+}
+
 /* Tables */
 table {
     margin-bottom: 24px;

docs/features/virtualization.md

@@ -1,19 +1,17 @@
 # Virtualization
 
-Virtual machines, clusters, and standalone hypervisors can be modeled in NetBox alongside physical infrastructure. IP addresses and other resources are assigned to these objects just like physical objects, providing a seamless integration between physical and virtual networks.
+Virtual machines and clusters can be modeled in NetBox alongside physical infrastructure. IP addresses and other resources are assigned to these objects just like physical objects, providing a seamless integration between physical and virtual networks.
 
 ```mermaid
 flowchart TD
     ClusterGroup & ClusterType --> Cluster
     Cluster --> VirtualMachine
-    Device --> VirtualMachine
     Platform --> VirtualMachine
     VirtualMachine --> VMInterface
 
 click Cluster "../../models/virtualization/cluster/"
 click ClusterGroup "../../models/virtualization/clustergroup/"
 click ClusterType "../../models/virtualization/clustertype/"
-click Device "../../models/dcim/device/"
 click Platform "../../models/dcim/platform/"
 click VirtualMachine "../../models/virtualization/virtualmachine/"
 click VMInterface "../../models/virtualization/vminterface/"
@@ -25,10 +23,4 @@ A cluster is one or more physical host devices on which virtual machines can run
 
 ## Virtual Machines
 
-A virtual machine is a virtualized compute instance. These behave in NetBox very similarly to device objects, but without any physical attributes. For example, a VM may have interfaces assigned to it with IP addresses and VLANs, however its interfaces cannot be connected via cables (because they are virtual). Each VM may define its compute, memory, and storage resources as well.
-
-A VM can be placed in one of three ways:
-
-- Assigned to a site alone for logical grouping.
-- Assigned to a cluster and optionally pinned to a specific host device within that cluster.
-- Assigned directly to a standalone device that does not belong to any cluster.
+A virtual machine is a virtualized compute instance. These behave in NetBox very similarly to device objects, but without any physical attributes. For example, a VM may have interfaces assigned to it with IP addresses and VLANs, however its interfaces cannot be connected via cables (because they are virtual). Each VM may also define its compute, memory, and storage resources as well.

docs/integrations/rest-api.md

@@ -341,7 +341,7 @@ When retrieving devices and virtual machines via the REST API, each will include
 
 ## Pagination
 
-API responses which contain a list of many objects will be paginated for efficiency. NetBox employs offset-based pagination by default, which forms a page by skipping the number of objects indicated by the `offset` URL parameter. The root JSON object returned by a list endpoint contains the following attributes:
+API responses which contain a list of many objects will be paginated for efficiency. The root JSON object returned by a list endpoint contains the following attributes:
 
 * `count`: The total number of all objects matching the query
 * `next`: A hyperlink to the next page of results (if applicable)
@@ -398,49 +398,6 @@ The maximum number of objects that can be returned is limited by the [`MAX_PAGE_
 !!! warning
     Disabling the page size limit introduces a potential for very resource-intensive requests, since one API request can effectively retrieve an entire table from the database.
 
-### Cursor-Based Pagination
-
-For large datasets, offset-based pagination can become inefficient because the database must scan all rows up to the offset. As an alternative, cursor-based pagination uses the `start` query parameter to filter results by primary key (PK), enabling efficient keyset pagination.
-
-To use cursor-based pagination, pass `start` (the minimum PK value) and `limit` (the page size):
-
-```
-http://netbox/api/dcim/devices/?start=0&limit=100
-```
-
-This returns objects with an `id` greater than or equal to zero, ordered by PK, limited to 100 results. Below is an example showing an arbitrary `start` value.
-
-```json
-{
-    "count": null,
-    "next": "http://netbox/api/dcim/devices/?start=356&limit=100",
-    "previous": null,
-    "results": [
-        {
-            "id": 109,
-            "name": "dist-router07",
-            ...
-        },
-        ...
-        {
-            "id": 356,
-            "name": "acc-switch492",
-            ...
-        }
-    ]
-}
-```
-
-To iterate through all results, use the `id` of the last object in each response plus one as the `start` value for the next request. Continue until `next` is null.
-
-!!! info
-    Some important differences from offset-based pagination:
-
-    * `start` and `offset` are **mutually exclusive**; specifying both will result in a 400 error.
-    * Results are always ordered by primary key when using `start`. This is required to ensure deterministic behavior.
-    * `count` is always `null` in cursor mode, as counting all matching rows would partially negate its performance benefit.
-    * `previous` is always `null`: cursor-based pagination supports only forward navigation.
-
 ## Interacting with Objects
 
 ### Retrieving Multiple Objects

docs/integrations/webhooks.md

@@ -23,19 +23,14 @@ For example, you might create a NetBox webhook to [trigger a Slack message](http
 
 The following data is available as context for Jinja2 templates:
 
-* `event` - The type of event which triggered the webhook: `created`, `updated`, or `deleted`.
+* `event` - The type of event which triggered the webhook: created, updated, or deleted.
+* `model` - The NetBox model which triggered the change.
 * `timestamp` - The time at which the event occurred (in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) format).
-* `object_type` - The NetBox model which triggered the change in the form `app_label.model_name`.
 * `username` - The name of the user account associated with the change.
 * `request_id` - The unique request ID. This may be used to correlate multiple changes associated with a single request.
 * `data` - A detailed representation of the object in its current state. This is typically equivalent to the model's representation in NetBox's REST API.
 * `snapshots` - Minimal "snapshots" of the object state both before and after the change was made; provided as a dictionary with keys named `prechange` and `postchange`. These are not as extensive as the fully serialized representation, but contain enough information to convey what has changed.
 
-!!! warning "Deprecation of legacy fields"
-    The "request_id" and "username" fields in the webhook payload above are deprecated and should no longer be used. Support for them will be removed in NetBox v4.7.0.
-
-    Use `request.user.username` and `request.request_id` from the `request` object included in the callback context instead.
-
 ### Default Request Body
 
 If no body template is specified, the request body will be populated with a JSON object containing the context data. For example, a newly created site might appear as follows:
@@ -43,20 +38,18 @@ If no body template is specified, the request body will be populated with a JSON
 ```json
 {
     "event": "created",
-    "timestamp": "2026-03-06T15:11:23.503186+00:00",
-    "object_type": "dcim.site",
+    "timestamp": "2021-03-09 17:55:33.968016+00:00",
+    "model": "site",
     "username": "jstretch",
-    "request_id": "17af32f0-852a-46ca-a7d4-33ecd0c13de6",
+    "request_id": "fdbca812-3142-4783-b364-2e2bd5c16c6a",
     "data": {
-        "id": 4,
-        "url": "/api/dcim/sites/4/",
-        "display_url": "/dcim/sites/4/",
-        "display": "Site 1",
+        "id": 19,
         "name": "Site 1",
         "slug": "site-1",
-        "status": {
+        "status": 
             "value": "active",
-            "label": "Active"
+            "label": "Active",
+            "id": 1
         },
         "region": null,
         ...
@@ -64,10 +57,8 @@ If no body template is specified, the request body will be populated with a JSON
     "snapshots": {
         "prechange": null,
         "postchange": {
-            "created": "2026-03-06T15:11:23.484Z",
-            "owner": null,
-            "description": "",
-            "comments": "",
+            "created": "2021-03-09",
+            "last_updated": "2021-03-09T17:55:33.851Z",
             "name": "Site 1",
             "slug": "site-1",
             "status": "active",

docs/models/core/datasource.md

@@ -36,16 +36,13 @@ If false, synchronization will be disabled.
 
 ### Ignore Rules
 
-A set of rules (one per line) identifying files or paths to ignore during synchronization. Rules are matched against both the full relative path (e.g. `subdir/file.txt`) and the bare filename, so path-based patterns can be used to exclude entire directories. Some examples are provided below. See Python's [`fnmatch()` documentation](https://docs.python.org/3/library/fnmatch.html) for a complete reference.
+A set of rules (one per line) identifying filenames to ignore during synchronization. Some examples are provided below. See Python's [`fnmatch()` documentation](https://docs.python.org/3/library/fnmatch.html) for a complete reference.
 
-| Rule                  | Description                                          |
-|-----------------------|------------------------------------------------------|
-| `README`              | Ignore any files named `README`                      |
-| `*.txt`               | Ignore any files with a `.txt` extension             |
-| `data???.json`        | Ignore e.g. `data123.json`                           |
-| `subdir/*`            | Ignore all files within `subdir/`                    |
-| `subdir/*/*`          | Ignore all files one level deep within `subdir/`     |
-| `*/dev/*`             | Ignore files inside any directory named `dev/`       |
+| Rule           | Description                              |
+|----------------|------------------------------------------|
+| `README`       | Ignore any files named `README`          |
+| `*.txt`        | Ignore any files with a `.txt` extension |
+| `data???.json` | Ignore e.g. `data123.json`               |
 
 ### Sync Interval
 

docs/models/dcim/cablebundle.md

@@ -1,15 +0,0 @@
-# Cable Bundles
-
-A cable bundle is a logical grouping of individual [cables](./cable.md). Bundles can be used to organize cables that share a common purpose, route, or physical grouping (such as a conduit or harness).
-
-Assigning cables to a bundle is optional and does not affect cable tracing or connectivity. Bundles persist independently of their member cables: deleting a cable clears its bundle assignment but does not delete the bundle itself.
-
-## Fields
-
-### Name
-
-A unique name for the cable bundle.
-
-### Description
-
-A brief description of the bundle's purpose or contents.

docs/models/dcim/devicebay.md

@@ -23,8 +23,3 @@ The device bay's name. Must be unique to the parent device.
 ### Label
 
 An alternative physical label identifying the device bay.
-
-### Enabled
-
-Whether this device bay is enabled. Disabled device bays are not available for installation.
-

docs/models/dcim/devicetype.md

@@ -7,18 +7,6 @@ Device types are instantiated as devices installed within sites and/or equipment
 !!! note
     This parent/child relationship is **not** suitable for modeling chassis-based devices, wherein child members share a common control plane. Instead, line cards and similarly non-autonomous hardware should be modeled as modules or inventory items within a device.
 
-## Automatic Component Renaming
-
-When adding component templates to a device type, the string `{vc_position}` can be used in component template names to reference the
-`vc_position` field of the device being provisioned, when that device is a member of a Virtual Chassis.
-
-For example, an interface template named `Gi{vc_position}/0/0` installed on a Virtual Chassis
-member with position `2` will be rendered as `Gi2/0/0`.
-
-If the device is not a member of a Virtual Chassis, `{vc_position}` defaults to `0`. A custom
-fallback value can be specified using the syntax `{vc_position:X}`, where `X` is the desired default.
-For example, `{vc_position:1}` will render as `1` when no Virtual Chassis position is set.
-
 ## Fields
 
 ### Manufacturer

docs/models/dcim/modulebay.md

@@ -1,6 +1,6 @@
 # Module Bays
 
-Module bays represent a space or slot within a device in which a field-replaceable [module](./module.md) may be installed. A common example is that of a chassis-based switch such as the Cisco Nexus 9000 or Juniper EX9200. Modules, in turn, hold additional components that become available to the parent device.
+Module bays represent a space or slot within a device in which a field-replaceable [module](./module.md) may be installed. A common example is that of a chassis-based switch such as the Cisco Nexus 9000 or Juniper EX9200. Modules in turn hold additional components that become available to the parent device.
 
 !!! note
     If you need to model child devices rather than modules, use a [device bay](./devicebay.md) instead.
@@ -29,8 +29,3 @@ An alternative physical label identifying the module bay.
 ### Position
 
 The numeric position in which this module bay is situated. For example, this would be the number assigned to a slot within a chassis-based switch.
-
-### Enabled
-
-Whether this module bay is enabled. Disabled module bays are not available for installation.
-

docs/models/dcim/moduletype.md

@@ -20,16 +20,6 @@ When adding component templates to a module type, the string `{module}` can be u
 
 For example, you can create a module type with interface templates named `Gi{module}/0/[1-48]`. When a new module of this type is "installed" to a module bay with a position of "3", NetBox will automatically name these interfaces `Gi3/0/[1-48]`.
 
-Similarly, the string `{vc_position}` can be used in component template names to reference the
-`vc_position` field of the device being provisioned, when that device is a member of a Virtual Chassis.
-
-For example, an interface template named `Gi{vc_position}/{module}/0` installed on a Virtual Chassis
-member with position `2` and module bay position `3` will be rendered as `Gi2/3/0`.
-
-If the device is not a member of a Virtual Chassis, `{vc_position}` defaults to `0`. A custom
-fallback value can be specified using the syntax `{vc_position:X}`, where `X` is the desired default.
-For example, `{vc_position:1}` will render as `1` when no Virtual Chassis position is set.
-
 Automatic renaming is supported for all modular component types (those listed above).
 
 ## Fields

docs/models/dcim/rack.md

@@ -1,6 +1,6 @@
 # Racks
 
-The rack model represents a physical two- or four-post equipment rack in which [devices](./device.md) can be installed. Each rack must be assigned to a [site](./site.md), and may optionally be assigned to a [location](./location.md) within that site. Racks can also be organized by user-defined functional roles or by [rack groups](./rackgroup.md). The name and facility ID of each rack within a location must be unique.
+The rack model represents a physical two- or four-post equipment rack in which [devices](./device.md) can be installed. Each rack must be assigned to a [site](./site.md), and may optionally be assigned to a [location](./location.md) within that site. Racks can also be organized by user-defined functional roles. The name and facility ID of each rack within a location must be unique.
 
 Rack height is measured in *rack units* (U); racks are commonly between 42U and 48U tall, but NetBox allows you to define racks of arbitrary height. A toggle is provided to indicate whether rack units are in ascending (from the ground up) or descending order.
 
@@ -16,10 +16,6 @@ The [site](./site.md) to which the rack is assigned.
 
 The [location](./location.md) within a site where the rack has been installed (optional).
 
-### Rack Group
-
-The [group](./rackgroup.md) used to organize racks by physical placement (optional).
-
 ### Name
 
 The rack's name or identifier. Must be unique to the rack's location, if assigned.

docs/models/dcim/rackgroup.md

@@ -1,15 +0,0 @@
-# Rack Groups
-
-Racks can optionally be assigned to rack groups to reflect their physical placement. Rack groups provide a secondary means of categorization alongside [locations](./location.md), which is particularly useful for datacenter operators who need to group racks by row, aisle, or similar physical arrangement while keeping them assigned to the same location, such as a cage or room. Rack groups are flat and do not form a hierarchy.
-
-Rack groups can also be used to scope [VLAN groups](../ipam/vlangroup.md), which can help model L2 domains spanning rows or pairs of racks.
-
-## Fields
-
-### Name
-
-A unique human-friendly name.
-
-### Slug
-
-A unique URL-friendly identifier. (This value can be used for filtering.)

docs/models/dcim/rackreservation.md

@@ -12,10 +12,6 @@ The [rack](./rack.md) being reserved.
 
 The rack unit or units being reserved. Multiple units can be expressed using commas and/or hyphens. For example, `1,3,5-7` specifies units 1, 3, 5, 6, and 7.
 
-### Total U's
-
-A calculated (read-only) field that reflects the total number of units in the reservation. Can be filtered upon using `unit_count_min` and `unit_count_max` parameters in the UI or API.
-
 ### Status
 
 The current status of the reservation. (This is for documentation only: The status of a reservation has no impact on the installation of devices within a reserved rack unit.)

docs/models/extras/webhook.md

@@ -77,17 +77,14 @@ The file path to a particular certificate authority (CA) file to use when valida
 
 ## Context Data
 
-The following context variables are available to the text and link templates.
+The following context variables are available in to the text and link templates.
 
-| Variable      | Description                                          |
-|---------------|------------------------------------------------------|
-| `event`       | The event type (`create`, `update`, or `delete`)     |
-| `timestamp`   | The time at which the event occurred                 |
-| `object_type` | The type of object impacted (`app_label.model_name`) |
-| `username`    | The name of the user associated with the change      |
-| `request_id`  | The unique request ID                                |
-| `data`        | A complete serialized representation of the object   |
-| `snapshots`   | Pre- and post-change snapshots of the object         |
-
-!!! warning "Deprecation of legacy fields"
-    The `request_id` and `username` fields in the webhook payload above are deprecated and should no longer be used. Support for them will be removed in NetBox v4.7.0. Use `request.user` and `request.id` from the `request` object included in the callback context instead. (Note that `request` is populated in the context only when the webhook is associated with a triggering request.)
+| Variable     | Description                                        |
+|--------------|----------------------------------------------------|
+| `event`      | The event type (`create`, `update`, or `delete`)   |
+| `timestamp`  | The time at which the event occured                |
+| `model`      | The type of object impacted                        |
+| `username`   | The name of the user associated with the change    |
+| `request_id` | The unique request ID                              |
+| `data`       | A complete serialized representation of the object |
+| `snapshots`  | Pre- and post-change snapshots of the object       |

docs/models/ipam/asn.md

@@ -14,10 +14,6 @@ The 16- or 32-bit AS number.
 
 The [Regional Internet Registry](./rir.md) or similar authority responsible for the allocation of this particular ASN.
 
-### Role
-
-The user-defined functional [role](./role.md) assigned to this ASN.
-
 ### Sites
 
 The [site(s)](../dcim/site.md) to which this ASN is assigned.

docs/models/ipam/vlangroup.md

@@ -18,10 +18,6 @@ A unique URL-friendly identifier. (This value can be used for filtering.)
 
 The set of VLAN IDs which are encompassed by the group. By default, this will be the entire range of valid IEEE 802.1Q VLAN IDs (1 to 4094, inclusive). VLANs created within a group must have a VID that falls within one of these ranges. Ranges may not overlap.
 
-### Total VLAN IDs
-
-A read-only integer indicating the total count of VLAN IDs available within the group, calculated from the configured VLAN ID Ranges. For example, a group with ranges `100-199` and `300-399` would have a total of 200 VLAN IDs. This value is automatically computed and updated whenever the VLAN ID ranges are modified.
-
 ### Scope
 
 The domain covered by a VLAN group, defined as one of the supported object types. This conveys the context in which a VLAN group applies.

docs/models/virtualization/virtualmachine.md

@@ -1,21 +1,18 @@
 # Virtual Machines
 
-A virtual machine (VM) represents a virtual compute instance hosted within a cluster or directly on a device. Each VM must be assigned to at least one of: a [site](../dcim/site.md), a [cluster](./cluster.md), or a [device](../dcim/device.md).
+A virtual machine (VM) represents a virtual compute instance hosted within a [cluster](./cluster.md). Each VM must be assigned to a [site](../dcim/site.md) and/or cluster, and may optionally be assigned to a particular host [device](../dcim/device.md) within a cluster.
 
-Virtual machines may have virtual [interfaces](./vminterface.md) assigned to them, but do not support any physical component. When a VM has one or more interfaces with IP addresses assigned, a primary IP for the VM can be designated, for both IPv4 and IPv6.
+Virtual machines may have virtual [interfaces](./vminterface.md) assigned to them, but do not support any physical component. When a VM has one or more interfaces with IP addresses assigned, a primary IP for the device can be designated, for both IPv4 and IPv6.
 
 ## Fields
 
 ### Name
 
-The virtual machine's configured name. Must be unique within its scoping context:
-
-- If assigned to a **cluster**: unique within the cluster and tenant.
-- If assigned to a **device** (no cluster): unique within the device and tenant.
+The virtual machine's configured name. Must be unique to the assigned cluster and tenant.
 
 ### Role
 
-The functional role assigned to the VM.
+The functional [role](../dcim/devicerole.md) assigned to the VM.
 
 ### Status
 
@@ -24,24 +21,20 @@ The VM's operational status.
 !!! tip
     Additional statuses may be defined by setting `VirtualMachine.status` under the [`FIELD_CHOICES`](../../configuration/data-validation.md#field_choices) configuration parameter.
 
-### Start on Boot
+### Start on boot
 
 The start on boot setting from the hypervisor.
 
 !!! tip
     Additional statuses may be defined by setting `VirtualMachine.start_on_boot` under the [`FIELD_CHOICES`](../../configuration/data-validation.md#field_choices) configuration parameter.
 
-### Site / Cluster / Device
+### Site & Cluster
 
-The location or host for this VM. At least one must be specified:
+The [site](../dcim/site.md) and/or [cluster](./cluster.md) to which the VM is assigned.
 
-- **Site only**: The VM exists at a site but is not assigned to a specific cluster or device.
-- **Cluster only**: The VM belongs to a virtualization cluster. The site is automatically inferred from the cluster's scope.
-- **Device only**: The VM runs directly on a physical host device without a cluster (e.g. containers). The site is automatically inferred from the device's site.
-- **Cluster + Device**: The VM belongs to a cluster and is pinned to a specific host device within that cluster. The device must be a registered host of the assigned cluster.
+### Device
 
-!!! info "New in NetBox v4.6"
-    Virtual machines can now be assigned directly to a device without requiring a cluster. This is particularly useful for modeling VMs running on standalone hosts outside of a cluster.
+The physical host [device](../dcim/device.md) within the assigned site/cluster on which this VM resides.
 
 ### Platform
 
@@ -71,7 +64,4 @@ The amount of disk storage provisioned, in megabytes.
 
 ### Serial Number
 
-Optional serial number assigned to this virtual machine.
-
-!!! info
-    Unlike devices, uniqueness is not enforced for virtual machine serial numbers.
+Optional serial number assigned to this virtual machine. Unlike devices, uniqueness is not enforced for virtual machine serial numbers.

docs/plugins/development/webhooks.md

@@ -43,11 +43,6 @@ The resulting webhook payload will look like the following:
 }
 ```
 
-!!! warning "Deprecation of legacy fields"
-    The "request_id" and "username" fields in the webhook payload above are deprecated and should no longer be used. Support for them will be removed in NetBox v4.7.0.
-
-    Use `request.user.username` and `request.request_id` from the `request` object included in the callback context instead.
-
 !!! note "Consider namespacing webhook data"
     The data returned from all webhook callbacks will be compiled into a single `context` dictionary. Any existing keys within this dictionary will be overwritten by subsequent callbacks which include those keys. To avoid collisions with webhook data provided by other plugins, consider namespacing your plugin's data within a nested dictionary as such:
     

docs/release-notes/version-4.5.md

@@ -1,111 +1,5 @@
 # NetBox v4.5
 
-## v4.5.5 (2026-03-17)
-
-### Enhancements
-
-* [#21114](https://github.com/netbox-community/netbox/issues/21114) - Support path exclusions for data source synchronization
-* [#21578](https://github.com/netbox-community/netbox/issues/21578) - Support identifying scope object by name or slug when bulk importing scoped objects
-
-### Performance Improvements
-
-* [#21330](https://github.com/netbox-community/netbox/issues/21330) - Optimize the assignment of tags when saving objects
-* [#21402](https://github.com/netbox-community/netbox/issues/21402) - Avoid excessive database queries when rendering unnamed devices via the REST API
-* [#21611](https://github.com/netbox-community/netbox/issues/21611) - Replace inefficient calls to `.count()` with `.exists()`
-
-### Bug Fixes
-
-* [#19867](https://github.com/netbox-community/netbox/issues/19867) - Preserve the "per page" pagination setting when returning from object edit forms
-* [#20077](https://github.com/netbox-community/netbox/issues/20077) - Fix form field focus bug in Microsoft Edge
-* [#20385](https://github.com/netbox-community/netbox/issues/20385) - Enforce `MAX_PAGE_SIZE` limit for GraphQL API requests
-* [#20468](https://github.com/netbox-community/netbox/issues/20468) - Fix range-based filter lookups for integer fields in GraphQL API
-* [#20915](https://github.com/netbox-community/netbox/issues/20915) - Restore user language preference after login via social authentication
-* [#20934](https://github.com/netbox-community/netbox/issues/20934) - Fix dark mode flicker on page load
-* [#21012](https://github.com/netbox-community/netbox/issues/21012) - Add pagination for VLAN table on interface view to prevent silent truncation at 100 entries
-* [#21380](https://github.com/netbox-community/netbox/issues/21380) - Fix display of the background tasks table on mobile
-* [#21440](https://github.com/netbox-community/netbox/issues/21440) - Avoid erroneously clearing primary/OOB IP assignments during bulk import/update
-* [#21468](https://github.com/netbox-community/netbox/issues/21468) - Preserve safe custom HTTP headers when copying requests for background job processing
-* [#21486](https://github.com/netbox-community/netbox/issues/21486) - Fix `AttributeError` exception caused by missing `COOKIES` attribute on `NetBoxFakeRequest`
-* [#21512](https://github.com/netbox-community/netbox/issues/21512) - Fix GraphQL filter field name mismatch for device component types (e.g. `console_ports`)
-* [#21531](https://github.com/netbox-community/netbox/issues/21531) - Fix search functionality for location when combined with other filters
-* [#21556](https://github.com/netbox-community/netbox/issues/21556) - Avoid clearing the platform field when changing device type in the device edit form
-* [#21579](https://github.com/netbox-community/netbox/issues/21579) - Hide the script "Add" button for users lacking the required permission
-* [#21580](https://github.com/netbox-community/netbox/issues/21580) - Hide the virtual machine "Add components" dropdown for users lacking change permission
-* [#21586](https://github.com/netbox-community/netbox/issues/21586) - Fix broken "Add child group" link in site group view (was pointing to the region endpoint)
-* [#21618](https://github.com/netbox-community/netbox/issues/21618) - Fix cable termination points being lost when bulk-editing the cable profile
-* [#21651](https://github.com/netbox-community/netbox/issues/21651) - Disable sorting by the `is_primary` column in the MAC address list view
-* [#21653](https://github.com/netbox-community/netbox/issues/21653) - Fix profile-based cable tracing when a single origin carries multiple positions
-* [#21673](https://github.com/netbox-community/netbox/issues/21673) - Fix display of primary IP address with associated NAT IP on virtual machine view
-* [#21686](https://github.com/netbox-community/netbox/issues/21686) - Clean up cached circuit attributes when reassigning a circuit termination
-
----
-
-## v4.5.4 (2026-03-03)
-
-### Enhancements
-
-* [#21369](https://github.com/netbox-community/netbox/issues/21369) - Support lazy-loading of image attachments
-* [#21385](https://github.com/netbox-community/netbox/issues/21385) - Add contact assignment support for virtual circuits
-* [#21394](https://github.com/netbox-community/netbox/issues/21394) - Add 10GBASE-CU and 40GBASE-SR4 BiDi interface types
-* [#21477](https://github.com/netbox-community/netbox/issues/21477) - Extend GraphQL API filters for cables
-
-### Performance Improvements
-
-* [#21456](https://github.com/netbox-community/netbox/issues/21456) - Improve performance of config context resolution via GraphQL API
-* [#21459](https://github.com/netbox-community/netbox/issues/21459) - Avoid prefetching data for hidden table columns
-
-### Bug Fixes
-
-* [#20490](https://github.com/netbox-community/netbox/issues/20490) - Restrict visibility of scripts in list view to users with view permission
-* [#20911](https://github.com/netbox-community/netbox/issues/20911) - Sort module bay options alphabetically when installing a module
-* [#21347](https://github.com/netbox-community/netbox/issues/21347) - The allocation of IPv6 addresses from a non-pool prefix should start at one, not zero
-* [#21429](https://github.com/netbox-community/netbox/issues/21429) - Termination type should persist when employing "create & add another" workflow for cables
-* [#21478](https://github.com/netbox-community/netbox/issues/21478) - Fix GraphQL union type resolution for connected console ports
-* [#21481](https://github.com/netbox-community/netbox/issues/21481) - Fix display of facility ID on rack view
-* [#21518](https://github.com/netbox-community/netbox/issues/21518) - Fix decimal custom field displaying as unset when value is zero
-* [#21524](https://github.com/netbox-community/netbox/issues/21524) - Avoid `IndexError` exception when encountering stale cable paths
-* [#21527](https://github.com/netbox-community/netbox/issues/21527) - Fix display of primary IP address with associated NAT IP on device view
-* [#21550](https://github.com/netbox-community/netbox/issues/21550) - Ensure pre-change snapshots are recorded for related objects
-
----
-
-## v4.5.3 (2026-02-17)
-
-### Enhancements
-
-* [#19129](https://github.com/netbox-community/netbox/issues/19129) - Improve display of multiple MAC addresses within interfaces table
-* [#20981](https://github.com/netbox-community/netbox/issues/20981) - Enhance JSON rendering for custom validators and protection rules in config revision view
-* [#21240](https://github.com/netbox-community/netbox/issues/21240) - Add support for configuring Redis `KWARGS` parameters
-* [#21257](https://github.com/netbox-community/netbox/issues/21257) - `ContentTypeFilter` now accepts multiple values
-* [#21266](https://github.com/netbox-community/netbox/issues/21266) - Add table columns representing installed devices to the device bays table
-* [#21267](https://github.com/netbox-community/netbox/issues/21267) - Normalize device height formatting in rack units (display "0U")
-* [#21268](https://github.com/netbox-community/netbox/issues/21268) - Add device type details panel to device view
-* [#21337](https://github.com/netbox-community/netbox/issues/21337) - Show the assigned platform's parent on the virtual machine UI view
-
-### Performance Improvements
-
-* [#20211](https://github.com/netbox-community/netbox/issues/20211) - Use thumbnails for image attachment hover previews to improve page load performance
-* [#21016](https://github.com/netbox-community/netbox/issues/21016) - Restore missing SQL indexes for MPTT fields
-* [#21196](https://github.com/netbox-community/netbox/issues/21196) - `q` filter should match on primary IP only for IP address values when filtering devices/VMs
-* [#21420](https://github.com/netbox-community/netbox/issues/21420) - Improve query performance of `ContentTypeFilter`
-* [#21421](https://github.com/netbox-community/netbox/issues/21421) - Eliminate extraneous application of `DISTINCT` to queries for `MultipleChoiceFilter`
-
-### Bug Fixes
-
-* [#20435](https://github.com/netbox-community/netbox/issues/20435) - Fix navigation menu margin issue when scrollbar appears
-* [#21127](https://github.com/netbox-community/netbox/issues/21127) - Ensure assigned cable paths are cleared when removing terminations from a cable
-* [#21277](https://github.com/netbox-community/netbox/issues/21277) - Record pre-change snapshot when adding cluster members via UI
-* [#21320](https://github.com/netbox-community/netbox/issues/21320) - Avoid validation failures when site or optional fields are missing during rack import
-* [#21354](https://github.com/netbox-community/netbox/issues/21354) - Fix base URL in Swagger when `BASE_PATH` is set
-* [#21358](https://github.com/netbox-community/netbox/issues/21358) - Token list in UI cannot be ordered by token value
-* [#21371](https://github.com/netbox-community/netbox/issues/21371) - Fix `KeyError` exception when triggering a webhook from an event rule
-* [#21375](https://github.com/netbox-community/netbox/issues/21375) - Address failure condition in `ipam.0070_vlangroup_vlan_id_ranges` migration
-* [#21390](https://github.com/netbox-community/netbox/issues/21390) - Avoid creating "empty" changelog records for related objects when processing manyo-to-many relations
-* [#21397](https://github.com/netbox-community/netbox/issues/21397) - Correct rendering of owner field in CircuitType edit form
-* [#21412](https://github.com/netbox-community/netbox/issues/21412) - Avoid `AttributeError` exception on initialization when a plugin has local imports in `__init__.py`
-
----
-
 ## v4.5.2 (2026-02-03)
 
 ### Enhancements

mkdocs.yml

@@ -1,4 +1,3 @@
-# Note: NetBox has migrated from MkDocs to Zensical
 site_name: NetBox Documentation
 site_dir: netbox/project-static/docs
 site_url: https://docs.netbox.dev/
@@ -190,7 +189,6 @@ nav:
             - Job: 'models/core/job.md'
         - DCIM:
             - Cable: 'models/dcim/cable.md'
-            - CableBundle: 'models/dcim/cablebundle.md'
             - ConsolePort: 'models/dcim/consoleport.md'
             - ConsolePortTemplate: 'models/dcim/consoleporttemplate.md'
             - ConsoleServerPort: 'models/dcim/consoleserverport.md'
@@ -223,7 +221,6 @@ nav:
             - PowerPort: 'models/dcim/powerport.md'
             - PowerPortTemplate: 'models/dcim/powerporttemplate.md'
             - Rack: 'models/dcim/rack.md'
-            - RackGroup: 'models/dcim/rackgroup.md'
             - RackReservation: 'models/dcim/rackreservation.md'
             - RackRole: 'models/dcim/rackrole.md'
             - RackType: 'models/dcim/racktype.md'

netbox/account/urls.py

@@ -1,7 +1,6 @@
 from django.urls import include, path
 
 from utilities.urls import get_model_urls
-
 from . import views
 
 app_name = 'account'

netbox/account/views.py

@@ -2,15 +2,14 @@ import logging
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth import login as auth_login
-from django.contrib.auth import logout as auth_logout
-from django.contrib.auth import update_session_auth_hash
+from django.contrib.auth import login as auth_login, logout as auth_logout, update_session_auth_hash
 from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import update_last_login
 from django.contrib.auth.signals import user_logged_in
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render, resolve_url
+from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import render, resolve_url
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.http import urlencode
@@ -36,11 +35,11 @@ from utilities.request import safe_for_redirect
 from utilities.string import remove_linebreaks
 from utilities.views import register_model_view
 
+
 #
 # Login/logout
 #
 
-
 class LoginView(View):
     """
     Perform user authentication via the web UI.
@@ -140,8 +139,9 @@ class LoginView(View):
 
             return response
 
-        username = form['username'].value()
-        logger.debug(f"Login form validation failed for username: {remove_linebreaks(username)}")
+        else:
+            username = form['username'].value()
+            logger.debug(f"Login form validation failed for username: {remove_linebreaks(username)}")
 
         return render(request, self.template_name, {
             'form': form,

netbox/circuits/api/serializers.py

@@ -1,2 +1,2 @@
-from .serializers_.circuits import *
 from .serializers_.providers import *
+from .serializers_.circuits import *

netbox/circuits/api/serializers_/circuits.py

@@ -4,34 +4,24 @@ from rest_framework import serializers
 from circuits.choices import CircuitPriorityChoices, CircuitStatusChoices, VirtualCircuitTerminationRoleChoices
 from circuits.constants import CIRCUIT_GROUP_ASSIGNMENT_MEMBER_MODELS, CIRCUIT_TERMINATION_TERMINATION_TYPES
 from circuits.models import (
-    Circuit,
-    CircuitGroup,
-    CircuitGroupAssignment,
-    CircuitTermination,
-    CircuitType,
-    VirtualCircuit,
-    VirtualCircuitTermination,
-    VirtualCircuitType,
+    Circuit, CircuitGroup, CircuitGroupAssignment, CircuitTermination, CircuitType, VirtualCircuit,
+    VirtualCircuitTermination, VirtualCircuitType,
 )
-from dcim.api.serializers_.cables import CabledObjectSerializer
 from dcim.api.serializers_.device_components import InterfaceSerializer
+from dcim.api.serializers_.cables import CabledObjectSerializer
 from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField
 from netbox.api.gfk_fields import GFKSerializerField
 from netbox.api.serializers import (
-    NetBoxModelSerializer,
-    OrganizationalModelSerializer,
-    PrimaryModelSerializer,
-    WritableNestedSerializer,
+    NetBoxModelSerializer, OrganizationalModelSerializer, PrimaryModelSerializer, WritableNestedSerializer,
 )
 from netbox.choices import DistanceUnitChoices
 from tenancy.api.serializers_.tenants import TenantSerializer
-
 from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, ProviderSerializer
 
 __all__ = (
+    'CircuitSerializer',
     'CircuitGroupAssignmentSerializer',
     'CircuitGroupSerializer',
-    'CircuitSerializer',
     'CircuitTerminationSerializer',
     'CircuitTypeSerializer',
     'VirtualCircuitSerializer',

netbox/circuits/api/serializers_/providers.py

@@ -5,7 +5,6 @@ from ipam.api.serializers_.asns import ASNSerializer
 from ipam.models import ASN
 from netbox.api.fields import RelatedObjectCountField, SerializedPKRelatedField
 from netbox.api.serializers import PrimaryModelSerializer
-
 from .nested import NestedProviderAccountSerializer
 
 __all__ = (

netbox/circuits/api/urls.py

@@ -1,7 +1,7 @@
 from netbox.api.routers import NetBoxRouter
-
 from . import views
 
+
 router = NetBoxRouter()
 router.APIRootView = views.CircuitsRootView
 

netbox/circuits/api/views.py

@@ -4,7 +4,6 @@ from circuits import filtersets
 from circuits.models import *
 from dcim.api.views import PassThroughPortMixin
 from netbox.api.viewsets import NetBoxModelViewSet
-
 from . import serializers
 
 

netbox/circuits/apps.py

@@ -9,8 +9,7 @@ class CircuitsConfig(AppConfig):
 
     def ready(self):
         from netbox.models.features import register_models
-
-        from . import search, signals  # noqa: F401
+        from . import signals, search  # noqa: F401
         from .models import CircuitTermination
 
         # Register models

netbox/circuits/choices.py

@@ -2,11 +2,11 @@ from django.utils.translation import gettext_lazy as _
 
 from utilities.choices import ChoiceSet
 
+
 #
 # Circuits
 #
 
-
 class CircuitStatusChoices(ChoiceSet):
     key = 'Circuit.status'
 

netbox/circuits/constants.py

@@ -1,5 +1,6 @@
 from django.db.models import Q
 
+
 # models values for ContentTypes which may be CircuitTermination termination types
 CIRCUIT_TERMINATION_TERMINATION_TYPES = (
     'region', 'sitegroup', 'site', 'location', 'providernetwork',

netbox/circuits/filtersets.py

@@ -9,13 +9,9 @@ from ipam.models import ASN
 from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet
 from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
 from utilities.filters import (
-    MultiValueCharFilter,
-    MultiValueContentTypeFilter,
-    MultiValueNumberFilter,
-    TreeNodeMultipleChoiceFilter,
+    ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, TreeNodeMultipleChoiceFilter,
 )
 from utilities.filtersets import register_filterset
-
 from .choices import *
 from .models import *
 
@@ -25,9 +21,9 @@ __all__ = (
     'CircuitGroupFilterSet',
     'CircuitTerminationFilterSet',
     'CircuitTypeFilterSet',
+    'ProviderNetworkFilterSet',
     'ProviderAccountFilterSet',
     'ProviderFilterSet',
-    'ProviderNetworkFilterSet',
     'VirtualCircuitFilterSet',
     'VirtualCircuitTerminationFilterSet',
     'VirtualCircuitTypeFilterSet',
@@ -103,13 +99,11 @@ class ProviderFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
 class ProviderAccountFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
@@ -133,13 +127,11 @@ class ProviderAccountFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
 class ProviderNetworkFilterSet(PrimaryModelFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
@@ -171,26 +163,22 @@ class CircuitTypeFilterSet(OrganizationalModelFilterSet):
 class CircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
     provider_account_id = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         label=_('Provider account (ID)'),
     )
     provider_account = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account__account',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='account',
         label=_('Provider account (account)'),
     )
@@ -201,19 +189,16 @@ class CircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilt
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitType.objects.all(),
-        distinct=False,
         label=_('Circuit type (ID)'),
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
         queryset=CircuitType.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Circuit type (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=CircuitStatusChoices,
-        distinct=False,
         null_value=None
     )
     region_id = TreeNodeMultipleChoiceFilter(
@@ -260,12 +245,10 @@ class CircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilt
     )
     termination_a_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitTermination.objects.all(),
-        distinct=False,
         label=_('Termination A (ID)'),
     )
     termination_z_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitTermination.objects.all(),
-        distinct=False,
         label=_('Termination A (ID)'),
     )
 
@@ -296,10 +279,9 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
     )
     circuit_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Circuit.objects.all(),
-        distinct=False,
         label=_('Circuit'),
     )
-    termination_type = MultiValueContentTypeFilter()
+    termination_type = ContentTypeFilter()
     region_id = TreeNodeMultipleChoiceFilter(
         queryset=Region.objects.all(),
         field_name='_region',
@@ -328,14 +310,12 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
-        distinct=False,
         field_name='_site',
         label=_('Site (ID)'),
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='_site__slug',
         queryset=Site.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Site (slug)'),
     )
@@ -354,20 +334,17 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
     )
     provider_network_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
-        distinct=False,
         field_name='_provider_network',
         label=_('ProviderNetwork (ID)'),
     )
     provider_id = django_filters.ModelMultipleChoiceFilter(
         field_name='circuit__provider_id',
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='circuit__provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
@@ -404,7 +381,7 @@ class CircuitGroupAssignmentFilterSet(NetBoxModelFilterSet):
         method='search',
         label=_('Search'),
     )
-    member_type = MultiValueContentTypeFilter()
+    member_type = ContentTypeFilter()
     circuit = MultiValueCharFilter(
         method='filter_circuit',
         field_name='cid',
@@ -437,13 +414,11 @@ class CircuitGroupAssignmentFilterSet(NetBoxModelFilterSet):
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitGroup.objects.all(),
-        distinct=False,
         label=_('Circuit group (ID)'),
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
         queryset=CircuitGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Circuit group (slug)'),
     )
@@ -513,49 +488,41 @@ class VirtualCircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_network__provider',
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_network__provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
     provider_account_id = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         label=_('Provider account (ID)'),
     )
     provider_account = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account__account',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='account',
         label=_('Provider account (account)'),
     )
     provider_network_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
-        distinct=False,
         label=_('Provider network (ID)'),
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VirtualCircuitType.objects.all(),
-        distinct=False,
         label=_('Virtual circuit type (ID)'),
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
         queryset=VirtualCircuitType.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Virtual circuit type (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=CircuitStatusChoices,
-        distinct=False,
         null_value=None
     )
 
@@ -581,49 +548,41 @@ class VirtualCircuitTerminationFilterSet(NetBoxModelFilterSet):
     )
     virtual_circuit_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VirtualCircuit.objects.all(),
-        distinct=False,
         label=_('Virtual circuit'),
     )
     role = django_filters.MultipleChoiceFilter(
         choices=VirtualCircuitTerminationRoleChoices,
-        distinct=False,
         null_value=None
     )
     provider_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_network__provider',
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_network__provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
     provider_account_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         label=_('Provider account (ID)'),
     )
     provider_account = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_account__account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         to_field_name='account',
         label=_('Provider account (account)'),
     )
     provider_network_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
-        distinct=False,
         field_name='virtual_circuit__provider_network',
         label=_('Provider network (ID)'),
     )
     interface_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Interface.objects.all(),
-        distinct=False,
         field_name='interface',
         label=_('Interface (ID)'),
     )

netbox/circuits/forms/bulk_edit.py

@@ -4,10 +4,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
 
 from circuits.choices import (
-    CircuitCommitRateChoices,
-    CircuitPriorityChoices,
-    CircuitStatusChoices,
-    VirtualCircuitTerminationRoleChoices,
+    CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices, VirtualCircuitTerminationRoleChoices,
 )
 from circuits.constants import CIRCUIT_TERMINATION_TERMINATION_TYPES
 from circuits.models import *
@@ -18,10 +15,7 @@ from netbox.forms import NetBoxModelBulkEditForm, OrganizationalModelBulkEditFor
 from tenancy.models import Tenant
 from utilities.forms import add_blank_choice, get_field_value
 from utilities.forms.fields import (
-    ColorField,
-    ContentTypeChoiceField,
-    DynamicModelChoiceField,
-    DynamicModelMultipleChoiceField,
+    ColorField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
 )
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker, HTMXSelect, NumberWithOptions
@@ -33,8 +27,8 @@ __all__ = (
     'CircuitGroupBulkEditForm',
     'CircuitTerminationBulkEditForm',
     'CircuitTypeBulkEditForm',
-    'ProviderAccountBulkEditForm',
     'ProviderBulkEditForm',
+    'ProviderAccountBulkEditForm',
     'ProviderNetworkBulkEditForm',
     'VirtualCircuitBulkEditForm',
     'VirtualCircuitTerminationBulkEditForm',

netbox/circuits/forms/bulk_import.py

@@ -12,14 +12,14 @@ from tenancy.models import Tenant
 from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField
 
 __all__ = (
+    'CircuitImportForm',
     'CircuitGroupAssignmentImportForm',
     'CircuitGroupImportForm',
-    'CircuitImportForm',
     'CircuitTerminationImportForm',
     'CircuitTerminationImportRelatedForm',
     'CircuitTypeImportForm',
-    'ProviderAccountImportForm',
     'ProviderImportForm',
+    'ProviderAccountImportForm',
     'ProviderNetworkImportForm',
     'VirtualCircuitImportForm',
     'VirtualCircuitTerminationImportForm',

netbox/circuits/forms/filtersets.py

@@ -2,10 +2,7 @@ from django import forms
 from django.utils.translation import gettext as _
 
 from circuits.choices import (
-    CircuitCommitRateChoices,
-    CircuitPriorityChoices,
-    CircuitStatusChoices,
-    CircuitTerminationSideChoices,
+    CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices, CircuitTerminationSideChoices,
     VirtualCircuitTerminationRoleChoices,
 )
 from circuits.models import *
@@ -13,7 +10,7 @@ from dcim.models import Location, Region, Site, SiteGroup
 from ipam.models import ASN
 from netbox.choices import DistanceUnitChoices
 from netbox.forms import NetBoxModelFilterSetForm, OrganizationalModelFilterSetForm, PrimaryModelFilterSetForm
-from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
+from tenancy.forms import TenancyFilterForm, ContactModelFilterForm
 from utilities.forms import add_blank_choice
 from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.rendering import FieldSet
@@ -25,8 +22,8 @@ __all__ = (
     'CircuitGroupFilterForm',
     'CircuitTerminationFilterForm',
     'CircuitTypeFilterForm',
-    'ProviderAccountFilterForm',
     'ProviderFilterForm',
+    'ProviderAccountFilterForm',
     'ProviderNetworkFilterForm',
     'VirtualCircuitFilterForm',
     'VirtualCircuitTerminationFilterForm',

netbox/circuits/forms/model_forms.py

@@ -4,9 +4,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
 
 from circuits.choices import (
-    CircuitCommitRateChoices,
-    CircuitTerminationPortSpeedChoices,
-    VirtualCircuitTerminationRoleChoices,
+    CircuitCommitRateChoices, CircuitTerminationPortSpeedChoices, VirtualCircuitTerminationRoleChoices,
 )
 from circuits.constants import *
 from circuits.models import *
@@ -16,10 +14,7 @@ from netbox.forms import NetBoxModelForm, OrganizationalModelForm, PrimaryModelF
 from tenancy.forms import TenancyForm
 from utilities.forms import get_field_value
 from utilities.forms.fields import (
-    ContentTypeChoiceField,
-    DynamicModelChoiceField,
-    DynamicModelMultipleChoiceField,
-    SlugField,
+    ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField,
 )
 from utilities.forms.mixins import DistanceValidationMixin
 from utilities.forms.rendering import FieldSet, InlineFields
@@ -32,8 +27,8 @@ __all__ = (
     'CircuitGroupForm',
     'CircuitTerminationForm',
     'CircuitTypeForm',
-    'ProviderAccountForm',
     'ProviderForm',
+    'ProviderAccountForm',
     'ProviderNetworkForm',
     'VirtualCircuitForm',
     'VirtualCircuitTerminationForm',
@@ -96,13 +91,13 @@ class ProviderNetworkForm(PrimaryModelForm):
 
 class CircuitTypeForm(OrganizationalModelForm):
     fieldsets = (
-        FieldSet('name', 'slug', 'color', 'description', 'tags'),
+        FieldSet('name', 'slug', 'color', 'description', 'owner', 'tags'),
     )
 
     class Meta:
         model = CircuitType
         fields = [
-            'name', 'slug', 'color', 'description', 'owner', 'comments', 'tags',
+            'name', 'slug', 'color', 'description', 'comments', 'tags',
         ]
 
 

netbox/circuits/graphql/enums.py

@@ -3,9 +3,9 @@ import strawberry
 from circuits.choices import *
 
 __all__ = (
-    'CircuitPriorityEnum',
     'CircuitStatusEnum',
     'CircuitTerminationSideEnum',
+    'CircuitPriorityEnum',
     'VirtualCircuitTerminationRoleEnum',
 )
 

netbox/circuits/graphql/filter_mixins.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated, TYPE_CHECKING
 
 import strawberry
 import strawberry_django

netbox/circuits/graphql/filters.py

@@ -1,10 +1,10 @@
 from datetime import date
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated, TYPE_CHECKING
 
 import strawberry
 import strawberry_django
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, DateFilterLookup, StrFilterLookup
+from strawberry_django import BaseFilterLookup, FilterLookup, DateFilterLookup
 
 from circuits import models
 from circuits.graphql.filter_mixins import CircuitTypeFilterMixin
@@ -19,7 +19,6 @@ if TYPE_CHECKING:
     from dcim.graphql.filters import InterfaceFilter, LocationFilter, RegionFilter, SiteFilter, SiteGroupFilter
     from ipam.graphql.filters import ASNFilter
     from netbox.graphql.filter_lookups import IntegerLookup
-
     from .enums import *
 
 __all__ = (
@@ -28,8 +27,8 @@ __all__ = (
     'CircuitGroupFilter',
     'CircuitTerminationFilter',
     'CircuitTypeFilter',
-    'ProviderAccountFilter',
     'ProviderFilter',
+    'ProviderAccountFilter',
     'ProviderNetworkFilter',
     'VirtualCircuitFilter',
     'VirtualCircuitTerminationFilter',
@@ -62,9 +61,9 @@ class CircuitTerminationFilter(
     upstream_speed: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
         strawberry_django.filter_field()
     )
-    xconnect_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    pp_info: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    xconnect_id: FilterLookup[str] | None = strawberry_django.filter_field()
+    pp_info: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: FilterLookup[str] | None = strawberry_django.filter_field()
 
     # Cached relations
     _provider_network: Annotated['ProviderNetworkFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
@@ -92,7 +91,7 @@ class CircuitFilter(
     TenancyFilterMixin,
     PrimaryModelFilter
 ):
-    cid: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    cid: FilterLookup[str] | None = strawberry_django.filter_field()
     provider: Annotated['ProviderFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
         strawberry_django.filter_field()
     )
@@ -145,8 +144,8 @@ class CircuitGroupAssignmentFilter(CustomFieldsFilterMixin, TagsFilterMixin, Cha
 
 @strawberry_django.filter_type(models.Provider, lookups=True)
 class ProviderFilter(ContactFilterMixin, PrimaryModelFilter):
-    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    slug: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    slug: FilterLookup[str] | None = strawberry_django.filter_field()
     asns: Annotated['ASNFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
     circuits: Annotated['CircuitFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
         strawberry_django.filter_field()
@@ -159,18 +158,18 @@ class ProviderAccountFilter(ContactFilterMixin, PrimaryModelFilter):
         strawberry_django.filter_field()
     )
     provider_id: ID | None = strawberry_django.filter_field()
-    account: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    account: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter_type(models.ProviderNetwork, lookups=True)
 class ProviderNetworkFilter(PrimaryModelFilter):
-    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
     provider: Annotated['ProviderFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
         strawberry_django.filter_field()
     )
     provider_id: ID | None = strawberry_django.filter_field()
-    service_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    service_id: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter_type(models.VirtualCircuitType, lookups=True)
@@ -180,7 +179,7 @@ class VirtualCircuitTypeFilter(CircuitTypeFilterMixin, OrganizationalModelFilter
 
 @strawberry_django.filter_type(models.VirtualCircuit, lookups=True)
 class VirtualCircuitFilter(TenancyFilterMixin, PrimaryModelFilter):
-    cid: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    cid: FilterLookup[str] | None = strawberry_django.filter_field()
     provider_network: Annotated['ProviderNetworkFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
         strawberry_django.filter_field()
     )
@@ -218,4 +217,4 @@ class VirtualCircuitTerminationFilter(CustomFieldsFilterMixin, TagsFilterMixin,
         strawberry_django.filter_field()
     )
     interface_id: ID | None = strawberry_django.filter_field()
-    description: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    description: FilterLookup[str] | None = strawberry_django.filter_field()

netbox/circuits/graphql/schema.py

@@ -1,3 +1,5 @@
+from typing import List
+
 import strawberry
 import strawberry_django
 
@@ -7,34 +9,34 @@ from .types import *
 @strawberry.type(name="Query")
 class CircuitsQuery:
     circuit: CircuitType = strawberry_django.field()
-    circuit_list: list[CircuitType] = strawberry_django.field()
+    circuit_list: List[CircuitType] = strawberry_django.field()
 
     circuit_termination: CircuitTerminationType = strawberry_django.field()
-    circuit_termination_list: list[CircuitTerminationType] = strawberry_django.field()
+    circuit_termination_list: List[CircuitTerminationType] = strawberry_django.field()
 
     circuit_type: CircuitTypeType = strawberry_django.field()
-    circuit_type_list: list[CircuitTypeType] = strawberry_django.field()
+    circuit_type_list: List[CircuitTypeType] = strawberry_django.field()
 
     circuit_group: CircuitGroupType = strawberry_django.field()
-    circuit_group_list: list[CircuitGroupType] = strawberry_django.field()
+    circuit_group_list: List[CircuitGroupType] = strawberry_django.field()
 
     circuit_group_assignment: CircuitGroupAssignmentType = strawberry_django.field()
-    circuit_group_assignment_list: list[CircuitGroupAssignmentType] = strawberry_django.field()
+    circuit_group_assignment_list: List[CircuitGroupAssignmentType] = strawberry_django.field()
 
     provider: ProviderType = strawberry_django.field()
-    provider_list: list[ProviderType] = strawberry_django.field()
+    provider_list: List[ProviderType] = strawberry_django.field()
 
     provider_account: ProviderAccountType = strawberry_django.field()
-    provider_account_list: list[ProviderAccountType] = strawberry_django.field()
+    provider_account_list: List[ProviderAccountType] = strawberry_django.field()
 
     provider_network: ProviderNetworkType = strawberry_django.field()
-    provider_network_list: list[ProviderNetworkType] = strawberry_django.field()
+    provider_network_list: List[ProviderNetworkType] = strawberry_django.field()
 
     virtual_circuit: VirtualCircuitType = strawberry_django.field()
-    virtual_circuit_list: list[VirtualCircuitType] = strawberry_django.field()
+    virtual_circuit_list: List[VirtualCircuitType] = strawberry_django.field()
 
     virtual_circuit_termination: VirtualCircuitTerminationType = strawberry_django.field()
-    virtual_circuit_termination_list: list[VirtualCircuitTerminationType] = strawberry_django.field()
+    virtual_circuit_termination_list: List[VirtualCircuitTerminationType] = strawberry_django.field()
 
     virtual_circuit_type: VirtualCircuitTypeType = strawberry_django.field()
-    virtual_circuit_type_list: list[VirtualCircuitTypeType] = strawberry_django.field()
+    virtual_circuit_type_list: List[VirtualCircuitTypeType] = strawberry_django.field()

netbox/circuits/graphql/types.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated, List, TYPE_CHECKING, Union
 
 import strawberry
 import strawberry_django
@@ -8,7 +8,6 @@ from dcim.graphql.mixins import CabledObjectMixin
 from extras.graphql.mixins import ContactsMixin, CustomFieldsMixin, TagsMixin
 from netbox.graphql.types import BaseObjectType, ObjectType, OrganizationalObjectType, PrimaryObjectType
 from tenancy.graphql.types import TenantType
-
 from .filters import *
 
 if TYPE_CHECKING:
@@ -21,9 +20,9 @@ __all__ = (
     'CircuitTerminationType',
     'CircuitType',
     'CircuitTypeType',
+    'ProviderType',
     'ProviderAccountType',
     'ProviderNetworkType',
-    'ProviderType',
     'VirtualCircuitTerminationType',
     'VirtualCircuitType',
     'VirtualCircuitTypeType',
@@ -37,10 +36,10 @@ __all__ = (
     pagination=True
 )
 class ProviderType(ContactsMixin, PrimaryObjectType):
-    networks: list[Annotated["ProviderNetworkType", strawberry.lazy('circuits.graphql.types')]]
-    circuits: list[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]
-    asns: list[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]]
-    accounts: list[Annotated["ProviderAccountType", strawberry.lazy('circuits.graphql.types')]]
+    networks: List[Annotated["ProviderNetworkType", strawberry.lazy('circuits.graphql.types')]]
+    circuits: List[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]
+    asns: List[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]]
+    accounts: List[Annotated["ProviderAccountType", strawberry.lazy('circuits.graphql.types')]]
 
 
 @strawberry_django.type(
@@ -51,7 +50,7 @@ class ProviderType(ContactsMixin, PrimaryObjectType):
 )
 class ProviderAccountType(ContactsMixin, PrimaryObjectType):
     provider: Annotated["ProviderType", strawberry.lazy('circuits.graphql.types')]
-    circuits: list[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]
+    circuits: List[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]
 
 
 @strawberry_django.type(
@@ -62,7 +61,7 @@ class ProviderAccountType(ContactsMixin, PrimaryObjectType):
 )
 class ProviderNetworkType(PrimaryObjectType):
     provider: Annotated["ProviderType", strawberry.lazy('circuits.graphql.types')]
-    circuit_terminations: list[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]
+    circuit_terminations: List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]
 
 
 @strawberry_django.type(
@@ -72,17 +71,16 @@ class ProviderNetworkType(PrimaryObjectType):
     pagination=True
 )
 class CircuitTerminationType(CustomFieldsMixin, TagsMixin, CabledObjectMixin, ObjectType):
-    circuit: Annotated['CircuitType', strawberry.lazy('circuits.graphql.types')]
+    circuit: Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]
 
     @strawberry_django.field
-    def termination(self) -> Annotated[
-        Annotated['LocationType', strawberry.lazy('dcim.graphql.types')]
-        | Annotated['RegionType', strawberry.lazy('dcim.graphql.types')]
-        | Annotated['SiteGroupType', strawberry.lazy('dcim.graphql.types')]
-        | Annotated['SiteType', strawberry.lazy('dcim.graphql.types')]
-        | Annotated['ProviderNetworkType', strawberry.lazy('circuits.graphql.types')],
-        strawberry.union('CircuitTerminationTerminationType'),
-    ] | None:
+    def termination(self) -> Annotated[Union[
+        Annotated["LocationType", strawberry.lazy('dcim.graphql.types')],
+        Annotated["RegionType", strawberry.lazy('dcim.graphql.types')],
+        Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')],
+        Annotated["SiteType", strawberry.lazy('dcim.graphql.types')],
+        Annotated["ProviderNetworkType", strawberry.lazy('circuits.graphql.types')],
+    ], strawberry.union("CircuitTerminationTerminationType")] | None:
         return self.termination
 
 
@@ -95,7 +93,7 @@ class CircuitTerminationType(CustomFieldsMixin, TagsMixin, CabledObjectMixin, Ob
 class CircuitTypeType(OrganizationalObjectType):
     color: str
 
-    circuits: list[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]
+    circuits: List[Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]]
 
 
 @strawberry_django.type(
@@ -111,7 +109,7 @@ class CircuitType(PrimaryObjectType, ContactsMixin):
     termination_z: CircuitTerminationType | None
     type: CircuitTypeType
     tenant: TenantType | None
-    terminations: list[CircuitTerminationType]
+    terminations: List[CircuitTerminationType]
 
 
 @strawberry_django.type(
@@ -131,14 +129,13 @@ class CircuitGroupType(OrganizationalObjectType):
     pagination=True
 )
 class CircuitGroupAssignmentType(TagsMixin, BaseObjectType):
-    group: Annotated['CircuitGroupType', strawberry.lazy('circuits.graphql.types')]
+    group: Annotated["CircuitGroupType", strawberry.lazy('circuits.graphql.types')]
 
     @strawberry_django.field
-    def member(self) -> Annotated[
-        Annotated['CircuitType', strawberry.lazy('circuits.graphql.types')]
-        | Annotated['VirtualCircuitType', strawberry.lazy('circuits.graphql.types')],
-        strawberry.union('CircuitGroupAssignmentMemberType'),
-    ] | None:
+    def member(self) -> Annotated[Union[
+        Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')],
+        Annotated["VirtualCircuitType", strawberry.lazy('circuits.graphql.types')],
+    ], strawberry.union("CircuitGroupAssignmentMemberType")] | None:
         return self.member
 
 
@@ -151,7 +148,7 @@ class CircuitGroupAssignmentType(TagsMixin, BaseObjectType):
 class VirtualCircuitTypeType(OrganizationalObjectType):
     color: str
 
-    virtual_circuits: list[Annotated["VirtualCircuitType", strawberry.lazy('circuits.graphql.types')]]
+    virtual_circuits: List[Annotated["VirtualCircuitType", strawberry.lazy('circuits.graphql.types')]]
 
 
 @strawberry_django.type(
@@ -177,11 +174,11 @@ class VirtualCircuitTerminationType(CustomFieldsMixin, TagsMixin, ObjectType):
     filters=VirtualCircuitFilter,
     pagination=True
 )
-class VirtualCircuitType(ContactsMixin, PrimaryObjectType):
+class VirtualCircuitType(PrimaryObjectType):
     provider_network: ProviderNetworkType = strawberry_django.field(select_related=["provider_network"])
     provider_account: ProviderAccountType | None
     type: Annotated["VirtualCircuitTypeType", strawberry.lazy('circuits.graphql.types')] = strawberry_django.field(
         select_related=["type"]
     )
     tenant: TenantType | None
-    terminations: list[VirtualCircuitTerminationType]
+    terminations: List[VirtualCircuitTerminationType]

netbox/circuits/migrations/0001_squashed.py

@@ -1,8 +1,7 @@
-import django.db.models.deletion
-from django.db import migrations, models
-
 import ipam.fields
 from utilities.json import CustomFieldJSONEncoder
+from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

netbox/circuits/migrations/0002_squashed_0029.py

@@ -1,6 +1,6 @@
+from django.db import migrations, models
 import django.db.models.deletion
 import taggit.managers
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

netbox/circuits/migrations/0043_circuittype_color.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.2.5 on 2023-10-20 21:25
 
 from django.db import migrations
-
 import utilities.fields
 
 

netbox/circuits/migrations/0044_circuit_groups.py

@@ -1,8 +1,7 @@
 import django.db.models.deletion
 import taggit.managers
-from django.db import migrations, models
-
 import utilities.json
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

netbox/circuits/models/circuits.py

@@ -8,16 +8,10 @@ from django.utils.translation import gettext_lazy as _
 from circuits.choices import *
 from dcim.models import CabledObjectModel
 from netbox.models import ChangeLoggedModel, OrganizationalModel, PrimaryModel
-from netbox.models.features import (
-    ContactsMixin,
-    CustomFieldsMixin,
-    CustomLinksMixin,
-    ExportTemplatesMixin,
-    ImageAttachmentsMixin,
-    TagsMixin,
-)
 from netbox.models.mixins import DistanceMixin
-
+from netbox.models.features import (
+    ContactsMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, ImageAttachmentsMixin, TagsMixin,
+)
 from .base import BaseCircuitType
 
 __all__ = (
@@ -347,13 +341,6 @@ class CircuitTermination(
         verbose_name = _('circuit termination')
         verbose_name_plural = _('circuit terminations')
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Cache original values to detect changes
-        self._orig_circuit_id = self.__dict__.get('circuit_id')
-        self._orig_term_side = self.__dict__.get('term_side')
-
     def __str__(self):
         return f'{self.circuit}: Termination {self.term_side}'
 
@@ -367,39 +354,11 @@ class CircuitTermination(
             raise ValidationError(_("A circuit termination must attach to a terminating object."))
 
     def save(self, *args, **kwargs):
-        is_new = self._state.adding
-        update_fields = kwargs.get('update_fields')
-
-        # Only consider circuit/term_side changes if those fields
-        # are actually being persisted
-        if update_fields is not None:
-            tracking_relevant = 'circuit' in update_fields or 'term_side' in update_fields
-        else:
-            tracking_relevant = True
-
-        circuit_changed = tracking_relevant and self._orig_circuit_id and self._orig_circuit_id != self.circuit_id
-        term_side_changed = tracking_relevant and self._orig_term_side and self._orig_term_side != self.term_side
-
         # Cache objects associated with the terminating object (for filtering)
         self.cache_related_objects()
 
         super().save(*args, **kwargs)
 
-        # Clear the old termination reference if circuit or term_side changed
-        if circuit_changed or term_side_changed:
-            old_termination_name = f'termination_{self._orig_term_side.lower()}'
-            Circuit.objects.filter(pk=self._orig_circuit_id).update(**{old_termination_name: None})
-
-        # Update the cache if this is a new termination or circuit/term_side changed
-        if is_new or circuit_changed or term_side_changed:
-            # Update the new circuit's termination reference
-            termination_name = f'termination_{self.term_side.lower()}'
-            Circuit.objects.filter(pk=self.circuit_id).update(**{termination_name: self.pk})
-
-            # Update cached values for subsequent saves
-            self._orig_circuit_id = self.circuit_id
-            self._orig_term_side = self.term_side
-
     def cache_related_objects(self):
         self._provider_network = self._region = self._site_group = self._site = self._location = None
         if self.termination_type:

netbox/circuits/models/providers.py

@@ -6,9 +6,9 @@ from netbox.models import PrimaryModel
 from netbox.models.features import ContactsMixin
 
 __all__ = (
+    'ProviderNetwork',
     'Provider',
     'ProviderAccount',
-    'ProviderNetwork',
 )
 
 

netbox/circuits/models/virtual_circuits.py

@@ -8,8 +8,7 @@ from django.utils.translation import gettext_lazy as _
 
 from circuits.choices import *
 from netbox.models import ChangeLoggedModel, PrimaryModel
-from netbox.models.features import ContactsMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, TagsMixin
-
+from netbox.models.features import CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, TagsMixin
 from .base import BaseCircuitType
 
 __all__ = (
@@ -30,7 +29,7 @@ class VirtualCircuitType(BaseCircuitType):
         verbose_name_plural = _('virtual circuit types')
 
 
-class VirtualCircuit(ContactsMixin, PrimaryModel):
+class VirtualCircuit(PrimaryModel):
     """
     A virtual connection between two or more endpoints, delivered across one or more physical circuits.
     """
@@ -185,8 +184,6 @@ class VirtualCircuitTermination(
             return self.virtual_circuit.terminations.filter(
                 role=VirtualCircuitTerminationRoleChoices.ROLE_HUB
             )
-        # Fallback for unexpected roles
-        return self.virtual_circuit.terminations.none()
 
     def clean(self):
         super().clean()

netbox/circuits/search.py

@@ -1,5 +1,4 @@
 from netbox.search import SearchIndex, register_search
-
 from . import models
 
 

netbox/circuits/signals.py

@@ -2,10 +2,20 @@ from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 
 from dcim.signals import rebuild_paths
-
 from .models import CircuitTermination
 
 
+@receiver(post_save, sender=CircuitTermination)
+def update_circuit(instance, **kwargs):
+    """
+    When a CircuitTermination has been modified, update its parent Circuit.
+    """
+    termination_name = f'termination_{instance.term_side.lower()}'
+    instance.circuit.refresh_from_db()
+    setattr(instance.circuit, termination_name, instance)
+    instance.circuit.save()
+
+
 @receiver((post_save, post_delete), sender=CircuitTermination)
 def rebuild_cablepaths(instance, raw=False, **kwargs):
     """

netbox/circuits/tables/circuits.py

@@ -4,7 +4,6 @@ from django.utils.translation import gettext_lazy as _
 from circuits.models import *
 from netbox.tables import NetBoxTable, OrganizationalModelTable, PrimaryModelTable, columns
 from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
-
 from .columns import CommitRateColumn
 
 __all__ = (

netbox/circuits/tables/providers.py

@@ -7,9 +7,9 @@ from netbox.tables import PrimaryModelTable, columns
 from tenancy.tables import ContactsColumnMixin
 
 __all__ = (
+    'ProviderTable',
     'ProviderAccountTable',
     'ProviderNetworkTable',
-    'ProviderTable',
 )
 
 

netbox/circuits/tables/virtual_circuits.py

@@ -71,7 +71,7 @@ class VirtualCircuitTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModel
         model = VirtualCircuit
         fields = (
             'pk', 'id', 'cid', 'provider', 'provider_account', 'provider_network', 'type', 'status', 'tenant',
-            'tenant_group', 'description', 'comments', 'contacts', 'tags', 'created', 'last_updated',
+            'tenant_group', 'description', 'comments', 'tags', 'created', 'last_updated',
         )
         default_columns = (
             'pk', 'cid', 'provider', 'provider_account', 'provider_network', 'type', 'status', 'tenant',

netbox/circuits/tests/test_filtersets.py

@@ -5,16 +5,7 @@ from circuits.filtersets import *
 from circuits.models import *
 from dcim.choices import InterfaceTypeChoices, LocationStatusChoices
 from dcim.models import (
-    Cable,
-    Device,
-    DeviceRole,
-    DeviceType,
-    Interface,
-    Location,
-    Manufacturer,
-    Region,
-    Site,
-    SiteGroup,
+    Cable, Device, DeviceRole, DeviceType, Interface, Location, Manufacturer, Region, Site, SiteGroup
 )
 from ipam.models import ASN, RIR
 from netbox.choices import DistanceUnitChoices

netbox/circuits/tests/test_models.py

@@ -1,148 +0,0 @@
-from django.test import TestCase
-
-from circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
-from dcim.models import Site
-
-
-class CircuitTerminationTestCase(TestCase):
-
-    @classmethod
-    def setUpTestData(cls):
-        provider = Provider.objects.create(name='Provider 1', slug='provider-1')
-        circuit_type = CircuitType.objects.create(name='Circuit Type 1', slug='circuit-type-1')
-
-        cls.sites = (
-            Site.objects.create(name='Site 1', slug='site-1'),
-            Site.objects.create(name='Site 2', slug='site-2'),
-        )
-
-        cls.circuits = (
-            Circuit.objects.create(cid='Circuit 1', provider=provider, type=circuit_type),
-            Circuit.objects.create(cid='Circuit 2', provider=provider, type=circuit_type),
-        )
-
-        cls.provider_network = ProviderNetwork.objects.create(name='Provider Network 1', provider=provider)
-
-    def test_circuit_termination_creation_populates_circuit_cache(self):
-        """
-        When a CircuitTermination is created, the parent Circuit's termination_a or termination_z
-        cache field should be populated.
-        """
-        # Create A termination
-        termination_a = CircuitTermination.objects.create(
-            circuit=self.circuits[0],
-            term_side='A',
-            termination=self.sites[0],
-        )
-        self.circuits[0].refresh_from_db()
-        self.assertEqual(self.circuits[0].termination_a, termination_a)
-        self.assertIsNone(self.circuits[0].termination_z)
-
-        # Create Z termination
-        termination_z = CircuitTermination.objects.create(
-            circuit=self.circuits[0],
-            term_side='Z',
-            termination=self.sites[1],
-        )
-        self.circuits[0].refresh_from_db()
-        self.assertEqual(self.circuits[0].termination_a, termination_a)
-        self.assertEqual(self.circuits[0].termination_z, termination_z)
-
-    def test_circuit_termination_circuit_change_clears_old_cache(self):
-        """
-        When a CircuitTermination's circuit is changed, the old Circuit's cache should be cleared
-        and the new Circuit's cache should be populated.
-        """
-        # Create termination on self.circuits[0]
-        termination = CircuitTermination.objects.create(
-            circuit=self.circuits[0],
-            term_side='A',
-            termination=self.sites[0],
-        )
-        self.circuits[0].refresh_from_db()
-        self.assertEqual(self.circuits[0].termination_a, termination)
-
-        # Move termination to self.circuits[1]
-        termination.circuit = self.circuits[1]
-        termination.save()
-
-        self.circuits[0].refresh_from_db()
-        self.circuits[1].refresh_from_db()
-
-        # Old circuit's cache should be cleared
-        self.assertIsNone(self.circuits[0].termination_a)
-        # New circuit's cache should be populated
-        self.assertEqual(self.circuits[1].termination_a, termination)
-
-    def test_circuit_termination_term_side_change_clears_old_cache(self):
-        """
-        When a CircuitTermination's term_side is changed, the old side's cache should be cleared
-        and the new side's cache should be populated.
-        """
-        # Create A termination
-        termination = CircuitTermination.objects.create(
-            circuit=self.circuits[0],
-            term_side='A',
-            termination=self.sites[0],
-        )
-        self.circuits[0].refresh_from_db()
-        self.assertEqual(self.circuits[0].termination_a, termination)
-        self.assertIsNone(self.circuits[0].termination_z)
-
-        # Change from A to Z
-        termination.term_side = 'Z'
-        termination.save()
-
-        self.circuits[0].refresh_from_db()
-
-        # A side should be cleared, Z side should be populated
-        self.assertIsNone(self.circuits[0].termination_a)
-        self.assertEqual(self.circuits[0].termination_z, termination)
-
-    def test_circuit_termination_circuit_and_term_side_change(self):
-        """
-        When both circuit and term_side are changed, the old Circuit's old side cache should be
-        cleared and the new Circuit's new side cache should be populated.
-        """
-        # Create A termination on self.circuits[0]
-        termination = CircuitTermination.objects.create(
-            circuit=self.circuits[0],
-            term_side='A',
-            termination=self.sites[0],
-        )
-        self.circuits[0].refresh_from_db()
-        self.assertEqual(self.circuits[0].termination_a, termination)
-
-        # Change to self.circuits[1] Z side
-        termination.circuit = self.circuits[1]
-        termination.term_side = 'Z'
-        termination.save()
-
-        self.circuits[0].refresh_from_db()
-        self.circuits[1].refresh_from_db()
-
-        # Old circuit's A side should be cleared
-        self.assertIsNone(self.circuits[0].termination_a)
-        self.assertIsNone(self.circuits[0].termination_z)
-        # New circuit's Z side should be populated
-        self.assertIsNone(self.circuits[1].termination_a)
-        self.assertEqual(self.circuits[1].termination_z, termination)
-
-    def test_circuit_termination_deletion_clears_cache(self):
-        """
-        When a CircuitTermination is deleted, the parent Circuit's cache should be cleared.
-        """
-        termination = CircuitTermination.objects.create(
-            circuit=self.circuits[0],
-            term_side='A',
-            termination=self.sites[0],
-        )
-        self.circuits[0].refresh_from_db()
-        self.assertEqual(self.circuits[0].termination_a, termination)
-
-        # Delete the termination
-        termination.delete()
-        self.circuits[0].refresh_from_db()
-
-        # Cache should be cleared (SET_NULL behavior)
-        self.assertIsNone(self.circuits[0].termination_a)

netbox/circuits/tests/test_tables.py

@@ -1,4 +1,4 @@
-from django.test import RequestFactory, TestCase, tag
+from django.test import RequestFactory, tag, TestCase
 
 from circuits.models import CircuitTermination
 from circuits.tables import CircuitTerminationTable

netbox/circuits/urls.py

@@ -1,7 +1,6 @@
 from django.urls import include, path
 
 from utilities.urls import get_model_urls
-
 from . import views
 
 app_name = 'circuits'

netbox/circuits/views.py

@@ -5,15 +5,14 @@ from netbox.object_actions import AddObject, BulkDelete, BulkEdit, BulkExport, B
 from netbox.views import generic
 from utilities.query import count_related
 from utilities.views import GetRelatedModelsMixin, register_model_view
-
 from . import filtersets, forms, tables
 from .models import *
 
+
 #
 # Providers
 #
 
-
 @register_model_view(Provider, 'list', path='', detail=False)
 class ProviderListView(generic.ObjectListView):
     queryset = Provider.objects.annotate(

netbox/core/api/schema.py

@@ -2,16 +2,10 @@ import re
 import typing
 from collections import OrderedDict
 
-from drf_spectacular.contrib.django_filters import DjangoFilterExtension
-from drf_spectacular.extensions import OpenApiSerializerExtension, OpenApiSerializerFieldExtension, _SchemaType
+from drf_spectacular.extensions import OpenApiSerializerFieldExtension, OpenApiSerializerExtension, _SchemaType
 from drf_spectacular.openapi import AutoSchema
 from drf_spectacular.plumbing import (
-    build_basic_type,
-    build_choice_field,
-    build_media_type_object,
-    build_object_type,
-    follow_field_source,
-    get_doc,
+    build_basic_type, build_choice_field, build_media_type_object, build_object_type, get_doc,
 )
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import Direction
@@ -25,29 +19,6 @@ BULK_ACTIONS = ("bulk_destroy", "bulk_partial_update", "bulk_update")
 WRITABLE_ACTIONS = ("PATCH", "POST", "PUT")
 
 
-class NetBoxDjangoFilterExtension(DjangoFilterExtension):
-    """
-    Overrides drf-spectacular's DjangoFilterExtension to fix a regression in v0.29.0 where
-    _get_model_field() incorrectly double-appends to_field_name when field_name already ends
-    with that value (e.g. field_name='tags__slug', to_field_name='slug' produces the invalid
-    path ['tags', 'slug', 'slug']). This caused hundreds of spurious warnings during schema
-    generation for filters such as TagFilter, TenancyFilterSet.tenant, and OwnerFilterMixin.owner.
-
-    See: https://github.com/netbox-community/netbox/issues/20787
-         https://github.com/tfranzel/drf-spectacular/issues/1475
-    """
-    priority = 1
-
-    def _get_model_field(self, filter_field, model):
-        if not filter_field.field_name:
-            return None
-        path = filter_field.field_name.split('__')
-        to_field_name = filter_field.extra.get('to_field_name')
-        if to_field_name is not None and path[-1] != to_field_name:
-            path.append(to_field_name)
-        return follow_field_source(model, path, emit_warnings=False)
-
-
 class FixTimeZoneSerializerField(OpenApiSerializerFieldExtension):
     target_class = 'timezone_field.rest_framework.TimeZoneSerializerField'
 
@@ -64,7 +35,7 @@ class ChoiceFieldFix(OpenApiSerializerFieldExtension):
         if direction == 'request':
             return build_cf
 
-        if direction == "response":
+        elif direction == "response":
             value = build_cf
             label = {
                 **build_basic_type(OpenApiTypes.STR),
@@ -78,10 +49,6 @@ class ChoiceFieldFix(OpenApiSerializerFieldExtension):
                 }
             )
 
-        # TODO: This function should never implicitly/explicitly return `None`
-        # The fallback should be well-defined (drf-spectacular expects request/response naming).
-        return None
-
 
 def viewset_handles_bulk_create(view):
     """Check if view automatically provides list-based bulk create"""
@@ -104,7 +71,8 @@ class NetBoxAutoSchema(AutoSchema):
     def is_bulk_action(self):
         if hasattr(self.view, "action") and self.view.action in BULK_ACTIONS:
             return True
-        return False
+        else:
+            return False
 
     def get_operation_id(self):
         """
@@ -344,7 +312,8 @@ class FixSerializedPKRelatedField(OpenApiSerializerFieldExtension):
         if direction == "response":
             component = auto_schema.resolve_serializer(self.target.serializer, direction)
             return component.ref if component else None
-        return build_basic_type(OpenApiTypes.INT)
+        else:
+            return build_basic_type(OpenApiTypes.INT)
 
 
 class FixIntegerRangeSerializerSchema(OpenApiSerializerExtension):

netbox/core/api/serializers_/object_types.py

@@ -34,14 +34,14 @@ class ObjectTypeSerializer(BaseModelSerializer):
     @extend_schema_field(OpenApiTypes.STR)
     def get_rest_api_endpoint(self, obj):
         if not (model := obj.model_class()):
-            return None
+            return
         try:
             return get_action_url(model, action='list', rest_api=True)
         except NoReverseMatch:
-            return None
+            return
 
     @extend_schema_field(OpenApiTypes.STR)
     def get_description(self, obj):
         if not (model := obj.model_class()):
-            return None
+            return
         return inspect.getdoc(model)

netbox/core/api/serializers_/tasks.py

@@ -2,8 +2,8 @@ from rest_framework import serializers
 from rest_framework.reverse import reverse
 
 __all__ = (
-    'BackgroundQueueSerializer',
     'BackgroundTaskSerializer',
+    'BackgroundQueueSerializer',
     'BackgroundWorkerSerializer',
 )
 

netbox/core/api/urls.py

@@ -1,5 +1,4 @@
 from netbox.api.routers import NetBoxRouter
-
 from . import views
 
 app_name = 'core-api'

netbox/core/api/views.py

@@ -23,7 +23,6 @@ from netbox.api.metadata import ContentTypeMetadata
 from netbox.api.pagination import LimitOffsetListPagination
 from netbox.api.viewsets import NetBoxModelViewSet, NetBoxReadOnlyModelViewSet
 from utilities.api import IsSuperuser
-
 from . import serializers
 
 
@@ -285,4 +284,5 @@ class BackgroundTaskViewSet(BaseRQViewSet):
         stopped_jobs = stop_rq_job(id)
         if len(stopped_jobs) == 1:
             return HttpResponse(status=200)
-        return HttpResponse(status=204)
+        else:
+            return HttpResponse(status=204)

netbox/core/apps.py

@@ -6,7 +6,7 @@ from django.db.migrations.operations import AlterModelOptions
 from django.utils.translation import gettext as _
 
 from core.events import *
-from netbox.events import EVENT_TYPE_KIND_DANGER, EVENT_TYPE_KIND_SUCCESS, EVENT_TYPE_KIND_WARNING, EventType
+from netbox.events import EventType, EVENT_TYPE_KIND_DANGER, EVENT_TYPE_KIND_SUCCESS, EVENT_TYPE_KIND_WARNING
 from utilities.migration import custom_deconstruct
 
 # Ignore verbose_name & verbose_name_plural Meta options when calculating model migrations
@@ -23,10 +23,9 @@ class CoreConfig(AppConfig):
     def ready(self):
         from core.api import schema  # noqa: F401
         from core.checks import check_duplicate_indexes  # noqa: F401
-        from netbox import context_managers  # noqa: F401
         from netbox.models.features import register_models
-
         from . import data_backends, events, search  # noqa: F401
+        from netbox import context_managers  # noqa: F401
 
         # Register models
         register_models(*self.get_models())

netbox/core/checks.py

@@ -1,6 +1,6 @@
-from django.apps import apps
-from django.core.checks import Error, Tags, register
+from django.core.checks import Error, register, Tags
 from django.db.models import Index, UniqueConstraint
+from django.apps import apps
 
 __all__ = (
     'check_duplicate_indexes',

netbox/core/choices.py

@@ -2,11 +2,11 @@ from django.utils.translation import gettext_lazy as _
 
 from utilities.choices import ChoiceSet
 
+
 #
 # Data sources
 #
 
-
 class DataSourceStatusChoices(ChoiceSet):
     NEW = 'new'
     QUEUED = 'queued'

netbox/core/data_backends.py

@@ -15,7 +15,6 @@ from netbox.utils import register_data_backend
 from utilities.constants import HTTP_PROXY_SUPPORTED_SCHEMAS, HTTP_PROXY_SUPPORTED_SOCK_SCHEMAS
 from utilities.proxy import resolve_proxies
 from utilities.socks import ProxyPoolManager
-
 from .exceptions import SyncError
 
 __all__ = (

netbox/core/dataclasses.py

@@ -1,4 +1,5 @@
 import logging
+
 from dataclasses import dataclass, field
 from datetime import datetime
 

netbox/core/filtersets.py

@@ -6,9 +6,8 @@ from django.utils.translation import gettext as _
 from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, PrimaryModelFilterSet
 from netbox.utils import get_data_backend_choices
 from users.models import User
-from utilities.filters import MultiValueContentTypeFilter
+from utilities.filters import ContentTypeFilter
 from utilities.filtersets import register_filterset
-
 from .choices import *
 from .models import *
 
@@ -26,17 +25,14 @@ __all__ = (
 class DataSourceFilterSet(PrimaryModelFilterSet):
     type = django_filters.MultipleChoiceFilter(
         choices=get_data_backend_choices,
-        distinct=False,
         null_value=None
     )
     status = django_filters.MultipleChoiceFilter(
         choices=DataSourceStatusChoices,
-        distinct=False,
         null_value=None
     )
     sync_interval = django_filters.MultipleChoiceFilter(
         choices=JobIntervalChoices,
-        distinct=False,
         null_value=None
     )
 
@@ -61,13 +57,11 @@ class DataFileFilterSet(ChangeLoggedModelFilterSet):
     )
     source_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data source (ID)'),
     )
     source = django_filters.ModelMultipleChoiceFilter(
         field_name='source__name',
         queryset=DataSource.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Data source (name)'),
     )
@@ -92,10 +86,9 @@ class JobFilterSet(BaseFilterSet):
     )
     object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ObjectType.objects.with_feature('jobs'),
-        distinct=False,
         field_name='object_type_id',
     )
-    object_type = MultiValueContentTypeFilter()
+    object_type = ContentTypeFilter()
     created = django_filters.DateTimeFilter()
     created__before = django_filters.DateTimeFilter(
         field_name='created',
@@ -134,7 +127,6 @@ class JobFilterSet(BaseFilterSet):
     )
     status = django_filters.MultipleChoiceFilter(
         choices=JobStatusChoices,
-        distinct=False,
         null_value=None
     )
     queue_name = django_filters.CharFilter()
@@ -188,21 +180,18 @@ class ObjectChangeFilterSet(BaseFilterSet):
         label=_('Search'),
     )
     time = django_filters.DateTimeFromToRangeFilter()
-    changed_object_type = MultiValueContentTypeFilter()
+    changed_object_type = ContentTypeFilter()
     changed_object_type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ContentType.objects.all(),
-        distinct=False,
+        queryset=ContentType.objects.all()
     )
-    related_object_type = MultiValueContentTypeFilter()
+    related_object_type = ContentTypeFilter()
     user_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
-        distinct=False,
         label=_('User (ID)'),
     )
     user = django_filters.ModelMultipleChoiceFilter(
         field_name='user__username',
         queryset=User.objects.all(),
-        distinct=False,
         to_field_name='username',
         label=_('User name'),
     )

netbox/core/forms/filtersets.py

@@ -9,10 +9,7 @@ from netbox.utils import get_data_backend_choices
 from users.models import User
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
 from utilities.forms.fields import (
-    ContentTypeChoiceField,
-    ContentTypeMultipleChoiceField,
-    DynamicModelMultipleChoiceField,
-    TagFilterField,
+    ContentTypeChoiceField, ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, TagFilterField,
 )
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import DateTimePicker

netbox/core/forms/model_forms.py

@@ -8,7 +8,7 @@ from django.utils.translation import gettext_lazy as _
 
 from core.forms.mixins import SyncedDataMixin
 from core.models import *
-from netbox.config import PARAMS, get_config
+from netbox.config import get_config, PARAMS
 from netbox.forms import NetBoxModelForm, PrimaryModelForm
 from netbox.registry import registry
 from netbox.utils import get_data_backend_choices
@@ -43,7 +43,7 @@ class DataSourceForm(PrimaryModelForm):
                 attrs={
                     'rows': 5,
                     'class': 'font-monospace',
-                    'placeholder': '.cache\n*.txt\nsubdir/*'
+                    'placeholder': '.cache\n*.txt'
                 }
             ),
         }
@@ -165,10 +165,9 @@ class ConfigRevisionForm(forms.ModelForm, metaclass=ConfigFormMetaclass):
         FieldSet('PAGINATE_COUNT', 'MAX_PAGE_SIZE', name=_('Pagination')),
         FieldSet('CUSTOM_VALIDATORS', 'PROTECTION_RULES', name=_('Validation')),
         FieldSet('DEFAULT_USER_PREFERENCES', name=_('User Preferences')),
-        FieldSet('CHANGELOG_RETENTION', 'CHANGELOG_RETAIN_CREATE_LAST_UPDATE', name=_('Change Log')),
         FieldSet(
-            'MAINTENANCE_MODE', 'COPILOT_ENABLED', 'GRAPHQL_ENABLED', 'JOB_RETENTION', 'MAPS_URL',
-            name=_('Miscellaneous'),
+            'MAINTENANCE_MODE', 'COPILOT_ENABLED', 'GRAPHQL_ENABLED', 'CHANGELOG_RETENTION', 'JOB_RETENTION',
+            'MAPS_URL', name=_('Miscellaneous'),
         ),
         FieldSet('comment', name=_('Config Revision'))
     )

netbox/core/graphql/filter_mixins.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated, TYPE_CHECKING
 
 import strawberry
 import strawberry_django

netbox/core/graphql/filters.py

@@ -1,15 +1,14 @@
 from datetime import datetime
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated, TYPE_CHECKING
 
 import strawberry
 import strawberry_django
 from django.contrib.contenttypes.models import ContentType as DjangoContentType
 from strawberry.scalars import ID
-from strawberry_django import BaseFilterLookup, DatetimeFilterLookup, FilterLookup, StrFilterLookup
+from strawberry_django import BaseFilterLookup, DatetimeFilterLookup, FilterLookup
 
 from core import models
 from netbox.graphql.filters import BaseModelFilter, PrimaryModelFilter
-
 from .enums import *
 
 if TYPE_CHECKING:
@@ -17,10 +16,10 @@ if TYPE_CHECKING:
     from users.graphql.filters import UserFilter
 
 __all__ = (
-    'ContentTypeFilter',
     'DataFileFilter',
     'DataSourceFilter',
     'ObjectChangeFilter',
+    'ContentTypeFilter',
 )
 
 
@@ -32,23 +31,23 @@ class DataFileFilter(BaseModelFilter):
         strawberry_django.filter_field()
     )
     source_id: ID | None = strawberry_django.filter_field()
-    path: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    path: FilterLookup[str] | None = strawberry_django.filter_field()
     size: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
         strawberry_django.filter_field()
     )
-    hash: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    hash: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter_type(models.DataSource, lookups=True)
 class DataSourceFilter(PrimaryModelFilter):
-    name: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    type: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    source_url: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    type: FilterLookup[str] | None = strawberry_django.filter_field()
+    source_url: FilterLookup[str] | None = strawberry_django.filter_field()
     status: (
         BaseFilterLookup[Annotated['DataSourceStatusEnum', strawberry.lazy('core.graphql.enums')]] | None
     ) = strawberry_django.filter_field()
     enabled: FilterLookup[bool] | None = strawberry_django.filter_field()
-    ignore_rules: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    ignore_rules: FilterLookup[str] | None = strawberry_django.filter_field()
     parameters: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
         strawberry_django.filter_field()
     )
@@ -62,8 +61,8 @@ class DataSourceFilter(PrimaryModelFilter):
 class ObjectChangeFilter(BaseModelFilter):
     time: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
     user: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field()
-    user_name: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    request_id: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    user_name: FilterLookup[str] | None = strawberry_django.filter_field()
+    request_id: FilterLookup[str] | None = strawberry_django.filter_field()
     action: (
         BaseFilterLookup[Annotated['ObjectChangeActionEnum', strawberry.lazy('core.graphql.enums')]] | None
     ) = strawberry_django.filter_field()
@@ -76,7 +75,7 @@ class ObjectChangeFilter(BaseModelFilter):
         strawberry_django.filter_field()
     )
     related_object_id: ID | None = strawberry_django.filter_field()
-    object_repr: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    object_repr: FilterLookup[str] | None = strawberry_django.filter_field()
     prechange_data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
         strawberry_django.filter_field()
     )
@@ -87,5 +86,5 @@ class ObjectChangeFilter(BaseModelFilter):
 
 @strawberry_django.filter_type(DjangoContentType, lookups=True)
 class ContentTypeFilter(BaseModelFilter):
-    app_label: StrFilterLookup[str] | None = strawberry_django.filter_field()
-    model: StrFilterLookup[str] | None = strawberry_django.filter_field()
+    app_label: FilterLookup[str] | None = strawberry_django.filter_field()
+    model: FilterLookup[str] | None = strawberry_django.filter_field()

netbox/core/graphql/mixins.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated, List, TYPE_CHECKING
 
 import strawberry
 import strawberry_django
@@ -20,7 +20,7 @@ __all__ = (
 class ChangelogMixin:
 
     @strawberry_django.field
-    def changelog(self, info: Info) -> list[Annotated['ObjectChangeType', strawberry.lazy('.types')]]:  # noqa: F821
+    def changelog(self, info: Info) -> List[Annotated['ObjectChangeType', strawberry.lazy('.types')]]:  # noqa: F821
         content_type = ContentType.objects.get_for_model(self)
         object_changes = ObjectChange.objects.filter(
             changed_object_type=content_type,

netbox/core/graphql/schema.py

@@ -1,3 +1,5 @@
+from typing import List
+
 import strawberry
 import strawberry_django
 
@@ -7,7 +9,7 @@ from .types import *
 @strawberry.type(name="Query")
 class CoreQuery:
     data_file: DataFileType = strawberry_django.field()
-    data_file_list: list[DataFileType] = strawberry_django.field()
+    data_file_list: List[DataFileType] = strawberry_django.field()
 
     data_source: DataSourceType = strawberry_django.field()
-    data_source_list: list[DataSourceType] = strawberry_django.field()
+    data_source_list: List[DataSourceType] = strawberry_django.field()

netbox/core/graphql/types.py

@@ -1,4 +1,4 @@
-from typing import Annotated
+from typing import Annotated, List
 
 import strawberry
 import strawberry_django
@@ -6,7 +6,6 @@ from django.contrib.contenttypes.models import ContentType as DjangoContentType
 
 from core import models
 from netbox.graphql.types import BaseObjectType, PrimaryObjectType
-
 from .filters import *
 
 __all__ = (
@@ -34,7 +33,7 @@ class DataFileType(BaseObjectType):
     pagination=True
 )
 class DataSourceType(PrimaryObjectType):
-    datafiles: list[Annotated["DataFileType", strawberry.lazy('core.graphql.types')]]
+    datafiles: List[Annotated["DataFileType", strawberry.lazy('core.graphql.types')]]
 
 
 @strawberry_django.type(

netbox/core/jobs.py

@@ -5,7 +5,6 @@ from importlib import import_module
 import requests
 from django.conf import settings
 from django.core.cache import cache
-from django.db.models import Exists, OuterRef, Subquery
 from django.utils import timezone
 from packaging import version
 
@@ -14,8 +13,7 @@ from netbox.config import Config
 from netbox.jobs import JobRunner, system_job
 from netbox.search.backends import search_backend
 from utilities.proxy import resolve_proxies
-
-from .choices import DataSourceStatusChoices, JobIntervalChoices, ObjectChangeActionChoices
+from .choices import DataSourceStatusChoices, JobIntervalChoices
 from .models import DataSource
 
 
@@ -127,51 +125,19 @@ class SystemHousekeepingJob(JobRunner):
         """
         Delete any ObjectChange records older than the configured changelog retention time (if any).
         """
-        self.logger.info('Pruning old changelog entries...')
+        self.logger.info("Pruning old changelog entries...")
         config = Config()
         if not config.CHANGELOG_RETENTION:
-            self.logger.info('No retention period specified; skipping.')
+            self.logger.info("No retention period specified; skipping.")
             return
 
         cutoff = timezone.now() - timedelta(days=config.CHANGELOG_RETENTION)
-        self.logger.debug(f'Changelog retention period: {config.CHANGELOG_RETENTION} days ({cutoff:%Y-%m-%d %H:%M:%S})')
+        self.logger.debug(
+            f"Changelog retention period: {config.CHANGELOG_RETENTION} days ({cutoff:%Y-%m-%d %H:%M:%S})"
+        )
 
-        expired_qs = ObjectChange.objects.filter(time__lt=cutoff)
-
-        # When enabled, retain each object's original create record and most recent update record while pruning expired
-        # changelog entries. This applies only to objects without a delete record.
-        if config.CHANGELOG_RETAIN_CREATE_LAST_UPDATE:
-            self.logger.debug('Retaining changelog create records and last update records (excluding deleted objects)')
-
-            deleted_exists = ObjectChange.objects.filter(
-                action=ObjectChangeActionChoices.ACTION_DELETE,
-                changed_object_type_id=OuterRef('changed_object_type_id'),
-                changed_object_id=OuterRef('changed_object_id'),
-            )
-
-            # Keep create records only where no delete exists for that object
-            create_pks_to_keep = (
-                ObjectChange.objects.filter(action=ObjectChangeActionChoices.ACTION_CREATE)
-                .annotate(has_delete=Exists(deleted_exists))
-                .filter(has_delete=False)
-                .values('pk')
-            )
-
-            # Keep the most recent update per object only where no delete exists for the object
-            latest_update_pks_to_keep = (
-                ObjectChange.objects.filter(action=ObjectChangeActionChoices.ACTION_UPDATE)
-                .annotate(has_delete=Exists(deleted_exists))
-                .filter(has_delete=False)
-                .order_by('changed_object_type_id', 'changed_object_id', '-time', '-pk')
-                .distinct('changed_object_type_id', 'changed_object_id')
-                .values('pk')
-            )
-
-            expired_qs = expired_qs.exclude(pk__in=Subquery(create_pks_to_keep))
-            expired_qs = expired_qs.exclude(pk__in=Subquery(latest_update_pks_to_keep))
-
-        count = expired_qs.delete()[0]
-        self.logger.info(f'Deleted {count} expired changelog records')
+        count = ObjectChange.objects.filter(time__lt=cutoff).delete()[0]
+        self.logger.info(f"Deleted {count} expired changelog records")
 
     def delete_expired_jobs(self):
         """

netbox/core/management/commands/nbshell.py

@@ -144,7 +144,7 @@ class Command(BaseCommand):
         # If Python code has been passed, execute it and exit.
         if options['command']:
             exec(options['command'], namespace)
-            return None
+            return
 
         # Try to enable tab-complete
         try: