From 58275977bb654f2c784da2d4724e072bf5ac4abd Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Mon, 13 Apr 2026 09:24:30 -0400
Subject: [PATCH] Closes #21890: Deprecate the `models` registry key (#21892)

* Closes #21890: Deprecate the 'models' registry key

* Add deprecation note for 'models' key to development docs
---
 docs/development/application-registry.md |  3 +++
 netbox/netbox/models/features.py         |  6 +++---
 netbox/netbox/registry.py                | 10 ++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/development/application-registry.md b/docs/development/application-registry.md
index 9503f8ff0..7946d9df4 100644
--- a/docs/development/application-registry.md
+++ b/docs/development/application-registry.md
@@ -32,6 +32,9 @@ Core model features are listed in the [features matrix](./models.md#features-mat
 
 ### `models`
 
+!!! warning "Deprecated"
+    Usage of this key has been deprecated and will be removed in NetBox v4.7. Use `ObjectType.objects.public()` to find registered models.
+
 This key lists all models which have been registered in NetBox which are not designated for private use. (Setting `_netbox_private` to True on a model excludes it from this list.) As with individual features under `model_features`, models are organized by app label.
 
 ### `plugins`
diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index e4dbf9112..993828c1b 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -723,10 +723,10 @@ def register_models(*models):
     for model in models:
         app_label, model_name = model._meta.label_lower.split('.')
 
-        # TODO: Remove in NetBox v4.5
-        # Register public models
+        # TODO: Remove in NetBox v4.7
+        # Register public models (access the underlying dict directly to avoid triggering the deprecation warning)
         if not getattr(model, '_netbox_private', False):
-            registry['models'][app_label].add(model_name)
+            dict.__getitem__(registry, 'models')[app_label].add(model_name)
 
         # Register applicable feature views for the model
         if issubclass(model, ContactsMixin):
diff --git a/netbox/netbox/registry.py b/netbox/netbox/registry.py
index d7e5988ce..f894a11b0 100644
--- a/netbox/netbox/registry.py
+++ b/netbox/netbox/registry.py
@@ -9,6 +9,15 @@ class Registry(dict):
     removed (though the value of each key is mutable).
     """
     def __getitem__(self, key):
+        # TODO: Remove in NetBox v4.7
+        if key == 'models':
+            import warnings
+            warnings.warn(
+                'The "models" registry key is deprecated and will be removed in NetBox v4.7. Registered models can be '
+                'obtained by calling ObjectType.objects.public().',
+                DeprecationWarning,
+                stacklevel=2,
+            )
         try:
             return super().__getitem__(key)
         except KeyError:
@@ -30,6 +39,7 @@ registry = Registry({
     'filtersets': dict(),
     'model_actions': collections.defaultdict(set),
     'model_features': dict(),
+    # TODO: Remove in NetBox v4.7
     'models': collections.defaultdict(set),
     'plugins': dict(),
     'request_processors': list(),