diff --git a/netbox/circuits/graphql/filter_mixins.py b/netbox/circuits/graphql/filter_mixins.py index f3a0d1f4a..3ae6fa82e 100644 --- a/netbox/circuits/graphql/filter_mixins.py +++ b/netbox/circuits/graphql/filter_mixins.py @@ -1,15 +1,17 @@ from dataclasses import dataclass from typing import Annotated, TYPE_CHECKING + import strawberry import strawberry_django + from netbox.graphql.filter_mixins import OrganizationalModelFilterMixin if TYPE_CHECKING: - from .filters import * - from netbox.graphql.filter_lookups import * - from netbox.graphql.enums import * + from netbox.graphql.enums import ColorEnum -__all__ = ['BaseCircuitTypeFilterMixin'] +__all__ = ( + 'BaseCircuitTypeFilterMixin', +) @dataclass diff --git a/netbox/circuits/graphql/filters.py b/netbox/circuits/graphql/filters.py index d8154368b..48b4252ac 100644 --- a/netbox/circuits/graphql/filters.py +++ b/netbox/circuits/graphql/filters.py @@ -1,33 +1,30 @@ from datetime import date from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry.scalars import ID import strawberry_django +from strawberry.scalars import ID from strawberry_django import FilterLookup, DateFilterLookup -from extras.graphql.filter_mixins import * -from netbox.graphql.filter_mixins import * -from core.graphql.filter_mixins import * -from tenancy.graphql.filter_mixins import * -from dcim.graphql.filter_mixins import * -from .filter_mixins import * from circuits import models +from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin +from dcim.graphql.filter_mixins import CabledObjectModelFilterMixin +from extras.graphql.filter_mixins import CustomFieldsFilterMixin, TagsFilterMixin +from netbox.graphql.filter_mixins import ( + DistanceFilterMixin, + ImageAttachmentFilterMixin, + OrganizationalModelFilterMixin, + PrimaryModelFilterMixin, +) +from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin +from .filter_mixins import BaseCircuitTypeFilterMixin if TYPE_CHECKING: + from core.graphql.filters import ContentTypeFilter + from dcim.graphql.filters import InterfaceFilter + from ipam.graphql.filters import ASNFilter + from netbox.graphql.filter_lookups import IntegerLookup from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from core.graphql.filters import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * __all__ = ( 'CircuitFilter', diff --git a/netbox/core/graphql/filter_mixins.py b/netbox/core/graphql/filter_mixins.py index 463350ab9..670ec2ebb 100644 --- a/netbox/core/graphql/filter_mixins.py +++ b/netbox/core/graphql/filter_mixins.py @@ -1,16 +1,20 @@ from dataclasses import dataclass from datetime import datetime from typing import Annotated, TYPE_CHECKING -import strawberry -from strawberry import ID -import strawberry_django -from strawberry_django import DatetimeFilterLookup +import strawberry +import strawberry_django +from strawberry import ID +from strawberry_django import DatetimeFilterLookup if TYPE_CHECKING: from .filters import * -__all__ = ['BaseFilterMixin', 'BaseObjectTypeFilterMixin', 'ChangeLogFilterMixin'] +__all__ = ( + 'BaseFilterMixin', + 'BaseObjectTypeFilterMixin', + 'ChangeLogFilterMixin', +) # @strawberry.input diff --git a/netbox/core/graphql/filters.py b/netbox/core/graphql/filters.py index 476e69533..e5d44674a 100644 --- a/netbox/core/graphql/filters.py +++ b/netbox/core/graphql/filters.py @@ -1,25 +1,19 @@ from datetime import datetime from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry.scalars import ID import strawberry_django -from strawberry_django import ( - DatetimeFilterLookup, - FilterLookup, -) from django.contrib.contenttypes.models import ContentType as DjangoContentType -from core.graphql.filter_mixins import BaseFilterMixin -from netbox.graphql.filter_lookups import JSONFilter -from netbox.graphql.filter_mixins import ( - PrimaryModelFilterMixin, -) +from strawberry.scalars import ID +from strawberry_django import DatetimeFilterLookup, FilterLookup from core import models +from core.graphql.filter_mixins import BaseFilterMixin +from netbox.graphql.filter_mixins import PrimaryModelFilterMixin if TYPE_CHECKING: - from netbox.graphql.filter_lookups import * - from users.graphql.filters import * - + from netbox.graphql.filter_lookups import IntegerLookup, JSONFilter + from users.graphql.filters import UserFilter __all__ = ( 'DataFileFilter', diff --git a/netbox/dcim/graphql/filter_mixins.py b/netbox/dcim/graphql/filter_mixins.py index 23ab29813..47a75d08e 100644 --- a/netbox/dcim/graphql/filter_mixins.py +++ b/netbox/dcim/graphql/filter_mixins.py @@ -1,18 +1,21 @@ from dataclasses import dataclass from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry import ID import strawberry_django +from strawberry import ID from strawberry_django import FilterLookup -from core.graphql.filter_mixins import * -from netbox.graphql.filter_mixins import * + +from core.graphql.filter_mixins import BaseFilterMixin, ChangeLogFilterMixin +from core.graphql.filters import ContentTypeFilter +from netbox.graphql.filter_mixins import NetBoxModelFilterMixin, PrimaryModelFilterMixin, WeightFilterMixin from .enums import * if TYPE_CHECKING: + from netbox.graphql.filter_lookups import IntegerLookup + from extras.graphql.filters import ConfigTemplateFilter + from ipam.graphql.filters import VLANFilter, VLANTranslationPolicyFilter from .filters import * - from netbox.graphql.filter_lookups import * - from extras.graphql.filters import * - from ipam.graphql.filters import * __all__ = ( 'CabledObjectModelFilterMixin', @@ -111,9 +114,8 @@ class InterfaceBaseFilterMixin(BaseFilterMixin): qinq_svlan: Annotated['VLANFilter', strawberry.lazy('ipam.graphql.filters')] | None = ( strawberry_django.filter_field() ) - vlan_tranlation_policy: Annotated['VLANTranslationPolicyFilter', strawberry.lazy('ipam.graphql.filters')] | None = ( - strawberry_django.filter_field() - ) + vlan_translation_policy: Annotated['VLANTranslationPolicyFilter', strawberry.lazy('ipam.graphql.filters')] | None \ + = strawberry_django.filter_field() primary_mac_address: Annotated['MACAddressFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/dcim/graphql/filters.py b/netbox/dcim/graphql/filters.py index 5d9e84aff..4203517cc 100644 --- a/netbox/dcim/graphql/filters.py +++ b/netbox/dcim/graphql/filters.py @@ -1,13 +1,13 @@ from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry.scalars import ID import strawberry_django -from strawberry_django import ( - FilterLookup, -) -from extras.graphql.filter_mixins import ( - ConfigContextFilterMixin, -) +from strawberry.scalars import ID +from strawberry_django import FilterLookup + +from core.graphql.filter_mixins import ChangeLogFilterMixin +from dcim import models +from extras.graphql.filter_mixins import ConfigContextFilterMixin from netbox.graphql.filter_mixins import ( PrimaryModelFilterMixin, OrganizationalModelFilterMixin, @@ -15,27 +15,32 @@ from netbox.graphql.filter_mixins import ( ImageAttachmentFilterMixin, WeightFilterMixin, ) -from .filter_mixins import * -from dcim import models -from core.graphql.filter_mixins import * from tenancy.graphql.filter_mixins import TenancyFilterMixin, ContactFilterMixin +from .filter_mixins import ( + CabledObjectModelFilterMixin, + ComponentModelFilterMixin, + ComponentTemplateFilterMixin, + InterfaceBaseFilterMixin, + ModularComponentModelFilterMixin, + ModularComponentTemplateFilterMixin, + RackBaseFilterMixin, + RenderConfigFilterMixin, +) if TYPE_CHECKING: + from core.graphql.filters import ContentTypeFilter + from extras.graphql.filters import ConfigTemplateFilter, ImageAttachmentFilter + from ipam.graphql.filters import ( + ASNFilter, FHRPGroupAssignmentFilter, IPAddressFilter, PrefixFilter, VLANGroupFilter, VRFFilter, + ) + from netbox.graphql.enums import ColorEnum + from netbox.graphql.filter_lookups import FloatLookup, IntegerArrayLookup, IntegerLookup, TreeNodeFilter + from users.graphql.filters import UserFilter + from virtualization.graphql.filters import ClusterFilter + from vpn.graphql.filters import L2VPNFilter, TunnelTerminationFilter + from wireless.graphql.enums import WirelessChannelEnum, WirelessRoleEnum + from wireless.graphql.filters import WirelessLANFilter, WirelessLinkFilter from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from core.graphql.filters import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * - __all__ = ( 'CableFilter', diff --git a/netbox/extras/graphql/filter_mixins.py b/netbox/extras/graphql/filter_mixins.py index 228f78b3c..7e9a970f2 100644 --- a/netbox/extras/graphql/filter_mixins.py +++ b/netbox/extras/graphql/filter_mixins.py @@ -1,21 +1,23 @@ from dataclasses import dataclass from typing import Annotated, TYPE_CHECKING + import strawberry import strawberry_django from strawberry_django import FilterLookup + from core.graphql.filter_mixins import BaseFilterMixin if TYPE_CHECKING: - from netbox.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import JSONFilter from .filters import * -__all__ = [ +__all__ = ( 'CustomFieldsFilterMixin', 'JournalEntriesFilterMixin', 'TagsFilterMixin', 'ConfigContextFilterMixin', 'TagBaseFilterMixin', -] +) @dataclass diff --git a/netbox/extras/graphql/filters.py b/netbox/extras/graphql/filters.py index f7fb8ec96..e22bda0ac 100644 --- a/netbox/extras/graphql/filters.py +++ b/netbox/extras/graphql/filters.py @@ -1,33 +1,26 @@ from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry.scalars import ID import strawberry_django -from strawberry_django import ( - FilterLookup, -) -from netbox.graphql.filter_mixins import ( - BaseObjectTypeFilterMixin, - ChangeLogFilterMixin, - SyncedDataFilterMixin, -) +from strawberry.scalars import ID +from strawberry_django import FilterLookup + +from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin from extras import models from extras.graphql.filter_mixins import TagBaseFilterMixin, CustomFieldsFilterMixin, TagsFilterMixin +from netbox.graphql.filter_mixins import SyncedDataFilterMixin if TYPE_CHECKING: + from core.graphql.filters import ContentTypeFilter + from dcim.graphql.filters import ( + DeviceRoleFilter, DeviceTypeFilter, LocationFilter, PlatformFilter, RegionFilter, SiteFilter, SiteGroupFilter, + ) + from tenancy.graphql.filters import TenantFilter, TenantGroupFilter + from netbox.graphql.enums import ColorEnum + from netbox.graphql.filter_lookups import IntegerLookup, JSONFilter, StringArrayLookup, TreeNodeFilter + from users.graphql.filters import GroupFilter, UserFilter + from virtualization.graphql.filters import ClusterFilter, ClusterGroupFilter, ClusterTypeFilter from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * - __all__ = ( 'ConfigContextFilter', diff --git a/netbox/ipam/graphql/filter_mixins.py b/netbox/ipam/graphql/filter_mixins.py index 187a0a270..511850285 100644 --- a/netbox/ipam/graphql/filter_mixins.py +++ b/netbox/ipam/graphql/filter_mixins.py @@ -1,15 +1,18 @@ from dataclasses import dataclass from typing import Annotated, TYPE_CHECKING + import strawberry import strawberry_django -from core.graphql.filter_mixins import * +from core.graphql.filter_mixins import BaseFilterMixin if TYPE_CHECKING: + from netbox.graphql.filter_lookups import IntegerLookup from .enums import * - from netbox.graphql.filter_lookups import * -__all__ = ['ServiceBaseFilterMixin'] +__all__ = ( + 'ServiceBaseFilterMixin', +) @dataclass diff --git a/netbox/ipam/graphql/filters.py b/netbox/ipam/graphql/filters.py index e45e406ee..2f4e185f1 100644 --- a/netbox/ipam/graphql/filters.py +++ b/netbox/ipam/graphql/filters.py @@ -1,37 +1,28 @@ from datetime import date from typing import Annotated, TYPE_CHECKING + import netaddr -from netaddr.core import AddrFormatError -from django.db.models import Q import strawberry -from strawberry.scalars import ID import strawberry_django -from strawberry_django import ( - FilterLookup, - DateFilterLookup, -) -from core.graphql.filter_mixins import * +from django.db.models import Q +from netaddr.core import AddrFormatError +from strawberry.scalars import ID +from strawberry_django import FilterLookup, DateFilterLookup + +from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin from dcim.graphql.filter_mixins import ScopedFilterMixin -from netbox.graphql.filter_mixins import * -from tenancy.graphql.filter_mixins import * from ipam import models -from ipam.graphql.filter_mixins import * +from ipam.graphql.filter_mixins import ServiceBaseFilterMixin +from netbox.graphql.filter_mixins import NetBoxModelFilterMixin, OrganizationalModelFilterMixin, PrimaryModelFilterMixin +from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin if TYPE_CHECKING: + from netbox.graphql.filter_lookups import IntegerArrayLookup, IntegerLookup + from core.graphql.filters import ContentTypeFilter + from dcim.graphql.filters import DeviceFilter, SiteFilter + from virtualization.graphql.filters import VirtualMachineFilter + from vpn.graphql.filters import L2VPNFilter from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from core.graphql.filters import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * __all__ = ( 'ASNFilter', diff --git a/netbox/netbox/graphql/filter_lookups.py b/netbox/netbox/graphql/filter_lookups.py index 09f470c96..859236e4d 100644 --- a/netbox/netbox/graphql/filter_lookups.py +++ b/netbox/netbox/graphql/filter_lookups.py @@ -1,32 +1,33 @@ from enum import Enum from typing import TypeVar, Tuple, Generic -from django.db.models import Q, QuerySet -from django.core.exceptions import FieldDoesNotExist -from django.db.models.fields.related import ForeignKey, ManyToManyField, ManyToManyRel, ManyToOneRel + import strawberry +import strawberry_django +from django.core.exceptions import FieldDoesNotExist +from django.db.models import Q, QuerySet +from django.db.models.fields.related import ForeignKey, ManyToManyField, ManyToManyRel, ManyToOneRel from strawberry import ID from strawberry.types import Info -import strawberry_django from strawberry_django import ( - process_filters, - FilterLookup, - RangeLookup, ComparisonFilterLookup, DateFilterLookup, DatetimeFilterLookup, + FilterLookup, + RangeLookup, TimeFilterLookup, + process_filters, ) -__all__ = [ - 'JSONFilter', - 'TreeNodeFilter', - 'IntegerLookup', - 'FloatLookup', +__all__ = ( 'ArrayLookup', - 'IntegerArrayLookup', 'FloatArrayLookup', + 'FloatLookup', + 'IntegerArrayLookup', + 'IntegerLookup', + 'JSONFilter', 'StringArrayLookup', -] + 'TreeNodeFilter', +) T = TypeVar('T') SKIP_MSG = 'Filter will be skipped on `null` value' diff --git a/netbox/netbox/graphql/filter_mixins.py b/netbox/netbox/graphql/filter_mixins.py index 09bd71bfc..ce6d81a86 100644 --- a/netbox/netbox/graphql/filter_mixins.py +++ b/netbox/netbox/graphql/filter_mixins.py @@ -1,30 +1,26 @@ from dataclasses import dataclass +from datetime import datetime from typing import TypeVar, TYPE_CHECKING, Annotated - -from datetime import datetime import strawberry -from strawberry import ID import strawberry_django +from strawberry import ID from strawberry_django import FilterLookup, DatetimeFilterLookup -from extras.models import * -from utilities.filters import * -from netbox.graphql.filter_lookups import * -from core.graphql.filter_mixins import * -from extras.graphql.filter_mixins import * +from core.graphql.filter_mixins import BaseFilterMixin, BaseObjectTypeFilterMixin, ChangeLogFilterMixin +from extras.graphql.filter_mixins import CustomFieldsFilterMixin, JournalEntriesFilterMixin, TagsFilterMixin +from netbox.graphql.filter_lookups import IntegerLookup -__all__ = [ +__all__ = ( + 'DistanceFilterMixin', + 'ImageAttachmentFilterMixin', + 'NestedGroupModelFilterMixin', 'NetBoxModelFilterMixin', 'OrganizationalModelFilterMixin', 'PrimaryModelFilterMixin', - # 'autotype_decorator', - 'NestedGroupModelFilterMixin', - 'ImageAttachmentFilterMixin', - 'WeightFilterMixin', 'SyncedDataFilterMixin', - 'DistanceFilterMixin', -] + 'WeightFilterMixin', +) T = TypeVar('T') @@ -32,7 +28,6 @@ T = TypeVar('T') if TYPE_CHECKING: from .enums import * from core.graphql.filters import * - from tenancy.graphql.filters import * from extras.graphql.filters import * diff --git a/netbox/tenancy/graphql/filter_mixins.py b/netbox/tenancy/graphql/filter_mixins.py index 1bf690013..cc4a4297c 100644 --- a/netbox/tenancy/graphql/filter_mixins.py +++ b/netbox/tenancy/graphql/filter_mixins.py @@ -1,15 +1,20 @@ from dataclasses import dataclass from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry import ID import strawberry_django +from strawberry import ID + from core.graphql.filter_mixins import BaseFilterMixin if TYPE_CHECKING: - from .filters import * - from netbox.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import TreeNodeFilter + from .filters import ContactFilter, TenantFilter, TenantGroupFilter -__all__ = ['TenancyFilterMixin', 'ContactFilterMixin'] +__all__ = ( + 'ContactFilterMixin', + 'TenancyFilterMixin', +) @dataclass diff --git a/netbox/tenancy/graphql/filters.py b/netbox/tenancy/graphql/filters.py index 597784457..5abfa0a6c 100644 --- a/netbox/tenancy/graphql/filters.py +++ b/netbox/tenancy/graphql/filters.py @@ -1,29 +1,49 @@ from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry.scalars import ID import strawberry_django -from strawberry_django import ( - FilterLookup, -) -from netbox.graphql.filter_mixins import ( - PrimaryModelFilterMixin, - OrganizationalModelFilterMixin, - NestedGroupModelFilterMixin, -) -from extras.graphql.filter_mixins import CustomFieldsFilterMixin, TagsFilterMixin +from strawberry.scalars import ID +from strawberry_django import FilterLookup + from core.graphql.filter_mixins import ChangeLogFilterMixin +from extras.graphql.filter_mixins import CustomFieldsFilterMixin, TagsFilterMixin +from netbox.graphql.filter_mixins import ( + NestedGroupModelFilterMixin, + OrganizationalModelFilterMixin, + PrimaryModelFilterMixin, +) from tenancy import models from .filter_mixins import ContactFilterMixin if TYPE_CHECKING: - from .enums import * + from core.graphql.filters import ContentTypeFilter + from circuits.graphql.filters import CircuitFilter + from dcim.graphql.filters import ( + CableFilter, + DeviceFilter, + LocationFilter, + PowerFeedFilter, + RackFilter, + RackReservationFilter, + SiteFilter, + VirtualDeviceContextFilter, + ) + from ipam.graphql.filters import ( + AggregateFilter, + ASNFilter, + ASNRangeFilter, + IPAddressFilter, + IPRangeFilter, + PrefixFilter, + RouteTargetFilter, + VLANFilter, + VRFFilter, + ) from netbox.graphql.filter_lookups import TreeNodeFilter - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from wireless.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * + from wireless.graphql.filters import WirelessLANFilter, WirelessLinkFilter + from virtualization.graphql.filters import ClusterFilter, VirtualMachineFilter + from vpn.graphql.filters import L2VPNFilter, TunnelFilter + from .enums import * __all__ = ( 'TenantFilter', diff --git a/netbox/tenancy/graphql/mixins.py b/netbox/tenancy/graphql/mixins.py index 9cdba100e..9437a06f2 100644 --- a/netbox/tenancy/graphql/mixins.py +++ b/netbox/tenancy/graphql/mixins.py @@ -9,5 +9,4 @@ __all__ = ( @strawberry.type class ContactAssignmentsMixin: - assignments: List[Annotated["ContactAssignmentType", strawberry.lazy('tenancy.graphql.types')]] # noqa: F821 diff --git a/netbox/users/graphql/filters.py b/netbox/users/graphql/filters.py index 8ead12213..8f8a8f946 100644 --- a/netbox/users/graphql/filters.py +++ b/netbox/users/graphql/filters.py @@ -1,32 +1,13 @@ from datetime import datetime -from typing import Annotated, TYPE_CHECKING +from typing import Annotated + import strawberry import strawberry_django -from strawberry_django import ( - FilterLookup, - DatetimeFilterLookup, -) -from core.graphql.filter_mixins import * -from netbox.graphql.filter_mixins import * -from tenancy.graphql.filter_mixins import * +from strawberry_django import DatetimeFilterLookup, FilterLookup +from core.graphql.filter_mixins import BaseObjectTypeFilterMixin from users import models -if TYPE_CHECKING: - from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * - __all__ = ( 'GroupFilter', 'UserFilter', diff --git a/netbox/virtualization/graphql/filter_mixins.py b/netbox/virtualization/graphql/filter_mixins.py index 4a7386dbe..e4c334425 100644 --- a/netbox/virtualization/graphql/filter_mixins.py +++ b/netbox/virtualization/graphql/filter_mixins.py @@ -1,16 +1,19 @@ from dataclasses import dataclass from typing import Annotated, TYPE_CHECKING + import strawberry -from strawberry import ID import strawberry_django +from strawberry import ID from strawberry_django import FilterLookup from netbox.graphql.filter_mixins import NetBoxModelFilterMixin if TYPE_CHECKING: - from .filters import * + from .filters import VirtualMachineFilter -__all__ = ['VMComponentFilterMixin'] +__all__ = ( + 'VMComponentFilterMixin', +) @dataclass diff --git a/netbox/virtualization/graphql/filters.py b/netbox/virtualization/graphql/filters.py index 66c0e7139..ab4753616 100644 --- a/netbox/virtualization/graphql/filters.py +++ b/netbox/virtualization/graphql/filters.py @@ -1,33 +1,33 @@ from typing import Annotated, TYPE_CHECKING -import strawberry -from strawberry.scalars import ID -import strawberry_django -from strawberry_django import ( - FilterLookup, -) -from core.graphql.filter_mixins import * -from netbox.graphql.filter_mixins import * -from tenancy.graphql.filter_mixins import * -from dcim.graphql.filter_mixins import * -from extras.graphql.filter_mixins import * -from virtualization.graphql.filter_mixins import * +import strawberry +import strawberry_django +from strawberry.scalars import ID +from strawberry_django import FilterLookup + +from dcim.graphql.filter_mixins import InterfaceBaseFilterMixin, RenderConfigFilterMixin, ScopedFilterMixin +from extras.graphql.filter_mixins import ConfigContextFilterMixin +from netbox.graphql.filter_mixins import ( + ImageAttachmentFilterMixin, + OrganizationalModelFilterMixin, + PrimaryModelFilterMixin, +) +from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin from virtualization import models +from virtualization.graphql.filter_mixins import VMComponentFilterMixin if TYPE_CHECKING: from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * + from netbox.graphql.filter_lookups import FloatLookup, IntegerLookup + from dcim.graphql.filters import DeviceFilter, DeviceRoleFilter, MACAddressFilter, PlatformFilter, SiteFilter + from ipam.graphql.filters import ( + FHRPGroupAssignmentFilter, + IPAddressFilter, + ServiceFilter, + VLANGroupFilter, + VRFFilter, + ) + from vpn.graphql.filters import L2VPNFilter, TunnelTerminationFilter __all__ = ( 'ClusterFilter', diff --git a/netbox/vpn/graphql/filters.py b/netbox/vpn/graphql/filters.py index ca038ce3d..4e12012dd 100644 --- a/netbox/vpn/graphql/filters.py +++ b/netbox/vpn/graphql/filters.py @@ -1,34 +1,21 @@ from typing import Annotated, TYPE_CHECKING -import strawberry -from strawberry.scalars import ID -import strawberry_django -from strawberry_django import ( - FilterLookup, -) -from extras.graphql.filter_mixins import * -from netbox.graphql.filter_mixins import * -from core.graphql.filter_mixins import * -from tenancy.graphql.filter_mixins import * -# from .filter_mixins import * +import strawberry +import strawberry_django +from strawberry.scalars import ID +from strawberry_django import FilterLookup + +from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin +from extras.graphql.filter_mixins import CustomFieldsFilterMixin, TagsFilterMixin +from netbox.graphql.filter_mixins import NetBoxModelFilterMixin, OrganizationalModelFilterMixin, PrimaryModelFilterMixin +from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin from vpn import models if TYPE_CHECKING: + from core.graphql.filters import ContentTypeFilter + from ipam.graphql.filters import IPAddressFilter, RouteTargetFilter + from netbox.graphql.filter_lookups import IntegerLookup from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from core.graphql.filters import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * - __all__ = ( 'TunnelGroupFilter', diff --git a/netbox/wireless/graphql/filter_mixins.py b/netbox/wireless/graphql/filter_mixins.py index 2028bba4e..636bc8a52 100644 --- a/netbox/wireless/graphql/filter_mixins.py +++ b/netbox/wireless/graphql/filter_mixins.py @@ -1,5 +1,6 @@ from dataclasses import dataclass from typing import Annotated, TYPE_CHECKING + import strawberry import strawberry_django from strawberry_django import FilterLookup @@ -7,10 +8,11 @@ from strawberry_django import FilterLookup from core.graphql.filter_mixins import BaseFilterMixin if TYPE_CHECKING: - from .filters import * from .enums import * -__all__ = ['WirelessAuthenticationBaseFilterMixin'] +__all__ = ( + 'WirelessAuthenticationBaseFilterMixin', +) @dataclass diff --git a/netbox/wireless/graphql/filters.py b/netbox/wireless/graphql/filters.py index cdbf715a2..d71af7ae2 100644 --- a/netbox/wireless/graphql/filters.py +++ b/netbox/wireless/graphql/filters.py @@ -1,33 +1,20 @@ from typing import Annotated, TYPE_CHECKING -import strawberry -from strawberry.scalars import ID -import strawberry_django -from strawberry_django import ( - FilterLookup, -) -from dcim.graphql.filter_mixins import ScopedFilterMixin -from extras.graphql.filter_mixins import * -from netbox.graphql.filter_mixins import * -from core.graphql.filter_mixins import * -from tenancy.graphql.filter_mixins import * -from .filter_mixins import * +import strawberry +import strawberry_django +from strawberry.scalars import ID +from strawberry_django import FilterLookup + +from dcim.graphql.filter_mixins import ScopedFilterMixin +from netbox.graphql.filter_mixins import DistanceFilterMixin, PrimaryModelFilterMixin, NestedGroupModelFilterMixin +from tenancy.graphql.filter_mixins import TenancyFilterMixin from wireless import models +from .filter_mixins import WirelessAuthenticationBaseFilterMixin if TYPE_CHECKING: + from dcim.graphql.filters import InterfaceFilter + from ipam.graphql.filters import VLANFilter from .enums import * - from netbox.graphql.enums import * - from wireless.graphql.enums import * - from netbox.graphql.filter_lookups import * - from extras.graphql.filters import * - from circuits.graphql.filters import * - from dcim.graphql.filters import * - from ipam.graphql.filters import * - from tenancy.graphql.filters import * - from wireless.graphql.filters import * - from users.graphql.filters import * - from virtualization.graphql.filters import * - from vpn.graphql.filters import * __all__ = ( 'WirelessLANGroupFilter',