Remove deprecated code and slight cleanup (#1173)

Author: ethanwharris

docs/source/api/data.rst

@@ -7,16 +7,6 @@ flash.core.data
     :local:
     :backlinks: top
 
-flash.core.data.io.output
-_________________________
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-    :template: classtemplate.rst
-
-    ~flash.core.data.io.output.Output
-
 flash.core.data.base_viz
 ________________________
 
@@ -58,38 +48,6 @@ ___________________________
 
     ~flash.core.data.data_module.DataModule
 
-flash.core.data.data_pipeline
-_____________________________
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-    :template: classtemplate.rst
-
-    ~flash.core.data.data_pipeline.DataPipeline
-
-flash.core.data.io.input
-___________________________
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-    :template: classtemplate.rst
-
-    ~flash.core.data.io.input.Input
-    ~flash.core.data.io.input.DataKeys
-    ~flash.core.data.io.input.InputFormat
-
-flash.core.data.io.classification_input
-_______________________________________
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-    :template: classtemplate.rst
-
-    ~flash.core.data.io.classification_input.ClassificationInputMixin
-
 flash.core.data.utilities.classification
 ________________________________________
 
@@ -109,19 +67,6 @@ ________________________________________
     ~flash.core.data.utilities.classification.MultiBinaryTargetFormatter
     ~flash.core.data.utilities.classification.get_target_formatter
 
-flash.core.data.process
-_______________________
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-    :template: classtemplate.rst
-
-    ~flash.core.data.process.DeserializerMapping
-    ~flash.core.data.process.Deserializer
-    ~flash.core.data.io.output_transform.OutputTransform
-    ~flash.core.data.io.input_transform.InputTransform
-
 flash.core.data.properties
 __________________________
 
@@ -175,3 +120,55 @@ _____________________
 
     ~flash.core.data.utils.convert_to_modules
     ~flash.core.data.utils.download_data
+
+flash.core.data.io.input
+___________________________
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+    :template: classtemplate.rst
+
+    ~flash.core.data.io.input.Input
+    ~flash.core.data.io.input.DataKeys
+    ~flash.core.data.io.input.InputFormat
+
+flash.core.data.io.classification_input
+_______________________________________
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+    :template: classtemplate.rst
+
+    ~flash.core.data.io.classification_input.ClassificationInputMixin
+
+flash.core.data.io.input_transform
+__________________________________
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+    :template: classtemplate.rst
+
+    ~flash.core.data.io.input_transform.InputTransform
+
+flash.core.data.io.output
+_________________________
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+    :template: classtemplate.rst
+
+    ~flash.core.data.io.output.Output
+
+flash.core.data.io.output_transform
+___________________________________
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+    :template: classtemplate.rst
+
+    ~flash.core.data.io.output_transform.OutputTransform

flash/__init__.py

@@ -25,7 +25,6 @@
     from flash.core.data.io.input_transform import InputTransform
     from flash.core.data.io.output import Output
     from flash.core.data.io.output_transform import OutputTransform
-    from flash.core.data.process import Serializer
     from flash.core.model import Task
     from flash.core.trainer import Trainer
     from flash.core.utilities.stages import RunningStage
@@ -49,7 +48,6 @@
         "Output",
         "OutputTransform",
         "RunningStage",
-        "Serializer",
         "Task",
         "Trainer",
     ]

flash/audio/speech_recognition/input.py

@@ -20,8 +20,7 @@
 from torch.utils.data import Dataset
 
 import flash
-from flash.core.data.io.input import DataKeys, Input
-from flash.core.data.process import Deserializer
+from flash.core.data.io.input import DataKeys, Input, ServeInput
 from flash.core.data.utilities.paths import filter_valid_files, list_valid_files
 from flash.core.data.utilities.samples import to_sample, to_samples
 from flash.core.utilities.imports import _AUDIO_AVAILABLE, requires
@@ -31,7 +30,7 @@
     from datasets import load_dataset
 
 
-class SpeechRecognitionDeserializer(Deserializer):
+class SpeechRecognitionDeserializer(ServeInput):
     @requires("audio")
     def __init__(self, sampling_rate: int = 16000, **kwargs):
         super().__init__(**kwargs)

flash/core/classification.py

@@ -15,7 +15,7 @@
 
 import torch
 import torch.nn.functional as F
-from pytorch_lightning.utilities import rank_zero_deprecation, rank_zero_warn
+from pytorch_lightning.utilities import rank_zero_warn
 from torchmetrics import Accuracy, Metric
 
 from flash.core.adapter import AdapterTask
@@ -71,12 +71,12 @@ def _build(
         return metrics, loss_fn
 
     def to_metrics_format(self, x: torch.Tensor) -> torch.Tensor:
-        if getattr(self.hparams, "multi_label", False):
+        if getattr(self, "multi_label", False):
             return torch.sigmoid(x)
         return torch.softmax(x, dim=1)
 
 
-class ClassificationTask(Task, ClassificationMixin):
+class ClassificationTask(ClassificationMixin, Task):
 
     outputs: FlashRegistry = Task.outputs + CLASSIFICATION_OUTPUTS
 
@@ -101,7 +101,7 @@ def __init__(
         )
 
 
-class ClassificationAdapterTask(AdapterTask, ClassificationMixin):
+class ClassificationAdapterTask(ClassificationMixin, AdapterTask):
 
     outputs: FlashRegistry = Task.outputs + CLASSIFICATION_OUTPUTS
 
@@ -350,20 +350,3 @@ def transform(
             filepath = sample[DataKeys.METADATA]["filepath"]
             return {"filepath": filepath, "predictions": fo_predictions}
         return fo_predictions
-
-
-class Labels(LabelsOutput):
-    def __init__(self, labels: Optional[List[str]] = None, multi_label: bool = False, threshold: float = 0.5):
-        rank_zero_deprecation(
-            "`Labels` was deprecated in v0.6.0 and will be removed in v0.7.0." "Please use `LabelsOutput` instead."
-        )
-        super().__init__(labels=labels, multi_label=multi_label, threshold=threshold)
-
-
-class Probabilities(ProbabilitiesOutput):
-    def __init__(self, multi_label: bool = False):
-        rank_zero_deprecation(
-            "`Probabilities` was deprecated in v0.6.0 and will be removed in v0.7.0."
-            "Please use `ProbabilitiesOutput` instead."
-        )
-        super().__init__(multi_label=multi_label)

flash/core/data/data_source.py

@@ -72,9 +72,6 @@ def download_data(url: str, path: str = "data/", verbose: bool = False) -> None:
     Usage:
         download_file('http://web4host.net/5MB.zip')
     """
-    if url == "NEED_TO_BE_CREATED":
-        raise NotImplementedError
-
     if not os.path.exists(path):
         os.makedirs(path)
     local_filename = os.path.join(path, url.split("/")[-1])

flash/core/data/process.py

@@ -29,7 +29,6 @@
 METRICS_TYPE = TypeVar("METRICS_TYPE", Metric, Mapping, Sequence, None)
 
 # Data Pipeline
-DESERIALIZER_TYPE = TypeVar("DESERIALIZER_TYPE", "flash.core.data.process.Deserializer", None)
 INPUT_TRANSFORM_TYPE = TypeVar(
     "INPUT_TRANSFORM_TYPE",
     Type["flash.core.data.io.input_transform.InputTransform"],

flash/core/data/utils.py

@@ -20,8 +20,7 @@
 import torch
 
 import flash
-from flash.core.data.io.input import DataKeys, Input
-from flash.core.data.process import Deserializer
+from flash.core.data.io.input import DataKeys, Input, ServeInput
 from flash.core.data.utilities.paths import filter_valid_files, has_file_allowed_extension, PATH_TYPE
 from flash.core.data.utilities.samples import to_samples
 from flash.core.data.utils import image_default_loader
@@ -49,7 +48,7 @@ def image_loader(filepath: str):
     return img
 
 
-class ImageDeserializer(Deserializer):
+class ImageDeserializer(ServeInput):
     @requires("image")
     def serve_load_sample(self, data: str) -> Dict:
         encoded_with_padding = (data + "===").encode("ascii")

flash/core/utilities/types.py

@@ -61,7 +61,7 @@ def from_task(cls, task: Task, **kwargs) -> Output:
 
     def transform(self, sample: Dict[str, Any]) -> Union[Detections, Dict[str, Any]]:
         if DataKeys.METADATA not in sample:
-            raise ValueError("sample requires DefaultDataKeys.METADATA to use a FiftyOneDetectionLabelsOutput output.")
+            raise ValueError("sample requires DataKeys.METADATA to use a FiftyOneDetectionLabelsOutput output.")
 
         height, width = sample[DataKeys.METADATA]["size"]