upgini 1.2.119__py3-none-any.whl → 1.2.120__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.119"
+__version__ = "1.2.120"

upgini/features_enricher.py

@@ -1028,13 +1028,7 @@ class FeaturesEnricher(TransformerMixin):
                     columns_renaming,
                     _,
                 ) = prepared_data
-
-                # rename baseline_score_column
-                reversed_renaming = {v: k for k, v in columns_renaming.items()}
-                baseline_score_column = self.baseline_score_column
-                if baseline_score_column is not None:
-                    baseline_score_column = reversed_renaming[baseline_score_column]
-
+                
                 gc.collect()
 
                 if fitting_X.shape[1] == 0 and fitting_enriched_X.shape[1] == 0:
@@ -1089,7 +1083,7 @@ class FeaturesEnricher(TransformerMixin):
                             has_time=has_time,
                         )
                         baseline_cv_result = baseline_estimator.cross_val_predict(
-                            fitting_X, y_sorted, baseline_score_column
+                            fitting_X, y_sorted, self.baseline_score_column
                         )
                         baseline_metric = baseline_cv_result.get_display_metric()
                         if baseline_metric is None:
@@ -1192,7 +1186,7 @@ class FeaturesEnricher(TransformerMixin):
                                     f"on client features: {eval_X_sorted.columns.to_list()}"
                                 )
                                 etalon_eval_results = baseline_estimator.calculate_metric(
-                                    eval_X_sorted, eval_y_sorted, baseline_score_column
+                                    eval_X_sorted, eval_y_sorted, self.baseline_score_column
                                 )
                                 etalon_eval_metric = etalon_eval_results.get_display_metric()
                                 self.logger.info(
@@ -2502,6 +2496,9 @@ if response.status_code == 200:
     ) -> tuple[pd.DataFrame, dict[str, str], list[str], dict[str, SearchKey]]:
         if self._search_task is None:
             raise NotFittedError(self.bundle.get("transform_unfitted_enricher"))
+        features_meta = self._search_task.get_all_features_metadata_v2()
+        if features_meta is None:
+            raise NotFittedError(self.bundle.get("transform_unfitted_enricher"))
 
         start_time = time.time()
         search_id = self.search_id or (self._search_task.search_task_id if self._search_task is not None else None)
@@ -2531,7 +2528,6 @@ if response.status_code == 200:
                 self.__display_support_link(msg)
                 return None, {}, [], self.search_keys
 
-            features_meta = self._search_task.get_all_features_metadata_v2()
             online_api_features = [fm.name for fm in features_meta if fm.from_online_api and fm.shap_value > 0]
             if len(online_api_features) > 0:
                 self.logger.warning(
@@ -3382,6 +3378,7 @@ if response.status_code == 200:
             except KeyboardInterrupt as e:
                 print(self.bundle.get("search_stopping"))
                 self.rest_client.stop_search_task_v2(trace_id, self._search_task.search_task_id)
+                self._search_task = None
                 self.logger.warning(f"Search {self._search_task.search_task_id} stopped by user")
                 print(self.bundle.get("search_stopped"))
                 raise e

upgini/utils/sklearn_ext.py

@@ -1301,6 +1301,7 @@ def _encode_cat_features(X_train, y_train, X_test, y_test, cat_features, estimat
             encoder = OrdinalEncoder(handle_unknown="use_encoded_value", unknown_value=-1)
             encoder.fit(X_train[cat_features], y_train)
 
+            # OrdinalEncoder doesn't support progressive encoding with target
             X_train[cat_features] = encoder.transform(X_train[cat_features]).astype(int)
             X_test[cat_features] = encoder.transform(X_test[cat_features]).astype(int)
 
@@ -1314,10 +1315,8 @@ def _encode_cat_features(X_train, y_train, X_test, y_test, cat_features, estimat
             encoder = OrdinalEncoder(handle_unknown="use_encoded_value", unknown_value=-1)
             encoder.fit(X_train[cat_features], y_train)
 
-            # Progressive encoding on train (using y)
-            X_train[cat_features] = encoder.transform(X_train[cat_features], y_train).astype(int)
-
-            # Static encoding on validation (no y)
+            # OrdinalEncoder doesn't support progressive encoding with target
+            X_train[cat_features] = encoder.transform(X_train[cat_features]).astype(int)
             X_test[cat_features] = encoder.transform(X_test[cat_features]).astype(int)
 
             return X_train, y_train, X_test, y_test, [], encoder

{upgini-1.2.119.dist-info → upgini-1.2.120.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.119
+Version: 1.2.120
 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.119.dist-info → upgini-1.2.120.dist-info}/RECORD

@@ -1,9 +1,9 @@
-upgini/__about__.py,sha256=dGQsiLpbGOBMNMjbBQebmAujqSJwdzWvwm3Nkl_FFhk,24
+upgini/__about__.py,sha256=C4MPkUjPY8txHqkpCAHzv554Bvc9hUrOFMic1aakSTI,24
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=pQ8JQe0cdygD-W9GefJmfE6bnj4EYzXsjlgWdIS9nS8,31578
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=C9pZKusj_QnG9coPVAa1a_88VC-lLR4Tre4uC10yt04,231852
+upgini/features_enricher.py,sha256=Du1S72F55cqyKbHT3VGSPnJO3XicWABFVkA2-G3chdA,231696
 upgini/http.py,sha256=-J_wOpnwVnT0ebPC6sOs6fN3AWtCD0LJLu6nlYmxaqk,44348
 upgini/metadata.py,sha256=VzgtgEbPPtNxTrj9LM5qSDP3DujHwAXqbUSKBjPcb9c,12477
 upgini/metrics.py,sha256=KCPE_apPN-9BIdv6GqASbJVaB_gBcy8wzNApAcyaGo4,46020
@@ -68,13 +68,13 @@ upgini/utils/postal_code_utils.py,sha256=5M0sUqH2DAr33kARWCTXR-ACyzWbjDq_-0mmEml
 upgini/utils/progress_bar.py,sha256=N-Sfdah2Hg8lXP_fV9EfUTXz_PyRt4lo9fAHoUDOoLc,1550
 upgini/utils/psi.py,sha256=vw8QEktXSx29IiMJMxmDeFU_4lJInJBXt_XL5Muekzo,11114
 upgini/utils/sample_utils.py,sha256=xpfYaZ2cYP7I2JrcooVc13QNBFawB81cJRuh38451Q4,15123
-upgini/utils/sklearn_ext.py,sha256=jLJWAKkqQinV15Z4y1ZnsN3c-fKFwXTsprs00COnyVU,49315
+upgini/utils/sklearn_ext.py,sha256=Pcy8sWD6f4YcE5Bu0UmXD4j0ICmXtrT8DJlTArM-_a0,49356
 upgini/utils/sort.py,sha256=8uuHs2nfSMVnz8GgvbOmgMB1PgEIZP1uhmeRFxcwnYw,7039
 upgini/utils/target_utils.py,sha256=GCPn4QeJ83JJ_vyBJ3IhY5fyIRkLC9q9BE59S2FRO1I,10882
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/ts_utils.py,sha256=26vhC0pN7vLXK6R09EEkMK3Lwb9IVPH7LRdqFIQ3kPs,1383
 upgini/utils/warning_counter.py,sha256=-GRY8EUggEBKODPSuXAkHn9KnEQwAORC0mmz_tim-PM,254
-upgini-1.2.119.dist-info/METADATA,sha256=kYExWpX2yb4opF3KCsG2H0LdMS_mkSzspOgEhO6Jgtg,50743
-upgini-1.2.119.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-upgini-1.2.119.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.119.dist-info/RECORD,,
+upgini-1.2.120.dist-info/METADATA,sha256=KFxeOoYvqFTE347dhf5EmvIskXqWMZvxYWy3AAwOyWI,50743
+upgini-1.2.120.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+upgini-1.2.120.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.120.dist-info/RECORD,,