chore: move base filter creation

graphql-python · Oct 6, 2023 · 18a7c54 · 18a7c54
1 parent 1aef748
commit 18a7c54
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/graphene_sqlalchemy/registry.py b/graphene_sqlalchemy/registry.py
@@ -1,3 +1,4 @@
+import inspect
 from collections import defaultdict
 from typing import TYPE_CHECKING, List, Type
 
@@ -7,7 +8,7 @@
 from sqlalchemy.types import Enum as SQLAlchemyEnumType
 
 if TYPE_CHECKING:  # pragma: no_cover
-    from graphene_sqlalchemy.filters import (
+    from .filters import (
         FieldFilter,
         BaseTypeFilter,
         RelationshipFilter, )
@@ -26,6 +27,26 @@ def __init__(self):
         self._registry_base_type_filters = {}
         self._registry_relationship_filters = {}
 
+        self._init_base_filters()
+
+    def _init_base_filters(self):
+        import graphene_sqlalchemy.filters as gsqa_filters
+
+        from .filters import (FieldFilter)
+        field_filter_classes = [
+            filter_cls[1]
+            for filter_cls in inspect.getmembers(gsqa_filters, inspect.isclass)
+            if (
+                    filter_cls[1] is not FieldFilter
+                    and FieldFilter in filter_cls[1].__mro__
+                    and getattr(filter_cls[1]._meta, "graphene_type", False)
+            )
+        ]
+        for field_filter_class in field_filter_classes:
+            self.register_filter_for_scalar_type(
+                field_filter_class._meta.graphene_type, field_filter_class
+            )
+
     def register(self, obj_type):
         from .types import SQLAlchemyBase
 

diff --git a/graphene_sqlalchemy/types.py b/graphene_sqlalchemy/types.py
@@ -20,7 +20,6 @@
 from sqlalchemy.orm import ColumnProperty, CompositeProperty, RelationshipProperty
 from sqlalchemy.orm.exc import NoResultFound
 
-import graphene_sqlalchemy.filters as gsa_filters
 from .converter import (
     convert_sqlalchemy_column,
     convert_sqlalchemy_composite,
@@ -420,21 +419,7 @@ def __init_subclass_with_meta__(
             )
 
         if not registry:
-            # TODO add documentation for users to register their own filters
             registry = get_global_registry()
-            field_filter_classes = [
-                filter_cls[1]
-                for filter_cls in inspect.getmembers(gsa_filters, inspect.isclass)
-                if (
-                        filter_cls[1] is not FieldFilter
-                        and FieldFilter in filter_cls[1].__mro__
-                        and getattr(filter_cls[1]._meta, "graphene_type", False)
-                )
-            ]
-            for field_filter_class in field_filter_classes:
-                get_global_registry().register_filter_for_scalar_type(
-                    field_filter_class._meta.graphene_type, field_filter_class
-                )
 
         assert isinstance(registry, Registry), (
             "The attribute registry in {} needs to be an instance of "