upgini 1.2.55a1__py3-none-any.whl → 1.2.55a2__py3-none-any.whl

upgini/__about__.py

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

upgini/dataset.py

@@ -587,23 +587,15 @@ class Dataset:  # (pd.DataFrame):
         if (
             runtime_parameters is not None
             and runtime_parameters.properties is not None
+            and "generate_features" in runtime_parameters.properties
         ):
-            if "generate_features" in runtime_parameters.properties:
-                generate_features = runtime_parameters.properties["generate_features"].split(",")
-                renamed_generate_features = []
-                for f in generate_features:
-                    for new_column, orig_column in self.columns_renaming.items():
-                        if f == orig_column:
-                            renamed_generate_features.append(new_column)
-                runtime_parameters.properties["generate_features"] = ",".join(renamed_generate_features)
-            if "columns_for_online_api" in runtime_parameters.properties:
-                columns_for_online_api = runtime_parameters.properties["columns_for_online_api"].split(",")
-                renamed_columns_for_online_api = []
-                for f in columns_for_online_api:
-                    for new_column, orig_column in self.columns_renaming.items():
-                        if f == orig_column:
-                            renamed_columns_for_online_api.append(new_column)
-                runtime_parameters.properties["columns_for_online_api"] = ",".join(renamed_columns_for_online_api)
+            generate_features = runtime_parameters.properties["generate_features"].split(",")
+            renamed_generate_features = []
+            for f in generate_features:
+                for new_column, orig_column in self.columns_renaming.items():
+                    if f == orig_column:
+                        renamed_generate_features.append(new_column)
+            runtime_parameters.properties["generate_features"] = ",".join(renamed_generate_features)
 
         return runtime_parameters
 

upgini/features_enricher.py

@@ -222,7 +222,6 @@ class FeaturesEnricher(TransformerMixin):
         loss: Optional[str] = None,
         detect_missing_search_keys: bool = True,
         generate_features: Optional[List[str]] = None,
-        columns_for_online_api: Optional[List[str]] = None,
         round_embeddings: Optional[int] = None,
         logs_enabled: bool = True,
         raise_validation_error: bool = True,
@@ -346,9 +345,6 @@ class FeaturesEnricher(TransformerMixin):
                     self.logger.error(msg)
                     raise ValidationError(msg)
                 self.runtime_parameters.properties["round_embeddings"] = round_embeddings
-        self.columns_for_online_api = columns_for_online_api
-        if columns_for_online_api is not None:
-            self.runtime_parameters.properties["columns_for_online_api"] = ",".join(columns_for_online_api)
         maybe_downsampling_limit = self.runtime_parameters.properties.get("downsampling_limit")
         if maybe_downsampling_limit is not None:
             Dataset.FIT_SAMPLE_THRESHOLD = int(maybe_downsampling_limit)
@@ -2464,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")
@@ -2612,18 +2620,17 @@ if response.status_code == 200:
             checked_generate_features = []
             for gen_feature in self.generate_features:
                 if gen_feature not in x_columns:
-                    msg = self.bundle.get("missing_generate_feature").format(gen_feature, x_columns)
-                    self.__log_warning(msg)
+                    if gen_feature == self._get_phone_column(self.search_keys):
+                        raise ValidationError(
+                            self.bundle.get("missing_generate_feature").format(gen_feature, x_columns)
+                        )
+                    else:
+                        self.__log_warning(self.bundle.get("missing_generate_feature").format(gen_feature, x_columns))
                 else:
                     checked_generate_features.append(gen_feature)
             self.generate_features = checked_generate_features
             self.runtime_parameters.properties["generate_features"] = ",".join(self.generate_features)
 
-        if self.columns_for_online_api is not None and len(self.columns_for_online_api) > 0:
-            for column in self.columns_for_online_api:
-                if column not in validated_X.columns:
-                    raise ValidationError(self.bundle.get("missing_column_for_online_api").format(column))
-
         if self.id_columns is not None:
             for id_column in self.id_columns:
                 if id_column not in validated_X.columns:
@@ -3726,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)
@@ -3737,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/metadata.py

@@ -89,7 +89,7 @@ class SearchKey(Enum):
         if meaning_type == FileColumnMeaningType.EMAIL:
             return SearchKey.EMAIL
         if meaning_type == FileColumnMeaningType.HEM:
-            return SearchKey.HEM
+            return SearchKey.HEM  # TODO check that it wasn't EMAIL
         if meaning_type == FileColumnMeaningType.IP_ADDRESS:
             return SearchKey.IP
         if meaning_type == FileColumnMeaningType.MSISDN:
@@ -105,27 +105,27 @@ class SearchKey(Enum):
         if meaning_type == FileColumnMeaningType.POSTAL_CODE:
             return SearchKey.POSTAL_CODE
         if meaning_type == FileColumnMeaningType.IPV6_ADDRESS:
-            return SearchKey.IPV6_ADDRESS
-        if meaning_type == FileColumnMeaningType.IPV6_RANGE_FROM:
-            return SearchKey.IPV6_RANGE_FROM
-        if meaning_type == FileColumnMeaningType.IPV6_RANGE_TO:
-            return SearchKey.IPV6_RANGE_TO
-        if meaning_type == FileColumnMeaningType.EMAIL_ONE_DOMAIN:
-            return SearchKey.EMAIL_ONE_DOMAIN
-        if meaning_type == FileColumnMeaningType.IP_RANGE_FROM:
-            return SearchKey.IP_RANGE_FROM
-        if meaning_type == FileColumnMeaningType.IP_RANGE_TO:
-            return SearchKey.IP_RANGE_TO
-        if meaning_type == FileColumnMeaningType.MSISDN_RANGE_FROM:
-            return SearchKey.MSISDN_RANGE_FROM
-        if meaning_type == FileColumnMeaningType.MSISDN_RANGE_TO:
-            return SearchKey.MSISDN_RANGE_TO
+            return SearchKey.IP
+        # if meaning_type == FileColumnMeaningType.IPV6_RANGE_FROM:
+        #     return SearchKey.IPV6_RANGE_FROM
+        # if meaning_type == FileColumnMeaningType.IPV6_RANGE_TO:
+        #     return SearchKey.IPV6_RANGE_TO
+        # if meaning_type == FileColumnMeaningType.EMAIL_ONE_DOMAIN:
+        #     return SearchKey.EMAIL_ONE_DOMAIN
+        # if meaning_type == FileColumnMeaningType.IP_RANGE_FROM:
+        #     return SearchKey.IP_RANGE_FROM
+        # if meaning_type == FileColumnMeaningType.IP_RANGE_TO:
+        #     return SearchKey.IP_RANGE_TO
+        # if meaning_type == FileColumnMeaningType.MSISDN_RANGE_FROM:
+        #     return SearchKey.MSISDN_RANGE_FROM
+        # if meaning_type == FileColumnMeaningType.MSISDN_RANGE_TO:
+        #     return SearchKey.MSISDN_RANGE_TO
         if meaning_type == FileColumnMeaningType.IP_BINARY:
-            return SearchKey.IP_BINARY
-        if meaning_type == FileColumnMeaningType.IP_RANGE_FROM_BINARY:
-            return SearchKey.IP_RANGE_FROM_BINARY
-        if meaning_type == FileColumnMeaningType.IP_RANGE_TO_BINARY:
-            return SearchKey.IP_RANGE_TO_BINARY
+            return SearchKey.IP
+        # if meaning_type == FileColumnMeaningType.IP_RANGE_FROM_BINARY:
+        #     return SearchKey.IP_RANGE_FROM_BINARY
+        # if meaning_type == FileColumnMeaningType.IP_RANGE_TO_BINARY:
+        #     return SearchKey.IP_RANGE_TO_BINARY
 
     @staticmethod
     def find_key(search_keys: Dict[str, SearchKey], keys: Union[SearchKey, List[SearchKey]]) -> Optional[SearchKey]:
@@ -249,7 +249,9 @@ class FileMetadata(BaseModel):
             for key in keys_group:
                 column = self.column_by_name(key)
                 if column:
-                    search_keys[SearchKey.from_meaning_type(column.meaningType)] = column.name
+                    search_key = SearchKey.from_meaning_type(column.meaningType)
+                    if search_key is not None:
+                        search_keys[search_key] = column.name
         return search_keys
 
 

upgini/resource_bundle/strings.properties

@@ -111,7 +111,6 @@ x_is_empty=X is empty
 y_is_empty=y is empty
 x_contains_reserved_column_name=Column name {} is reserved. Please rename column and try again
 missing_generate_feature=Feature {} specified in `generate_features` is not present in input columns: {}
-missing_column_for_online_api=Column {} specified in `columns_for_online_api` is not present in input columns: {}
 x_unstable_by_date=Your training sample is unstable in number of rows per date. It is recommended to redesign the training sample
 train_unstable_target=Your training sample contains an unstable target event, PSI = {}. This will lead to unstable scoring on deferred samples. It is recommended to redesign the training sample
 eval_unstable_target=Your training and evaluation samples have a difference in target distribution. PSI = {}. The results will be unstable. It is recommended to redesign the training and evaluation samples

upgini/utils/email_utils.py

@@ -116,17 +116,17 @@ class EmailSearchKeyConverter:
         else:
             df[self.hem_column] = df[self.hem_column].astype("string").str.lower()
 
-        # del self.search_keys[self.email_column]
-        # if self.email_column in self.unnest_search_keys:
-        #     self.unnest_search_keys.remove(self.email_column)
+        del self.search_keys[self.email_column]
+        if self.email_column in self.unnest_search_keys:
+            self.unnest_search_keys.remove(self.email_column)
 
         one_domain_name = self.email_column + self.ONE_DOMAIN_SUFFIX
         df[one_domain_name] = df[self.email_column].apply(self._email_to_one_domain)
         self.columns_renaming[one_domain_name] = original_email_column
         self.search_keys[one_domain_name] = SearchKey.EMAIL_ONE_DOMAIN
 
-        # if self.email_converted_to_hem:
-        #     df = df.drop(columns=self.email_column)
-        #     del self.columns_renaming[self.email_column]
+        if self.email_converted_to_hem:
+            df = df.drop(columns=self.email_column)
+            del self.columns_renaming[self.email_column]
 
         return df

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

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

@@ -1,12 +1,12 @@
-upgini/__about__.py,sha256=86s5f_R4jUHavxr1KulObYZALbZX82z6GRJ0aiY88oY,25
+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=NP5vHqEfZQ1HWz3TcNAa_OhXG8wiMRdydm26D6UBiRU,34166
+upgini/dataset.py,sha256=vT4JyHmafLNbj54SySXr93f5hNS6-t94aFslbBy-7No,33535
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=ZYBLKxkFZB-b94-7oiAqZ0b4sbA1wXKClfkxVU529e0,200957
+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=-bulW4ay0qxOxR4_5oDvENtgKiZgZI-QnU2stGHrKhg,12130
+upgini/metadata.py,sha256=Jh6YTaS00m_nbaOY_owvlSyn9zgkErkqu8iTr9ZjKI8,12279
 upgini/metrics.py,sha256=hr7UwLphbZ_FEglLuO2lzr_pFgxOJ4c3WBeg7H-fNqY,35521
 upgini/search_task.py,sha256=qxUxAD-bed-FpZYmTB_4orW7YJsW_O6a1TcgnZIRFr4,17307
 upgini/spinner.py,sha256=4iMd-eIe_BnkqFEMIliULTbj6rNI2HkN_VJ4qYe0cUc,1118
@@ -30,7 +30,7 @@ upgini/normalizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 upgini/normalizer/normalize_utils.py,sha256=Ft2MwSgVoBilXAORAOYAuwPD79GOLfwn4qQE3IUFzzg,7218
 upgini/resource_bundle/__init__.py,sha256=S5F2G47pnJd2LDpmFsjDqEwiKkP8Hm-hcseDbMka6Ko,8345
 upgini/resource_bundle/exceptions.py,sha256=5fRvx0_vWdE1-7HcSgF0tckB4A9AKyf5RiinZkInTsI,621
-upgini/resource_bundle/strings.properties,sha256=UXMiaFP3p-WdiXyZJN3O_OZstb-F33BWVDxDiofyxd4,27464
+upgini/resource_bundle/strings.properties,sha256=0_KAExIi1u48N1CQ13LKJS3bgDlRs-MPOyU3VxcE-qY,27350
 upgini/resource_bundle/strings_widget.properties,sha256=gOdqvZWntP2LCza_tyVk1_yRYcG4c04K9sQOAVhF_gw,1577
 upgini/sampler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upgini/sampler/base.py,sha256=7GpjYqjOp58vYcJLiX__1R5wjUlyQbxvHJ2klFnup_M,6389
@@ -46,7 +46,7 @@ upgini/utils/cv_utils.py,sha256=w6FQb9nO8BWDx88EF83NpjPLarK4eR4ia0Wg0kLBJC4,3525
 upgini/utils/datetime_utils.py,sha256=RVAk4_rakK8X9zjybK3-rj0to0e3elye8tnBuA4wTWU,13491
 upgini/utils/deduplicate_utils.py,sha256=SMZx9IKIhWI5HqXepfKiQb3uDJrogQZtG6jcWuMo5Z4,8855
 upgini/utils/display_utils.py,sha256=DsBjJ8jEYAh8BPgfAbzq5imoGFV6IACP20PQ78BQCX0,11964
-upgini/utils/email_utils.py,sha256=pZ2vCfNxLIPUhxr0-OlABNXm12jjU44isBk8kGmqQzA,5277
+upgini/utils/email_utils.py,sha256=GbnhHJn1nhUBytmK6PophYqaoq4t7Lp6i0-O0Gd3RV8,5265
 upgini/utils/fallback_progress_bar.py,sha256=PDaKb8dYpVZaWMroNcOHsTc3pSjgi9mOm0--cOFTwJ0,1074
 upgini/utils/feature_info.py,sha256=0rOXSyCj-sw-8migWP0ge8qrOzGU50dQvH0JUJUrDfQ,6766
 upgini/utils/features_validator.py,sha256=lEfmk4DoxZ4ooOE1HC0ZXtUb_lFKRFHIrnFULZ4_rL8,3746
@@ -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.55a1.dist-info/METADATA,sha256=uESME_SjmqafjB1XBhRSZWYFrv4rPx5F1pKSxEKKsNs,49057
-upgini-1.2.55a1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-upgini-1.2.55a1.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.55a1.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,,