extend typing: base

.deepsource.toml

@@ -20,4 +20,4 @@ enabled = true
 
 [[transformers]]
 name = "autopep8"
-enabled = true
+enabled = false

setup.cfg

@@ -73,18 +73,6 @@ files = torchmetrics
 disallow_untyped_defs = True
 ignore_missing_imports = True
 
-# todo: add proper typing to this module...
-[mypy-torchmetrics.metric]
-ignore_errors = True
-
-# todo: add proper typing to this module...
-[mypy-torchmetrics.collections]
-ignore_errors = True
-
-# todo: add proper typing to this module...
-[mypy-torchmetrics.compositional]
-ignore_errors = True
-
 # todo: add proper typing to this module...
 [mypy-torchmetrics.image.ssim]
 ignore_errors = True

torchmetrics/collections.py

@@ -14,7 +14,7 @@
 
 from collections import OrderedDict
 from copy import deepcopy
-from typing import Any, Dict, Iterable, Optional, Sequence, Tuple, Union
+from typing import Any, Dict, Hashable, Iterable, Optional, Sequence, Tuple, Union
 
 import torch
 from torch import nn
@@ -103,15 +103,15 @@ def __init__(
  self.postfix = self._check_arg(postfix, 'postfix')
 
  @torch.jit.unused
- def forward(self, *args, **kwargs) -> Dict[str, Any]: # pylint: disable=E0202
+ def forward(self, *args: Any, **kwargs: Any) -> Dict[str, Any]:
  """
  Iteratively call forward for each metric. Positional arguments (args) will
  be passed to every metric in the collection, while keyword arguments (kwargs)
  will be filtered based on the signature of the individual metric.
  """
  return {k: m(*args, **m._filter_kwargs(**kwargs)) for k, m in self.items()}
 
- def update(self, *args, **kwargs): # pylint: disable=E0202
+ def update(self, *args: Any, **kwargs: Any) -> None:
  """
  Iteratively call update for each metric. Positional arguments (args) will
  be passed to every metric in the collection, while keyword arguments (kwargs)
@@ -161,7 +161,7 @@ def add_metrics(
  if isinstance(metrics, Sequence):
  # prepare for optional additions
  metrics = list(metrics)
- remain = []
+ remain: list = []
  for m in additional_metrics:
  (metrics if isinstance(m, Metric) else remain).append(m)
 
@@ -207,7 +207,7 @@ def _to_renamed_ordered_dict(self) -> OrderedDict:
  od[self._set_name(k)] = v
  return od
 
- def keys(self, keep_base: bool = False):
+ def keys(self, keep_base: bool = False) -> Iterable[Hashable]:
  r"""Return an iterable of the ModuleDict key.
  Args:
  keep_base: Whether to add prefix/postfix on the items collection.
@@ -231,7 +231,7 @@ def _check_arg(arg: Optional[str], name: str) -> Optional[str]:
  return arg
  raise ValueError(f'Expected input `{name}` to be a string, but got {type(arg)}')
 
- def __repr__(self) -> Optional[str]:
+ def __repr__(self) -> str:
  repr_str = super().__repr__()[:-2]
  if self.prefix:
  repr_str += f",\n prefix={self.prefix}{',' if self.postfix else ''}"