Address review: standardize missing-id errors and tighten Any types

- Missing-id resolvers now raise GraphQLError consistently (was Model.DoesNotExist on three resolvers, GraphQLError on resolve_assignment)
- _get_user_type/corpus_folder_type/annotation_type return type[T] instead of bare type, with TYPE_CHECKING forward refs to avoid circular imports
- resolve_feedback_count: int, resolve_total_messages: int, resolve_all_source_node_in_relationship: QuerySet[Relationship]
- id_to_children: dict[int | str, list[int | str]] (was dict[Any, list[Any]])

Author: JSv4

config/graphql/annotation_types.py

@@ -93,14 +93,14 @@ def resolve_content_modalities(self, info) -> Any:
 
     all_source_node_in_relationship = graphene.List(lambda: RelationshipType)
 
-    def resolve_feedback_count(self, info) -> Any:
+    def resolve_feedback_count(self, info) -> int:
         # If feedback_count was annotated on the queryset, use it
         if hasattr(self, "feedback_count"):
             return self.feedback_count
         # Otherwise, count it (but this triggers N+1)
         return self.user_feedback.count()
 
-    def resolve_all_source_node_in_relationship(self, info) -> Any:
+    def resolve_all_source_node_in_relationship(self, info) -> QuerySet[Relationship]:
         return self.source_node_in_relationships.all()
 
     all_target_node_in_relationship = graphene.List(lambda: RelationshipType)

config/graphql/base_types.py

@@ -2,12 +2,17 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import graphene
 from graphene.types.generic import GenericScalar
 from graphql_relay import to_global_id
 
+if TYPE_CHECKING:
+    from config.graphql.annotation_types import AnnotationType
+    from config.graphql.corpus_types import CorpusFolderType
+    from config.graphql.user_types import UserType
+
 
 def build_flat_tree(
     nodes: list[dict[str, Any]],
@@ -31,7 +36,7 @@ def build_flat_tree(
             - "children": list of child node global IDs.
     """
     # Map node IDs to their immediate children IDs
-    id_to_children: dict[Any, list[Any]] = {}
+    id_to_children: dict[int | str, list[int | str]] = {}
     for node in nodes:
         node_id = node["id"]
         parent_id = node["parent_id"]
@@ -231,19 +236,19 @@ class PageAwareAnnotationType(graphene.ObjectType):
     page_annotations = graphene.List(lambda: _get_annotation_type())
 
 
-def _get_user_type() -> type:
+def _get_user_type() -> type[UserType]:
     from config.graphql.user_types import UserType
 
     return UserType
 
 
-def _get_corpus_folder_type() -> type:
+def _get_corpus_folder_type() -> type[CorpusFolderType]:
     from config.graphql.corpus_types import CorpusFolderType
 
     return CorpusFolderType
 
 
-def _get_annotation_type() -> type:
+def _get_annotation_type() -> type[AnnotationType]:
     from config.graphql.annotation_types import AnnotationType
 
     return AnnotationType

config/graphql/document_queries.py

@@ -12,6 +12,7 @@
 from django.db.models import QuerySet
 from graphene import relay
 from graphene_django.filter import DjangoFilterConnectionField
+from graphql import GraphQLError
 from graphql_jwt.decorators import login_required
 from graphql_relay import from_global_id
 
@@ -142,7 +143,7 @@ def resolve_document_relationship(
         """
         relay_id = kwargs.get("id")
         if relay_id is None:
-            raise DocumentRelationship.DoesNotExist()
+            raise GraphQLError("DocumentRelationship id is required")
         django_pk = from_global_id(relay_id)[1]
         result = DocumentRelationshipQueryOptimizer.get_relationship_by_id(
             user=info.context.user,

config/graphql/user_queries.py

@@ -83,7 +83,7 @@ def resolve_userimport(
     ) -> UserImport:
         relay_id = kwargs.get("id")
         if relay_id is None:
-            raise UserImport.DoesNotExist()
+            raise GraphQLError("UserImport id is required")
         django_pk = from_global_id(relay_id)[1]
         return UserImport.objects.visible_to_user(info.context.user).get(id=django_pk)
 
@@ -106,7 +106,7 @@ def resolve_userexport(
     ) -> UserExport:
         relay_id = kwargs.get("id")
         if relay_id is None:
-            raise UserExport.DoesNotExist()
+            raise GraphQLError("UserExport id is required")
         django_pk = from_global_id(relay_id)[1]
         return UserExport.objects.visible_to_user(info.context.user).get(id=django_pk)
 

config/graphql/user_types.py

@@ -82,7 +82,7 @@ def resolve_reputation_for_corpus(self, info, corpus_id) -> Any:
         except Exception:
             return 0
 
-    def resolve_total_messages(self, info) -> Any:
+    def resolve_total_messages(self, info) -> int:
         """
         Resolve total messages posted by this user.
         Only counts messages visible to the requesting user.