upgini 1.2.68a3832.dev2__tar.gz → 1.2.68a3832.dev4__tar.gz

{upgini-1.2.68a3832.dev2 → upgini-1.2.68a3832.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.68a3832.dev2
+Version: 1.2.68a3832.dev4
 Summary: Intelligent data search & enrichment for Machine Learning
 Project-URL: Bug Reports, https://github.com/upgini/upgini/issues
 Project-URL: Homepage, https://upgini.com/

upgini-1.2.68a3832.dev4/src/upgini/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.68a3832.dev4"

{upgini-1.2.68a3832.dev2 → upgini-1.2.68a3832.dev4}/src/upgini/metrics.py

@@ -8,7 +8,6 @@ from collections import defaultdict
 from copy import deepcopy
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
-import catboost
 import numpy as np
 import pandas as pd
 from lightgbm import LGBMClassifier, LGBMRegressor
@@ -532,6 +531,7 @@ class CatBoostWrapper(EstimatorWrapper):
 
         # Find embeddings
         from catboost import CatBoostClassifier
+        import catboost
         if hasattr(CatBoostClassifier, "get_embedding_feature_indices"):
             emb_pattern = r"(.+)_emb\d+"
             self.emb_features = [c for c in x.columns if re.match(emb_pattern, c) and is_numeric_dtype(x[c])]

{upgini-1.2.68a3832.dev2 → upgini-1.2.68a3832.dev4}/src/upgini/utils/sklearn_ext.py

@@ -9,7 +9,6 @@ from traceback import format_exc
 
 import numpy as np
 import scipy.sparse as sp
-from catboost import CatBoostClassifier, CatBoostRegressor
 from joblib import Parallel, logger
 from scipy.sparse import issparse
 from sklearn import config_context, get_config
@@ -342,6 +341,14 @@ def cross_validate(
         raise e
 
 
+def is_catboost_estimator(estimator):
+    try:
+        from catboost import CatBoostClassifier, CatBoostRegressor
+        return isinstance(estimator, (CatBoostClassifier, CatBoostRegressor))
+    except ImportError:
+        return False
+
+
 def _fit_and_score(
     estimator,
     X,
@@ -497,7 +504,7 @@ def _fit_and_score(
         if y_train is None:
             estimator.fit(X_train, **fit_params)
         else:
-            if isinstance(estimator, (CatBoostClassifier, CatBoostRegressor)):
+            if is_catboost_estimator(estimator):
                 fit_params = fit_params.copy()
                 fit_params["eval_set"] = [(X_test, y_test)]
             estimator.fit(X_train, y_train, **fit_params)

upgini-1.2.68a3832.dev2/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.68a3832.dev2"