snowflake-ml-python 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

snowflake/ml/modeling/xgboost/xgbrf_regressor.py

@@ -21,17 +21,19 @@ from sklearn.utils.metaestimators import available_if
 from snowflake.ml.modeling.framework.base import BaseTransformer, _process_cols
 from snowflake.ml._internal import telemetry
 from snowflake.ml._internal.exceptions import error_codes, exceptions, modeling_error_messages
+from snowflake.ml._internal.env_utils import SNOWML_SPROC_ENV
 from snowflake.ml._internal.utils import pkg_version_utils, identifier
-from snowflake.snowpark import DataFrame
+from snowflake.snowpark import DataFrame, Session
 from snowflake.snowpark._internal.type_utils import convert_sp_to_sf_type
 from snowflake.ml.modeling._internal.snowpark_handlers import SnowparkHandlers as HandlersImpl
+from snowflake.ml.modeling._internal.model_trainer_builder import ModelTrainerBuilder
+from snowflake.ml.modeling._internal.model_trainer import ModelTrainer
 from snowflake.ml.modeling._internal.estimator_utils import (
     gather_dependencies,
     original_estimator_has_callable,
     transform_snowml_obj_to_sklearn_obj,
     validate_sklearn_args,
 )
-from snowflake.ml.modeling._internal.snowpark_handlers import XGBoostWrapperProvider
 from snowflake.ml.modeling._internal.estimator_protocols import FitPredictHandlers
 
 from snowflake.ml.model.model_signature import (
@@ -51,7 +53,6 @@ _PROJECT = "ModelDevelopment"
 _SUBPROJECT = "".join([s.capitalize() for s in "xgboost".replace("sklearn.", "").split("_")])
 
 
-
 class XGBRFRegressor(BaseTransformer):
     r"""scikit-learn API for XGBoost random forest regression
     For more details on this class, see [xgboost.XGBRFRegressor]
@@ -60,7 +61,51 @@ class XGBRFRegressor(BaseTransformer):
     Parameters
     ----------
 
-        n_estimators: int
+    input_cols: Optional[Union[str, List[str]]]
+        A string or list of strings representing column names that contain features.
+        If this parameter is not specified, all columns in the input DataFrame except
+        the columns specified by label_cols, sample_weight_col, and passthrough_cols
+        parameters are considered input columns. Input columns can also be set after
+        initialization with the `set_input_cols` method.
+    
+    label_cols: Optional[Union[str, List[str]]]
+        A string or list of strings representing column names that contain labels.
+        Label columns must be specified with this parameter during initialization
+        or with the `set_label_cols` method before fitting.
+
+    output_cols: Optional[Union[str, List[str]]]
+        A string or list of strings representing column names that will store the
+        output of predict and transform operations. The length of output_cols must
+        match the expected number of output columns from the specific predictor or
+        transformer class used.
+        If you omit this parameter, output column names are derived by adding an
+        OUTPUT_ prefix to the label column names for supervised estimators, or
+        OUTPUT_<IDX>for unsupervised estimators. These inferred output column names
+        work for predictors, but output_cols must be set explicitly for transformers.
+        In general, explicitly specifying output column names is clearer, especially
+        if you don’t specify the input column names.
+        To transform in place, pass the same names for input_cols and output_cols.
+        be set explicitly for transformers. Output columns can also be set after
+        initialization with the `set_output_cols` method.
+
+    sample_weight_col: Optional[str]
+        A string representing the column name containing the sample weights.
+        This argument is only required when working with weighted datasets. Sample
+        weight column can also be set after initialization with the
+        `set_sample_weight_col` method.
+
+    passthrough_cols: Optional[Union[str, List[str]]]
+        A string or a list of strings indicating column names to be excluded from any
+        operations (such as train, transform, or inference). These specified column(s)
+        will remain untouched throughout the process. This option is helpful in scenarios
+        requiring automatic input_cols inference, but need to avoid using specific
+        columns, like index columns, during training or inference. Passthrough columns
+        can also be set after initialization with the `set_passthrough_cols` method.
+
+    drop_input_cols: Optional[bool], default=False
+        If set, the response of predict(), transform() methods will not contain input columns.
+
+    n_estimators: int
             Number of trees in random forest to fit.
 
         max_depth:  Optional[int]
@@ -267,35 +312,6 @@ class XGBRFRegressor(BaseTransformer):
                     The value of the gradient for each sample point.
                 hess: array_like of shape [n_samples]
                     The value of the second derivative for each sample point
-
-    input_cols: Optional[Union[str, List[str]]]
-        A string or list of strings representing column names that contain features.
-        If this parameter is not specified, all columns in the input DataFrame except
-        the columns specified by label_cols and sample_weight_col parameters are
-        considered input columns.
-
-    label_cols: Optional[Union[str, List[str]]]
-        A string or list of strings representing column names that contain labels.
-        This is a required param for estimators, as there is no way to infer these
-        columns. If this parameter is not specified, then object is fitted without
-        labels (like a transformer).
-
-    output_cols: Optional[Union[str, List[str]]]
-        A string or list of strings representing column names that will store the
-        output of predict and transform operations. The length of output_cols must
-        match the expected number of output columns from the specific estimator or
-        transformer class used.
-        If this parameter is not specified, output column names are derived by
-        adding an OUTPUT_ prefix to the label column names. These inferred output
-        column names work for estimator's predict() method, but output_cols must
-        be set explicitly for transformers.
-
-    sample_weight_col: Optional[str]
-        A string representing the column name containing the sample weights.
-        This argument is only required when working with weighted datasets.
-
-    drop_input_cols: Optional[bool], default=False
-        If set, the response of predict(), transform() methods will not contain input columns.
     """
 
     def __init__(  # type: ignore[no-untyped-def]
@@ -308,6 +324,7 @@ class XGBRFRegressor(BaseTransformer):
         input_cols: Optional[Union[str, Iterable[str]]] = None,
         output_cols: Optional[Union[str, Iterable[str]]] = None,
         label_cols: Optional[Union[str, Iterable[str]]] = None,
+        passthrough_cols: Optional[Union[str, Iterable[str]]] = None,
         drop_input_cols: Optional[bool] = False,
         sample_weight_col: Optional[str] = None,
         **kwargs,
@@ -317,9 +334,10 @@ class XGBRFRegressor(BaseTransformer):
         self.set_input_cols(input_cols)
         self.set_output_cols(output_cols)
         self.set_label_cols(label_cols)
+        self.set_passthrough_cols(passthrough_cols)
         self.set_drop_input_cols(drop_input_cols)
         self.set_sample_weight_col(sample_weight_col)        
-        deps = set(XGBoostWrapperProvider().dependencies)
+        deps: Set[str] = set([f'numpy=={np.__version__}', f'xgboost=={xgboost.__version__}', f'cloudpickle=={cp.__version__}'])
         
         self._deps = list(deps)
         
@@ -331,14 +349,15 @@ class XGBRFRegressor(BaseTransformer):
             args=init_args,
             klass=xgboost.XGBRFRegressor
         )
-        self._sklearn_object = xgboost.XGBRFRegressor(
+        self._sklearn_object: Any = xgboost.XGBRFRegressor(
             **cleaned_up_init_args,
             **kwargs,
         )
         self._model_signature_dict: Optional[Dict[str, ModelSignature]] = None
         # If user used snowpark dataframe during fit, here it stores the snowpark input_cols, otherwise the processed input_cols
         self._snowpark_cols: Optional[List[str]] = self.input_cols
-        self._handlers: FitPredictHandlers = HandlersImpl(class_name=XGBRFRegressor.__class__.__name__, subproject=_SUBPROJECT, autogenerated=True, wrapper_provider=XGBoostWrapperProvider())
+        self._handlers: FitPredictHandlers = HandlersImpl(class_name=XGBRFRegressor.__class__.__name__, subproject=_SUBPROJECT, autogenerated=True)
+        self._autogenerated = True
 
     def _get_rand_id(self) -> str:
         """
@@ -349,24 +368,6 @@ class XGBRFRegressor(BaseTransformer):
         """
         return str(uuid4()).replace("-", "_").upper()
 
-    def _infer_input_output_cols(self, dataset: Union[DataFrame, pd.DataFrame]) -> None:
-        """
-        Infer `self.input_cols` and `self.output_cols` if they are not explicitly set.
-
-        Args:
-            dataset: Input dataset.
-        """
-        if not self.input_cols:
-            cols = [
-                c for c in dataset.columns 
-                if c not in self.get_label_cols() and c != self.sample_weight_col
-            ]
-            self.set_input_cols(input_cols=cols)
-
-        if not self.output_cols:
-            cols = [identifier.concat_names(ids=['OUTPUT_', c]) for c in self.label_cols]
-            self.set_output_cols(output_cols=cols)
-
     def set_input_cols(self, input_cols: Optional[Union[str, Iterable[str]]]) -> "XGBRFRegressor":
         """
         Input columns setter.
@@ -412,54 +413,48 @@ class XGBRFRegressor(BaseTransformer):
             self
         """
         self._infer_input_output_cols(dataset)
-        if isinstance(dataset, pd.DataFrame):
-            assert self._sklearn_object is not None  # keep mypy happy
-            self._sklearn_object = self._handlers.fit_pandas(
-                dataset,
-                self._sklearn_object,
-                self.input_cols,
-                self.label_cols,
-                self.sample_weight_col
-            )
-        elif isinstance(dataset, DataFrame):
-            self._fit_snowpark(dataset)
-        else:
-            raise TypeError(
-                f"Unexpected dataset type: {type(dataset)}."
-                "Supported dataset types: snowpark.DataFrame, pandas.DataFrame."
-            )
+        if isinstance(dataset, DataFrame):
+            session = dataset._session
+            assert session is not None  # keep mypy happy
+            # Validate that key package version in user workspace are supported in snowflake conda channel
+            # If customer doesn't have package in conda channel, replace the ones have the closest versions
+            self._deps = pkg_version_utils.get_valid_pkg_versions_supported_in_snowflake_conda_channel(
+                pkg_versions=self._get_dependencies(), session=session, subproject=_SUBPROJECT)
+            
+            # Specify input columns so column pruning will be enforced
+            selected_cols = self._get_active_columns()
+            if len(selected_cols) > 0:
+                dataset = dataset.select(selected_cols)
+
+            self._snowpark_cols = dataset.select(self.input_cols).columns
+
+             # If we are already in a stored procedure, no need to kick off another one.
+            if SNOWML_SPROC_ENV in os.environ:
+                statement_params = telemetry.get_function_usage_statement_params(
+                    project=_PROJECT,
+                    subproject=_SUBPROJECT,
+                    function_name=telemetry.get_statement_params_full_func_name(inspect.currentframe(), XGBRFRegressor.__class__.__name__),
+                    api_calls=[Session.call],
+                    custom_tags=dict([("autogen", True)]) if self._autogenerated else None,
+                )
+                pd_df: pd.DataFrame = dataset.to_pandas(statement_params=statement_params)
+                pd_df.columns = dataset.columns
+                dataset = pd_df
+
+        model_trainer = ModelTrainerBuilder.build(
+            estimator=self._sklearn_object,
+            dataset=dataset,
+            input_cols=self.input_cols,
+            label_cols=self.label_cols,
+            sample_weight_col=self.sample_weight_col,
+            autogenerated=self._autogenerated,
+            subproject=_SUBPROJECT
+        )
+        self._sklearn_object = model_trainer.train()
         self._is_fitted = True
         self._get_model_signatures(dataset)
         return self
 
-    def _fit_snowpark(self, dataset: DataFrame) -> None:
-        session = dataset._session
-        assert session is not None  # keep mypy happy
-        # Validate that key package version in user workspace are supported in snowflake conda channel
-        # If customer doesn't have package in conda channel, replace the ones have the closest versions
-        self._deps = pkg_version_utils.get_valid_pkg_versions_supported_in_snowflake_conda_channel(
-            pkg_versions=self._get_dependencies(), session=session, subproject=_SUBPROJECT)
-        
-        # Specify input columns so column pruning will be enforced
-        selected_cols = self._get_active_columns()
-        if len(selected_cols) > 0:
-            dataset = dataset.select(selected_cols)
-
-        estimator = self._sklearn_object
-        assert estimator is not None  # Keep mypy happy
-
-        self._snowpark_cols = dataset.select(self.input_cols).columns
-
-        self._sklearn_object = self._handlers.fit_snowpark(
-            dataset,
-            session,
-            estimator,
-            ["snowflake-snowpark-python"] + self._get_dependencies(),
-            self.input_cols,
-            self.label_cols,
-            self.sample_weight_col,
-        )
-
     def _get_pass_through_columns(self, dataset: DataFrame) -> List[str]:
         if self._drop_input_cols:
             return []
@@ -647,11 +642,6 @@ class XGBRFRegressor(BaseTransformer):
         subproject=_SUBPROJECT,
         custom_tags=dict([("autogen", True)]),
     )
-    @telemetry.add_stmt_params_to_df(
-        project=_PROJECT,
-        subproject=_SUBPROJECT,
-        custom_tags=dict([("autogen", True)]),
-    )
     def predict(self, dataset: Union[DataFrame, pd.DataFrame]) -> Union[DataFrame, pd.DataFrame]:
         """Predict with `X`
         For more details on this function, see [xgboost.XGBRFRegressor.predict]
@@ -705,11 +695,6 @@ class XGBRFRegressor(BaseTransformer):
         subproject=_SUBPROJECT,
         custom_tags=dict([("autogen", True)]),
     )
-    @telemetry.add_stmt_params_to_df(
-        project=_PROJECT,
-        subproject=_SUBPROJECT,
-        custom_tags=dict([("autogen", True)]),
-    )
     def transform(self, dataset: Union[DataFrame, pd.DataFrame]) -> Union[DataFrame, pd.DataFrame]:
         """Method not supported for this class.
 
@@ -766,7 +751,8 @@ class XGBRFRegressor(BaseTransformer):
         if False:
             self.fit(dataset)
             assert self._sklearn_object is not None
-            return self._sklearn_object.labels_
+            labels : npt.NDArray[Any] = self._sklearn_object.labels_
+            return labels
         else:
             raise NotImplementedError
 
@@ -802,6 +788,7 @@ class XGBRFRegressor(BaseTransformer):
             output_cols = []
 
         # Make sure column names are valid snowflake identifiers.
+        assert output_cols is not None  # Make MyPy happy
         rv = [identifier.rename_to_valid_snowflake_identifier(c) for c in output_cols]
 
         return rv
@@ -812,11 +799,6 @@ class XGBRFRegressor(BaseTransformer):
         subproject=_SUBPROJECT,
         custom_tags=dict([("autogen", True)]),
     )
-    @telemetry.add_stmt_params_to_df(
-        project=_PROJECT,
-        subproject=_SUBPROJECT,
-        custom_tags=dict([("autogen", True)]),
-    )
     def predict_proba(
         self, dataset: Union[DataFrame, pd.DataFrame], output_cols_prefix: str = "predict_proba_"
     ) -> Union[DataFrame, pd.DataFrame]:
@@ -857,11 +839,6 @@ class XGBRFRegressor(BaseTransformer):
         subproject=_SUBPROJECT,
         custom_tags=dict([("autogen", True)]),
     )
-    @telemetry.add_stmt_params_to_df(
-        project=_PROJECT,
-        subproject=_SUBPROJECT,
-        custom_tags=dict([("autogen", True)]),
-    )
     def predict_log_proba(
         self, dataset: Union[DataFrame, pd.DataFrame], output_cols_prefix: str = "predict_log_proba_"
     ) -> Union[DataFrame, pd.DataFrame]:
@@ -898,16 +875,6 @@ class XGBRFRegressor(BaseTransformer):
         return output_df
 
     @available_if(original_estimator_has_callable("decision_function"))  # type: ignore[misc]
-    @telemetry.send_api_usage_telemetry(
-        project=_PROJECT,
-        subproject=_SUBPROJECT,
-        custom_tags=dict([("autogen", True)]),
-    )
-    @telemetry.add_stmt_params_to_df(
-        project=_PROJECT,
-        subproject=_SUBPROJECT,
-        custom_tags=dict([("autogen", True)]),
-    )
     def decision_function(
         self, dataset: Union[DataFrame, pd.DataFrame], output_cols_prefix: str = "decision_function_"
     ) -> Union[DataFrame, pd.DataFrame]:
@@ -1008,11 +975,6 @@ class XGBRFRegressor(BaseTransformer):
         subproject=_SUBPROJECT,
         custom_tags=dict([("autogen", True)]),
     )
-    @telemetry.add_stmt_params_to_df(
-        project=_PROJECT,
-        subproject=_SUBPROJECT,
-        custom_tags=dict([("autogen", True)]),
-    )
     def kneighbors(
         self,
         dataset: Union[DataFrame, pd.DataFrame],
@@ -1072,18 +1034,28 @@ class XGBRFRegressor(BaseTransformer):
             # For classifier, the type of predict is the same as the type of label
             if self._sklearn_object._estimator_type == 'classifier':
                  # label columns is the desired type for output
-                outputs = _infer_signature(dataset[self.label_cols], "output", use_snowflake_identifiers=True)
+                outputs = list(_infer_signature(dataset[self.label_cols], "output", use_snowflake_identifiers=True))
                 # rename the output columns
-                outputs = model_signature_utils.rename_features(outputs, self.output_cols)
+                outputs = list(model_signature_utils.rename_features(outputs, self.output_cols))
+                self._model_signature_dict["predict"] = ModelSignature(inputs,
+                                                                       ([] if self._drop_input_cols else inputs)
+                                                                       + outputs)
+            # For mixture models that use the density mixin, `predict` returns the argmax of the log prob.
+            # For outlier models, returns -1 for outliers and 1 for inliers.
+            # Clusterer returns int64 cluster labels. 
+            elif self._sklearn_object._estimator_type in ["DensityEstimator", "clusterer", "outlier_detector"]:
+                outputs = [FeatureSpec(dtype=DataType.INT64, name=c) for c in self.output_cols]
                 self._model_signature_dict["predict"] = ModelSignature(inputs,
                                                                        ([] if self._drop_input_cols else inputs)
                                                                        + outputs)
+            
             # For regressor, the type of predict is float64
             elif self._sklearn_object._estimator_type == 'regressor':
                 outputs = [FeatureSpec(dtype=DataType.DOUBLE, name=c) for c in self.output_cols]
                 self._model_signature_dict["predict"] = ModelSignature(inputs,
                                                                        ([] if self._drop_input_cols else inputs)
                                                                        + outputs)
+                
         for prob_func in PROB_FUNCTIONS:
             if hasattr(self, prob_func):
                 output_cols_prefix: str = f"{prob_func}_"

snowflake/ml/registry/model_registry.py

@@ -24,6 +24,7 @@ from snowflake.ml._internal.utils import (
     formatting,
     identifier,
     query_result_checker,
+    spcs_attribution_utils,
     table_manager,
     uri,
 )
@@ -1767,6 +1768,7 @@ class ModelRegistry:
             service_name = identifier.get_schema_level_object_identifier(
                 self._name, self._schema, f"service_{deployment['MODEL_ID']}"
             )
+            spcs_attribution_utils.record_service_end(self._session, service_name)
             query_result_checker.SqlResultValidator(
                 self._session,
                 f"DROP SERVICE IF EXISTS {service_name}",

snowflake/ml/registry/registry.py

@@ -0,0 +1,215 @@
+from types import ModuleType
+from typing import Dict, List, Optional
+
+from snowflake.ml._internal import telemetry
+from snowflake.ml._internal.utils import sql_identifier
+from snowflake.ml.model import model_signature, type_hints as model_types
+from snowflake.ml.model._client.model import model_impl, model_version_impl
+from snowflake.ml.model._client.ops import model_ops
+from snowflake.ml.model._model_composer import model_composer
+from snowflake.snowpark import session
+
+_TELEMETRY_PROJECT = "MLOps"
+_MODEL_TELEMETRY_SUBPROJECT = "ModelManagement"
+
+
+class Registry:
+    def __init__(
+        self,
+        session: session.Session,
+        *,
+        database_name: Optional[str] = None,
+        schema_name: Optional[str] = None,
+    ) -> None:
+        if database_name:
+            self._database_name = sql_identifier.SqlIdentifier(database_name)
+        else:
+            session_db = session.get_current_database()
+            if session_db:
+                self._database_name = sql_identifier.SqlIdentifier(session_db)
+            else:
+                raise ValueError("You need to provide a database to use registry.")
+
+        if schema_name:
+            self._schema_name = sql_identifier.SqlIdentifier(schema_name)
+        elif database_name:
+            self._schema_name = sql_identifier.SqlIdentifier("PUBLIC")
+        else:
+            session_schema = session.get_current_schema()
+            self._schema_name = (
+                sql_identifier.SqlIdentifier(session_schema)
+                if session_schema
+                else sql_identifier.SqlIdentifier("PUBLIC")
+            )
+
+        self._model_ops = model_ops.ModelOperator(
+            session, database_name=self._database_name, schema_name=self._schema_name
+        )
+
+    @property
+    def location(self) -> str:
+        return ".".join([self._database_name.identifier(), self._schema_name.identifier()])
+
+    @telemetry.send_api_usage_telemetry(
+        project=_TELEMETRY_PROJECT,
+        subproject=_MODEL_TELEMETRY_SUBPROJECT,
+    )
+    def log_model(
+        self,
+        model: model_types.SupportedModelType,
+        *,
+        model_name: str,
+        version_name: str,
+        conda_dependencies: Optional[List[str]] = None,
+        pip_requirements: Optional[List[str]] = None,
+        python_version: Optional[str] = None,
+        signatures: Optional[Dict[str, model_signature.ModelSignature]] = None,
+        sample_input_data: Optional[model_types.SupportedDataType] = None,
+        code_paths: Optional[List[str]] = None,
+        ext_modules: Optional[List[ModuleType]] = None,
+        options: Optional[model_types.ModelSaveOption] = None,
+    ) -> model_version_impl.ModelVersion:
+        """Log a model.
+
+        Args:
+            model: Model Python object
+            model_name: A string as name.
+            version_name: A string as version. model_name and version_name combination must be unique.
+            signatures: Model data signatures for inputs and output for every target methods. If it is None,
+                sample_input_data would be used to infer the signatures for those models that cannot automatically
+                infer the signature. If not None, sample_input should not be specified. Defaults to None.
+            sample_input_data: Sample input data to infer the model signatures from. If it is None, signatures must be
+                specified if the model cannot automatically infer the signature. If not None, signatures should not be
+                specified. Defaults to None.
+            conda_dependencies: List of Conda package specs. Use "[channel::]package [operator version]" syntax to
+                specify a dependency. It is a recommended way to specify your dependencies using conda. When channel is
+                not specified, Snowflake Anaconda Channel will be used.
+            pip_requirements: List of Pip package specs.
+            python_version: A string of python version where model is run. Used for user override. If specified as None,
+                current version would be captured. Defaults to None.
+            code_paths: Directory of code to import.
+            ext_modules: External modules that user might want to get pickled with model object. Defaults to None.
+            options: Model specific kwargs.
+
+        Returns:
+            A ModelVersion object corresponding to the model just get logged.
+        """
+
+        statement_params = telemetry.get_statement_params(
+            project=_TELEMETRY_PROJECT,
+            subproject=_MODEL_TELEMETRY_SUBPROJECT,
+        )
+        model_name_id = sql_identifier.SqlIdentifier(model_name)
+
+        version_name_id = sql_identifier.SqlIdentifier(version_name)
+
+        stage_path = self._model_ops.prepare_model_stage_path(
+            statement_params=statement_params,
+        )
+
+        mc = model_composer.ModelComposer(self._model_ops._session, stage_path=stage_path)
+        mc.save(
+            name=model_name_id.resolved(),
+            model=model,
+            signatures=signatures,
+            sample_input=sample_input_data,
+            conda_dependencies=conda_dependencies,
+            pip_requirements=pip_requirements,
+            python_version=python_version,
+            code_paths=code_paths,
+            ext_modules=ext_modules,
+            options=options,
+        )
+        self._model_ops.create_from_stage(
+            composed_model=mc,
+            model_name=model_name_id,
+            version_name=version_name_id,
+            statement_params=statement_params,
+        )
+
+        return model_version_impl.ModelVersion._ref(
+            self._model_ops,
+            model_name=model_name_id,
+            version_name=version_name_id,
+        )
+
+    @telemetry.send_api_usage_telemetry(
+        project=_TELEMETRY_PROJECT,
+        subproject=_MODEL_TELEMETRY_SUBPROJECT,
+    )
+    def get_model(self, model_name: str) -> model_impl.Model:
+        """Get the model object.
+
+        Args:
+            model_name: The model name.
+
+        Raises:
+            ValueError: Raised when the model requested does not exist.
+
+        Returns:
+            The model object.
+        """
+        model_name_id = sql_identifier.SqlIdentifier(model_name)
+
+        statement_params = telemetry.get_statement_params(
+            project=_TELEMETRY_PROJECT,
+            subproject=_MODEL_TELEMETRY_SUBPROJECT,
+        )
+        if self._model_ops.validate_existence(
+            model_name=model_name_id,
+            statement_params=statement_params,
+        ):
+            return model_impl.Model._ref(
+                self._model_ops,
+                model_name=model_name_id,
+            )
+        else:
+            raise ValueError(f"Unable to find model {model_name}")
+
+    @telemetry.send_api_usage_telemetry(
+        project=_TELEMETRY_PROJECT,
+        subproject=_MODEL_TELEMETRY_SUBPROJECT,
+    )
+    def list_models(self) -> List[model_impl.Model]:
+        """List all models in the schema where the registry is opened.
+
+        Returns:
+            A List of Model= object representing all models in the schema where the registry is opened.
+        """
+        statement_params = telemetry.get_statement_params(
+            project=_TELEMETRY_PROJECT,
+            subproject=_MODEL_TELEMETRY_SUBPROJECT,
+        )
+        model_names = self._model_ops.list_models_or_versions(
+            statement_params=statement_params,
+        )
+        return [
+            model_impl.Model._ref(
+                self._model_ops,
+                model_name=model_name,
+            )
+            for model_name in model_names
+        ]
+
+    @telemetry.send_api_usage_telemetry(
+        project=_TELEMETRY_PROJECT,
+        subproject=_MODEL_TELEMETRY_SUBPROJECT,
+    )
+    def delete_model(self, model_name: str) -> None:
+        """Delete the model.
+
+        Args:
+            model_name: The model name, can be fully qualified one.
+                If not, use database name and schema name of the registry.
+        """
+        model_name_id = sql_identifier.SqlIdentifier(model_name)
+
+        statement_params = telemetry.get_statement_params(
+            project=_TELEMETRY_PROJECT,
+            subproject=_MODEL_TELEMETRY_SUBPROJECT,
+        )
+
+        self._model_ops.delete_model_or_version(
+            model_name=model_name_id,
+            statement_params=statement_params,
+        )

snowflake/ml/version.py

@@ -1 +1 @@
-VERSION="1.1.0"
+VERSION="1.1.2"