upgini 1.2.38a3769.dev6__py3-none-any.whl → 1.2.38a3769.dev8__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.38a3769.dev6"
+__version__ = "1.2.38a3769.dev8"

upgini/features_enricher.py

@@ -932,7 +932,9 @@ class FeaturesEnricher(TransformerMixin):
                 cat_features, search_keys_for_metrics = self._get_client_cat_features(
                     estimator, validated_X, self.search_keys
                 )
-                search_keys_for_metrics.extend([c for c in self.id_columns or [] if c not in search_keys_for_metrics])
+                search_keys_for_metrics.extend(
+                    [c for c in self.__get_renamed_id_columns() or [] if c not in search_keys_for_metrics]
+                )
 
                 prepared_data = self._prepare_data_for_metrics(
                     trace_id=trace_id,
@@ -1448,9 +1450,11 @@ class FeaturesEnricher(TransformerMixin):
 
         excluding_search_keys = list(search_keys.keys())
         if search_keys_for_metrics is not None and len(search_keys_for_metrics) > 0:
+            excluded = set()
             for sk in excluding_search_keys:
                 if columns_renaming.get(sk) in search_keys_for_metrics:
-                    excluding_search_keys.remove(sk)
+                    excluded.add(sk)
+            excluding_search_keys = [sk for sk in excluding_search_keys if sk not in excluded]
 
         client_features = [
             c
@@ -2659,8 +2663,9 @@ class FeaturesEnricher(TransformerMixin):
 
         if self.id_columns is not None and self.cv is not None and self.cv.is_time_series():
             id_columns = self.__get_renamed_id_columns()
-            self.fit_search_keys.update({col: SearchKey.CUSTOM_KEY for col in id_columns})
-            self.runtime_parameters.properties["id_columns"] = ",".join(id_columns)
+            if id_columns:
+                self.fit_search_keys.update({col: SearchKey.CUSTOM_KEY for col in id_columns})
+                self.runtime_parameters.properties["id_columns"] = ",".join(id_columns)
 
         df, fintech_warnings = remove_fintech_duplicates(
             df, self.fit_search_keys, date_format=self.date_format, logger=self.logger, bundle=self.bundle
@@ -2946,7 +2951,7 @@ class FeaturesEnricher(TransformerMixin):
 
     def __get_renamed_id_columns(self):
         reverse_renaming = {v: k for k, v in self.fit_columns_renaming.items()}
-        return [reverse_renaming.get(c) or c for c in self.id_columns]
+        return None if self.id_columns is None else [reverse_renaming.get(c) or c for c in self.id_columns]
 
     def __adjust_cv(self, df: pd.DataFrame):
         date_column = SearchKey.find_key(self.fit_search_keys, [SearchKey.DATE, SearchKey.DATETIME])

{upgini-1.2.38a3769.dev6.dist-info → upgini-1.2.38a3769.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.38a3769.dev6
+Version: 1.2.38a3769.dev8
 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.38a3769.dev6.dist-info → upgini-1.2.38a3769.dev8.dist-info}/RECORD

@@ -1,9 +1,9 @@
-upgini/__about__.py,sha256=BkueeegvmmuEH9qyBrb5l1xILgdxX8JrEA3EC3ANEDk,33
+upgini/__about__.py,sha256=CC220x-svaLNQ720kmg-FXJClpcVpjfggATaAuECXJY,33
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=-3FeDMADnHxGb70rKFY_U96NCQO-TEUAXFicFl25CtY,33222
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=saA9lh32FC6uQ1Y537WLCNR0YgZ9AguleGG97uR0CrY,196108
+upgini/features_enricher.py,sha256=zi2BIxtbT-h0kouY2kkt-2lsdwfIH2Z_K081mSE_yVI,196342
 upgini/http.py,sha256=plZGTGoi1h2edd8Cnjt4eYB8t4NbBGnZz7DtPTByiNc,42885
 upgini/lazy_import.py,sha256=74gQ8JuA48BGRLxAo7lNHNKY2D2emMxrUxKGdxVGhuY,1012
 upgini/metadata.py,sha256=-ibqiNjD7dTagqg53FoEJNEqvAYbwgfyn9PGTRQ_YKU,12054
@@ -59,7 +59,7 @@ upgini/utils/sklearn_ext.py,sha256=13jQS_k7v0aUtudXV6nGUEWjttPQzAW9AFYL5wgEz9k,4
 upgini/utils/target_utils.py,sha256=RlpKGss9kMibVSlA8iZuO_qxmyeplqzn7X8g6hiGGGs,14341
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/warning_counter.py,sha256=-GRY8EUggEBKODPSuXAkHn9KnEQwAORC0mmz_tim-PM,254
-upgini-1.2.38a3769.dev6.dist-info/METADATA,sha256=ZhLqyvPmIEibbeefPmaH1Rl2rVqaINTUw48JAZd6MVk,48604
-upgini-1.2.38a3769.dev6.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.2.38a3769.dev6.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.38a3769.dev6.dist-info/RECORD,,
+upgini-1.2.38a3769.dev8.dist-info/METADATA,sha256=76dOyIVY-e6JFMq7glccMY8EWLvK0DMovtJNXM4wA6M,48604
+upgini-1.2.38a3769.dev8.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.2.38a3769.dev8.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.38a3769.dev8.dist-info/RECORD,,