upgini 1.1.268__tar.gz → 1.1.268a2__tar.gz
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.
- {upgini-1.1.268/src/upgini.egg-info → upgini-1.1.268a2}/PKG-INFO +1 -1
- {upgini-1.1.268 → upgini-1.1.268a2}/setup.py +1 -1
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/metrics.py +8 -34
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/sklearn_ext.py +2 -1
- {upgini-1.1.268 → upgini-1.1.268a2/src/upgini.egg-info}/PKG-INFO +1 -1
- {upgini-1.1.268 → upgini-1.1.268a2}/LICENSE +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/README.md +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/pyproject.toml +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/setup.cfg +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/ads.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/ads_management/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/ads_management/ads_manager.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/all_operands.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/binary.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/date.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/feature.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/groupby.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/operand.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/unary.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/autofe/vector.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/data_source/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/data_source/data_source_publisher.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/dataset.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/errors.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/features_enricher.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/fingerprint.js +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/http.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/mdc/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/mdc/context.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/metadata.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/normalizer/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/normalizer/phone_normalizer.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/resource_bundle/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/resource_bundle/exceptions.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/resource_bundle/strings.properties +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/resource_bundle/strings_widget.properties +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/sampler/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/sampler/base.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/sampler/random_under_sampler.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/sampler/utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/search_task.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/spinner.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/__init__.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/base_search_key_detector.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/blocked_time_series.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/country_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/custom_loss_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/cv_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/datetime_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/deduplicate_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/display_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/email_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/fallback_progress_bar.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/features_validator.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/format.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/ip_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/phone_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/postal_code_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/progress_bar.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/target_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/track_info.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/utils/warning_counter.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini/version_validator.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini.egg-info/SOURCES.txt +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini.egg-info/dependency_links.txt +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini.egg-info/requires.txt +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/src/upgini.egg-info/top_level.txt +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_autofe_operands.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_binary_dataset.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_blocked_time_series.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_categorical_dataset.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_continuous_dataset.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_country_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_custom_loss_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_datetime_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_email_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_etalon_validation.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_features_enricher.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_metrics.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_phone_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_postal_code_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_target_utils.py +0 -0
- {upgini-1.1.268 → upgini-1.1.268a2}/tests/test_widget.py +0 -0
|
@@ -3,10 +3,10 @@ import re
|
|
|
3
3
|
from copy import deepcopy
|
|
4
4
|
from typing import Any, Callable, Dict, List, Optional, Tuple, Union
|
|
5
5
|
|
|
6
|
-
import catboost
|
|
7
6
|
import numpy as np
|
|
8
7
|
import pandas as pd
|
|
9
8
|
from catboost import CatBoostClassifier, CatBoostRegressor
|
|
9
|
+
import catboost
|
|
10
10
|
from lightgbm import LGBMClassifier, LGBMRegressor
|
|
11
11
|
from numpy import log1p
|
|
12
12
|
from pandas.api.types import is_numeric_dtype
|
|
@@ -353,7 +353,6 @@ class EstimatorWrapper:
|
|
|
353
353
|
"target_type": target_type,
|
|
354
354
|
"groups": groups,
|
|
355
355
|
"text_features": text_features,
|
|
356
|
-
"logger": logger,
|
|
357
356
|
}
|
|
358
357
|
if estimator is None:
|
|
359
358
|
params = dict()
|
|
@@ -416,18 +415,9 @@ class CatBoostWrapper(EstimatorWrapper):
|
|
|
416
415
|
target_type: ModelTaskType,
|
|
417
416
|
groups: Optional[List[str]] = None,
|
|
418
417
|
text_features: Optional[List[str]] = None,
|
|
419
|
-
logger: Optional[logging.Logger] = None,
|
|
420
418
|
):
|
|
421
419
|
super(CatBoostWrapper, self).__init__(
|
|
422
|
-
estimator,
|
|
423
|
-
scorer,
|
|
424
|
-
metric_name,
|
|
425
|
-
multiplier,
|
|
426
|
-
cv,
|
|
427
|
-
target_type,
|
|
428
|
-
groups=groups,
|
|
429
|
-
text_features=text_features,
|
|
430
|
-
logger=logger,
|
|
420
|
+
estimator, scorer, metric_name, multiplier, cv, target_type, groups=groups, text_features=text_features
|
|
431
421
|
)
|
|
432
422
|
self.cat_features = None
|
|
433
423
|
self.emb_features = None
|
|
@@ -449,7 +439,9 @@ class CatBoostWrapper(EstimatorWrapper):
|
|
|
449
439
|
X, embedding_features = self.group_embeddings(X)
|
|
450
440
|
params["embedding_features"] = embedding_features
|
|
451
441
|
else:
|
|
452
|
-
self.logger.info(
|
|
442
|
+
self.logger.info(
|
|
443
|
+
f"Embedding features count less than 3, so use them separately: {self.emb_features}"
|
|
444
|
+
)
|
|
453
445
|
self.emb_features = []
|
|
454
446
|
else:
|
|
455
447
|
self.logger.warning(f"Embedding features are not supported by Catboost version {catboost.__version__}")
|
|
@@ -526,7 +518,7 @@ class CatBoostWrapper(EstimatorWrapper):
|
|
|
526
518
|
self, X: pd.DataFrame, y: np.ndarray, baseline_score_column: Optional[Any] = None
|
|
527
519
|
) -> Optional[float]:
|
|
528
520
|
try:
|
|
529
|
-
|
|
521
|
+
super().cross_val_predict(X, y, baseline_score_column)
|
|
530
522
|
except Exception as e:
|
|
531
523
|
if "Dictionary size is 0" in e.args[0] and self.text_features:
|
|
532
524
|
high_cardinality_features = FeaturesValidator.find_high_cardinality(X[self.text_features])
|
|
@@ -554,18 +546,9 @@ class LightGBMWrapper(EstimatorWrapper):
|
|
|
554
546
|
target_type: ModelTaskType,
|
|
555
547
|
groups: Optional[List[str]] = None,
|
|
556
548
|
text_features: Optional[List[str]] = None,
|
|
557
|
-
logger: Optional[logging.Logger] = None,
|
|
558
549
|
):
|
|
559
550
|
super(LightGBMWrapper, self).__init__(
|
|
560
|
-
estimator,
|
|
561
|
-
scorer,
|
|
562
|
-
metric_name,
|
|
563
|
-
multiplier,
|
|
564
|
-
cv,
|
|
565
|
-
target_type,
|
|
566
|
-
groups=groups,
|
|
567
|
-
text_features=text_features,
|
|
568
|
-
logger=logger,
|
|
551
|
+
estimator, scorer, metric_name, multiplier, cv, target_type, groups=groups, text_features=text_features
|
|
569
552
|
)
|
|
570
553
|
self.cat_features = None
|
|
571
554
|
|
|
@@ -602,18 +585,9 @@ class OtherEstimatorWrapper(EstimatorWrapper):
|
|
|
602
585
|
target_type: ModelTaskType,
|
|
603
586
|
groups: Optional[List[str]] = None,
|
|
604
587
|
text_features: Optional[List[str]] = None,
|
|
605
|
-
logger: Optional[logging.Logger] = None,
|
|
606
588
|
):
|
|
607
589
|
super(OtherEstimatorWrapper, self).__init__(
|
|
608
|
-
estimator,
|
|
609
|
-
scorer,
|
|
610
|
-
metric_name,
|
|
611
|
-
multiplier,
|
|
612
|
-
cv,
|
|
613
|
-
target_type,
|
|
614
|
-
groups=groups,
|
|
615
|
-
text_features=text_features,
|
|
616
|
-
logger=logger,
|
|
590
|
+
estimator, scorer, metric_name, multiplier, cv, target_type, groups=groups, text_features=text_features
|
|
617
591
|
)
|
|
618
592
|
self.cat_features = None
|
|
619
593
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import functools
|
|
2
|
+
import logging
|
|
2
3
|
import numbers
|
|
3
4
|
import time
|
|
4
5
|
import warnings
|
|
@@ -311,7 +312,7 @@ def cross_validate(
|
|
|
311
312
|
ret[key] = train_scores_dict[name]
|
|
312
313
|
|
|
313
314
|
return ret
|
|
314
|
-
except Exception:
|
|
315
|
+
except Exception as e:
|
|
315
316
|
# logging.exception("Failed to execute overriden cross_validate. Fallback to original")
|
|
316
317
|
raise
|
|
317
318
|
# fit_params["use_best_model"] = False
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|