Feature/EnhancePreprocessing

CHANGELOG.md

@@ -6,13 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 ### Added
+- `StandardScaler` Transformer in `pymilo_param.py`
+- `PreprocessingTransporter` Transporter
 - ndarray shape config in `GeneralDataStructure` Transporter
 - `util.py` in chains
 - `BinMapperTransporter` Transporter
 - `BunchTransporter` Transporter
 - `GeneratorTransporter` Transporter
-- `LabelEncoderTransporter` Transporter
-- `OneHotEncoderTransporter` Transporter
 - `TreePredictorTransporter` Transporter
 - `AdaboostClassifier` model
 - `AdaboostRegressor` model
@@ -37,6 +37,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Ensemble chain
 - `SECURITY.md`
 ### Changed
+- `Pipeline` test updated
+- `LabelBinarizer`,`LabelEncoder` and `OneHotEncoder` got embedded in `PreprocessingTransporter`
+- Preprocessing support added to Ensemble chain
+- Preprocessing params initialized in `pymilo_param`
 - `util.py` in utils updated
 - `test_pymilo.py` updated
 - `pymilo_func.py` updated

SUPPORTED_MODELS.md

@@ -630,4 +630,9 @@
 		<td><b>LabelEncoder</b></td>
         <td>>=0.8</td>
 	</tr>
+	<tr align="center">
+		<td>4</td>
+		<td><b>StandardScaler</b></td>
+        <td>>=0.8</td>
+	</tr>
 </table>

pymilo/chains/clustering_chain.py

@@ -5,6 +5,7 @@
 from ..transporters.general_data_structure_transporter import GeneralDataStructureTransporter
 from ..transporters.function_transporter import FunctionTransporter
 from ..transporters.cfnode_transporter import CFNodeTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..utils.util import get_sklearn_type
 
@@ -15,6 +16,7 @@
 
 bisecting_kmeans_support = SKLEARN_CLUSTERING_TABLE["BisectingKMeans"] != NOT_SUPPORTED
 CLUSTERING_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
     "FunctionTransporter": FunctionTransporter(),
     "CFNodeTransporter": CFNodeTransporter(),

pymilo/chains/decision_tree_chain.py

@@ -5,6 +5,7 @@
 from ..transporters.general_data_structure_transporter import GeneralDataStructureTransporter
 from ..transporters.tree_transporter import TreeTransporter
 from ..transporters.randomstate_transporter import RandomStateTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..utils.util import get_sklearn_type
 
@@ -16,6 +17,7 @@
 
 
 DECISION_TREE_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
     "RandomStateTransporter": RandomStateTransporter(),
     "TreeTransporter": TreeTransporter(),

pymilo/chains/ensemble_chain.py

@@ -4,12 +4,11 @@
 from ..transporters.general_data_structure_transporter import GeneralDataStructureTransporter
 from ..transporters.randomstate_transporter import RandomStateTransporter
 from ..transporters.lossfunction_transporter import LossFunctionTransporter
-from ..transporters.onehotencoder_transporter import OneHotEncoderTransporter
 from ..transporters.bunch_transporter import BunchTransporter
-from ..transporters.labelencoder_transporter import LabelEncoderTransporter
 from ..transporters.generator_transporter import GeneratorTransporter
 from ..transporters.treepredictor_transporter import TreePredictorTransporter
 from ..transporters.binmapper_transporter import BinMapperTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..pymilo_param import SKLEARN_ENSEMBLE_TABLE
 
@@ -27,14 +26,13 @@
 import copy
 
 ENSEMBLE_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
     "TreePredictorTransporter": TreePredictorTransporter(),
     "BinMapperTransporter": BinMapperTransporter(),
     "GeneratorTransporter": GeneratorTransporter(),
     "RandomStateTransporter": RandomStateTransporter(),
     "LossFunctionTransporter": LossFunctionTransporter(),
-    "OneHotEncoderTransporter": OneHotEncoderTransporter(),
-    "LabelEncoderTransporter": LabelEncoderTransporter(),
     "BunchTransporter": BunchTransporter(),
 }
 
@@ -166,14 +164,18 @@ def serialize_ensemble(ensemble_object):
     for key, value in ensemble_object.__dict__.items():
         if isinstance(value, list):
             has_inner_tuple_with_ml_model = False
+            pt = PreprocessingTransporter()
             for idx, item in enumerate(value):
                 if isinstance(item, tuple):
                     listed_tuple = list(item)
                     for inner_idx, inner_item in enumerate(listed_tuple):
-                        has_inner_model, result = serialize_possible_ml_model(inner_item)
-                        if has_inner_model:
-                            has_inner_tuple_with_ml_model = True
-                        listed_tuple[inner_idx] = result
+                        if pt.is_preprocessing_module(inner_item):
+                            listed_tuple[inner_idx] = pt.serialize_pre_module(inner_item)
+                        else:
+                            has_inner_model, result = serialize_possible_ml_model(inner_item)
+                            if has_inner_model:
+                                has_inner_tuple_with_ml_model = True
+                            listed_tuple[inner_idx] = result
                     value[idx] = listed_tuple
                 else:
                     value[idx] = serialize_possible_ml_model(item)[1]
@@ -325,12 +327,16 @@ def deserialize_ensemble(ensemble, is_inner_model=False):
                                      value) and value["pymiloed-data-structure"] == "list of (str, estimator) tuples":
                 listed_tuples = value["pymiloed-data"]
                 list_of_tuples = []
+                pt = PreprocessingTransporter()
                 for listed_tuple in listed_tuples:
-                    name, serialized_ml_model = listed_tuple
+                    name, serialized_model = listed_tuple
+                    retrieved_model = pt.deserialize_pre_module(serialized_model) if pt.is_preprocessing_module(
+                        serialized_model) else deserialize_possible_ml_model(serialized_model)[1]
                     list_of_tuples.append(
-                        (name, deserialize_possible_ml_model(serialized_ml_model)[1])
+                        (name, retrieved_model)
                     )
                 data[key] = list_of_tuples
+
             elif GeneralDataStructureTransporter().is_deserialized_ndarray(value):
                 has_inner_model, result = deserialize_models_in_ndarray(value)
                 if has_inner_model:

pymilo/chains/linear_model_chain.py

@@ -5,7 +5,7 @@
 from ..transporters.general_data_structure_transporter import GeneralDataStructureTransporter
 from ..transporters.baseloss_transporter import BaseLossTransporter
 from ..transporters.lossfunction_transporter import LossFunctionTransporter
-from ..transporters.labelbinarizer_transporter import LabelBinarizerTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..pymilo_param import SKLEARN_LINEAR_MODEL_TABLE
 from ..utils.util import get_sklearn_type, is_iterable
@@ -16,10 +16,11 @@
 
 
 LINEAR_MODEL_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
     "BaseLossTransporter": BaseLossTransporter(),
     "LossFunctionTransporter": LossFunctionTransporter(),
-    "LabelBinarizerTransporter": LabelBinarizerTransporter()}
+}
 
 
 def is_linear_model(model):
@@ -101,9 +102,9 @@ def serialize_linear_model(linear_model_object):
     for key in linear_model_object.__dict__:
         if is_linear_model(linear_model_object.__dict__[key]):
             linear_model_object.__dict__[key] = {
-                "pymilo-inner-model-data": transport_linear_model(linear_model_object.__dict__[key], Command.SERIALIZE),
+                "pymilo-inner-model-data": transport_linear_model(linear_model_object.__dict__[key], Command.SERIALIZE, True),
                 "pymilo-inner-model-type": get_sklearn_type(linear_model_object.__dict__[key]),
-                "by-pass": True
+                "pymilo-by-pass": True
             }
     # now serializing non-linear model fields
     for transporter in LINEAR_MODEL_CHAIN:

pymilo/chains/naive_bayes_chain.py

@@ -3,6 +3,7 @@
 from ..transporters.transporter import Command
 
 from ..transporters.general_data_structure_transporter import GeneralDataStructureTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..pymilo_param import SKLEARN_NAIVE_BAYES_TABLE
 from ..exceptions.serialize_exception import PymiloSerializationException, SerilaizatoinErrorTypes
@@ -13,6 +14,7 @@
 from traceback import format_exc
 
 NAIVE_BAYES_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
 }
 

pymilo/chains/neighbours_chain.py

@@ -4,6 +4,7 @@
 
 from ..transporters.general_data_structure_transporter import GeneralDataStructureTransporter
 from ..transporters.neighbors_tree_transporter import NeighborsTreeTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..pymilo_param import SKLEARN_NEIGHBORS_TABLE
 from ..exceptions.serialize_exception import PymiloSerializationException, SerilaizatoinErrorTypes
@@ -14,6 +15,7 @@
 from traceback import format_exc
 
 NEIGHBORS_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
     "NeighborsTreeTransporter": NeighborsTreeTransporter(),
 }

pymilo/chains/neural_network_chain.py

@@ -6,7 +6,7 @@
 from ..transporters.randomstate_transporter import RandomStateTransporter
 from ..transporters.sgdoptimizer_transporter import SGDOptimizerTransporter
 from ..transporters.adamoptimizer_transporter import AdamOptimizerTransporter
-from ..transporters.labelbinarizer_transporter import LabelBinarizerTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..pymilo_param import SKLEARN_NEURAL_NETWORK_TABLE
 
@@ -19,11 +19,11 @@
 
 
 NEURAL_NETWORK_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
     "RandomStateTransporter": RandomStateTransporter(),
     "SGDOptimizer": SGDOptimizerTransporter(),
     "AdamOptimizerTransporter": AdamOptimizerTransporter(),
-    "LabelBinarizerTransporter": LabelBinarizerTransporter(),
 }
 
 

pymilo/chains/svm_chain.py

@@ -4,6 +4,7 @@
 
 from ..transporters.general_data_structure_transporter import GeneralDataStructureTransporter
 from ..transporters.randomstate_transporter import RandomStateTransporter
+from ..transporters.preprocessing_transporter import PreprocessingTransporter
 
 from ..pymilo_param import SKLEARN_SVM_TABLE
 from ..exceptions.serialize_exception import PymiloSerializationException, SerilaizatoinErrorTypes
@@ -14,6 +15,7 @@
 from traceback import format_exc
 
 SVM_CHAIN = {
+    "PreprocessingTransporter": PreprocessingTransporter(),
     "GeneralDataStructureTransporter": GeneralDataStructureTransporter(),
     "RandomStateTransporter": RandomStateTransporter(),
 }

pymilo/pymilo_param.py

@@ -1,14 +1,6 @@
 # -*- coding: utf-8 -*-
 """Parameters and constants."""
-from numpy import uint8
-from numpy import intc
-from numpy import inf
-from numpy import float64
-from numpy import int32
-from numpy import int64
-from numpy import uint64
-from sklearn.preprocessing import LabelBinarizer
-
+import numpy as np
 import sklearn.linear_model as linear_model
 import sklearn.neural_network as neural_network
 import sklearn.tree as tree
@@ -20,7 +12,7 @@
 import sklearn.dummy as dummy
 import sklearn.ensemble as ensemble
 import sklearn.pipeline as pipeline
-
+import sklearn.preprocessing as preprocessing
 
 quantile_regressor_support = False
 try:
@@ -205,24 +197,32 @@
     "Pipeline": pipeline.Pipeline,
 }
 
+SKLEARN_PREPROCESSING_TABLE = {
+    "StandardScaler": preprocessing.StandardScaler,
+    "OneHotEncoder": preprocessing.OneHotEncoder,
+    "LabelBinarizer": preprocessing.LabelBinarizer,
+    "LabelEncoder": preprocessing.LabelEncoder,
+}
+
 KEYS_NEED_PREPROCESSING_BEFORE_DESERIALIZATION = {
-    "_label_binarizer": LabelBinarizer,  # in Ridge Classifier
-    "active_": int32,  # in Lasso Lars
-    "n_nonzero_coefs_": int64,  # in OMP-CV
+    "_label_binarizer": preprocessing.LabelBinarizer,  # in Ridge Classifier
+    "active_": np.int32,  # in Lasso Lars
+    "n_nonzero_coefs_": np.int64,  # in OMP-CV
     "scores_": dict,  # in Logistic Regression CV,
     "_base_loss": {},  # BaseLoss in Logistic Regression,
     "loss_function_": {},  # LossFunction in SGD Classifier,
     "estimator_": {},  # LinearRegression model inside RANSAC
 }
 
 NUMPY_TYPE_DICT = {
-    "numpy.intc": intc,
-    "numpy.int32": int32,
-    "numpy.int64": int64,
-    "numpy.float64": float64,
-    "numpy.infinity": lambda _: inf,
-    "numpy.uint8": uint8,
-    "numpy.uint64": uint64,
+    "numpy.intc": np.intc,
+    "numpy.int32": np.int32,
+    "numpy.int64": np.int64,
+    "numpy.float64": np.float64,
+    "numpy.infinity": lambda _: np.inf,
+    "numpy.uint8": np.uint8,
+    "numpy.uint64": np.uint64,
+    "numpy.dtype": np.dtype,
 }
 
 EXPORTED_MODELS_PATH = {

pymilo/transporters/general_data_structure_transporter.py

@@ -93,8 +93,16 @@ def serialize(self, data, key, model_type):
         :type model_type: str
         :return: pymilo serialized output of data[key]
         """
+        if isinstance(data[key], type):
+            raw_type = str(data[key])
+            raw_type = "numpy" + str(raw_type).split("numpy")[-1][:-2]
+            if raw_type in NUMPY_TYPE_DICT.keys():
+                data[key] = {
+                    "np-type": "numpy.dtype",
+                    "value": raw_type
+                }
         # 1. Handling numpy infinity, ransac
-        if isinstance(data[key], np.float64):
+        elif isinstance(data[key], np.float64):
             if np.inf == data[key]:
                 data[key] = {
                     "np-type": "numpy.infinity",
@@ -209,7 +217,7 @@ def get_deserialized_dict(self, content):
             return self.deep_deserialize_ndarray(content)
 
         if check_str_in_iterable("np-type", content) and check_str_in_iterable("value", content):
-            return NUMPY_TYPE_DICT[content["np-type"]](content["value"])
+            return self.get_deserialized_regular_primary_types(content)
 
         for key in content:
 
@@ -271,6 +279,8 @@ def get_deserialized_regular_primary_types(self, content):
         :return: the associated np.int32|np.int64|np.inf
         """
         if "np-type" in content:
+            if content["np-type"] == "numpy.dtype":
+                return NUMPY_TYPE_DICT[content["np-type"]](NUMPY_TYPE_DICT[content['value']])
             return NUMPY_TYPE_DICT[content["np-type"]](content['value'])
 
     def is_numpy_primary_type(self, content):
@@ -359,8 +369,7 @@ def deserialize_primitive_type(self, primitive):
         if is_primitive(primitive):
             return primitive
         elif check_str_in_iterable("np-type", primitive):
-            return NUMPY_TYPE_DICT[primitive["np-type"]
-                                   ](primitive['value'])
+            return self.get_deserialized_regular_primary_types(primitive)
         else:
             return primitive