upgini 1.2.68a3832.dev2__py3-none-any.whl → 1.2.68a3832.dev4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of upgini might be problematic. Click here for more details.
- upgini/__about__.py +1 -1
- upgini/metrics.py +1 -1
- upgini/utils/sklearn_ext.py +9 -2
- {upgini-1.2.68a3832.dev2.dist-info → upgini-1.2.68a3832.dev4.dist-info}/METADATA +1 -1
- {upgini-1.2.68a3832.dev2.dist-info → upgini-1.2.68a3832.dev4.dist-info}/RECORD +7 -7
- {upgini-1.2.68a3832.dev2.dist-info → upgini-1.2.68a3832.dev4.dist-info}/WHEEL +0 -0
- {upgini-1.2.68a3832.dev2.dist-info → upgini-1.2.68a3832.dev4.dist-info}/licenses/LICENSE +0 -0
upgini/__about__.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__version__ = "1.2.68a3832.
|
|
1
|
+
__version__ = "1.2.68a3832.dev4"
|
upgini/metrics.py
CHANGED
|
@@ -8,7 +8,6 @@ from collections import defaultdict
|
|
|
8
8
|
from copy import deepcopy
|
|
9
9
|
from typing import Any, Callable, Dict, List, Optional, Tuple, Union
|
|
10
10
|
|
|
11
|
-
import catboost
|
|
12
11
|
import numpy as np
|
|
13
12
|
import pandas as pd
|
|
14
13
|
from lightgbm import LGBMClassifier, LGBMRegressor
|
|
@@ -532,6 +531,7 @@ class CatBoostWrapper(EstimatorWrapper):
|
|
|
532
531
|
|
|
533
532
|
# Find embeddings
|
|
534
533
|
from catboost import CatBoostClassifier
|
|
534
|
+
import catboost
|
|
535
535
|
if hasattr(CatBoostClassifier, "get_embedding_feature_indices"):
|
|
536
536
|
emb_pattern = r"(.+)_emb\d+"
|
|
537
537
|
self.emb_features = [c for c in x.columns if re.match(emb_pattern, c) and is_numeric_dtype(x[c])]
|
upgini/utils/sklearn_ext.py
CHANGED
|
@@ -9,7 +9,6 @@ from traceback import format_exc
|
|
|
9
9
|
|
|
10
10
|
import numpy as np
|
|
11
11
|
import scipy.sparse as sp
|
|
12
|
-
from catboost import CatBoostClassifier, CatBoostRegressor
|
|
13
12
|
from joblib import Parallel, logger
|
|
14
13
|
from scipy.sparse import issparse
|
|
15
14
|
from sklearn import config_context, get_config
|
|
@@ -342,6 +341,14 @@ def cross_validate(
|
|
|
342
341
|
raise e
|
|
343
342
|
|
|
344
343
|
|
|
344
|
+
def is_catboost_estimator(estimator):
|
|
345
|
+
try:
|
|
346
|
+
from catboost import CatBoostClassifier, CatBoostRegressor
|
|
347
|
+
return isinstance(estimator, (CatBoostClassifier, CatBoostRegressor))
|
|
348
|
+
except ImportError:
|
|
349
|
+
return False
|
|
350
|
+
|
|
351
|
+
|
|
345
352
|
def _fit_and_score(
|
|
346
353
|
estimator,
|
|
347
354
|
X,
|
|
@@ -497,7 +504,7 @@ def _fit_and_score(
|
|
|
497
504
|
if y_train is None:
|
|
498
505
|
estimator.fit(X_train, **fit_params)
|
|
499
506
|
else:
|
|
500
|
-
if
|
|
507
|
+
if is_catboost_estimator(estimator):
|
|
501
508
|
fit_params = fit_params.copy()
|
|
502
509
|
fit_params["eval_set"] = [(X_test, y_test)]
|
|
503
510
|
estimator.fit(X_train, y_train, **fit_params)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.3
|
|
2
2
|
Name: upgini
|
|
3
|
-
Version: 1.2.68a3832.
|
|
3
|
+
Version: 1.2.68a3832.dev4
|
|
4
4
|
Summary: Intelligent data search & enrichment for Machine Learning
|
|
5
5
|
Project-URL: Bug Reports, https://github.com/upgini/upgini/issues
|
|
6
6
|
Project-URL: Homepage, https://upgini.com/
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
upgini/__about__.py,sha256=
|
|
1
|
+
upgini/__about__.py,sha256=tA-8e1UEPt8tajFxx1rKXEmQOOfuqGfXLGYhIFUctPM,33
|
|
2
2
|
upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
|
|
3
3
|
upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
|
|
4
4
|
upgini/dataset.py,sha256=OGjpeFHbj3lWiZTOHTpWEoMMDmFY1FlNC44FKktoZvU,34956
|
|
@@ -7,7 +7,7 @@ upgini/features_enricher.py,sha256=GXXx14jwf3F26_KrfJ6O40Vcu1hRx5iBjUB_jxy3Xvg,2
|
|
|
7
7
|
upgini/http.py,sha256=ud0Cp7h0jNeHuuZGpU_1dAAEiabGoJjGxc1X5oeBQr4,43496
|
|
8
8
|
upgini/lazy_import.py,sha256=74gQ8JuA48BGRLxAo7lNHNKY2D2emMxrUxKGdxVGhuY,1012
|
|
9
9
|
upgini/metadata.py,sha256=Jh6YTaS00m_nbaOY_owvlSyn9zgkErkqu8iTr9ZjKI8,12279
|
|
10
|
-
upgini/metrics.py,sha256=
|
|
10
|
+
upgini/metrics.py,sha256=0WIe1IQx9vzUK0pVGv3hODBrOL3zaLDybXbs5S_ntvQ,36991
|
|
11
11
|
upgini/search_task.py,sha256=qxUxAD-bed-FpZYmTB_4orW7YJsW_O6a1TcgnZIRFr4,17307
|
|
12
12
|
upgini/spinner.py,sha256=4iMd-eIe_BnkqFEMIliULTbj6rNI2HkN_VJ4qYe0cUc,1118
|
|
13
13
|
upgini/version_validator.py,sha256=DvbaAvuYFoJqYt0fitpsk6Xcv-H1BYDJYHUMxaKSH_Y,1509
|
|
@@ -64,13 +64,13 @@ upgini/utils/mstats.py,sha256=dLJQr5Ak5BAoV-pDPpnfvMURZVkZ3_v250QzAsSlqY4,6286
|
|
|
64
64
|
upgini/utils/phone_utils.py,sha256=IrbztLuOJBiePqqxllfABWfYlfAjYevPhXKipl95wUI,10432
|
|
65
65
|
upgini/utils/postal_code_utils.py,sha256=5M0sUqH2DAr33kARWCTXR-ACyzWbjDq_-0mmEml6ZcU,1716
|
|
66
66
|
upgini/utils/progress_bar.py,sha256=N-Sfdah2Hg8lXP_fV9EfUTXz_PyRt4lo9fAHoUDOoLc,1550
|
|
67
|
-
upgini/utils/sklearn_ext.py,sha256=
|
|
67
|
+
upgini/utils/sklearn_ext.py,sha256=E7zfYqBW597LetYXHxyM-i4f8luHsGIuP6mMJ2wtSMs,44661
|
|
68
68
|
upgini/utils/sort.py,sha256=VDXgZObIVAuGzXlAEejlKCNQcHmN5pN2bMou58sDKFI,6729
|
|
69
69
|
upgini/utils/target_utils.py,sha256=b1GzO8_gMcwXSZ2v98CY50MJJBzKbWHId_BJGybXfkM,16579
|
|
70
70
|
upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
|
|
71
71
|
upgini/utils/ts_utils.py,sha256=26vhC0pN7vLXK6R09EEkMK3Lwb9IVPH7LRdqFIQ3kPs,1383
|
|
72
72
|
upgini/utils/warning_counter.py,sha256=-GRY8EUggEBKODPSuXAkHn9KnEQwAORC0mmz_tim-PM,254
|
|
73
|
-
upgini-1.2.68a3832.
|
|
74
|
-
upgini-1.2.68a3832.
|
|
75
|
-
upgini-1.2.68a3832.
|
|
76
|
-
upgini-1.2.68a3832.
|
|
73
|
+
upgini-1.2.68a3832.dev4.dist-info/METADATA,sha256=N1U1IshnQeHVgYDyt_pa2G7SezelEjMUjcdNOQ1KxkQ,49149
|
|
74
|
+
upgini-1.2.68a3832.dev4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
|
|
75
|
+
upgini-1.2.68a3832.dev4.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
|
|
76
|
+
upgini-1.2.68a3832.dev4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|