upgini 1.2.135a1__py3-none-any.whl → 1.2.135a3__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.135a1"
+__version__ = "1.2.135a3"

upgini/dataset.py

@@ -285,6 +285,7 @@ class Dataset:
             for key in search_group
             if key in self.columns_renaming
             and not self.columns_renaming.get(key).endswith(EmailSearchKeyConverter.ONE_DOMAIN_SUFFIX)
+            and not self.columns_renaming.get(key) == "current_date"
         }
         ipv4_column = self.etalon_def_checked.get(FileColumnMeaningType.IP_ADDRESS.value)
         if (

upgini/features_enricher.py

@@ -814,7 +814,7 @@ class FeaturesEnricher(TransformerMixin):
                     keep_input=keep_input,
                 )
                 if TARGET in result.columns:
-                    result.drop(columns=TARGET, inplace=True)
+                    result = result.drop(columns=TARGET)
                 self.logger.info("Transform finished successfully")
                 search_progress = SearchProgress(100.0, ProgressStage.FINISHED)
                 if progress_bar is not None:
@@ -1047,7 +1047,8 @@ class FeaturesEnricher(TransformerMixin):
                 with Spinner():
                     self._check_train_and_eval_target_distribution(y_sorted, fitting_eval_set_dict)
 
-                    has_date = self._get_date_column(search_keys) is not None
+                    date_col = self._get_date_column(search_keys)
+                    has_date = date_col is not None and date_col in validated_X.columns
                     model_task_type = self.model_task_type or define_task(y_sorted, has_date, self.logger, silent=True)
                     cat_features = list(set(client_cat_features + cat_features_from_backend))
                     has_time = has_date and isinstance(_cv, TimeSeriesSplit) or isinstance(_cv, BlockedTimeSeriesSplit)
@@ -1323,7 +1324,7 @@ class FeaturesEnricher(TransformerMixin):
             search_keys = {str(k): v for k, v in search_keys.items()}
 
         date_column = self._get_date_column(search_keys)
-        has_date = date_column is not None
+        has_date = date_column is not None and date_column in validated_X.columns
         if not has_date:
             self.logger.info("No date column for OOT PSI calculation")
             return
@@ -2087,7 +2088,8 @@ class FeaturesEnricher(TransformerMixin):
         search_keys = self.fit_search_keys.copy()
 
         rows_to_drop = None
-        has_date = self._get_date_column(search_keys) is not None
+        date_column = self._get_date_column(search_keys)
+        has_date = date_column is not None and date_column in validated_X.columns
         self.model_task_type = self.model_task_type or define_task(
             self.df_with_original_index[TARGET], has_date, self.logger, silent=True
         )
@@ -2954,7 +2956,10 @@ if response.status_code == 200:
         is_transform: bool = False,
     ):
         fit_input_columns = [c.originalName for c in self._search_task.get_file_metadata(trace_id).columns]
-        new_columns_on_transform = [c for c in validated_Xy.columns if c not in fit_input_columns]
+        original_dropped_features = [self.fit_columns_renaming.get(c, c) for c in self.fit_dropped_features]
+        new_columns_on_transform = [
+            c for c in validated_Xy.columns if c not in fit_input_columns and c not in original_dropped_features
+        ]
 
         selected_generated_features = [c for c in generated_features if c in self.feature_names_]
         if keep_input is True:
@@ -3129,7 +3134,7 @@ if response.status_code == 200:
         self.fit_search_keys = self.__prepare_search_keys(df, self.fit_search_keys, is_demo_dataset)
 
         maybe_date_column = SearchKey.find_key(self.fit_search_keys, [SearchKey.DATE, SearchKey.DATETIME])
-        has_date = maybe_date_column is not None
+        has_date = maybe_date_column is not None and maybe_date_column in validated_X.columns
 
         self.model_task_type = self.model_task_type or define_task(validated_y, has_date, self.logger)
 
@@ -3763,7 +3768,8 @@ if response.status_code == 200:
         if eval_set is None:
             return None
         validated_eval_set = []
-        has_date = self._get_date_column(self.search_keys) is not None
+        date_col = self._get_date_column(self.search_keys)
+        has_date = date_col is not None and date_col in X.columns
         for idx, eval_pair in enumerate(eval_set):
             validated_pair = self._validate_eval_set_pair(X, eval_pair)
             if validated_pair[1].isna().all():

upgini/utils/features_validator.py

@@ -44,12 +44,14 @@ class FeaturesValidator:
                 else:
                     empty_or_constant_features.append(f)
 
+        columns_renaming = columns_renaming or {}
+
         if one_hot_encoded_features:
-            msg = bundle.get("one_hot_encoded_features").format(one_hot_encoded_features)
+            msg = bundle.get("one_hot_encoded_features").format(
+                [columns_renaming.get(f, f) for f in one_hot_encoded_features]
+            )
             warnings.append(msg)
 
-        columns_renaming = columns_renaming or {}
-
         if empty_or_constant_features:
             msg = bundle.get("empty_or_contant_features").format(
                 [columns_renaming.get(f, f) for f in empty_or_constant_features]

{upgini-1.2.135a1.dist-info → upgini-1.2.135a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upgini
-Version: 1.2.135a1
+Version: 1.2.135a3
 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.135a1.dist-info → upgini-1.2.135a3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-upgini/__about__.py,sha256=ut2rbJ0xiGgZg547NgkkPDfF6sWBeWwDef4pISy7Ipc,26
+upgini/__about__.py,sha256=zKar2BSHx-M-ruW4V1DQDr70UfG-vBoiDPsQB4duA-c,26
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
-upgini/dataset.py,sha256=Nm2ZmwyQqvTnymYpGUwyJWy7y2ebXlHMyYmGeGcyA_s,31652
+upgini/dataset.py,sha256=qXo1eAUM21jmNMYGa6IeGuRJmjU3jtCieS4sAVVIfXs,31721
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=YvVLu2Fa0XQb-J8sUKH0W0_k-WLyfwWQ7646raObva4,235033
+upgini/features_enricher.py,sha256=dC71_-18cqymS26EhEnfYnZFGDvRtvW6Pga4ZtJN-BI,235485
 upgini/http.py,sha256=-J_wOpnwVnT0ebPC6sOs6fN3AWtCD0LJLu6nlYmxaqk,44348
 upgini/metadata.py,sha256=H3wiN37k-yqWZgbPD0tJzx8DzaCIkgmX5cybhByQWLg,12619
 upgini/metrics.py,sha256=KCPE_apPN-9BIdv6GqASbJVaB_gBcy8wzNApAcyaGo4,46020
@@ -58,7 +58,7 @@ upgini/utils/display_utils.py,sha256=MoTqXZJvC6pAqgOaI3V0FG-IU_LnMfrn4TDcNvUqsdg
 upgini/utils/email_utils.py,sha256=pZ2vCfNxLIPUhxr0-OlABNXm12jjU44isBk8kGmqQzA,5277
 upgini/utils/fallback_progress_bar.py,sha256=PDaKb8dYpVZaWMroNcOHsTc3pSjgi9mOm0--cOFTwJ0,1074
 upgini/utils/feature_info.py,sha256=SQTRbSxJDkh2G2c0KGBmOv8f69gVzWbTtcXn0_2Qb-8,7945
-upgini/utils/features_validator.py,sha256=A_3AX7X5u5AH7RLgkTiS6dHxaOiq5vm8w4ijQWLGcMY,4871
+upgini/utils/features_validator.py,sha256=RdRMisZYeJ8HVCKiKxqSyWjoLf_MsZNXxHIuWf6H2g4,4939
 upgini/utils/format.py,sha256=Yv5cvvSs2bOLUzzNu96Pu33VMDNbabio92QepUj41jU,243
 upgini/utils/hash_utils.py,sha256=mP2yHyzvDNdpa5g3B4MHzulxBeEz_ZSoGl1YF_VnAyE,5538
 upgini/utils/ip_utils.py,sha256=wmnnwVQdjX9o1cNQw6VQMk6maHhvsq6hNsZBYf9knrw,6585
@@ -74,7 +74,7 @@ upgini/utils/target_utils.py,sha256=CihpV6SC95HwtlMH60rGAUzVDa4Id0Bva8ySprmNHlE,
 upgini/utils/track_info.py,sha256=NDKeQTUlZaYp15UoP-xLKGoDoJQ0drbDMwB0g9R0PUg,6427
 upgini/utils/ts_utils.py,sha256=26vhC0pN7vLXK6R09EEkMK3Lwb9IVPH7LRdqFIQ3kPs,1383
 upgini/utils/warning_counter.py,sha256=-GRY8EUggEBKODPSuXAkHn9KnEQwAORC0mmz_tim-PM,254
-upgini-1.2.135a1.dist-info/METADATA,sha256=0E6YorGA-6HKO5wnsp75qUKG-BxNKXOVEEH5snEVBvI,51135
-upgini-1.2.135a1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-upgini-1.2.135a1.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.135a1.dist-info/RECORD,,
+upgini-1.2.135a3.dist-info/METADATA,sha256=p6JAaluvHU1B6Al8fHzq5KsgyNQvznWkEDwE1fhHuZI,51135
+upgini-1.2.135a3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+upgini-1.2.135a3.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.135a3.dist-info/RECORD,,