upgini 1.2.38a3769.dev6__tar.gz → 1.2.38a3769.dev8__tar.gz

{upgini-1.2.38a3769.dev6 → upgini-1.2.38a3769.dev8}/PKG-INFO

@@ -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.dev8/src/upgini/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.38a3769.dev8"

{upgini-1.2.38a3769.dev6 → upgini-1.2.38a3769.dev8}/src/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/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.38a3769.dev6"