Merge branch 'main' into claude/resolve-issue-1335-cRUxc

Author: JSv4

CHANGELOG.md

@@ -3,6 +3,7 @@
 """
 
 import logging
+from typing import Any
 
 import graphene
 from graphene_django.fields import DjangoConnectionField
@@ -33,7 +34,7 @@ class ActionQueryMixin:
     )
 
     @login_required
-    def resolve_corpus_action_templates(self, info, **kwargs):
+    def resolve_corpus_action_templates(self, info, **kwargs) -> Any:
         """Return available corpus action templates.
 
         Templates are system-level and read-only — any authenticated user
@@ -58,7 +59,7 @@ def resolve_corpus_action_templates(self, info, **kwargs):
     )
 
     @login_required
-    def resolve_corpus_actions(self, info, **kwargs):
+    def resolve_corpus_actions(self, info, **kwargs) -> Any:
         """
         Resolver for corpus_actions that returns actions visible to the current user.
         Can be filtered by corpus_id, trigger type, and disabled status.
@@ -93,7 +94,7 @@ def resolve_corpus_actions(self, info, **kwargs):
     )
 
     @login_required
-    def resolve_agent_action_results(self, info, **kwargs):
+    def resolve_agent_action_results(self, info, **kwargs) -> Any:
         """
         Resolver for agent_action_results that returns results visible to the current user.
         Can be filtered by corpus_action_id, document_id, and status.
@@ -142,7 +143,7 @@ def resolve_agent_action_results(self, info, **kwargs):
     )
 
     @login_required
-    def resolve_corpus_action_executions(self, info, **kwargs):
+    def resolve_corpus_action_executions(self, info, **kwargs) -> Any:
         """
         Resolver for corpus_action_executions that returns executions visible to
         the current user.
@@ -159,7 +160,7 @@ def resolve_corpus_action_executions(self, info, **kwargs):
         # Filter by corpus if provided (with access check)
         corpus_id = kwargs.get("corpus_id")
         if corpus_id:
-            corpus_pk = from_global_id(corpus_id)[1]
+            corpus_pk = int(from_global_id(corpus_id)[1])
             # Defense-in-depth: verify user has access to this corpus
             if not Corpus.objects.visible_to_user(user).filter(pk=corpus_pk).exists():
                 return queryset.none()
@@ -168,7 +169,7 @@ def resolve_corpus_action_executions(self, info, **kwargs):
         # Filter by document if provided (with access check)
         document_id = kwargs.get("document_id")
         if document_id:
-            document_pk = from_global_id(document_id)[1]
+            document_pk = int(from_global_id(document_id)[1])
             # Defense-in-depth: verify user has access to this document
             if (
                 not Document.objects.visible_to_user(user)
@@ -220,7 +221,7 @@ def resolve_corpus_action_executions(self, info, **kwargs):
     )
 
     @login_required
-    def resolve_corpus_action_trail_stats(self, info, corpus_id, since=None):
+    def resolve_corpus_action_trail_stats(self, info, corpus_id, since=None) -> Any:
         """
         Resolver for corpus_action_trail_stats that returns aggregated statistics
         for corpus action executions.
@@ -230,7 +231,7 @@ def resolve_corpus_action_trail_stats(self, info, corpus_id, since=None):
         from opencontractserver.corpuses.models import Corpus, CorpusActionExecution
 
         user = info.context.user
-        corpus_pk = from_global_id(corpus_id)[1]
+        corpus_pk = int(from_global_id(corpus_id)[1])
 
         # Defense-in-depth: verify user has access to this corpus
         if not Corpus.objects.visible_to_user(user).filter(pk=corpus_pk).exists():
@@ -291,7 +292,7 @@ def resolve_corpus_action_trail_stats(self, info, corpus_id, since=None):
         corpus_id=graphene.ID(required=False),
     )
 
-    def resolve_document_corpus_actions(self, info, document_id, corpus_id=None):
+    def resolve_document_corpus_actions(self, info, document_id, corpus_id=None) -> Any:
         """
         Resolve document actions (corpus actions, extracts, analysis rows) with proper
         permission filtering.

config/graphql/action_queries.py

@@ -80,7 +80,7 @@ def mutate(
         avatar_url=None,
         corpus_id=None,
         is_public=True,
-    ):
+    ) -> "CreateAgentConfigurationMutation":
         user = info.context.user
 
         try:
@@ -204,7 +204,7 @@ def mutate(
         avatar_url=None,
         is_active=None,
         is_public=None,
-    ):
+    ) -> "UpdateAgentConfigurationMutation":
         user = info.context.user
 
         try:
@@ -282,7 +282,7 @@ class Arguments:
 
     @login_required
     @graphql_ratelimit(rate=RateLimits.WRITE_LIGHT)
-    def mutate(root, info, agent_id):
+    def mutate(root, info, agent_id) -> "DeleteAgentConfigurationMutation":
         user = info.context.user
 
         try:

config/graphql/agent_mutations.py

@@ -1,5 +1,7 @@
 """GraphQL type definitions for agent and action types."""
 
+from typing import Any
+
 import graphene
 from graphene import relay
 from graphene_django import DjangoObjectType
@@ -37,7 +39,7 @@ class Meta:
             "source_template__id": ["exact"],
         }
 
-    def resolve_pre_authorized_tools(self, info):
+    def resolve_pre_authorized_tools(self, info) -> Any:
         """Resolve pre_authorized_tools as a list of strings."""
         return self.pre_authorized_tools or []
 
@@ -61,15 +63,15 @@ class Meta:
             "creator__id": ["exact"],
         }
 
-    def resolve_tools_executed(self, info):
+    def resolve_tools_executed(self, info) -> Any:
         """Resolve tools_executed as a list of JSON objects."""
         return self.tools_executed or []
 
-    def resolve_execution_metadata(self, info):
+    def resolve_execution_metadata(self, info) -> Any:
         """Resolve execution_metadata as JSON dict."""
         return self.execution_metadata or {}
 
-    def resolve_duration_seconds(self, info):
+    def resolve_duration_seconds(self, info) -> Any:
         """Resolve duration from the model property."""
         return self.duration_seconds
 
@@ -100,19 +102,19 @@ class Meta:
             "creator__id": ["exact"],
         }
 
-    def resolve_duration_seconds(self, info):
+    def resolve_duration_seconds(self, info) -> Any:
         """Resolve duration from the model property."""
         return self.duration_seconds
 
-    def resolve_wait_time_seconds(self, info):
+    def resolve_wait_time_seconds(self, info) -> Any:
         """Resolve wait time from the model property."""
         return self.wait_time_seconds
 
-    def resolve_affected_objects(self, info):
+    def resolve_affected_objects(self, info) -> Any:
         """Resolve affected_objects as a list of JSON objects."""
         return self.affected_objects or []
 
-    def resolve_execution_metadata(self, info):
+    def resolve_execution_metadata(self, info) -> Any:
         """Resolve execution_metadata as JSON dict."""
         return self.execution_metadata or {}
 
@@ -180,17 +182,17 @@ class Meta:
             "corpus": ["exact"],
         }
 
-    def resolve_mention_format(self, info):
+    def resolve_mention_format(self, info) -> Any:
         """Return the @ mention format for this agent."""
         if self.slug:
             return f"@agent:{self.slug}"
         return None
 
-    def resolve_available_tools(self, info):
+    def resolve_available_tools(self, info) -> Any:
         """Resolve available_tools as a list of strings, ensuring proper array type."""
         return self.available_tools if self.available_tools else []
 
-    def resolve_permission_required_tools(self, info):
+    def resolve_permission_required_tools(self, info) -> Any:
         """Resolve permission_required_tools as a list of strings, ensuring proper array type."""
         return self.permission_required_tools if self.permission_required_tools else []
 
@@ -261,5 +263,5 @@ class Meta:
             "created",
         )
 
-    def resolve_pre_authorized_tools(self, info):
+    def resolve_pre_authorized_tools(self, info) -> Any:
         return self.pre_authorized_tools or []

config/graphql/agent_types.py

@@ -37,7 +37,7 @@ class Arguments:
 
     @user_passes_test(lambda user: user.is_superuser)
     @graphql_ratelimit(rate=RateLimits.ADMIN_OPERATION)
-    def mutate(root, info, analysis_id):
+    def mutate(root, info, analysis_id) -> "MakeAnalysisPublic":
 
         try:
             analysis_pk = from_global_id(analysis_id)[1]
@@ -87,7 +87,7 @@ def mutate(
         document_id=None,
         corpus_id=None,
         analysis_input_data=None,
-    ):
+    ) -> "StartDocumentAnalysisMutation":
         """
         Starts a document or corpus analysis using the specified analyzer.
         Accepts optional analysis_input_data for analyzers that need
@@ -176,7 +176,7 @@ class Arguments:
         id = graphene.String(required=True)
 
     @login_required
-    def mutate(root, info, id):
+    def mutate(root, info, id) -> "DeleteAnalysisMutation":
 
         # ok = False
         # message = "Could not complete"
@@ -206,3 +206,5 @@ def mutate(root, info, id):
 
         # Kick off an async task to delete the analysis (as it can be very large)
         delete_analysis_and_annotations_task.si(analysis_pk=analysis_pk).apply_async()
+
+        return DeleteAnalysisMutation(ok=True, message="SUCCESS")

config/graphql/analysis_mutations.py

@@ -47,7 +47,7 @@ class Arguments:
     message = graphene.String()
 
     @login_required
-    def mutate(root, info, annotation_id):
+    def mutate(root, info, annotation_id) -> "RemoveAnnotation":
         try:
             user = info.context.user
             annotation_pk = from_global_id(annotation_id)[1]
@@ -96,7 +96,7 @@ class Arguments:
 
     @login_required
     @transaction.atomic
-    def mutate(root, info, annotation_id, comment=None):
+    def mutate(root, info, annotation_id, comment=None) -> "RejectAnnotation":
         user = info.context.user
         annotation_pk = from_global_id(annotation_id)[1]
 
@@ -159,7 +159,7 @@ class Arguments:
 
     @login_required
     @transaction.atomic
-    def mutate(root, info, annotation_id, comment=None):
+    def mutate(root, info, annotation_id, comment=None) -> "ApproveAnnotation":
         user = info.context.user
         annotation_pk = from_global_id(annotation_id)[1]
 
@@ -254,7 +254,7 @@ def mutate(
         annotation_label_id,
         annotation_type,
         long_description=None,
-    ):
+    ) -> "AddAnnotation":
         corpus_pk = from_global_id(corpus_id)[1]
         document_pk = from_global_id(document_id)[1]
         label_pk = from_global_id(annotation_label_id)[1]
@@ -296,7 +296,9 @@ class Arguments:
     annotation = graphene.Field(AnnotationType)
 
     @login_required
-    def mutate(root, info, corpus_id, document_id, annotation_label_id):
+    def mutate(
+        root, info, corpus_id, document_id, annotation_label_id
+    ) -> "AddDocTypeAnnotation":
         annotation = None
         ok = False
 
@@ -328,7 +330,7 @@ class Arguments:
     message = graphene.String()
 
     @login_required
-    def mutate(root, info, relationship_id):
+    def mutate(root, info, relationship_id) -> "RemoveRelationship":
         try:
             user = info.context.user
             relationship_pk = from_global_id(relationship_id)[1]
@@ -400,7 +402,7 @@ def mutate(
         relationship_label_id,
         corpus_id,
         document_id,
-    ):
+    ) -> "AddRelationship":
         try:
             source_pks = list(
                 map(lambda graphene_id: from_global_id(graphene_id)[1], source_ids)
@@ -479,7 +481,7 @@ class Arguments:
     message = graphene.String()
 
     @login_required
-    def mutate(root, info, relationship_ids):
+    def mutate(root, info, relationship_ids) -> "RemoveRelationships":
         user = info.context.user
         for graphene_id in relationship_ids:
             pk = from_global_id(graphene_id)[1]
@@ -542,7 +544,7 @@ def mutate(
         add_target_ids=None,
         remove_source_ids=None,
         remove_target_ids=None,
-    ):
+    ) -> "UpdateRelationship":
         try:
             relationship_pk = from_global_id(relationship_id)[1]
             relationship = Relationship.objects.get(pk=relationship_pk)
@@ -662,7 +664,7 @@ class Arguments:
     message = graphene.String()
 
     @login_required
-    def mutate(root, info, relationships):
+    def mutate(root, info, relationships) -> "UpdateRelations":
         user = info.context.user
         for relationship in relationships:
             pk = from_global_id(relationship["id"])[1]
@@ -728,7 +730,7 @@ class Arguments:
     version = graphene.Int(description="The new version number after update")
 
     @login_required
-    def mutate(root, info, note_id, new_content, title=None):
+    def mutate(root, info, note_id, new_content, title=None) -> "UpdateNote":
         from opencontractserver.annotations.models import Note
 
         try:
@@ -826,7 +828,9 @@ class Arguments:
     obj = graphene.Field(NoteType)
 
     @login_required
-    def mutate(root, info, document_id, title, content, corpus_id=None, parent_id=None):
+    def mutate(
+        root, info, document_id, title, content, corpus_id=None, parent_id=None
+    ) -> "CreateNote":
         from opencontractserver.annotations.models import Note
         from opencontractserver.corpuses.models import Corpus
         from opencontractserver.documents.models import Document