upgini 1.2.60a3792.dev1__py3-none-any.whl → 1.2.60a3792.dev2__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.60a3792.dev1"
+__version__ = "1.2.60a3792.dev2"

upgini/dataset.py

@@ -40,7 +40,6 @@ from upgini.utils.email_utils import EmailSearchKeyConverter
 from upgini.utils.target_utils import (
     balance_undersample,
     balance_undersample_forced,
-    balance_undersample_time_series,
     balance_undersample_time_series_trunc,
 )
 
@@ -304,12 +303,12 @@ class Dataset:  # (pd.DataFrame):
                 )
 
         # Resample over fit threshold
-        if not self.imbalanced and EVAL_SET_INDEX in self.data.columns:
-            sample_threshold = self.FIT_SAMPLE_WITH_EVAL_SET_THRESHOLD
-            sample_rows = self.FIT_SAMPLE_WITH_EVAL_SET_ROWS
-        elif self.cv_type is not None and self.cv_type.is_time_series():
+        if self.cv_type is not None and self.cv_type.is_time_series():
             sample_threshold = self.FIT_SAMPLE_THRESHOLD_TS
             sample_rows = self.FIT_SAMPLE_ROWS_TS
+        elif not self.imbalanced and EVAL_SET_INDEX in self.data.columns:
+            sample_threshold = self.FIT_SAMPLE_WITH_EVAL_SET_THRESHOLD
+            sample_rows = self.FIT_SAMPLE_WITH_EVAL_SET_ROWS
         else:
             sample_threshold = self.FIT_SAMPLE_THRESHOLD
             sample_rows = self.FIT_SAMPLE_ROWS

upgini/utils/target_utils.py

@@ -313,7 +313,7 @@ def balance_undersample_time_series_trunc(
 
     if time_unit < time_unit_threshold:
         for trunc_length in highfreq_trunc_lengths:
-            sampled_df = trunc_datetime(dates_df, id_columns, date_column, trunc_length)
+            sampled_df = trunc_datetime(dates_df, id_columns, date_column, trunc_length, logger=logger)
             if len(sampled_df) <= sample_size:
                 break
         if len(sampled_df) > sample_size:
@@ -322,7 +322,7 @@ def balance_undersample_time_series_trunc(
             )
     else:
         for trunc_length in lowfreq_trunc_lengths:
-            sampled_df = trunc_datetime(dates_df, id_columns, date_column, trunc_length)
+            sampled_df = trunc_datetime(dates_df, id_columns, date_column, trunc_length, logger=logger)
             if len(sampled_df) <= sample_size:
                 break
         if len(sampled_df) > sample_size:

{upgini-1.2.60a3792.dev1.dist-info → upgini-1.2.60a3792.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.60a3792.dev1
+Version: 1.2.60a3792.dev2
 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.60a3792.dev1.dist-info → upgini-1.2.60a3792.dev2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-upgini/__about__.py,sha256=yYjoHiqKj96yFzYqXlsnJPzF_FcgZvyGwKBQjTVsNi4,33
+upgini/__about__.py,sha256=8VHknGDFZaUmYuHXftocfi6wQkP1htM0HF9T5bSV43M,33
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
-upgini/dataset.py,sha256=iSZX4KiDJlJFukNnAzBgkuT3UqbS-pyOyJlVXwTyaU0,34993
+upgini/dataset.py,sha256=OGjpeFHbj3lWiZTOHTpWEoMMDmFY1FlNC44FKktoZvU,34956
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
 upgini/features_enricher.py,sha256=IXU6ahvQqMGLdZsrHCjOGEia1pBAgixfld3pNVPcGEM,202468
 upgini/http.py,sha256=ud0Cp7h0jNeHuuZGpU_1dAAEiabGoJjGxc1X5oeBQr4,43496
@@ -56,11 +56,11 @@ upgini/utils/phone_utils.py,sha256=IrbztLuOJBiePqqxllfABWfYlfAjYevPhXKipl95wUI,1
 upgini/utils/postal_code_utils.py,sha256=5M0sUqH2DAr33kARWCTXR-ACyzWbjDq_-0mmEml6ZcU,1716
 upgini/utils/progress_bar.py,sha256=N-Sfdah2Hg8lXP_fV9EfUTXz_PyRt4lo9fAHoUDOoLc,1550
 upgini/utils/sklearn_ext.py,sha256=13jQS_k7v0aUtudXV6nGUEWjttPQzAW9AFYL5wgEz9k,44511
-upgini/utils/target_utils.py,sha256=a7Ck7WgQeUhDrnluOdFXvOdX6zDL-4Wiqt_f4jZxHag,16543
+upgini/utils/target_utils.py,sha256=gGIO40NmLdm1DWaZNPWPoCIPlLNIDZWFGjoPuhOlzAU,16573
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/ts_utils.py,sha256=_YbNVE144vtEPlvLpvPGguDNzrnUM9IIjdX2VQz4T7E,1671
 upgini/utils/warning_counter.py,sha256=-GRY8EUggEBKODPSuXAkHn9KnEQwAORC0mmz_tim-PM,254
-upgini-1.2.60a3792.dev1.dist-info/METADATA,sha256=4k4LdGfGvuhNHhpT83pomgnfvZr8x2fKQDQbFCEAyPA,49065
-upgini-1.2.60a3792.dev1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.2.60a3792.dev1.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.60a3792.dev1.dist-info/RECORD,,
+upgini-1.2.60a3792.dev2.dist-info/METADATA,sha256=9ViiZMTzdvTgcXn1tdN-TUgwOW7ovx7JoOQk_VZfMf0,49065
+upgini-1.2.60a3792.dev2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.2.60a3792.dev2.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.60a3792.dev2.dist-info/RECORD,,