Correct typing on GraphQL attributes

Author: ogenstad

backend/infrahub/core/registry.py

@@ -38,7 +38,7 @@ class Registry:
     default_graphql_type: dict[str, InfrahubObject | type[BaseAttribute]] = field(default_factory=dict)
     graphql_type: dict = field(default_factory=lambda: defaultdict(dict))
     data_type: dict[str, type[InfrahubDataType]] = field(default_factory=dict)
-    input_type: dict[str, Union[BaseAttributeCreate, BaseAttributeUpdate]] = field(default_factory=dict)
+    input_type: dict[str, type[BaseAttributeCreate | BaseAttributeUpdate]] = field(default_factory=dict)
     account: dict = field(default_factory=dict)
     account_id: dict = field(default_factory=dict)
     node_group: dict = field(default_factory=dict)

backend/infrahub/graphql/mutations/attribute.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from graphene import BigInt, Boolean, Field, InputObjectType, Int, String
 from graphene.types.generic import GenericScalar
 
@@ -12,7 +14,7 @@ class BaseAttributeCreate(InputObjectType):
     owner = String(required=False)
 
     @classmethod
-    def __init_subclass__(cls, **kwargs) -> None:
+    def __init_subclass__(cls, **kwargs: dict[str, Any]) -> None:
         super().__init_subclass__(**kwargs)
         registry.input_type[cls.__name__] = cls
 
@@ -25,7 +27,7 @@ class BaseAttributeUpdate(InputObjectType):
     owner = String(required=False)
 
     @classmethod
-    def __init_subclass__(cls, **kwargs) -> None:
+    def __init_subclass__(cls, **kwargs: dict[str, Any]) -> None:
         super().__init_subclass__(**kwargs)
         registry.input_type[cls.__name__] = cls
 

pyproject.toml

@@ -296,14 +296,6 @@ ignore_errors = true
 module = "infrahub.git_credential.askpass"
 ignore_errors = true
 
-[[tool.mypy.overrides]]
-module = "infrahub.graphql"
-ignore_errors = true
-
-[[tool.mypy.overrides]]
-module = "infrahub.graphql.mutations.attribute"
-ignore_errors = true
-
 [[tool.mypy.overrides]]
 module = "infrahub.graphql.mutations.ipam"
 ignore_errors = true