Skip to content

Commit 067e309

Browse files
committed
isort it all
1 parent d6fb26c commit 067e309

19 files changed

+58
-69
lines changed

netbox_script_manager/api/serializers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from django.template.defaultfilters import date as date_filter
2-
from rest_framework import serializers
3-
42
from netbox.api.serializers import NetBoxModelSerializer
53
from netbox.config import get_config
4+
from rest_framework import serializers
65
from utilities.templatetags.builtins.filters import render_markdown
7-
from netbox_script_manager.models import ScriptInstance, ScriptExecution, ScriptLogLine, ScriptArtifact
6+
7+
from netbox_script_manager.models import ScriptArtifact, ScriptExecution, ScriptInstance, ScriptLogLine
88

99

1010
class MarkdownField(serializers.Field):

netbox_script_manager/api/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from netbox_script_manager.api.views import (
44
NetBoxScriptManagerView,
5-
ScriptInstanceViewSet,
5+
ScriptArtifactViewSet,
66
ScriptExecutionViewSet,
7+
ScriptInstanceViewSet,
78
ScriptLogLineViewSet,
8-
ScriptArtifactViewSet,
99
)
1010

1111
router = NetBoxRouter()

netbox_script_manager/api/views.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
import uuid
22

3-
from django.conf import settings
43
import django_rq
4+
from django.conf import settings
5+
from netbox.api.viewsets import NetBoxModelViewSet, NetBoxReadOnlyModelViewSet
6+
from rest_framework import status as http_status
57
from rest_framework.decorators import action
68
from rest_framework.exceptions import PermissionDenied
79
from rest_framework.response import Response
810
from rest_framework.routers import APIRootView
9-
from rest_framework import status as http_status
10-
11-
from netbox.api.viewsets import NetBoxModelViewSet, NetBoxReadOnlyModelViewSet
12-
from utilities.utils import copy_safe_request
13-
from ..choices import ScriptExecutionStatusChoices
1411
from utilities.permissions import get_permission_for_model
12+
from utilities.utils import copy_safe_request
1513

16-
from .serializers import (
17-
ScriptInstanceSerializer,
18-
ScriptExecutionSerializer,
19-
ScriptLogLineSerializer,
20-
ScriptArtifactSerializer,
21-
ScriptInputSerializer,
22-
)
23-
24-
# from netbox_dns.filters import ViewFilter, ZoneFilter, NameServerFilter, RecordFilter
25-
from ..models import ScriptInstance, ScriptArtifact, ScriptExecution, ScriptLogLine
26-
from ..filtersets import ScriptInstanceFilterSet, ScriptArtifactFilterSet, ScriptExecutionFilterSet, ScriptLogLineFilterSet
14+
from ..choices import ScriptExecutionStatusChoices
15+
from ..filtersets import (ScriptArtifactFilterSet, ScriptExecutionFilterSet, ScriptInstanceFilterSet,
16+
ScriptLogLineFilterSet)
17+
from ..models import ScriptArtifact, ScriptExecution, ScriptInstance, ScriptLogLine
2718
from ..scripts import run_script
19+
from .serializers import (ScriptArtifactSerializer, ScriptExecutionSerializer, ScriptInputSerializer,
20+
ScriptInstanceSerializer, ScriptLogLineSerializer)
2821

2922
plugin_config = settings.PLUGINS_CONFIG.get("netbox_script_manager")
3023

netbox_script_manager/filtersets.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import django_filters
22
from django.db.models import Q
3-
from netbox.filtersets import NetBoxModelFilterSet, BaseFilterSet
4-
from .models import ScriptInstance, ScriptArtifact, ScriptExecution, ScriptLogLine
5-
from .choices import ScriptExecutionStatusChoices, LogLevelChoices
3+
from netbox.filtersets import BaseFilterSet, NetBoxModelFilterSet
4+
5+
from .choices import LogLevelChoices, ScriptExecutionStatusChoices
6+
from .models import ScriptArtifact, ScriptExecution, ScriptInstance, ScriptLogLine
67

78

89
class ScriptInstanceFilterSet(NetBoxModelFilterSet):

netbox_script_manager/forms.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
from django import forms
2+
from django.contrib.auth.models import User
23
from django.utils.translation import gettext as _
3-
4-
from netbox.forms import NetBoxModelForm, NetBoxModelFilterSetForm
4+
from extras.choices import DurationChoices
55
from extras.forms.mixins import SavedFiltersMixin
6-
7-
from utilities.forms.widgets import DateTimePicker, NumberWithOptions, APISelectMultiple, DateTimePicker
6+
from netbox.forms import NetBoxModelFilterSetForm, NetBoxModelForm
87
from utilities.forms import BootstrapMixin, FilterForm
9-
10-
from extras.choices import DurationChoices
11-
from utilities.utils import local_now
128
from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField
13-
from django.contrib.auth.models import User
9+
from utilities.forms.widgets import APISelectMultiple, DateTimePicker, NumberWithOptions
10+
from utilities.utils import local_now
1411

15-
from .models import ScriptInstance, ScriptExecution
1612
from .choices import ScriptExecutionStatusChoices
17-
from utilities.forms.fields import TagFilterField
13+
from .models import ScriptExecution, ScriptInstance
1814

1915

2016
class ScriptInstanceForm(NetBoxModelForm):

netbox_script_manager/migrations/0001_initial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Generated by Django 4.1.9 on 2023-07-04 09:28
22

33
import django.core.validators
4-
from django.db import migrations, models
54
import django.db.models.deletion
65
import taggit.managers
76
import utilities.json
7+
from django.db import migrations, models
88

99

1010
class Migration(migrations.Migration):

netbox_script_manager/migrations/0002_scriptinstance_custom_field_data_scriptinstance_tags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Generated by Django 4.1.9 on 2023-07-06 07:38
22

3-
from django.db import migrations, models
43
import taggit.managers
54
import utilities.json
5+
from django.db import migrations, models
66

77

88
class Migration(migrations.Migration):

netbox_script_manager/migrations/0005_remove_scriptexecution_created_and_more.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated by Django 4.2.2 on 2023-07-25 08:51
22

3-
from django.db import migrations, models
43
import django.db.models.deletion
4+
from django.db import migrations, models
55

66

77
class Migration(migrations.Migration):

netbox_script_manager/migrations/0007_scriptexecution_created_scriptexecution_user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Generated by Django 4.2.2 on 2023-07-27 05:32
22

3-
from django.conf import settings
4-
from django.db import migrations, models
53
import django.db.models.deletion
64
import django.utils.timezone
5+
from django.conf import settings
6+
from django.db import migrations, models
77

88

99
class Migration(migrations.Migration):

netbox_script_manager/models.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import importlib
2-
from functools import cached_property
32
import threading
3+
from functools import cached_property
44

55
import django_rq
66
from django.conf import settings
@@ -10,14 +10,12 @@
1010
from django.db import models
1111
from django.urls import reverse
1212
from django.utils import timezone
13-
1413
from netbox.models import NetBoxModel
1514
from utilities.querysets import RestrictedQuerySet
1615

1716
from .choices import LogLevelChoices, ScriptExecutionStatusChoices
1817
from .util import clear_module_cache
1918

20-
2119
lock = threading.Lock()
2220
plugin_config = settings.PLUGINS_CONFIG.get("netbox_script_manager")
2321

0 commit comments

Comments
 (0)