upgini 1.2.19a1__tar.gz → 1.2.20__tar.gz

{upgini-1.2.19a1 → upgini-1.2.20}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.19a1
+Version: 1.2.20
 Summary: Intelligent data search & enrichment for Machine Learning
 Project-URL: Bug Reports, https://github.com/upgini/upgini/issues
 Project-URL: Homepage, https://upgini.com/
 Project-URL: Source, https://github.com/upgini/upgini
 Author-email: Upgini Developers <madewithlove@upgini.com>
+License-Expression: BSD-3-Clause
 License-File: LICENSE
 Keywords: automl,data mining,data science,data search,machine learning
 Classifier: Development Status :: 5 - Production/Stable

{upgini-1.2.19a1 → upgini-1.2.20}/pyproject.toml

@@ -7,6 +7,8 @@ name = "upgini"
 dynamic = ["version"]
 description = "Intelligent data search & enrichment for Machine Learning"
 readme = "README.md"
+license = "BSD-3-Clause"
+license-file = "LICENSE"
 requires-python = ">=3.8,<3.11"
 authors = [
     { name = "Upgini Developers", email = "madewithlove@upgini.com" },

upgini-1.2.20/src/upgini/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.20"

{upgini-1.2.19a1 → upgini-1.2.20}/src/upgini/features_enricher.py

@@ -2474,8 +2474,16 @@ class FeaturesEnricher(TransformerMixin):
 
         df = pd.concat([validated_X, validated_y], axis=1)
 
+        if validated_eval_set is not None and len(validated_eval_set) > 0:
+            df[EVAL_SET_INDEX] = 0
+            for idx, (eval_X, eval_y) in enumerate(validated_eval_set):
+                eval_df = pd.concat([eval_X, eval_y], axis=1)
+                eval_df[EVAL_SET_INDEX] = idx + 1
+                df = pd.concat([df, eval_df])
+
         self.fit_search_keys = self.search_keys.copy()
-        self.fit_search_keys = self.__prepare_search_keys(validated_X, self.fit_search_keys, is_demo_dataset)
+        df = self.__handle_index_search_keys(df, self.fit_search_keys)
+        self.fit_search_keys = self.__prepare_search_keys(df, self.fit_search_keys, is_demo_dataset)
 
         maybe_date_column = SearchKey.find_key(self.fit_search_keys, [SearchKey.DATE, SearchKey.DATETIME])
         has_date = maybe_date_column is not None
@@ -2487,17 +2495,8 @@ class FeaturesEnricher(TransformerMixin):
             self.loss, self.model_task_type, self.runtime_parameters, self.logger
         )
 
-        if validated_eval_set is not None and len(validated_eval_set) > 0:
-            df[EVAL_SET_INDEX] = 0
-            for idx, (eval_X, eval_y) in enumerate(validated_eval_set):
-                eval_df = pd.concat([eval_X, eval_y], axis=1)
-                eval_df[EVAL_SET_INDEX] = idx + 1
-                df = pd.concat([df, eval_df])
-
         df = self.__correct_target(df)
 
-        df = self.__handle_index_search_keys(df, self.fit_search_keys)
-
         if DEFAULT_INDEX in df.columns:
             msg = self.bundle.get("unsupported_index_column")
             self.logger.info(msg)

upgini-1.2.19a1/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.19a1"