Skip to content

Commit 3a7edf3

Browse files
jeremystretchjeremystretch
committed
Clean up imports
1 parent 8894c35 commit 3a7edf3

File tree

21 files changed

+242
-269
lines changed

21 files changed

+242
-269
lines changed

‎netbox/circuits/graphql/filter_mixins.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
from dataclasses import dataclass
22
from typing import Annotated, TYPE_CHECKING
3+
34
import strawberry
45
import strawberry_django
6+
57
from netbox.graphql.filter_mixins import OrganizationalModelFilterMixin
68

79
if TYPE_CHECKING:
8-
from .filters import *
9-
from netbox.graphql.filter_lookups import *
10-
from netbox.graphql.enums import *
10+
from netbox.graphql.enums import ColorEnum
1111

12-
__all__ = ['BaseCircuitTypeFilterMixin']
12+
__all__ = (
13+
'BaseCircuitTypeFilterMixin',
14+
)
1315

1416

1517
@dataclass

‎netbox/circuits/graphql/filters.py‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
from datetime import date
22
from typing import Annotated, TYPE_CHECKING
3+
34
import strawberry
4-
from strawberry.scalars import ID
55
import strawberry_django
6+
from strawberry.scalars import ID
67
from strawberry_django import FilterLookup, DateFilterLookup
7-
from extras.graphql.filter_mixins import *
8-
from netbox.graphql.filter_mixins import *
9-
from core.graphql.filter_mixins import *
10-
from tenancy.graphql.filter_mixins import *
11-
from dcim.graphql.filter_mixins import *
12-
from .filter_mixins import *
138

149
from circuits import models
10+
from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin
11+
from dcim.graphql.filter_mixins import CabledObjectModelFilterMixin
12+
from extras.graphql.filter_mixins import CustomFieldsFilterMixin, TagsFilterMixin
13+
from netbox.graphql.filter_mixins import (
14+
DistanceFilterMixin,
15+
ImageAttachmentFilterMixin,
16+
OrganizationalModelFilterMixin,
17+
PrimaryModelFilterMixin,
18+
)
19+
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin
20+
from .filter_mixins import BaseCircuitTypeFilterMixin
1521

1622
if TYPE_CHECKING:
23+
from core.graphql.filters import ContentTypeFilter
24+
from dcim.graphql.filters import InterfaceFilter
25+
from ipam.graphql.filters import ASNFilter
26+
from netbox.graphql.filter_lookups import IntegerLookup
1727
from .enums import *
18-
from netbox.graphql.enums import *
19-
from wireless.graphql.enums import *
20-
from netbox.graphql.filter_lookups import *
21-
from core.graphql.filters import *
22-
from extras.graphql.filters import *
23-
from circuits.graphql.filters import *
24-
from dcim.graphql.filters import *
25-
from ipam.graphql.filters import *
26-
from tenancy.graphql.filters import *
27-
from wireless.graphql.filters import *
28-
from users.graphql.filters import *
29-
from virtualization.graphql.filters import *
30-
from vpn.graphql.filters import *
3128

3229
__all__ = (
3330
'CircuitFilter',

‎netbox/core/graphql/filter_mixins.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
from dataclasses import dataclass
22
from datetime import datetime
33
from typing import Annotated, TYPE_CHECKING
4+
45
import strawberry
5-
from strawberry import ID
66
import strawberry_django
7+
from strawberry import ID
78
from strawberry_django import DatetimeFilterLookup
89

9-
1010
if TYPE_CHECKING:
1111
from .filters import *
1212

13-
__all__ = ['BaseFilterMixin', 'BaseObjectTypeFilterMixin', 'ChangeLogFilterMixin']
13+
__all__ = (
14+
'BaseFilterMixin',
15+
'BaseObjectTypeFilterMixin',
16+
'ChangeLogFilterMixin',
17+
)
1418

1519

1620
# @strawberry.input

‎netbox/core/graphql/filters.py‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
from datetime import datetime
22
from typing import Annotated, TYPE_CHECKING
3+
34
import strawberry
4-
from strawberry.scalars import ID
55
import strawberry_django
6-
from strawberry_django import (
7-
DatetimeFilterLookup,
8-
FilterLookup,
9-
)
106
from django.contrib.contenttypes.models import ContentType as DjangoContentType
11-
from core.graphql.filter_mixins import BaseFilterMixin
12-
from netbox.graphql.filter_lookups import JSONFilter
13-
from netbox.graphql.filter_mixins import (
14-
PrimaryModelFilterMixin,
15-
)
7+
from strawberry.scalars import ID
8+
from strawberry_django import DatetimeFilterLookup, FilterLookup
169

1710
from core import models
11+
from core.graphql.filter_mixins import BaseFilterMixin
12+
from netbox.graphql.filter_mixins import PrimaryModelFilterMixin
1813

1914
if TYPE_CHECKING:
20-
from netbox.graphql.filter_lookups import *
21-
from users.graphql.filters import *
22-
15+
from netbox.graphql.filter_lookups import IntegerLookup, JSONFilter
16+
from users.graphql.filters import UserFilter
2317

2418
__all__ = (
2519
'DataFileFilter',

‎netbox/dcim/graphql/filter_mixins.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
from dataclasses import dataclass
22
from typing import Annotated, TYPE_CHECKING
3+
34
import strawberry
4-
from strawberry import ID
55
import strawberry_django
6+
from strawberry import ID
67
from strawberry_django import FilterLookup
7-
from core.graphql.filter_mixins import *
8-
from netbox.graphql.filter_mixins import *
8+
9+
from core.graphql.filter_mixins import BaseFilterMixin, ChangeLogFilterMixin
10+
from core.graphql.filters import ContentTypeFilter
11+
from netbox.graphql.filter_mixins import NetBoxModelFilterMixin, PrimaryModelFilterMixin, WeightFilterMixin
912
from .enums import *
1013

1114
if TYPE_CHECKING:
15+
from netbox.graphql.filter_lookups import IntegerLookup
16+
from extras.graphql.filters import ConfigTemplateFilter
17+
from ipam.graphql.filters import VLANFilter, VLANTranslationPolicyFilter
1218
from .filters import *
13-
from netbox.graphql.filter_lookups import *
14-
from extras.graphql.filters import *
15-
from ipam.graphql.filters import *
1619

1720
__all__ = (
1821
'CabledObjectModelFilterMixin',
@@ -111,9 +114,8 @@ class InterfaceBaseFilterMixin(BaseFilterMixin):
111114
qinq_svlan: Annotated['VLANFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
112115
strawberry_django.filter_field()
113116
)
114-
vlan_tranlation_policy: Annotated['VLANTranslationPolicyFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
115-
strawberry_django.filter_field()
116-
)
117+
vlan_translation_policy: Annotated['VLANTranslationPolicyFilter', strawberry.lazy('ipam.graphql.filters')] | None \
118+
= strawberry_django.filter_field()
117119
primary_mac_address: Annotated['MACAddressFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
118120
strawberry_django.filter_field()
119121
)

‎netbox/dcim/graphql/filters.py‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,46 @@
11
from typing import Annotated, TYPE_CHECKING
2+
23
import strawberry
3-
from strawberry.scalars import ID
44
import strawberry_django
5-
from strawberry_django import (
6-
FilterLookup,
7-
)
8-
from extras.graphql.filter_mixins import (
9-
ConfigContextFilterMixin,
10-
)
5+
from strawberry.scalars import ID
6+
from strawberry_django import FilterLookup
7+
8+
from core.graphql.filter_mixins import ChangeLogFilterMixin
9+
from dcim import models
10+
from extras.graphql.filter_mixins import ConfigContextFilterMixin
1111
from netbox.graphql.filter_mixins import (
1212
PrimaryModelFilterMixin,
1313
OrganizationalModelFilterMixin,
1414
NestedGroupModelFilterMixin,
1515
ImageAttachmentFilterMixin,
1616
WeightFilterMixin,
1717
)
18-
from .filter_mixins import *
19-
from dcim import models
20-
from core.graphql.filter_mixins import *
2118
from tenancy.graphql.filter_mixins import TenancyFilterMixin, ContactFilterMixin
19+
from .filter_mixins import (
20+
CabledObjectModelFilterMixin,
21+
ComponentModelFilterMixin,
22+
ComponentTemplateFilterMixin,
23+
InterfaceBaseFilterMixin,
24+
ModularComponentModelFilterMixin,
25+
ModularComponentTemplateFilterMixin,
26+
RackBaseFilterMixin,
27+
RenderConfigFilterMixin,
28+
)
2229

2330
if TYPE_CHECKING:
31+
from core.graphql.filters import ContentTypeFilter
32+
from extras.graphql.filters import ConfigTemplateFilter, ImageAttachmentFilter
33+
from ipam.graphql.filters import (
34+
ASNFilter, FHRPGroupAssignmentFilter, IPAddressFilter, PrefixFilter, VLANGroupFilter, VRFFilter,
35+
)
36+
from netbox.graphql.enums import ColorEnum
37+
from netbox.graphql.filter_lookups import FloatLookup, IntegerArrayLookup, IntegerLookup, TreeNodeFilter
38+
from users.graphql.filters import UserFilter
39+
from virtualization.graphql.filters import ClusterFilter
40+
from vpn.graphql.filters import L2VPNFilter, TunnelTerminationFilter
41+
from wireless.graphql.enums import WirelessChannelEnum, WirelessRoleEnum
42+
from wireless.graphql.filters import WirelessLANFilter, WirelessLinkFilter
2443
from .enums import *
25-
from netbox.graphql.enums import *
26-
from wireless.graphql.enums import *
27-
from netbox.graphql.filter_lookups import *
28-
from core.graphql.filters import *
29-
from extras.graphql.filters import *
30-
from circuits.graphql.filters import *
31-
from dcim.graphql.filters import *
32-
from ipam.graphql.filters import *
33-
from tenancy.graphql.filters import *
34-
from wireless.graphql.filters import *
35-
from users.graphql.filters import *
36-
from virtualization.graphql.filters import *
37-
from vpn.graphql.filters import *
38-
3944

4045
__all__ = (
4146
'CableFilter',

‎netbox/extras/graphql/filter_mixins.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
from dataclasses import dataclass
22
from typing import Annotated, TYPE_CHECKING
3+
34
import strawberry
45
import strawberry_django
56
from strawberry_django import FilterLookup
7+
68
from core.graphql.filter_mixins import BaseFilterMixin
79

810
if TYPE_CHECKING:
9-
from netbox.graphql.filter_lookups import *
11+
from netbox.graphql.filter_lookups import JSONFilter
1012
from .filters import *
1113

12-
__all__ = [
14+
__all__ = (
1315
'CustomFieldsFilterMixin',
1416
'JournalEntriesFilterMixin',
1517
'TagsFilterMixin',
1618
'ConfigContextFilterMixin',
1719
'TagBaseFilterMixin',
18-
]
20+
)
1921

2022

2123
@dataclass

‎netbox/extras/graphql/filters.py‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
from typing import Annotated, TYPE_CHECKING
2+
23
import strawberry
3-
from strawberry.scalars import ID
44
import strawberry_django
5-
from strawberry_django import (
6-
FilterLookup,
7-
)
8-
from netbox.graphql.filter_mixins import (
9-
BaseObjectTypeFilterMixin,
10-
ChangeLogFilterMixin,
11-
SyncedDataFilterMixin,
12-
)
5+
from strawberry.scalars import ID
6+
from strawberry_django import FilterLookup
7+
8+
from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin
139
from extras import models
1410
from extras.graphql.filter_mixins import TagBaseFilterMixin, CustomFieldsFilterMixin, TagsFilterMixin
11+
from netbox.graphql.filter_mixins import SyncedDataFilterMixin
1512

1613
if TYPE_CHECKING:
14+
from core.graphql.filters import ContentTypeFilter
15+
from dcim.graphql.filters import (
16+
DeviceRoleFilter, DeviceTypeFilter, LocationFilter, PlatformFilter, RegionFilter, SiteFilter, SiteGroupFilter,
17+
)
18+
from tenancy.graphql.filters import TenantFilter, TenantGroupFilter
19+
from netbox.graphql.enums import ColorEnum
20+
from netbox.graphql.filter_lookups import IntegerLookup, JSONFilter, StringArrayLookup, TreeNodeFilter
21+
from users.graphql.filters import GroupFilter, UserFilter
22+
from virtualization.graphql.filters import ClusterFilter, ClusterGroupFilter, ClusterTypeFilter
1723
from .enums import *
18-
from netbox.graphql.enums import *
19-
from wireless.graphql.enums import *
20-
from netbox.graphql.filter_lookups import *
21-
from extras.graphql.filters import *
22-
from circuits.graphql.filters import *
23-
from dcim.graphql.filters import *
24-
from ipam.graphql.filters import *
25-
from tenancy.graphql.filters import *
26-
from wireless.graphql.filters import *
27-
from users.graphql.filters import *
28-
from virtualization.graphql.filters import *
29-
from vpn.graphql.filters import *
30-
3124

3225
__all__ = (
3326
'ConfigContextFilter',

‎netbox/ipam/graphql/filter_mixins.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
from dataclasses import dataclass
22
from typing import Annotated, TYPE_CHECKING
3+
34
import strawberry
45
import strawberry_django
56

6-
from core.graphql.filter_mixins import *
7+
from core.graphql.filter_mixins import BaseFilterMixin
78

89
if TYPE_CHECKING:
10+
from netbox.graphql.filter_lookups import IntegerLookup
911
from .enums import *
10-
from netbox.graphql.filter_lookups import *
1112

12-
__all__ = ['ServiceBaseFilterMixin']
13+
__all__ = (
14+
'ServiceBaseFilterMixin',
15+
)
1316

1417

1518
@dataclass

‎netbox/ipam/graphql/filters.py‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
11
from datetime import date
22
from typing import Annotated, TYPE_CHECKING
3+
34
import netaddr
4-
from netaddr.core import AddrFormatError
5-
from django.db.models import Q
65
import strawberry
7-
from strawberry.scalars import ID
86
import strawberry_django
9-
from strawberry_django import (
10-
FilterLookup,
11-
DateFilterLookup,
12-
)
13-
from core.graphql.filter_mixins import *
7+
from django.db.models import Q
8+
from netaddr.core import AddrFormatError
9+
from strawberry.scalars import ID
10+
from strawberry_django import FilterLookup, DateFilterLookup
11+
12+
from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin
1413
from dcim.graphql.filter_mixins import ScopedFilterMixin
15-
from netbox.graphql.filter_mixins import *
16-
from tenancy.graphql.filter_mixins import *
1714
from ipam import models
18-
from ipam.graphql.filter_mixins import *
15+
from ipam.graphql.filter_mixins import ServiceBaseFilterMixin
16+
from netbox.graphql.filter_mixins import NetBoxModelFilterMixin, OrganizationalModelFilterMixin, PrimaryModelFilterMixin
17+
from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin
1918

2019
if TYPE_CHECKING:
20+
from netbox.graphql.filter_lookups import IntegerArrayLookup, IntegerLookup
21+
from core.graphql.filters import ContentTypeFilter
22+
from dcim.graphql.filters import DeviceFilter, SiteFilter
23+
from virtualization.graphql.filters import VirtualMachineFilter
24+
from vpn.graphql.filters import L2VPNFilter
2125
from .enums import *
22-
from netbox.graphql.enums import *
23-
from wireless.graphql.enums import *
24-
from netbox.graphql.filter_lookups import *
25-
from core.graphql.filters import *
26-
from extras.graphql.filters import *
27-
from circuits.graphql.filters import *
28-
from dcim.graphql.filters import *
29-
from ipam.graphql.filters import *
30-
from tenancy.graphql.filters import *
31-
from wireless.graphql.filters import *
32-
from users.graphql.filters import *
33-
from virtualization.graphql.filters import *
34-
from vpn.graphql.filters import *
3526

3627
__all__ = (
3728
'ASNFilter',

0 commit comments

Comments
 (0)