fix mypy typings

Signed-off-by: Farhan Ahmed <[email protected]>

Author: f4str

art/defences/preprocessor/preprocessor.py

@@ -80,7 +80,7 @@ def apply_predict(self) -> bool:
         return self._apply_predict
 
     @abc.abstractmethod
-    def __call__(self, x: np.ndarray, y: Optional[np.ndarray] = None) -> Tuple[np.ndarray, Optional[np.ndarray]]:
+    def __call__(self, x: np.ndarray, y: Optional[Any] = None) -> Tuple[np.ndarray, Optional[Any]]:
         """
         Perform data preprocessing and return preprocessed data as tuple.
 
@@ -250,7 +250,7 @@ class PreprocessorTensorFlowV2(Preprocessor):
     """
 
     @abc.abstractmethod
-    def forward(self, x: "tf.Tensor", y: Optional["tf.Tensor"] = None) -> Tuple["tf.Tensor", Optional["tf.Tensor"]]:
+    def forward(self, x: "tf.Tensor", y: Optional[Any] = None) -> Tuple["tf.Tensor", Optional[Any]]:
         """
         Perform data preprocessing in TensorFlow v2 and return preprocessed data as tuple.
 

art/preprocessing/image/image_resize/numpy.py

@@ -78,13 +78,13 @@ def __init__(
         self.verbose = verbose
         self._check_params()
 
-    def __call__(  # type: ignore
-        self, x: Union[np.ndarray, List[np.ndarray]], y: Optional[Union[np.ndarray, List[Dict[str, np.ndarray]]]] = None
+    def __call__(
+        self, x: np.ndarray, y: Optional[Union[np.ndarray, List[Dict[str, np.ndarray]]]] = None
     ) -> Tuple[np.ndarray, Optional[Union[np.ndarray, List[Dict[str, np.ndarray]]]]]:
         """
         Resize `x` and adjust bounding boxes for labels `y` accordingly.
 
-        :param x: Input samples.
+        :param x: Input samples. A list of samples is also supported.
         :param y: Label of the samples `x`.
         :return: Transformed samples and labels.
         """

art/preprocessing/image/image_resize/pytorch.py

@@ -79,15 +79,15 @@ def __init__(
         self.verbose = verbose
         self._check_params()
 
-    def forward(  # type: ignore
+    def forward(
         self,
-        x: Union["torch.Tensor", List["torch.Tensor"]],
+        x: "torch.Tensor",
         y: Optional[Union["torch.Tensor", List[Dict[str, "torch.Tensor"]]]] = None,
     ) -> Tuple["torch.Tensor", Optional[Union["torch.Tensor", List[Dict[str, "torch.Tensor"]]]]]:
         """
         Resize `x` and adjust bounding boxes for labels `y` accordingly.
 
-        :param x: Input samples.
+        :param x: Input samples. A list of samples is also supported.
         :param y: Label of the samples `x`.
         :return: Transformed samples and labels.
         """

art/preprocessing/image/image_resize/tensorflow.py

@@ -78,15 +78,15 @@ def __init__(
         self.verbose = verbose
         self._check_params()
 
-    def forward(  # type: ignore
+    def forward(
         self,
-        x: Union["tf.Tensor", List["tf.Tensor"]],
+        x: "tf.Tensor",
         y: Optional[Union["tf.Tensor", List[Dict[str, "tf.Tensor"]]]] = None,
     ) -> Tuple["tf.Tensor", Optional[Union["tf.Tensor", List[Dict[str, "tf.Tensor"]]]]]:
         """
         Resize `x` and adjust bounding boxes for labels `y` accordingly.
 
-        :param x: Input samples.
+        :param x: Input samples. A list of samples is also supported.
         :param y: Label of the samples `x`.
         :return: Transformed samples and labels.
         """

art/preprocessing/image/image_square_pad/numpy.py

@@ -77,13 +77,13 @@ def __init__(
         self.verbose = verbose
         self._check_params()
 
-    def __call__(  # type: ignore
-        self, x: Union[np.ndarray, List[np.ndarray]], y: Optional[Union[np.ndarray, List[Dict[str, np.ndarray]]]] = None
-    ) -> Tuple[Union[np.ndarray, List[np.ndarray]], Optional[Union[np.ndarray, List[Dict[str, np.ndarray]]]]]:
+    def __call__(
+        self, x: np.ndarray, y: Optional[Union[np.ndarray, List[Dict[str, np.ndarray]]]] = None
+    ) -> Tuple[np.ndarray, Optional[Union[np.ndarray, List[Dict[str, np.ndarray]]]]]:
         """
         Square pad `x` and adjust bounding boxes for labels `y` accordingly.
 
-        :param x: Input samples.
+        :param x: Input samples. A list of samples is also supported.
         :param y: Label of the samples `x`.
         :return: Transformed samples and labels.
         """

art/preprocessing/image/image_square_pad/pytorch.py

@@ -79,17 +79,15 @@ def __init__(
         self.verbose = verbose
         self._check_params()
 
-    def forward(  # type: ignore
+    def forward(
         self,
-        x: Union["torch.Tensor", List["torch.Tensor"]],
+        x: "torch.Tensor",
         y: Optional[Union["torch.Tensor", List[Dict[str, "torch.Tensor"]]]] = None,
-    ) -> Tuple[
-        Union["torch.Tensor", List["torch.Tensor"]], Optional[Union["torch.Tensor", List[Dict[str, "torch.Tensor"]]]]
-    ]:
+    ) -> Tuple["torch.Tensor", Optional[Union["torch.Tensor", List[Dict[str, "torch.Tensor"]]]]]:
         """
         Square pad `x` and adjust bounding boxes for labels `y` accordingly.
 
-        :param x: Input samples.
+        :param x: Input samples. A list of samples is also supported.
         :param y: Label of the samples `x`.
         :return: Transformed samples and labels.
         """

art/preprocessing/image/image_square_pad/tensorflow.py

@@ -77,15 +77,15 @@ def __init__(
         self.verbose = verbose
         self._check_params()
 
-    def forward(  # type: ignore
+    def forward(
         self,
-        x: Union["tf.Tensor", List["tf.Tensor"]],
+        x: "tf.Tensor",
         y: Optional[Union["tf.Tensor", List[Dict[str, "tf.Tensor"]]]] = None,
-    ) -> Tuple[Union["tf.Tensor", List["tf.Tensor"]], Optional[Union["tf.Tensor", List[Dict[str, "tf.Tensor"]]]]]:
+    ) -> Tuple["tf.Tensor", Optional[Union["tf.Tensor", List[Dict[str, "tf.Tensor"]]]]]:
         """
         Square pad `x` and adjust bounding boxes for labels `y` accordingly.
 
-        :param x: Input samples.
+        :param x: Input samples. A list of samples is also supported.
         :param y: Label of the samples `x`.
         :return: Transformed samples and labels.
         """