upgini 1.2.14a3616.dev1__py3-none-any.whl → 1.2.14a3616.dev3__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.14a3616.dev1"
+__version__ = "1.2.14a3616.dev3"

upgini/features_enricher.py

@@ -2449,8 +2449,6 @@ class FeaturesEnricher(TransformerMixin):
         if is_numeric_dtype(df[self.TARGET_NAME]) and has_date:
             self._validate_PSI(df.sort_values(by=maybe_date_column))
 
-        self.__adjust_cv(df, maybe_date_column, self.model_task_type)
-
         normalizer = Normalizer(
             self.fit_search_keys, self.fit_generated_features, self.bundle, self.logger, self.warning_counter
         )
@@ -2458,6 +2456,10 @@ class FeaturesEnricher(TransformerMixin):
         columns_renaming = normalizer.columns_renaming
         self.fit_columns_renaming = columns_renaming
 
+        self.__adjust_cv(
+            df, normalizer.search_keys, self.model_task_type
+        )
+
         df = remove_fintech_duplicates(
             df, self.fit_search_keys, date_format=self.date_format, logger=self.logger, bundle=self.bundle
         )
@@ -2710,23 +2712,24 @@ class FeaturesEnricher(TransformerMixin):
         if not self.warning_counter.has_warnings():
             self.__display_support_link(self.bundle.get("all_ok_community_invite"))
 
-    def __adjust_cv(self, df: pd.DataFrame, date_column: pd.Series, model_task_type: ModelTaskType):
+    def __adjust_cv(self, df: pd.DataFrame, search_keys: Dict[str, SearchKey], model_task_type: ModelTaskType):
+        date_column = SearchKey.find_key(search_keys, [SearchKey.DATE, SearchKey.DATETIME])
         # Check Multivariate time series
         if (
             self.cv is None
             and date_column
             and model_task_type == ModelTaskType.REGRESSION
-            and len({SearchKey.PHONE, SearchKey.EMAIL, SearchKey.HEM}.intersection(self.fit_search_keys.keys())) == 0
-            and is_blocked_time_series(df, date_column, list(self.fit_search_keys.keys()) + [TARGET])
+            and len({SearchKey.PHONE, SearchKey.EMAIL, SearchKey.HEM}.intersection(search_keys.keys())) == 0
+            and is_blocked_time_series(df, date_column, list(search_keys.keys()) + [TARGET])
         ):
             msg = self.bundle.get("multivariate_timeseries_detected")
             self.__override_cv(CVType.blocked_time_series, msg, print_warning=False)
         elif self.cv is None and model_task_type != ModelTaskType.REGRESSION:
             msg = self.bundle.get("group_k_fold_in_classification")
             self.__override_cv(CVType.group_k_fold, msg, print_warning=self.cv is not None)
-            group_columns = self._get_group_columns(df, self.fit_search_keys)
-            self.runtime_parameters["cv_params.group_columns"] = ",".join(group_columns)
-            self.runtime_parameters["cv_params.shuffle_kfold"] = "True"
+            group_columns = self._get_group_columns(df, search_keys)
+            self.runtime_parameters.properties["cv_params.group_columns"] = ",".join(group_columns)
+            self.runtime_parameters.properties["cv_params.shuffle_kfold"] = "True"
 
     def __override_cv(self, cv: CVType, msg: str, print_warning: bool = True):
         if print_warning:

{upgini-1.2.14a3616.dev1.dist-info → upgini-1.2.14a3616.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.14a3616.dev1
+Version: 1.2.14a3616.dev3
 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.14a3616.dev1.dist-info → upgini-1.2.14a3616.dev3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-upgini/__about__.py,sha256=xdWwmQ_40JTbQqlf6J_ZWokxZnWKIFaksfIym9DE2io,33
+upgini/__about__.py,sha256=r3lE_a_du_MY_PJ07BeAX4zN5ZZJoiV-YXe1uJzNwTo,33
 upgini/__init__.py,sha256=M64LwQTBa-5Jz24Zm2h8rWwlKQQ1J8nP7gGgIciS0WU,589
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=olZ-OHSfBNoBSCo7R5t7uCLukI2nO7afpx_A-HCiJLk,31067
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=ek3iF7NC_yg--uDudhwGhWrnO-M5vsQ9igzEXgkGNpI,188195
+upgini/features_enricher.py,sha256=tGdWQdCgilWlG-sDebIBxQ_OMpnOqg8mTzxCj7Xp-yo,188320
 upgini/http.py,sha256=21asexflvavydzCOONJDGQBtQanCElrbnqLXakJ9Cu8,42880
 upgini/lazy_import.py,sha256=74gQ8JuA48BGRLxAo7lNHNKY2D2emMxrUxKGdxVGhuY,1012
 upgini/metadata.py,sha256=osmzdNESeh7yP3BZday6N9Q3eaIHfzhhRM1d6NSgcf0,11223
@@ -57,7 +57,7 @@ upgini/utils/sklearn_ext.py,sha256=13jQS_k7v0aUtudXV6nGUEWjttPQzAW9AFYL5wgEz9k,4
 upgini/utils/target_utils.py,sha256=BVtDmrmFMKerSUWaNOIEdzsYHIFiODdpnWbE50QDPDc,7864
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/warning_counter.py,sha256=dIWBB4dI5XRRJZudvIlqlIYKEiwLLPcXarsZuYRt338,227
-upgini-1.2.14a3616.dev1.dist-info/METADATA,sha256=bPwE4ATa-1L3kH-nxLBHYFCAKffzNtlldsFuJrdYFQA,48587
-upgini-1.2.14a3616.dev1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.2.14a3616.dev1.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.14a3616.dev1.dist-info/RECORD,,
+upgini-1.2.14a3616.dev3.dist-info/METADATA,sha256=t3fSIzaoSthUHfOhJmHqz45r_3UpZhF2ur9cFekdcA8,48587
+upgini-1.2.14a3616.dev3.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.2.14a3616.dev3.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.14a3616.dev3.dist-info/RECORD,,