Move is_script(), is_report() into extras.utils

netbox/extras/models/models.py

@@ -26,7 +26,7 @@ from core.models import ManagedFile
 from extras.choices import *
 from extras.constants import *
 from extras.conditions import ConditionSet
-from extras.utils import FeatureQuery, image_upload
+from extras.utils import FeatureQuery, image_upload, is_report, is_script
 from netbox.config import get_config
 from netbox.constants import RQ_QUEUE_DEFAULT
 from netbox.models import ChangeLoggedModel
@@ -34,7 +34,6 @@ from netbox.models.features import (
     CloningMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, JobResultsMixin, SyncedDataMixin,
     TagsMixin, WebhooksMixin,
 )
-from ..temp import is_report, is_script
 from utilities.querysets import RestrictedQuerySet
 from utilities.rqworker import get_queue_for_model
 from utilities.utils import render_jinja2

netbox/extras/temp.py

@@ -1,20 +0,0 @@
-def is_script(obj):
-    """
-    Returns True if the object is a Script.
-    """
-    from .scripts import Script
-    try:
-        return issubclass(obj, Script) and obj != Script
-    except TypeError:
-        return False
-
-
-def is_report(obj):
-    """
-    Returns True if the given object is a Report.
-    """
-    from .reports import Report
-    try:
-        return issubclass(obj, Report) and obj != Report
-    except TypeError:
-        return False

netbox/extras/utils.py

@@ -70,3 +70,25 @@ def register_features(model, features):
             raise KeyError(
                 f"{feature} is not a valid model feature! Valid keys are: {registry['model_features'].keys()}"
             )
+
+
+def is_script(obj):
+    """
+    Returns True if the object is a Script.
+    """
+    from .scripts import Script
+    try:
+        return issubclass(obj, Script) and obj != Script
+    except TypeError:
+        return False
+
+
+def is_report(obj):
+    """
+    Returns True if the given object is a Report.
+    """
+    from .reports import Report
+    try:
+        return issubclass(obj, Report) and obj != Report
+    except TypeError:
+        return False