Misc cleanup

netbox/extras/api/views.py

@@ -1,5 +1,4 @@
 from django.contrib.contenttypes.models import ContentType
-from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django_rq.queues import get_connection
 from rest_framework import status
@@ -15,7 +14,7 @@ from rq import Worker
 from core.models import Job
 from extras import filtersets
 from extras.models import *
-from extras.scripts import get_module_and_script, run_script
+from extras.scripts import run_script
 from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
 from netbox.api.features import SyncedDataMixin
 from netbox.api.metadata import ContentTypeMetadata
@@ -217,15 +216,8 @@ class ScriptViewSet(ModelViewSet):
     _ignore_model_permissions = True
     lookup_value_regex = '[^/]+'  # Allow dots
 
-    def _get_script(self, pk):
-        pk = int(pk)
-        script = get_object_or_404(self.queryset, pk=pk)
-        module = script.module
-
-        return module, script
-
     def retrieve(self, request, pk):
-        module, script = self._get_script(pk)
+        script = get_object_or_404(self.queryset, pk=pk)
         serializer = serializers.ScriptDetailSerializer(script, context={'request': request})
 
         return Response(serializer.data)
@@ -238,7 +230,7 @@ class ScriptViewSet(ModelViewSet):
         if not request.user.has_perm('extras.run_script'):
             raise PermissionDenied("This user does not have permission to run scripts.")
 
-        module, script = self._get_script(pk)
+        script = get_object_or_404(self.queryset, pk=pk)
         input_serializer = serializers.ScriptInputSerializer(
             data=request.data,
             context={'script': script}
@@ -251,7 +243,7 @@ class ScriptViewSet(ModelViewSet):
         if input_serializer.is_valid():
             script.result = Job.enqueue(
                 run_script,
-                instance=module,
+                instance=script.module,
                 name=script.python_class.class_name,
                 user=request.user,
                 data=input_serializer.data['data'],

netbox/extras/models/scripts.py

@@ -75,12 +75,12 @@ class Script(EventRulesMixin, JobsMixin):
     def python_class(self):
         return self.module.module_scripts.get(self.name)
 
-    def delete(self, soft_delete=False):
+    def delete(self, soft_delete=False, **kwargs):
         if soft_delete and self.jobs.exists():
             self.is_executable = False
             self.save()
         else:
-            super().delete()
+            super().delete(**kwargs)
             self.id = None
 
 
@@ -134,8 +134,8 @@ class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
 
     def sync_classes(self):
         """
-        Sync's the file based module to the database objects - adding and
-        removing python classes from the DB as appropriate.
+        Syncs the file-based module to the database, adding and removing individual Script objects
+        in the database as needed.
         """
         db_classes = {
             script.name: script for script in self.scripts.all()