Automatic sort argument for SQLAlchemyInterface

graphene_sqlalchemy/fields.py

@@ -26,14 +26,14 @@
 class SQLAlchemyConnectionField(ConnectionField):
     @property
     def type(self):
-        from .types import SQLAlchemyObjectType
+        from .types import SQLAlchemyBase
 
         type_ = super(ConnectionField, self).type
         nullable_type = get_nullable_type(type_)
         if issubclass(nullable_type, Connection):
             return type_
-        assert issubclass(nullable_type, SQLAlchemyObjectType), (
-            "SQLALchemyConnectionField only accepts SQLAlchemyObjectType types, not {}"
+        assert issubclass(nullable_type, SQLAlchemyBase), (
+            "SQLALchemyConnectionField only accepts SQLAlchemyBase types, not {}"
         ).format(nullable_type.__name__)
         assert nullable_type.connection, "The type {} doesn't have a connection".format(
             nullable_type.__name__

graphene_sqlalchemy/registry.py

@@ -95,15 +95,10 @@ def get_graphene_enum_for_sa_enum(self, sa_enum: SQLAlchemyEnumType):
         return self._registry_enums.get(sa_enum)
 
     def register_sort_enum(self, obj_type, sort_enum: Enum):
+        from .types import SQLAlchemyBase
 
-        from .types import SQLAlchemyObjectType
-
-        if not isinstance(obj_type, type) or not issubclass(
-            obj_type, SQLAlchemyObjectType
-        ):
-            raise TypeError(
-                "Expected SQLAlchemyObjectType, but got: {!r}".format(obj_type)
-            )
+        if not isinstance(obj_type, type) or not issubclass(obj_type, SQLAlchemyBase):
+            raise TypeError("Expected SQLAlchemyBase, but got: {!r}".format(obj_type))
         if not isinstance(sort_enum, type(Enum)):
             raise TypeError("Expected Graphene Enum, but got: {!r}".format(sort_enum))
         self._registry_sort_enums[obj_type] = sort_enum

graphene_sqlalchemy/tests/test_fields.py

@@ -51,7 +51,7 @@ def resolver(_obj, _info):
 
 
 def test_type_assert_sqlalchemy_object_type():
-    with pytest.raises(AssertionError, match="only accepts SQLAlchemyObjectType"):
+    with pytest.raises(AssertionError, match="only accepts SQLAlchemyBase types"):
         SQLAlchemyConnectionField(ObjectType).type
 
 

graphene_sqlalchemy/tests/test_registry.py

@@ -120,7 +120,7 @@ class Meta:
         [("ID", EnumValue("id", Pet.id)), ("NAME", EnumValue("name", Pet.name))],
     )
 
-    re_err = r"Expected SQLAlchemyObjectType, but got: .*PetSort.*"
+    re_err = r"Expected SQLAlchemyBase, but got: .*PetSort.*"
     with pytest.raises(TypeError, match=re_err):
         reg.register_sort_enum(sort_enum, sort_enum)