upgini 1.1.131a3__py3-none-any.whl → 1.1.132__py3-none-any.whl

upgini/features_enricher.py

@@ -63,7 +63,7 @@ from upgini.version_validator import validate_version
 DEMO_DATASET_HASHES = [
     "7c354d1b1794c53ac7d7e5a2f2574568b660ca9159bc0d2aca9c7127ebcea2f7",  # demo_salary fit
     "2519c9077c559f8975fdcdb5c50e9daae8d50b1d8a3ec72296c65ea7276f8812",  # demo_salary transform
-    ]
+]
 
 
 class FeaturesEnricher(TransformerMixin):
@@ -139,15 +139,16 @@ class FeaturesEnricher(TransformerMixin):
         raise_validation_error: bool = False,
         **kwargs,
     ):
-        self.api_key = api_key or os.environ.get(UPGINI_API_KEY)
+        self._api_key = api_key or os.environ.get(UPGINI_API_KEY)
         try:
-            self.rest_client = get_rest_client(endpoint, self.api_key)
+            self.rest_client = get_rest_client(endpoint, self._api_key)
         except UpginiConnectionError as e:
             print(e)
             return
 
+        self.logs_enabled = logs_enabled
         if logs_enabled:
-            self.logger = LoggerFactory().get_logger(endpoint, self.api_key)
+            self.logger = LoggerFactory().get_logger(endpoint, self._api_key)
         else:
             self.logger = logging.getLogger()
             self.logger.setLevel("FATAL")
@@ -174,7 +175,7 @@ class FeaturesEnricher(TransformerMixin):
             search_task = SearchTask(
                 search_id,
                 endpoint=self.endpoint,
-                api_key=self.api_key,
+                api_key=self._api_key,
             )
 
             print(bundle.get("search_by_task_id_start"))
@@ -235,6 +236,16 @@ class FeaturesEnricher(TransformerMixin):
         self.__cached_sampled_datasets: Optional[Tuple[pd.DataFrame, pd.DataFrame, pd.Series, Dict, Dict]] = None
         self.raise_validation_error = raise_validation_error
 
+    def _get_api_key(self):
+        return self._api_key
+
+    def _set_api_key(self, api_key: str):
+        self._api_key = api_key
+        if self.logs_enabled:
+            self.logger = LoggerFactory().get_logger(self.endpoint, self._api_key)
+
+    api_key = property(_get_api_key, _set_api_key)
+
     def fit(
         self,
         X: Union[pd.DataFrame, pd.Series, np.ndarray],
@@ -579,13 +590,14 @@ class FeaturesEnricher(TransformerMixin):
             finally:
                 self.logger.info(f"Transform elapsed time: {time.time() - start_time}")
 
-            if self.country_added:
-                result = drop_existing_columns(result, COUNTRY)
+            if result is not None:
+                if self.country_added:
+                    result = drop_existing_columns(result, COUNTRY)
 
-            if keep_input:
-                return result
-            else:
-                return drop_existing_columns(result, X.columns)
+                if keep_input:
+                    return result
+                else:
+                    return drop_existing_columns(result, X.columns)
 
     def calculate_metrics(
         self,
@@ -912,13 +924,21 @@ class FeaturesEnricher(TransformerMixin):
     def _has_features_with_commercial_schema(
         self, commercial_schema: str, exclude_features_sources: Optional[List[str]]
     ) -> bool:
+        return len(self._get_features_with_commercial_schema(commercial_schema, exclude_features_sources)) > 0
+
+    def _get_features_with_commercial_schema(
+        self, commercial_schema: str, exclude_features_sources: Optional[List[str]]
+    ) -> List[str]:
         if exclude_features_sources:
             filtered_features_info = self.features_info[
                 ~self.features_info[bundle.get("features_info_name")].isin(exclude_features_sources)
             ]
         else:
             filtered_features_info = self.features_info
-        return (filtered_features_info[bundle.get("features_info_commercial_schema")] == commercial_schema).any()
+        return list(filtered_features_info.loc[
+            filtered_features_info[bundle.get("features_info_commercial_schema")] == commercial_schema,
+            bundle.get("features_info_name"),
+        ].values)
 
     def _has_trial_features(self, exclude_features_sources: Optional[List[str]]) -> bool:
         return self._has_features_with_commercial_schema(CommercialSchema.TRIAL.value, exclude_features_sources)
@@ -1248,7 +1268,6 @@ class FeaturesEnricher(TransformerMixin):
                 msg = bundle.get("transform_with_trial_features")
                 self.logger.warn(msg)
                 print(msg)
-                return None
 
             columns_to_drop = [c for c in validated_X.columns if c in self.feature_names_]
             if len(columns_to_drop) > 0:
@@ -1313,7 +1332,9 @@ class FeaturesEnricher(TransformerMixin):
 
             columns_for_system_record_id = sorted(list(search_keys.keys()) + (original_features_for_transform or []))
 
-            df[SYSTEM_RECORD_ID] = pd.util.hash_pandas_object(df[columns_for_system_record_id], index=False)
+            df[SYSTEM_RECORD_ID] = pd.util.hash_pandas_object(df[columns_for_system_record_id], index=False).astype(
+                "Float64"
+            )
             meaning_types[SYSTEM_RECORD_ID] = FileColumnMeaningType.SYSTEM_RECORD_ID
 
             df = df.reset_index(drop=True)
@@ -1488,10 +1509,11 @@ class FeaturesEnricher(TransformerMixin):
             else None
         )
         is_demo_dataset = hash_input(validated_X, validated_y, validated_eval_set) in DEMO_DATASET_HASHES
-        if (is_demo_dataset):
+        if is_demo_dataset:
             msg = bundle.get("demo_dataset_info")
             self.logger.info(msg)
-            print(msg)
+            if not self.__is_registered:
+                print(msg)
 
         if self.generate_features is not None and len(self.generate_features) > 0:
             x_columns = list(validated_X.columns)

upgini/http.py

@@ -11,8 +11,8 @@ from http.client import HTTPConnection
 from json import dumps
 from typing import Dict, List, Optional
 from urllib.parse import urljoin
-import pandas as pd
 
+import pandas as pd
 import requests
 from pydantic import BaseModel
 from pythonjsonlogger import jsonlogger
@@ -32,7 +32,7 @@ from upgini.metadata import (
     SearchCustomization,
 )
 from upgini.resource_bundle import bundle
-from upgini.utils.track_info import get_track_metrics
+from upgini.utils.track_info import get_track_metrics_with_timeout
 
 try:
     from importlib_metadata import version
@@ -49,6 +49,7 @@ except ImportError:
 UPGINI_URL: str = "UPGINI_URL"
 UPGINI_API_KEY: str = "UPGINI_API_KEY"
 DEMO_API_KEY: str = "Aa4BPwGFbn1zNEXIkZ-NbhsRk0ricN6puKuga1-O5lM"
+TRACK_METRICS_TIMEOUT_SECONDS: int = 10
 
 refresh_token_lock = threading.Lock()
 
@@ -374,7 +375,11 @@ class _RestClient:
                         search_customization.json(exclude_none=True).encode(),
                         "application/json",
                     )
-                files["tracking"] = ("tracking.json", dumps(get_track_metrics()).encode(), "application/json")
+                files["tracking"] = (
+                    "tracking.json",
+                    dumps(get_track_metrics_with_timeout(TRACK_METRICS_TIMEOUT_SECONDS)).encode(),
+                    "application/json",
+                )
                 additional_headers = {self.SEARCH_KEYS_HEADER_NAME: ",".join(self.search_keys_meaning_types(metadata))}
 
                 return self._send_post_file_req_v2(
@@ -433,7 +438,6 @@ class _RestClient:
                 digest = md5_hash.hexdigest()
                 metadata_with_md5 = metadata.copy(update={"checksumMD5": digest})
 
-            import pandas as pd
             digest_sha256 = hashlib.sha256(pd.util.hash_pandas_object(pd.read_parquet(file_path)).values).hexdigest()
             metadata_with_md5 = metadata_with_md5.copy(update={"digest": digest_sha256})
 
@@ -453,7 +457,11 @@ class _RestClient:
                         search_customization.json(exclude_none=True).encode(),
                         "application/json",
                     )
-                files["tracking"] = ("ide", dumps(get_track_metrics()).encode(), "application/json")
+                files["tracking"] = (
+                    "ide",
+                    dumps(get_track_metrics_with_timeout(TRACK_METRICS_TIMEOUT_SECONDS)).encode(),
+                    "application/json",
+                )
 
                 additional_headers = {self.SEARCH_KEYS_HEADER_NAME: ",".join(self.search_keys_meaning_types(metadata))}
 
@@ -787,16 +795,20 @@ class BackendLogHandler(logging.Handler):
     def __init__(self, rest_client: _RestClient, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.rest_client = rest_client
-        if "ip" in get_track_metrics().keys():
-            self.hostname = get_track_metrics()["ip"]
-        else:
-            self.hostname = "0.0.0.0"
+        self.track_metrics = None
+        self.hostname = None
 
     def emit(self, record: logging.LogRecord) -> None:
         def task():
             try:
+                if self.track_metrics is None:
+                    self.track_metrics = get_track_metrics_with_timeout(TRACK_METRICS_TIMEOUT_SECONDS)
+                    if "ip" in self.track_metrics.keys():
+                        self.hostname = self.track_metrics["ip"]
+                    else:
+                        self.hostname = "0.0.0.0"
                 text = self.format(record)
-                tags = get_track_metrics()
+                tags = self.track_metrics
                 tags["version"] = __version__
                 self.rest_client.send_log_event(
                     LogEvent(

upgini/resource_bundle/strings.properties

@@ -25,7 +25,8 @@ metrics_no_important_free_features=WARNING: No important free features to calcul
 metrics_no_important_features=WARNING: No important features to calculate metrics
 metrics_negative_uplift_without_cv=Please re-check that your task is not a time series prediction. If so, restart search with cv=CVType.time_series param for correct search results. See docs https://github.com/upgini/upgini#-time-series-prediction-support
 metrics_with_trial_features=The calculation of final accuracy metrics using Trial data is not available for unauthorized users.\nGet a free API key on https://upgini.com and repeat your request.
-transform_with_trial_features=Enriching with Trial data is not available for unauthorized users.\nGet a free API key on https://upgini.com and repeat your request.
+transform_with_trial_features=WARNING: Your search results contain Trial data sources. To enrich your dataframe using transform or fit_transform with features from these Trial data sources, please register for a Free API key at https://upgini.com and resubmit your request.
+# Enriching with Trial data is not available for unauthorized users.\nGet a free API key on https://upgini.com and repeat your request.
 metrics_with_paid_features=The calculation of final accuracy metrics using Paid data is not available.\nContact Upgini support for the data access
 transform_with_paid_features=Enriching with Paid data is not available.\nContact Upgini support for the data access
 trial_quota_limit_riched=WARNING: You have reached the quota limit of trial data usage. Please contact Upgini support to remove restriction

upgini/search_task.py

@@ -59,8 +59,8 @@ class SearchTask:
         submitted_statuses = {"SUBMITTED", "VALIDATION_SUBMITTED"}
         if not quiet:
             print(bundle.get("polling_search_task").format(self.search_task_id))
-        if is_demo_api_key(self.api_key):
-            print(bundle.get("polling_unregister_information"))
+            if is_demo_api_key(self.api_key):
+                print(bundle.get("polling_unregister_information"))
         search_task_id = self.initial_search_task_id if self.initial_search_task_id is not None else self.search_task_id
 
         try:

upgini/utils/track_info.py

@@ -6,6 +6,7 @@ from functools import lru_cache
 from getpass import getuser
 from hashlib import sha256
 from uuid import getnode
+from concurrent import futures
 
 from requests import get, post
 
@@ -45,6 +46,17 @@ def _get_execution_ide() -> str:
         return "other"
 
 
+def get_track_metrics_with_timeout(timeout_seconds: int = 10) -> dict:
+    with futures.ThreadPoolExecutor() as executor:
+        future = executor.submit(get_track_metrics)
+        try:
+            result = future.result(timeout_seconds)
+            return result
+        except futures.TimeoutError:
+            future.cancel()
+            return dict()
+
+
 @lru_cache()
 def get_track_metrics() -> dict:
     # default values

{upgini-1.1.131a3.dist-info → upgini-1.1.132.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: upgini
-Version: 1.1.131a3
+Version: 1.1.132
 Summary: Intelligent data search & enrichment for Machine Learning
 Home-page: https://upgini.com/
 Author: Upgini Developers
@@ -33,7 +33,7 @@ Requires-Dist: pandas (<2.0.0,>=1.1.0)
 Requires-Dist: numpy (>=1.19.0)
 Requires-Dist: scikit-learn (>=1.0.1)
 Requires-Dist: pydantic (>=1.8.2)
-Requires-Dist: fastparquet (>=0.7.1)
+Requires-Dist: fastparquet (>=0.8.1)
 Requires-Dist: python-json-logger (>=2.0.2)
 Requires-Dist: catboost (>=1.0.3)
 Requires-Dist: lightgbm (>=3.3.2)

{upgini-1.1.131a3.dist-info → upgini-1.1.132.dist-info}/RECORD

@@ -2,11 +2,11 @@ upgini/__init__.py,sha256=asENHgEVHQBIkV-e_0IhE_ZWqkCG6398U3ZLrNzAH6k,407
 upgini/ads.py,sha256=mre6xn44wcC_fg63iLT_kTh4mViZqR9AKRJZAtpQz8Y,2592
 upgini/dataset.py,sha256=uiba8qC2RNvqka5MQp-XgdYDE7-nqO5FojMO5a0n_HA,42978
 upgini/errors.py,sha256=BqpvfhW2jJW5fa5KXj0alhXatGl-WK4xTl309-QNLp8,959
-upgini/features_enricher.py,sha256=QzNnU2Do5hHzvUA9HUVrSV3gPLtTL659HTiFLI0mfrA,117921
-upgini/http.py,sha256=Hq0rtEO2qN-IVYDPSyo7WJJ7gxjgF_z4dKIQzFOXOZg,35947
+upgini/features_enricher.py,sha256=iV9OHy8QFQdB5uUX6S2RuI28WBZFNkR5LZwRrhuB8Oo,118746
+upgini/http.py,sha256=164ysTRGZ2hRtsFTjl4vBsyaz0iS75jiF7BYGFk2MVc,36468
 upgini/metadata.py,sha256=Oefg-rkA4PsZUHIho_clZcnyZwdtVJ1gXPvEY6oBmpg,5969
 upgini/metrics.py,sha256=5tQ_6ZKUM0EBLnHmKZD63KHCQXTYGeE-uFLs0wHcYf4,15477
-upgini/search_task.py,sha256=4SbJhEqCUrntf-JrEsM4R_y3vebNEsJ5JXBeS7Y1K38,13589
+upgini/search_task.py,sha256=cM-3cAcdnKHrCl7ZTqhHLrSkDVpdgowV5YBaFq2BzjY,13597
 upgini/spinner.py,sha256=yhakBaydMNS8E8TRAwTdCMdnWrHeWT0cR1M8c9hP6jA,1157
 upgini/version_validator.py,sha256=rDIncP6BEko4J2F2hUcMOtKm_vZbI4ICWcNcw8hrwM4,1400
 upgini/ads_management/__init__.py,sha256=qzyisOToVRP-tquAJD1PblZhNtMrOB8FiyF9JvfkvgE,50
@@ -19,7 +19,7 @@ upgini/normalizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 upgini/normalizer/phone_normalizer.py,sha256=VIgLXuDuzzjPEXiy_LyDVLZKGaS7-le6Fh6T4D-TQDU,9930
 upgini/resource_bundle/__init__.py,sha256=M7GtS7KPQw9pinz8P2aQWXpSkD2YFwUPVGk1w92Pn84,7888
 upgini/resource_bundle/exceptions.py,sha256=KT-OnqA2J4OTfLjhbEl3KFZM2ci7EOPjqJuY_rXp3vs,622
-upgini/resource_bundle/strings.properties,sha256=pOQuq5RFEYqsB1edeMnQCwlogRH7E0fMIQg8vH6bhqo,20891
+upgini/resource_bundle/strings.properties,sha256=X0-yWoK3uAMZdlXk3IhGOgqqa5XC4YnElK-olp0sbRM,21137
 upgini/sampler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upgini/sampler/base.py,sha256=X2PVsfZ3Rl7twpFDh5UWyxqY2K_jcMGxZ2NcHLwFRj4,6489
 upgini/sampler/random_under_sampler.py,sha256=whX_f_TtalHH8Seyn_7n3sX_TSiDHeYfALmme9saqDg,4082
@@ -37,10 +37,10 @@ upgini/utils/format.py,sha256=Yv5cvvSs2bOLUzzNu96Pu33VMDNbabio92QepUj41jU,243
 upgini/utils/phone_utils.py,sha256=JNSkF8G6mgsN8Czy11pamaJdsY6rBINEMpi7jbVt_RA,408
 upgini/utils/postal_code_utils.py,sha256=_8CR9tBqsPptQsmMUvnrCAmBaMIQSWH3JfJ4ly3x_zs,409
 upgini/utils/target_utils.py,sha256=3eHrDy_Dc9ozuOwHGnGA705m9glCxKmjB-DfLrflqiA,1370
-upgini/utils/track_info.py,sha256=O_oL4gy1jH0DVgtiUeZAW0YKCeRT4B_bzH_SZYkFaOE,4076
+upgini/utils/track_info.py,sha256=dfDwLdQX7aY0eRT1izsMpeEiN0bYx_2YH7O69AoVhlU,4465
 upgini/utils/warning_counter.py,sha256=vnmdFo5-7GBkU2bK9h_uC0K0Y_wtfcYstxOdeRfacO0,228
-upgini-1.1.131a3.dist-info/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.1.131a3.dist-info/METADATA,sha256=VifR-A7emG26-mWmz35BrxZyUYZsS_LiCAvdnspo7ZA,43229
-upgini-1.1.131a3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-upgini-1.1.131a3.dist-info/top_level.txt,sha256=OFhTGiDIWKl5gFI49qvWq1R9IKflPaE2PekcbDXDtx4,7
-upgini-1.1.131a3.dist-info/RECORD,,
+upgini-1.1.132.dist-info/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.1.132.dist-info/METADATA,sha256=sUIjt9bSFBtawDxGqez0g6UUJmfFXMHgnQd4W8x08IY,43227
+upgini-1.1.132.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+upgini-1.1.132.dist-info/top_level.txt,sha256=OFhTGiDIWKl5gFI49qvWq1R9IKflPaE2PekcbDXDtx4,7
+upgini-1.1.132.dist-info/RECORD,,