Improve BaseLoader and other type annotations (#1269)

Author: Swatinem

graphql_api/dataloader/loader.py

@@ -1,10 +1,13 @@
+from typing import Self
+
 from aiodataloader import DataLoader
 from asgiref.sync import sync_to_async
+from graphql import GraphQLResolveInfo
 
 
 class BaseLoader(DataLoader):
     @classmethod
-    def loader(cls, info, *args):
+    def loader(cls, info: GraphQLResolveInfo, *args) -> Self:
         """
         Creates a new loader for the given `info` (instance of GraphQLResolveInfo) and `args`.
         If a loader of this type already exists for the given `args` then that same object will

graphql_api/types/commit/commit.py

@@ -64,36 +64,36 @@
 
 
 @commit_bindable.field("author")
-def resolve_author(commit, info):
+def resolve_author(commit: Commit, info: GraphQLResolveInfo) -> Owner | None:
     if commit.author_id:
         return OwnerLoader.loader(info).load(commit.author_id)
 
 
 @commit_bindable.field("parent")
-def resolve_parent(commit, info):
+def resolve_parent(commit: Commit, info: GraphQLResolveInfo) -> Commit | None:
     if commit.parent_commit_id:
         return CommitLoader.loader(info, commit.repository_id).load(
             commit.parent_commit_id
         )
 
 
 @commit_bindable.field("yaml")
-async def resolve_yaml(commit: Commit, info) -> dict:
+async def resolve_yaml(commit: Commit, info: GraphQLResolveInfo) -> dict:
     command = info.context["executor"].get_command("commit")
     final_yaml = await command.get_final_yaml(commit)
     return yaml.dump(final_yaml)
 
 
 @commit_bindable.field("yamlState")
-async def resolve_yaml_state(commit: Commit, info) -> YamlStates:
+async def resolve_yaml_state(commit: Commit, info: GraphQLResolveInfo) -> YamlStates:
     command = info.context["executor"].get_command("commit")
     final_yaml = await command.get_final_yaml(commit)
     return get_yaml_state(yaml=final_yaml)
 
 
 @commit_bindable.field("uploads")
 @sync_to_async
-def resolve_list_uploads(commit: Commit, info, **kwargs):
+def resolve_list_uploads(commit: Commit, info: GraphQLResolveInfo, **kwargs):
     if not commit.commitreport:
         return queryset_to_connection_sync([])
 
@@ -118,7 +118,9 @@ def resolve_list_uploads(commit: Commit, info, **kwargs):
 
 @commit_bindable.field("compareWithParent")
 @sentry_sdk.trace
-async def resolve_compare_with_parent(commit: Commit, info, **kwargs):
+async def resolve_compare_with_parent(
+    commit: Commit, info: GraphQLResolveInfo, **kwargs
+):
     if not commit.parent_commit_id:
         return MissingBaseCommit()
 

graphql_api/types/comparison/comparison.py

@@ -39,7 +39,7 @@ def resolve_state(comparison: ComparisonReport, info: GraphQLResolveInfo) -> str
 @sync_to_async
 def resolve_impacted_files(
     comparison_report: ComparisonReport, info: GraphQLResolveInfo, filters=None
-) -> List[ImpactedFile]:
+):
     command: CompareCommands = info.context["executor"].get_command("compare")
     comparison: Comparison = info.context.get("comparison", None)
 
@@ -59,23 +59,23 @@ def resolve_impacted_files(
 @sync_to_async
 def resolve_impacted_files_count(
     comparison: ComparisonReport, info: GraphQLResolveInfo
-):
+) -> int:
     return len(comparison.impacted_files)
 
 
 @comparison_bindable.field("directChangedFilesCount")
 @sync_to_async
 def resolve_direct_changed_files_count(
     comparison: ComparisonReport, info: GraphQLResolveInfo
-):
+) -> int:
     return len(comparison.impacted_files_with_direct_changes)
 
 
 @comparison_bindable.field("indirectChangedFilesCount")
 @sync_to_async
 def resolve_indirect_changed_files_count(
     comparison: ComparisonReport, info: GraphQLResolveInfo
-):
+) -> int:
     return len(comparison.impacted_files_with_unintended_changes)
 
 
@@ -157,10 +157,9 @@ async def resolve_head_totals(
 
 
 @comparison_bindable.field("patchTotals")
-@sentry_sdk.trace
 def resolve_patch_totals(
     comparison: ComparisonReport, info: GraphQLResolveInfo
-) -> dict:
+) -> dict | None:
     totals = comparison.commit_comparison.patch_totals
     if not totals:
         return None
@@ -233,7 +232,7 @@ def resolve_component_comparisons_count(
 @sync_to_async
 def resolve_flag_comparisons_count(
     comparison: ComparisonReport, info: GraphQLResolveInfo
-):
+) -> int:
     """
     Resolver to return if the head and base of a pull request have
     different number of reports on the head and base. This implementation