upgini 1.1.285a3418.post1__py3-none-any.whl → 1.1.286a3418.post1__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.1.285a3418-1"
+__version__ = "1.1.286a3418-1"

upgini/features_enricher.py

@@ -423,7 +423,7 @@ class FeaturesEnricher(TransformerMixin):
 
             self.logger.info("Start fit")
 
-            self.__validate_search_keys(self.search_keys, self.search_id)
+            self.__validate_search_keys(self.search_keys)
 
             # Validate client estimator params
             self._get_client_cat_features(estimator, X, self.search_keys)
@@ -557,7 +557,7 @@ class FeaturesEnricher(TransformerMixin):
 
             self.logger.info("Start fit_transform")
 
-            self.__validate_search_keys(self.search_keys, self.search_id)
+            self.__validate_search_keys(self.search_keys)
 
             search_progress = SearchProgress(0.0, ProgressStage.START_FIT)
             if progress_callback is not None:
@@ -972,6 +972,8 @@ class FeaturesEnricher(TransformerMixin):
 
                     # 2 Fit and predict with KFold estimator on enriched tds
                     # and calculate final metric (and uplift)
+                    enriched_metric = None
+                    uplift = None
                     enriched_estimator = None
                     if set(fitting_X.columns) != set(fitting_enriched_X.columns):
                         self.logger.info(
@@ -992,18 +994,15 @@ class FeaturesEnricher(TransformerMixin):
                             has_date=has_date,
                         )
                         enriched_metric = enriched_estimator.cross_val_predict(fitting_enriched_X, enriched_y_sorted)
-                        if etalon_metric is None:
+                        if enriched_metric is None:
                             self.logger.warning(
                                 f"Enriched {metric} on train combined features is None (maybe all features was removed)"
                             )
                             enriched_estimator = None
-                            uplift = None
                         else:
                             self.logger.info(f"Enriched {metric} on train combined features: {enriched_metric}")
+                        if etalon_metric is not None and enriched_metric is not None:
                             uplift = (enriched_metric - etalon_metric) * multiplier
-                    else:
-                        enriched_metric = None
-                        uplift = None
 
                     train_metrics = {
                         self.bundle.get("quality_metrics_segment_header"): self.bundle.get(
@@ -2147,7 +2146,7 @@ class FeaturesEnricher(TransformerMixin):
             ]
             return excluded_features[feature_name_header].values.tolist()
 
-    def __validate_search_keys(self, search_keys: Dict[str, SearchKey], search_id: Optional[str]):
+    def __validate_search_keys(self, search_keys: Dict[str, SearchKey], search_id: Optional[str] = None):
         if (search_keys is None or len(search_keys) == 0) and self.country_code is None:
             if search_id:
                 self.logger.debug(f"search_id {search_id} provided without search_keys")

upgini/utils/custom_loss_utils.py

@@ -11,46 +11,49 @@ def get_runtime_params_custom_loss(
     runtime_parameters: RuntimeParameters,
     logger: Optional[logging.Logger] = None,
 ) -> RuntimeParameters:
+    if not loss:
+        return runtime_parameters
+
     if logger is None:
         logger = logging.getLogger()
-    if loss is not None:
-        selection_loss_reg = [
-            "regression",
-            "regression_l1",
-            "huber",
-            "poisson",
-            "quantile",
-            "mape",
-            "mean_absolute_percentage_error",
-            "gamma",
-            "tweedie",
-        ]
-        selection_loss_binary = ["binary"]
-        selection_loss_multi_clf = ["multiclass", "multiclassova", "multiclass_ova", "ova", "ovr"]
-        use_custom_loss = (
-            True
-            if (
-                (model_task_type == ModelTaskType.REGRESSION)
-                and (loss in selection_loss_reg)
-                or (model_task_type == ModelTaskType.BINARY)
-                and (loss in selection_loss_binary)
-                or (model_task_type == ModelTaskType.MULTICLASS)
-                and (loss in selection_loss_multi_clf)
-            )
-            else False
+
+    selection_loss_reg = [
+        "regression",
+        "regression_l1",
+        "huber",
+        "poisson",
+        "quantile",
+        "mape",
+        "mean_absolute_percentage_error",
+        "gamma",
+        "tweedie",
+    ]
+    selection_loss_binary = ["binary"]
+    selection_loss_multi_clf = ["multiclass", "multiclassova", "multiclass_ova", "ova", "ovr"]
+    use_custom_loss = (
+        True
+        if (
+            (model_task_type == ModelTaskType.REGRESSION)
+            and (loss in selection_loss_reg)
+            or (model_task_type == ModelTaskType.BINARY)
+            and (loss in selection_loss_binary)
+            or (model_task_type == ModelTaskType.MULTICLASS)
+            and (loss in selection_loss_multi_clf)
         )
+        else False
+    )
 
-        if use_custom_loss:
-            runtime_parameters.properties["lightgbm_params_preselection.objective"] = loss
-            runtime_parameters.properties["lightgbm_params_base.objective"] = loss
-            runtime_parameters.properties["lightgbm_params_segment.objective"] = loss
-            msg = bundle.get("loss_selection_info").format(loss)
-            logger.info(msg)
-            print(msg)
-        else:
-            msg = bundle.get("loss_selection_warn").format(loss, model_task_type)
-            logger.warning(msg)
-            print(msg)
+    if use_custom_loss:
+        runtime_parameters.properties["lightgbm_params_preselection.objective"] = loss
+        runtime_parameters.properties["lightgbm_params_base.objective"] = loss
+        runtime_parameters.properties["lightgbm_params_segment.objective"] = loss
+        msg = bundle.get("loss_selection_info").format(loss)
+        logger.info(msg)
+        print(msg)
+    else:
+        msg = bundle.get("loss_selection_warn").format(loss, model_task_type)
+        logger.warning(msg)
+        print(msg)
 
     return runtime_parameters
 

upgini/version_validator.py

@@ -35,7 +35,7 @@ def validate_version(logger: logging.Logger):
         try:
             current_version = parse(__version__)
             latest_version = get_version("upgini")
-            if current_version < latest_version:  # type: ignore
+            if current_version < latest_version:
                 msg = bundle.get("version_warning").format(current_version, latest_version)
                 logger.warning(msg)
                 print(msg)

{upgini-1.1.285a3418.post1.dist-info → upgini-1.1.286a3418.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.1.285a3418.post1
+Version: 1.1.286a3418.post1
 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.1.285a3418.post1.dist-info → upgini-1.1.286a3418.post1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-upgini/__about__.py,sha256=M8oRdaN0OaDPoFncIo2PvsDEQ9MJDWvpN-9TQE9lVLs,31
+upgini/__about__.py,sha256=0u63MOlVTOemZweLQMeRYfiEkk1aAgsmjnV5cXKvCxk,31
 upgini/__init__.py,sha256=asENHgEVHQBIkV-e_0IhE_ZWqkCG6398U3ZLrNzAH6k,407
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=7TLVVhGtjgx_9yaiaIUK3kZSe_R9wg5dY0d4F5qCGM4,45636
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=oFrqaCKlKLol0OGJO3JkA83UisUkr2wb8pHbqKC58Do,177543
+upgini/features_enricher.py,sha256=EKngUPR5dpX8bZWrwl8qW61TtzssbxGEVwVO7XM3d3o,177530
 upgini/http.py,sha256=khrYSldpY-HbVLCcApfV1BjBFK6Uyuatb4colKybxgY,42301
 upgini/metadata.py,sha256=qDAIO7NLSSQp_XiXCv3U4XJTLO0KH3YuQ8lvCLYPqzs,9781
 upgini/metrics.py,sha256=DLvA2YLV4f7lnzBCcfZ5T4NkqAv3pbstbjTepavuT7U,30688
 upgini/search_task.py,sha256=LtRJ9bCPjMo1gJ-sUDKERhDwGcWKImrzwVFHjkMSQHQ,17071
 upgini/spinner.py,sha256=4iMd-eIe_BnkqFEMIliULTbj6rNI2HkN_VJ4qYe0cUc,1118
-upgini/version_validator.py,sha256=RGg87VweujTNlibgsOuqPLIEiBgIOkuXNVTGuNCD234,1405
+upgini/version_validator.py,sha256=ddSKUK_-eGJB3NgrqOMoWJU-OxQ253WsNLp8aqJkaIM,1389
 upgini/ads_management/__init__.py,sha256=qzyisOToVRP-tquAJD1PblZhNtMrOB8FiyF9JvfkvgE,50
 upgini/ads_management/ads_manager.py,sha256=igVbN2jz80Umb2BUJixmJVj-zx8unoKpecVo-R-nGdw,2648
 upgini/autofe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -39,7 +39,7 @@ upgini/utils/__init__.py,sha256=O_KgzKiJjW3g4NoqZ7lAxUpoHcBi_gze6r3ndEjCH74,842
 upgini/utils/base_search_key_detector.py,sha256=UNs2uxEcD1N_mOtkx3k6U70DCajW-QEO2vZp41GF0mU,855
 upgini/utils/blocked_time_series.py,sha256=Uqr3vp4YqNclj2-PzEYqVy763GSXHn86sbpIl1UOB4s,3382
 upgini/utils/country_utils.py,sha256=yE8oRgMpXuJxPfQm4fioY6dg6700HgVnHSk4Cv9sUyM,6511
-upgini/utils/custom_loss_utils.py,sha256=bLk3uygqkJBaGkyzfO032d72QASae-dDyEURfFehVJo,3973
+upgini/utils/custom_loss_utils.py,sha256=kieNZYBYZm5ZGBltF1F_jOSF4ea6C29rYuCyiDcqVNY,3857
 upgini/utils/cv_utils.py,sha256=w6FQb9nO8BWDx88EF83NpjPLarK4eR4ia0Wg0kLBJC4,3525
 upgini/utils/datetime_utils.py,sha256=-LsDTThsGKsTZ57V1uNiHtLcoTtqktk5tui4WnqggJo,10673
 upgini/utils/deduplicate_utils.py,sha256=6AbARehUCghJZ4PppFtrej2s3gFRruh41MEm6mzakHs,8607
@@ -56,7 +56,7 @@ upgini/utils/sklearn_ext.py,sha256=N-eJrfAJxYpDPc85sKQyMFcIeL9Ug2lwlqDyS4jFOdE,4
 upgini/utils/target_utils.py,sha256=Y96_PJ5cC-WsEbeqg20v9uqywDQobLoTb-xoP7S3o4E,7807
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/warning_counter.py,sha256=dIWBB4dI5XRRJZudvIlqlIYKEiwLLPcXarsZuYRt338,227
-upgini-1.1.285a3418.post1.dist-info/METADATA,sha256=Imf9T1uNKkL0_2VyaPtV8b-ZWqTAvINqnaxBJ-gxaRQ,48128
-upgini-1.1.285a3418.post1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.1.285a3418.post1.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.1.285a3418.post1.dist-info/RECORD,,
+upgini-1.1.286a3418.post1.dist-info/METADATA,sha256=9SFdoA6_qWRERhq8uJc8up6Rapixox3ccmmut3lg2Es,48128
+upgini-1.1.286a3418.post1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.1.286a3418.post1.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.1.286a3418.post1.dist-info/RECORD,,