snowflake-ml-python 1.7.4__py3-none-any.whl → 1.8.0__py3-none-any.whl

snowflake/ml/model/_packager/model_handlers/pytorch.py

@@ -10,10 +10,14 @@ from snowflake.ml._internal import type_utils
 from snowflake.ml.model import custom_model, model_signature, type_hints as model_types
 from snowflake.ml.model._packager.model_env import model_env
 from snowflake.ml.model._packager.model_handlers import _base, _utils as handlers_utils
-from snowflake.ml.model._packager.model_handlers_migrator import base_migrator
+from snowflake.ml.model._packager.model_handlers_migrator import (
+    base_migrator,
+    pytorch_migrator_2023_12_01,
+)
 from snowflake.ml.model._packager.model_meta import (
     model_blob_meta,
     model_meta as model_meta_api,
+    model_meta_schema,
 )
 from snowflake.ml.model._signatures import (
     pytorch_handler,
@@ -21,7 +25,6 @@ from snowflake.ml.model._signatures import (
 )
 
 if TYPE_CHECKING:
-    import sentence_transformers  # noqa: F401
     import torch
 
 
@@ -33,9 +36,11 @@ class PyTorchHandler(_base.BaseModelHandler["torch.nn.Module"]):
     """
 
     HANDLER_TYPE = "pytorch"
-    HANDLER_VERSION = "2023-12-01"
-    _MIN_SNOWPARK_ML_VERSION = "1.0.12"
-    _HANDLER_MIGRATOR_PLANS: Dict[str, Type[base_migrator.BaseModelHandlerMigrator]] = {}
+    HANDLER_VERSION = "2025-03-01"
+    _MIN_SNOWPARK_ML_VERSION = "1.8.0"
+    _HANDLER_MIGRATOR_PLANS: Dict[str, Type[base_migrator.BaseModelHandlerMigrator]] = {
+        "2023-12-01": pytorch_migrator_2023_12_01.PyTorchHandlerMigrator20231201
+    }
 
     MODEL_BLOB_FILE_OR_DIR = "model.pt"
     DEFAULT_TARGET_METHODS = ["forward"]
@@ -49,6 +54,7 @@ class PyTorchHandler(_base.BaseModelHandler["torch.nn.Module"]):
             type_utils.LazyType("torch.nn.Module").isinstance(model)
             and not type_utils.LazyType("torch.jit.ScriptModule").isinstance(model)
             and not type_utils.LazyType("sentence_transformers.SentenceTransformer").isinstance(model)
+            and not type_utils.LazyType("keras.Model").isinstance(model)
         )
 
     @classmethod
@@ -88,22 +94,33 @@ class PyTorchHandler(_base.BaseModelHandler["torch.nn.Module"]):
                 default_target_methods=cls.DEFAULT_TARGET_METHODS,
             )
 
+            multiple_inputs = kwargs.get("multiple_inputs", False)
+
             def get_prediction(
                 target_method_name: str, sample_input_data: "model_types.SupportedLocalDataType"
             ) -> model_types.SupportedLocalDataType:
-                if not pytorch_handler.SeqOfPyTorchTensorHandler.can_handle(sample_input_data):
-                    sample_input_data = pytorch_handler.SeqOfPyTorchTensorHandler.convert_from_df(
-                        model_signature._convert_local_data_to_df(sample_input_data)
-                    )
+                if multiple_inputs:
+                    if not pytorch_handler.SeqOfPyTorchTensorHandler.can_handle(sample_input_data):
+                        sample_input_data = pytorch_handler.SeqOfPyTorchTensorHandler.convert_from_df(
+                            model_signature._convert_local_data_to_df(sample_input_data)
+                        )
+                else:
+                    if not pytorch_handler.PyTorchTensorHandler.can_handle(sample_input_data):
+                        sample_input_data = pytorch_handler.PyTorchTensorHandler.convert_from_df(
+                            model_signature._convert_local_data_to_df(sample_input_data)
+                        )
 
                 model.eval()
                 target_method = getattr(model, target_method_name, None)
                 assert callable(target_method)
                 with torch.no_grad():
-                    predictions_df = target_method(*sample_input_data)
+                    if multiple_inputs:
+                        predictions_df = target_method(*sample_input_data)
+                        if not isinstance(predictions_df, tuple):
+                            predictions_df = [predictions_df]
+                    else:
+                        predictions_df = target_method(sample_input_data)
 
-                if isinstance(predictions_df, torch.Tensor):
-                    predictions_df = [predictions_df]
                 return predictions_df
 
             model_meta = handlers_utils.validate_signature(
@@ -126,6 +143,7 @@ class PyTorchHandler(_base.BaseModelHandler["torch.nn.Module"]):
             model_type=cls.HANDLER_TYPE,
             handler_version=cls.HANDLER_VERSION,
             path=cls.MODEL_BLOB_FILE_OR_DIR,
+            options=model_meta_schema.PyTorchModelBlobOptions(multiple_inputs=multiple_inputs),
         )
         model_meta.models[name] = base_meta
         model_meta.min_snowpark_ml_version = cls._MIN_SNOWPARK_ML_VERSION
@@ -171,6 +189,10 @@ class PyTorchHandler(_base.BaseModelHandler["torch.nn.Module"]):
             raw_model: "torch.nn.Module",
             model_meta: model_meta_api.ModelMetadata,
         ) -> Type[custom_model.CustomModel]:
+            multiple_inputs = cast(
+                model_meta_schema.PyTorchModelBlobOptions, model_meta.models[model_meta.name].options
+            )["multiple_inputs"]
+
             def fn_factory(
                 raw_model: "torch.nn.Module",
                 signature: model_signature.ModelSignature,
@@ -182,19 +204,28 @@ class PyTorchHandler(_base.BaseModelHandler["torch.nn.Module"]):
                         raise ValueError("Tensor cannot handle null values.")
 
                     raw_model.eval()
-                    t = pytorch_handler.SeqOfPyTorchTensorHandler.convert_from_df(X, signature.inputs)
+                    if multiple_inputs:
+                        st = pytorch_handler.SeqOfPyTorchTensorHandler.convert_from_df(X, signature.inputs)
+
+                        if kwargs.get("use_gpu", False):
+                            st = [element.cuda() for element in st]
 
-                    if kwargs.get("use_gpu", False):
-                        t = [element.cuda() for element in t]
+                        with torch.no_grad():
+                            res = getattr(raw_model, target_method)(*st)
 
-                    with torch.no_grad():
-                        res = getattr(raw_model, target_method)(*t)
+                        if not isinstance(res, tuple):
+                            res = [res]
+                    else:
+                        t = pytorch_handler.PyTorchTensorHandler.convert_from_df(X, signature.inputs)
+                        if kwargs.get("use_gpu", False):
+                            t = t.cuda()
 
-                    if isinstance(res, torch.Tensor):
-                        res = [res]
+                        with torch.no_grad():
+                            res = getattr(raw_model, target_method)(t)
 
                     return model_signature_utils.rename_pandas_df(
-                        data=pytorch_handler.SeqOfPyTorchTensorHandler.convert_to_df(res), features=signature.outputs
+                        model_signature._convert_local_data_to_df(res, ensure_serializable=True),
+                        features=signature.outputs,
                     )
 
                 return fn

snowflake/ml/model/_packager/model_handlers/sklearn.py

@@ -292,12 +292,34 @@ class SKLModelHandler(_base.BaseModelHandler[Union["sklearn.base.BaseEstimator",
                 def explain_fn(self: custom_model.CustomModel, X: pd.DataFrame) -> pd.DataFrame:
                     import shap
 
-                    # TODO: if not resolved by explainer, we need to pass the callable function
                     try:
                         explainer = shap.Explainer(raw_model, background_data)
                         df = handlers_utils.convert_explanations_to_2D_df(raw_model, explainer(X).values)
-                    except TypeError as e:
-                        raise ValueError(f"Explanation for this model type not supported yet: {str(e)}")
+                    except TypeError:
+                        try:
+                            dtype_map = {spec.name: spec.as_dtype(force_numpy_dtype=True) for spec in signature.inputs}
+
+                            if isinstance(X, pd.DataFrame):
+                                X = X.astype(dtype_map, copy=False)
+                            if hasattr(raw_model, "predict_proba"):
+                                if isinstance(X, np.ndarray):
+                                    explanations = shap.Explainer(
+                                        raw_model.predict_proba, background_data.values  # type: ignore[union-attr]
+                                    )(X).values
+                                else:
+                                    explanations = shap.Explainer(raw_model.predict_proba, background_data)(X).values
+                            elif hasattr(raw_model, "predict"):
+                                if isinstance(X, np.ndarray):
+                                    explanations = shap.Explainer(
+                                        raw_model.predict, background_data.values  # type: ignore[union-attr]
+                                    )(X).values
+                                else:
+                                    explanations = shap.Explainer(raw_model.predict, background_data)(X).values
+                            else:
+                                raise ValueError("Missing any supported target method to explain.")
+                            df = handlers_utils.convert_explanations_to_2D_df(raw_model, explanations)
+                        except TypeError as e:
+                            raise ValueError(f"Explanation for this model type not supported yet: {str(e)}")
                     return model_signature_utils.rename_pandas_df(df, signature.outputs)
 
                 if target_method == "explain":

snowflake/ml/model/_packager/model_handlers/snowmlmodel.py

@@ -74,11 +74,6 @@ class SnowMLModelHandler(_base.BaseModelHandler["BaseEstimator"]):
         background_data: Optional[model_types.SupportedDataType],
         enable_explainability: Optional[bool],
     ) -> Any:
-        from snowflake.ml.modeling import pipeline as snowml_pipeline
-
-        # handle pipeline objects separately
-        if isinstance(estimator, snowml_pipeline.Pipeline):  # type: ignore[attr-defined]
-            return None
 
         tree_methods = ["to_xgboost", "to_lightgbm", "to_sklearn"]
         non_tree_methods = ["to_sklearn"]
@@ -129,27 +124,54 @@ class SnowMLModelHandler(_base.BaseModelHandler["BaseEstimator"]):
         # Pipeline is inherited from BaseEstimator, so no need to add one more check
 
         if not is_sub_model:
-            if model_meta.signatures:
+            if model_meta.signatures or sample_input_data is not None:
                 warnings.warn(
                     "Providing model signature for Snowpark ML "
                     + "Modeling model is not required. Model signature will automatically be inferred during fitting. ",
                     UserWarning,
                     stacklevel=2,
                 )
-            assert hasattr(model, "model_signatures"), "Model does not have model signatures as expected."
-            model_signature_dict = getattr(model, "model_signatures", {})
-            target_methods = kwargs.pop("target_methods", None)
-            if not target_methods:
-                model_meta.signatures = model_signature_dict
+                target_methods = handlers_utils.get_target_methods(
+                    model=model,
+                    target_methods=kwargs.pop("target_methods", None),
+                    default_target_methods=cls.DEFAULT_TARGET_METHODS,
+                )
+
+                def get_prediction(
+                    target_method_name: str,
+                    sample_input_data: model_types.SupportedLocalDataType,
+                ) -> model_types.SupportedLocalDataType:
+                    if not isinstance(sample_input_data, (pd.DataFrame, np.ndarray)):
+                        sample_input_data = model_signature._convert_local_data_to_df(sample_input_data)
+
+                    target_method = getattr(model, target_method_name, None)
+                    assert callable(target_method)
+                    predictions_df = target_method(sample_input_data)
+                    return predictions_df
+
+                model_meta = handlers_utils.validate_signature(
+                    model=model,
+                    model_meta=model_meta,
+                    target_methods=target_methods,
+                    sample_input_data=sample_input_data,
+                    get_prediction_fn=get_prediction,
+                    is_for_modeling_model=True,
+                )
             else:
-                temp_model_signature_dict = {}
-                for method_name in target_methods:
-                    method_model_signature = model_signature_dict.get(method_name, None)
-                    if method_model_signature is not None:
-                        temp_model_signature_dict[method_name] = method_model_signature
-                    else:
-                        raise ValueError(f"Target method {method_name} does not exist in the model.")
-                model_meta.signatures = temp_model_signature_dict
+                assert hasattr(model, "model_signatures"), "Model does not have model signatures as expected."
+                model_signature_dict = getattr(model, "model_signatures", {})
+                optional_target_methods = kwargs.pop("target_methods", None)
+                if not optional_target_methods:
+                    model_meta.signatures = model_signature_dict
+                else:
+                    temp_model_signature_dict = {}
+                    for method_name in optional_target_methods:
+                        method_model_signature = model_signature_dict.get(method_name, None)
+                        if method_model_signature is not None:
+                            temp_model_signature_dict[method_name] = method_model_signature
+                        else:
+                            raise ValueError(f"Target method {method_name} does not exist in the model.")
+                    model_meta.signatures = temp_model_signature_dict
 
         python_base_obj = cls._get_supported_object_for_explainability(model, sample_input_data, enable_explainability)
         explain_target_method = handlers_utils.get_explain_target_method(model_meta, cls.EXPLAIN_TARGET_METHODS)
@@ -279,9 +301,39 @@ class SnowMLModelHandler(_base.BaseModelHandler["BaseEstimator"]):
                     for method_name in non_tree_methods:
                         try:
                             base_model = getattr(raw_model, method_name)()
-                            explainer = shap.Explainer(base_model, masker=background_data)
-                            df = handlers_utils.convert_explanations_to_2D_df(raw_model, explainer(X).values)
+                            try:
+                                explainer = shap.Explainer(base_model, masker=background_data)
+                                df = handlers_utils.convert_explanations_to_2D_df(base_model, explainer(X).values)
+                            except TypeError:
+                                try:
+                                    dtype_map = {
+                                        spec.name: spec.as_dtype(force_numpy_dtype=True) for spec in signature.inputs
+                                    }
+
+                                    if isinstance(X, pd.DataFrame):
+                                        X = X.astype(dtype_map, copy=False)
+                                    if hasattr(base_model, "predict_proba"):
+                                        if isinstance(X, np.ndarray):
+                                            explainer = shap.Explainer(
+                                                base_model.predict_proba,
+                                                background_data.values,  # type: ignore[union-attr]
+                                            )
+                                        else:
+                                            explainer = shap.Explainer(base_model.predict_proba, background_data)
+                                    elif hasattr(base_model, "predict"):
+                                        if isinstance(X, np.ndarray):
+                                            explainer = shap.Explainer(
+                                                base_model.predict, background_data.values  # type: ignore[union-attr]
+                                            )
+                                        else:
+                                            explainer = shap.Explainer(base_model.predict, background_data)
+                                    else:
+                                        raise ValueError("Missing any supported target method to explain.")
+                                    df = handlers_utils.convert_explanations_to_2D_df(base_model, explainer(X).values)
+                                except TypeError as e:
+                                    raise ValueError(f"Explanation for this model type not supported yet: {str(e)}")
                             return model_signature_utils.rename_pandas_df(df, signature.outputs)
+
                         except exceptions.SnowflakeMLException:
                             pass  # Do nothing and continue to the next method
                     raise ValueError("The model must be an xgboost, lightgbm or sklearn (not pipeline) estimator.")

snowflake/ml/model/_packager/model_handlers/tensorflow.py

@@ -1,7 +1,6 @@
 import os
 from typing import TYPE_CHECKING, Callable, Dict, Optional, Type, cast, final
 
-import numpy as np
 import pandas as pd
 from packaging import version
 from typing_extensions import TypeGuard, Unpack
@@ -10,14 +9,17 @@ from snowflake.ml._internal import type_utils
 from snowflake.ml.model import custom_model, model_signature, type_hints as model_types
 from snowflake.ml.model._packager.model_env import model_env
 from snowflake.ml.model._packager.model_handlers import _base, _utils as handlers_utils
-from snowflake.ml.model._packager.model_handlers_migrator import base_migrator
+from snowflake.ml.model._packager.model_handlers_migrator import (
+    base_migrator,
+    tensorflow_migrator_2023_12_01,
+    tensorflow_migrator_2025_01_01,
+)
 from snowflake.ml.model._packager.model_meta import (
     model_blob_meta,
     model_meta as model_meta_api,
     model_meta_schema,
 )
 from snowflake.ml.model._signatures import (
-    numpy_handler,
     tensorflow_handler,
     utils as model_signature_utils,
 )
@@ -28,15 +30,18 @@ if TYPE_CHECKING:
 
 @final
 class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
-    """Handler for TensorFlow based model.
+    """Handler for TensorFlow based model or keras v2 model.
 
     Currently tensorflow.Module based classes are supported.
     """
 
     HANDLER_TYPE = "tensorflow"
-    HANDLER_VERSION = "2023-12-01"
-    _MIN_SNOWPARK_ML_VERSION = "1.0.12"
-    _HANDLER_MIGRATOR_PLANS: Dict[str, Type[base_migrator.BaseModelHandlerMigrator]] = {}
+    HANDLER_VERSION = "2025-03-01"
+    _MIN_SNOWPARK_ML_VERSION = "1.8.0"
+    _HANDLER_MIGRATOR_PLANS: Dict[str, Type[base_migrator.BaseModelHandlerMigrator]] = {
+        "2023-12-01": tensorflow_migrator_2023_12_01.TensorflowHandlerMigrator20231201,
+        "2025-01-01": tensorflow_migrator_2025_01_01.TensorflowHandlerMigrator20250101,
+    }
 
     MODEL_BLOB_FILE_OR_DIR = "model"
     DEFAULT_TARGET_METHODS = ["__call__"]
@@ -46,7 +51,13 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
         cls,
         model: model_types.SupportedModelType,
     ) -> TypeGuard["tensorflow.nn.Module"]:
-        return type_utils.LazyType("tensorflow.Module").isinstance(model)
+        if not type_utils.LazyType("tensorflow.Module").isinstance(model):
+            return False
+        if type_utils.LazyType("keras.Model").isinstance(model):
+            import keras
+
+            return version.parse(keras.__version__) < version.parse("3.0.0")
+        return True
 
     @classmethod
     def cast_model(
@@ -74,44 +85,22 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
         if enable_explainability:
             raise NotImplementedError("Explainability is not supported for Tensorflow model.")
 
-        # When tensorflow is installed, keras is also installed.
-        import keras
         import tensorflow
 
         assert isinstance(model, tensorflow.Module)
 
-        is_keras_model = type_utils.LazyType("tensorflow.keras.Model").isinstance(model) or type_utils.LazyType(
-            "keras.Model"
-        ).isinstance(model)
+        is_keras_model = type_utils.LazyType("keras.Model").isinstance(model)
         is_tf_keras_model = type_utils.LazyType("tf_keras.Model").isinstance(model)
-        is_keras_functional_or_sequential_model = (
-            getattr(model, "_is_graph_network", False)
-            or type_utils.LazyType("tensorflow.keras.engine.sequential.Sequential").isinstance(model)
-            or type_utils.LazyType("keras.engine.sequential.Sequential").isinstance(model)
-            or type_utils.LazyType("tf_keras.engine.sequential.Sequential").isinstance(model)
-        )
-
-        assert isinstance(model, tensorflow.Module)
-
-        keras_version = version.parse(keras.__version__)
-
         # Tensorflow and keras model save format is different.
-        # Keras functional or sequential models are saved as keras format
-        # Keras v3 other models are saved using cloudpickle
-        # Keras v2 other models are saved using tensorflow saved model format
-        # Tensorflow models are saved using tensorflow saved model format
+        # Keras v2 models are saved using keras api
+        # Tensorflow models are saved using tensorflow api
 
         if is_keras_model or is_tf_keras_model:
-            if is_keras_functional_or_sequential_model:
-                save_format = "keras"
-            elif keras_version.major == 2 or is_tf_keras_model:
-                save_format = "keras_tf"
-            else:
-                save_format = "cloudpickle"
+            save_format = "keras_tf"
         else:
             save_format = "tf"
 
-        if is_keras_model:
+        if is_keras_model or is_tf_keras_model:
             default_target_methods = ["predict"]
         else:
             default_target_methods = cls.DEFAULT_TARGET_METHODS
@@ -123,25 +112,35 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
                 default_target_methods=default_target_methods,
             )
 
+            multiple_inputs = kwargs.get("multiple_inputs", False)
+
             if is_keras_model and len(target_methods) > 1:
                 raise ValueError("Keras model can only have one target method.")
 
             def get_prediction(
                 target_method_name: str, sample_input_data: "model_types.SupportedLocalDataType"
             ) -> model_types.SupportedLocalDataType:
-                if not tensorflow_handler.SeqOfTensorflowTensorHandler.can_handle(sample_input_data):
-                    sample_input_data = tensorflow_handler.SeqOfTensorflowTensorHandler.convert_from_df(
-                        model_signature._convert_local_data_to_df(sample_input_data)
-                    )
+                if multiple_inputs:
+                    if not tensorflow_handler.SeqOfTensorflowTensorHandler.can_handle(sample_input_data):
+                        sample_input_data = tensorflow_handler.SeqOfTensorflowTensorHandler.convert_from_df(
+                            model_signature._convert_local_data_to_df(sample_input_data)
+                        )
+                else:
+                    if not tensorflow_handler.TensorflowTensorHandler.can_handle(sample_input_data):
+                        sample_input_data = tensorflow_handler.TensorflowTensorHandler.convert_from_df(
+                            model_signature._convert_local_data_to_df(sample_input_data)
+                        )
 
                 target_method = getattr(model, target_method_name, None)
                 assert callable(target_method)
                 for tensor in sample_input_data:
                     tensorflow.stop_gradient(tensor)
-                predictions_df = target_method(*sample_input_data)
-
-                if isinstance(predictions_df, (tensorflow.Tensor, tensorflow.Variable, np.ndarray)):
-                    predictions_df = [predictions_df]
+                if multiple_inputs:
+                    predictions_df = target_method(*sample_input_data)
+                    if not isinstance(predictions_df, tuple):
+                        predictions_df = [predictions_df]
+                else:
+                    predictions_df = target_method(sample_input_data)
 
                 return predictions_df
 
@@ -156,15 +155,8 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
         model_blob_path = os.path.join(model_blobs_dir_path, name)
         os.makedirs(model_blob_path, exist_ok=True)
         save_path = os.path.join(model_blob_path, cls.MODEL_BLOB_FILE_OR_DIR)
-        if save_format == "keras":
-            model.save(save_path, save_format="keras")
-        elif save_format == "keras_tf":
+        if save_format == "keras_tf":
             model.save(save_path, save_format="tf")
-        elif save_format == "cloudpickle":
-            import cloudpickle
-
-            with open(save_path, "wb") as f:
-                cloudpickle.dump(model, f)
         else:
             tensorflow.saved_model.save(
                 model,
@@ -177,7 +169,9 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
             model_type=cls.HANDLER_TYPE,
             handler_version=cls.HANDLER_VERSION,
             path=cls.MODEL_BLOB_FILE_OR_DIR,
-            options=model_meta_schema.TensorflowModelBlobOptions(save_format=save_format),
+            options=model_meta_schema.TensorflowModelBlobOptions(
+                save_format=save_format, multiple_inputs=multiple_inputs
+            ),
         )
         model_meta.models[name] = base_meta
         model_meta.min_snowpark_ml_version = cls._MIN_SNOWPARK_ML_VERSION
@@ -186,7 +180,7 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
             model_env.ModelDependency(requirement="tensorflow", pip_name="tensorflow"),
         ]
         if is_keras_model:
-            dependencies.append(model_env.ModelDependency(requirement="keras", pip_name="keras"))
+            dependencies.append(model_env.ModelDependency(requirement="keras<=3", pip_name="keras"))
         elif is_tf_keras_model:
             dependencies.append(model_env.ModelDependency(requirement="tf-keras", pip_name="tf-keras"))
 
@@ -204,6 +198,7 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
         model_blobs_dir_path: str,
         **kwargs: Unpack[model_types.TensorflowLoadOptions],
     ) -> "tensorflow.Module":
+        os.environ["TF_USE_LEGACY_KERAS"] = "1"
         import tensorflow
 
         model_blob_path = os.path.join(model_blobs_dir_path, name)
@@ -212,14 +207,9 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
         model_blob_filename = model_blob_metadata.path
         model_blob_options = cast(model_meta_schema.TensorflowModelBlobOptions, model_blob_metadata.options)
         load_path = os.path.join(model_blob_path, model_blob_filename)
-        save_format = model_blob_options.get("save_format", "tf")
-        if save_format == "keras" or save_format == "keras_tf":
+        save_format = model_blob_options.get("save_format", "keras_tf")
+        if save_format == "keras_tf":
             m = tensorflow.keras.models.load_model(load_path)
-        elif save_format == "cloudpickle":
-            import cloudpickle
-
-            with open(load_path, "rb") as f:
-                m = cloudpickle.load(f)
         else:
             m = tensorflow.saved_model.load(load_path)
 
@@ -241,6 +231,10 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
             raw_model: "tensorflow.Module",
             model_meta: model_meta_api.ModelMetadata,
         ) -> Type[custom_model.CustomModel]:
+            multiple_inputs = cast(
+                model_meta_schema.TensorflowModelBlobOptions, model_meta.models[model_meta.name].options
+            )["multiple_inputs"]
+
             def fn_factory(
                 raw_model: "tensorflow.Module",
                 signature: model_signature.ModelSignature,
@@ -251,21 +245,25 @@ class TensorFlowHandler(_base.BaseModelHandler["tensorflow.Module"]):
                     if X.isnull().any(axis=None):
                         raise ValueError("Tensor cannot handle null values.")
 
-                    t = tensorflow_handler.SeqOfTensorflowTensorHandler.convert_from_df(X, signature.inputs)
+                    if multiple_inputs:
+                        t = tensorflow_handler.SeqOfTensorflowTensorHandler.convert_from_df(X, signature.inputs)
 
-                    for tensor in t:
-                        tensorflow.stop_gradient(tensor)
-                    res = getattr(raw_model, target_method)(*t)
+                        for tensor in t:
+                            tensorflow.stop_gradient(tensor)
+                        res = getattr(raw_model, target_method)(*t)
 
-                    if isinstance(res, (tensorflow.Tensor, tensorflow.Variable, np.ndarray)):
-                        res = [res]
-
-                    if isinstance(res, list) and len(res) > 0 and isinstance(res[0], np.ndarray):
-                        # In case of running on CPU, it will return numpy array
-                        df = numpy_handler.SeqOfNumpyArrayHandler.convert_to_df(res)
+                        if not isinstance(res, tuple):
+                            res = [res]
                     else:
-                        df = tensorflow_handler.SeqOfTensorflowTensorHandler.convert_to_df(res)
-                    return model_signature_utils.rename_pandas_df(df, signature.outputs)
+                        t = tensorflow_handler.TensorflowTensorHandler.convert_from_df(X, signature.inputs)
+
+                        tensorflow.stop_gradient(t)
+                        res = getattr(raw_model, target_method)(t)
+
+                    return model_signature_utils.rename_pandas_df(
+                        model_signature._convert_local_data_to_df(res, ensure_serializable=True),
+                        features=signature.outputs,
+                    )
 
                 return fn