upgini 1.2.54__py3-none-any.whl → 1.2.55a2__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.54"
+__version__ = "1.2.55a2"

upgini/features_enricher.py

@@ -2460,7 +2460,19 @@ if response.status_code == 200:
             if add_fit_system_record_id:
                 selecting_columns.append(SORT_ID)
 
-            result = result[selecting_columns]
+            selecting_columns = list(set(selecting_columns))
+            # sorting: first columns from X, then generated features, then enriched features
+            sorted_selecting_columns = [c for c in validated_X.columns if c in selecting_columns]
+            for c in generated_features:
+                if c in selecting_columns and c not in sorted_selecting_columns:
+                    sorted_selecting_columns.append(c)
+            for c in result.columns:
+                if c in selecting_columns and c not in sorted_selecting_columns:
+                    sorted_selecting_columns.append(c)
+
+            self.logger.info(f"Transform sorted_selecting_columns: {sorted_selecting_columns}")
+
+            result = result[sorted_selecting_columns]
 
             if self.country_added:
                 result = result.drop(columns=COUNTRY, errors="ignore")
@@ -3721,6 +3733,8 @@ if response.status_code == 200:
         features_info_without_links = []
         internal_features_info = []
 
+        original_shaps = {fm.name: fm.shap_value for fm in features_meta}
+
         if updated_shaps is not None:
             for fm in features_meta:
                 fm.shap_value = updated_shaps.get(fm.name, 0.0)
@@ -3732,15 +3746,16 @@ if response.status_code == 200:
 
             is_client_feature = feature_meta.name in x_columns
 
-            if feature_meta.shap_value == 0.0:
+            # TODO make a decision about selected features based on special flag from mlb
+            if original_shaps.get(feature_meta.name, 0.0) == 0.0:
                 if self.fit_select_features:
                     self.dropped_client_feature_names_.append(feature_meta.name)
                 continue
 
             # Use only important features
             if (
-                feature_meta.name in self.fit_generated_features
-                or feature_meta.name == COUNTRY
+                # feature_meta.name in self.fit_generated_features or
+                feature_meta.name == COUNTRY
                 # In select_features mode we select also from etalon features and need to show them
                 or (not self.fit_select_features and is_client_feature)
             ):

{upgini-1.2.54.dist-info → upgini-1.2.55a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.54
+Version: 1.2.55a2
 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.54.dist-info → upgini-1.2.55a2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-upgini/__about__.py,sha256=odKPoW2Uo_GtuB_RtRePNSus8XWCbeAFRoczr8nT784,23
+upgini/__about__.py,sha256=AoPRhBb-_Kg5q3atFlIhgGYnF89Sf3FiehaPlpQQx5M,25
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=vT4JyHmafLNbj54SySXr93f5hNS6-t94aFslbBy-7No,33535
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=RDdzFJKBOg9ZT1fbOFMFOMn7O_gbG_8bvbUeNywHOl4,200627
+upgini/features_enricher.py,sha256=Te4ZbFZ2RCEi9NHo1ddWaxfkTep_3O6Okct3U_DWeD0,201520
 upgini/http.py,sha256=ud0Cp7h0jNeHuuZGpU_1dAAEiabGoJjGxc1X5oeBQr4,43496
 upgini/lazy_import.py,sha256=74gQ8JuA48BGRLxAo7lNHNKY2D2emMxrUxKGdxVGhuY,1012
 upgini/metadata.py,sha256=Jh6YTaS00m_nbaOY_owvlSyn9zgkErkqu8iTr9ZjKI8,12279
@@ -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.54.dist-info/METADATA,sha256=UsKRAySU92ST26c9W_bfCOMEYHBNOQTweVVeL4mfA9I,49055
-upgini-1.2.54.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-upgini-1.2.54.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.54.dist-info/RECORD,,
+upgini-1.2.55a2.dist-info/METADATA,sha256=j01z5ab2V_U_jFU4mNVMFcSmWqsb9ePRLJsgK6BunU0,49057
+upgini-1.2.55a2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+upgini-1.2.55a2.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.55a2.dist-info/RECORD,,