upgini 1.2.122a5__py3-none-any.whl → 1.2.124__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.122a5"
+__version__ = "1.2.124"

upgini/features_enricher.py

@@ -284,9 +284,7 @@ class FeaturesEnricher(TransformerMixin):
         self.country_code = country_code
         self.__validate_search_keys(search_keys, search_id)
 
-        if model_task_type is not None:
-            self.model_task_type = ModelTaskType.parse(model_task_type)
-        self.model_task_type = model_task_type
+        self.model_task_type = ModelTaskType.parse(model_task_type)
         self.endpoint = endpoint
         self._search_task: SearchTask | None = None
         self.features_info: pd.DataFrame = self.EMPTY_FEATURES_INFO
@@ -2036,7 +2034,6 @@ class FeaturesEnricher(TransformerMixin):
 
         # Sample after sorting by system_record_id for idempotency
         df.sort_values(by=SYSTEM_RECORD_ID, inplace=True)
-        df = self.__downsample_for_metrics(df)
 
         if DateTimeSearchKeyConverter.DATETIME_COL in df.columns:
             df = df.drop(columns=DateTimeSearchKeyConverter.DATETIME_COL)
@@ -2045,6 +2042,9 @@ class FeaturesEnricher(TransformerMixin):
         generated_features = [columns_renaming.get(c, c) for c in generated_features]
         search_keys = {columns_renaming.get(k, k): v for k, v in search_keys.items()}
 
+        # It uses original columns names!
+        df = self.__downsample_for_metrics(df)
+
         train_df = df.query(f"{EVAL_SET_INDEX} == 0") if eval_set is not None else df
         X_sampled = train_df.drop(columns=[TARGET, EVAL_SET_INDEX], errors="ignore")
         y_sampled = train_df[TARGET].copy()
@@ -3386,8 +3386,8 @@ 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")
+                self._search_task = None
                 print(self.bundle.get("search_stopped"))
                 raise e
 

upgini/metadata.py

@@ -163,7 +163,9 @@ class ModelTaskType(Enum):
         return self in [ModelTaskType.BINARY, ModelTaskType.MULTICLASS]
 
     @staticmethod
-    def parse(task_type: Any) -> "ModelTaskType":
+    def parse(task_type: Any) -> Optional["ModelTaskType"]:
+        if task_type is None:
+            return None
         if isinstance(task_type, ModelTaskType):
             return task_type
         elif isinstance(task_type, str):

{upgini-1.2.122a5.dist-info → upgini-1.2.124.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.122a5
+Version: 1.2.124
 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.122a5.dist-info → upgini-1.2.124.dist-info}/RECORD

@@ -1,11 +1,11 @@
-upgini/__about__.py,sha256=BwOj9466fvyowbFb3TOCuB40JJRA7yzElaEpsHisTFY,26
+upgini/__about__.py,sha256=BVLX26XWHqzeaXiLce8Wr2FrayZ3daxZy_Sdqvu_jrI,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=lBaecwDHkKpYWTz8fxs5Q12bDJGPLcDOesCPh0xX96s,231839
+upgini/features_enricher.py,sha256=unkzwcMx2kcCqSYzjOP3JzcCsIYMZs30nc0mviOLw5Y,231791
 upgini/http.py,sha256=-J_wOpnwVnT0ebPC6sOs6fN3AWtCD0LJLu6nlYmxaqk,44348
-upgini/metadata.py,sha256=VzgtgEbPPtNxTrj9LM5qSDP3DujHwAXqbUSKBjPcb9c,12477
+upgini/metadata.py,sha256=1j2LkkPmFAVaVmT__FT3nYNecf9NMpwY3YE_HN_YcrY,12541
 upgini/metrics.py,sha256=KCPE_apPN-9BIdv6GqASbJVaB_gBcy8wzNApAcyaGo4,46020
 upgini/search_task.py,sha256=SAiUd1AytbA2Q6PSnnztr7oTRKpud1wQZ5YtKjsmQHU,18256
 upgini/spinner.py,sha256=4iMd-eIe_BnkqFEMIliULTbj6rNI2HkN_VJ4qYe0cUc,1118
@@ -74,7 +74,7 @@ upgini/utils/target_utils.py,sha256=GCPn4QeJ83JJ_vyBJ3IhY5fyIRkLC9q9BE59S2FRO1I,
 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.122a5.dist-info/METADATA,sha256=gSuBgVJ5i1C2234axb6TMO14sZu2KTd0m-RasjJ4OMQ,50745
-upgini-1.2.122a5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-upgini-1.2.122a5.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.122a5.dist-info/RECORD,,
+upgini-1.2.124.dist-info/METADATA,sha256=4oYOnQTr7xUDah86SaJL141wp3linADEiUVcY0X60Vk,50743
+upgini-1.2.124.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+upgini-1.2.124.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.124.dist-info/RECORD,,