upgini 1.1.203a1__py3-none-any.whl → 1.1.205__py3-none-any.whl

upgini/dataset.py

@@ -80,6 +80,7 @@ class Dataset:  # (pd.DataFrame):
         endpoint: Optional[str] = None,
         api_key: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
+        client_ip: Optional[str] = None,
         warning_counter: Optional[WarningCounter] = None,
         **kwargs,
     ):
@@ -123,6 +124,7 @@ class Dataset:  # (pd.DataFrame):
         else:
             self.logger = logging.getLogger()
             self.logger.setLevel("FATAL")
+        self.client_ip = client_ip
         self.warning_counter = warning_counter or WarningCounter()
 
     def __len__(self):
@@ -961,6 +963,7 @@ class Dataset:  # (pd.DataFrame):
             task_type=self.task_type,
             endpoint=self.endpoint,
             api_key=self.api_key,
+            client_ip=self.client_ip,
         )
 
     def validation(
@@ -1030,6 +1033,7 @@ class Dataset:  # (pd.DataFrame):
             initial_search_task_id=initial_search_task_id,
             endpoint=self.endpoint,
             api_key=self.api_key,
+            client_ip=self.client_ip,
         )
 
     def prepare_uploading_file(self, base_path: str) -> str:

upgini/features_enricher.py

@@ -168,16 +168,18 @@ class FeaturesEnricher(TransformerMixin):
         logs_enabled: bool = True,
         raise_validation_error: bool = True,
         exclude_columns: Optional[List[str]] = None,
+        client_ip: Optional[str] = None,
         **kwargs,
     ):
         self._api_key = api_key or os.environ.get(UPGINI_API_KEY)
         if api_key is not None and not isinstance(api_key, str):
             raise ValidationError(f"api_key should be `string`, but passed: `{api_key}`")
         self.rest_client = get_rest_client(endpoint, self._api_key)
+        self.client_ip = client_ip
 
         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, client_ip)
         else:
             self.logger = logging.getLogger()
             self.logger.setLevel("FATAL")
@@ -222,6 +224,7 @@ class FeaturesEnricher(TransformerMixin):
                 search_id,
                 endpoint=self.endpoint,
                 api_key=self._api_key,
+                client_ip=client_ip
             )
 
             print(bundle.get("search_by_task_id_start"))
@@ -281,7 +284,7 @@ class FeaturesEnricher(TransformerMixin):
     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)
+            self.logger = LoggerFactory().get_logger(self.endpoint, self._api_key, self.client_ip)
 
     api_key = property(_get_api_key, _set_api_key)
 
@@ -1584,6 +1587,7 @@ class FeaturesEnricher(TransformerMixin):
                 api_key=self.api_key,  # type: ignore
                 date_format=self.date_format,  # type: ignore
                 logger=self.logger,
+                client_ip=self.client_ip
             )
             dataset.meaning_types = meaning_types
             dataset.search_keys = combined_search_keys
@@ -1917,6 +1921,7 @@ class FeaturesEnricher(TransformerMixin):
             date_format=self.date_format,  # type: ignore
             random_state=self.random_state,  # type: ignore
             logger=self.logger,
+            client_ip=self.client_ip,
         )
         dataset.meaning_types = meaning_types
         dataset.search_keys = combined_search_keys

upgini/http.py

@@ -1,4 +1,6 @@
 import base64
+import copy
+import datetime
 import hashlib
 import logging
 import os
@@ -12,8 +14,6 @@ from http.client import HTTPConnection
 from json import dumps
 from typing import Any, Dict, List, Optional, Tuple
 from urllib.parse import urljoin
-import datetime
-import copy
 
 import jwt
 import pandas as pd
@@ -882,17 +882,18 @@ def _get_rest_client(backend_url: str, api_token: str) -> _RestClient:
 
 
 class BackendLogHandler(logging.Handler):
-    def __init__(self, rest_client: _RestClient, *args, **kwargs) -> None:
+    def __init__(self, rest_client: _RestClient, client_ip: Optional[str] = None, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.rest_client = rest_client
         self.track_metrics = None
         self.hostname = "0.0.0.0"
+        self.client_ip = client_ip
 
     def emit(self, record: logging.LogRecord) -> None:
         def task():
             try:
                 if self.track_metrics is None or len(self.track_metrics) == 0:
-                    self.track_metrics = get_track_metrics()
+                    self.track_metrics = get_track_metrics(self.client_ip)
                     self.hostname = self.track_metrics.get("ip") or "0.0.0.0"
                 text = self.format(record)
                 tags = self.track_metrics
@@ -933,7 +934,9 @@ class LoggerFactory:
         root.setLevel(logging.INFO)
         root.handlers.clear()
 
-    def get_logger(self, backend_url: Optional[str] = None, api_token: Optional[str] = None) -> logging.Logger:
+    def get_logger(
+        self, backend_url: Optional[str] = None, api_token: Optional[str] = None, client_ip: Optional[str] = None
+    ) -> logging.Logger:
         url = _resolve_backend_url(backend_url)
         token = resolve_api_token(api_token)
         key = url + token
@@ -944,7 +947,7 @@ class LoggerFactory:
         upgini_logger = logging.getLogger(f"upgini.{hash(key)}")
         upgini_logger.handlers.clear()
         rest_client = get_rest_client(backend_url, api_token)
-        datadog_handler = BackendLogHandler(rest_client)
+        datadog_handler = BackendLogHandler(rest_client, client_ip)
         json_formatter = jsonlogger.JsonFormatter(
             "%(asctime)s %(threadName)s %(name)s %(levelname)s %(message)s",
             timestamp=True,

upgini/search_task.py

@@ -42,6 +42,7 @@ class SearchTask:
         task_type: Optional[ModelTaskType] = None,
         endpoint: Optional[str] = None,
         api_key: Optional[str] = None,
+        client_ip: Optional[str] = None,
     ):
         self.search_task_id = search_task_id
         self.initial_search_task_id = initial_search_task_id
@@ -53,7 +54,7 @@ class SearchTask:
         self.summary = None
         self.endpoint = endpoint
         self.api_key = api_key
-        self.logger = LoggerFactory().get_logger(endpoint, api_key)
+        self.logger = LoggerFactory().get_logger(endpoint, api_key, client_ip)
         self.provider_metadata_v2: Optional[List[ProviderTaskMetadataV2]] = None
         self.unused_features_for_generation: Optional[List[str]] = None
 

upgini/utils/display_utils.py

@@ -135,9 +135,10 @@ def make_html_report(
 ):
     relevant_datasources_df = relevant_datasources_df.copy()
     relevant_datasources_df["action"] = (
-        f"""<a href="https://upgini.com/requet-a-quote?search-id={search_id}"><button>Request a quote</button></a>"""
+        f"""<a href="https://upgini.com/requet-a-quote?search-id={search_id}">"""
+        """<button type="button">Request a quote</button></a>"""
     )
-    relevant_datasources_df.rename(columns={"action": ""})
+    relevant_datasources_df.rename(columns={"action": "&nbsp;"}, inplace=True)
     return f"""<html>
         <head>
             <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

upgini/utils/track_info.py

@@ -5,6 +5,7 @@ import socket
 import sys
 from getpass import getuser
 from hashlib import sha256
+from typing import Optional
 from uuid import getnode
 
 from requests import get, post
@@ -46,7 +47,7 @@ def _get_execution_ide() -> str:
 
 
 @lru_cache()
-def get_track_metrics() -> dict:
+def get_track_metrics(client_ip: Optional[str]) -> dict:
     # default values
     track = {"ide": _get_execution_ide()}
     ident_res = "https://api.ipify.org"
@@ -93,28 +94,34 @@ def get_track_metrics() -> dict:
         except Exception as e:
             track["err"] = str(e)
             track["visitorId"] = "None"
-        try:
-            from google.colab import output  # type: ignore
-            from IPython.display import Javascript, display
-
-            display(
-                Javascript(
-                    f"""
-                        window.clientIP = fetch("{ident_res}")
-                            .then(response => response.text())
-                            .then(data => data);
-                    """
+        if client_ip:
+            track["ip"] = client_ip
+        else:
+            try:
+                from google.colab import output  # type: ignore
+                from IPython.display import Javascript, display
+
+                display(
+                    Javascript(
+                        f"""
+                            window.clientIP = fetch("{ident_res}")
+                                .then(response => response.text())
+                                .then(data => data);
+                        """
+                    )
                 )
-            )
-            track["ip"] = output.eval_js("window.clientIP", timeout_sec=10)
-        except Exception as e:
-            track["err"] = str(e)
-            track["ip"] = "0.0.0.0"
+                track["ip"] = output.eval_js("window.clientIP", timeout_sec=10)
+            except Exception as e:
+                track["err"] = str(e)
+                track["ip"] = "0.0.0.0"
 
     elif track["ide"] == "binder":
         try:
             if "CLIENT_IP" in os.environ.keys():
-                track["ip"] = os.environ["CLIENT_IP"]
+                if client_ip:
+                    track["ip"] = client_ip
+                else:
+                    track["ip"] = os.environ["CLIENT_IP"]
                 track["visitorId"] = sha256(os.environ["CLIENT_IP"].encode()).hexdigest()
         except Exception as e:
             track["err"] = str(e)
@@ -142,7 +149,10 @@ def get_track_metrics() -> dict:
             track["visitorId"] = "None"
     else:
         try:
-            track["ip"] = get(ident_res, timeout=10).text
+            if client_ip:
+                track["ip"] = client_ip
+            else:
+                track["ip"] = get(ident_res, timeout=10).text
             track["visitorId"] = sha256(str(getnode()).encode()).hexdigest()
         except Exception as e:
             track["err"] = str(e)

{upgini-1.1.203a1.dist-info → upgini-1.1.205.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: upgini
-Version: 1.1.203a1
+Version: 1.1.205
 Summary: Intelligent data search & enrichment for Machine Learning
 Home-page: https://upgini.com/
 Author: Upgini Developers

{upgini-1.1.203a1.dist-info → upgini-1.1.205.dist-info}/RECORD

@@ -1,13 +1,13 @@
 upgini/__init__.py,sha256=asENHgEVHQBIkV-e_0IhE_ZWqkCG6398U3ZLrNzAH6k,407
 upgini/ads.py,sha256=mre6xn44wcC_fg63iLT_kTh4mViZqR9AKRJZAtpQz8Y,2592
-upgini/dataset.py,sha256=8fu_B7s75WCB1CJBh_UQWVtOxVznnwLYAHe63-hLf3w,47350
+upgini/dataset.py,sha256=e5PX-NICeUUUrHJwEMpndYkNvWwbf-KE8USUd1rleSc,47502
 upgini/errors.py,sha256=BqpvfhW2jJW5fa5KXj0alhXatGl-WK4xTl309-QNLp8,959
-upgini/features_enricher.py,sha256=b7yCgyyebhftP1D2Hf-XHSYmteJFniZpjqCTdvtUxuE,146535
+upgini/features_enricher.py,sha256=EyU1QEye4slsDAYUsXcJIFvIaY0dwIWoXxJ2DRAKXKE,146753
 upgini/fingerprint.js,sha256=VygVIQlN1v4NGZfjHqtRogOw8zjTnnMNJg_f7M5iGQU,33442
-upgini/http.py,sha256=TNwJ3Bn5jw1fZ8OghGdRocvPANmc6ueG-fIbO6D7AC8,39560
+upgini/http.py,sha256=adz7jx0R7y3ndpXxt6aq2BxsRZea5H5Fkj4ETCqk8xQ,39700
 upgini/metadata.py,sha256=9Hm9L7efMGIRSfPUYZ_RUBW7_WMeeTL1fGhylMSvR7w,6135
 upgini/metrics.py,sha256=JeZz3hVAOBKOTtX60fn9jIHMHjt3LyIOfy_7VSpWbXI,22022
-upgini/search_task.py,sha256=kMs8nVmZfxANRhwV5HW-GNPO8Hw539x0CsgKou1j03o,16747
+upgini/search_task.py,sha256=f-wARUaAMKmSNQNmA_pmtVBhWpoSBY2F8S3DCt_y9zI,16799
 upgini/spinner.py,sha256=yhakBaydMNS8E8TRAwTdCMdnWrHeWT0cR1M8c9hP6jA,1157
 upgini/version_validator.py,sha256=rDIncP6BEko4J2F2hUcMOtKm_vZbI4ICWcNcw8hrwM4,1400
 upgini/ads_management/__init__.py,sha256=qzyisOToVRP-tquAJD1PblZhNtMrOB8FiyF9JvfkvgE,50
@@ -32,7 +32,7 @@ upgini/utils/country_utils.py,sha256=9BXSXoGm3nVoOZE_bRENY-KMkwMUFvAF3Au0zxUNA1o
 upgini/utils/custom_loss_utils.py,sha256=DBslpjWGPt7xTeypt78baR59012SYphbPsO_YLKdilo,3972
 upgini/utils/cv_utils.py,sha256=X-u6Ndnv9jcQoE0jYS11zbyVd4d6IZ4UALn4raLqZ2I,2393
 upgini/utils/datetime_utils.py,sha256=wS_wBme83H3n3eAVDTL1QFjCG6oFLJ8bxB9Aqs9z-sg,5942
-upgini/utils/display_utils.py,sha256=2Gl3dxiGjwpika6TMIdbdhSTPAGKTopmdtXNGoFT3Hk,9279
+upgini/utils/display_utils.py,sha256=KAuyrFy6BHpCNVk6upvpc0L2ukG1Ab7RQK7rxD9i37M,9328
 upgini/utils/email_utils.py,sha256=MhCLUAWqbp81xRyKizauNhVx6t_MFeJQRQ8pFM7EpFo,3480
 upgini/utils/fallback_progress_bar.py,sha256=f-VzVbiO6oU9WoKzEgoegYotixdiKanGlvdQCOGC-NY,1128
 upgini/utils/features_validator.py,sha256=iP8muF3PUf_aP9m7O3i3LPMuJPTNbw8rCAWqgvDt_h8,2369
@@ -43,10 +43,10 @@ upgini/utils/postal_code_utils.py,sha256=_8CR9tBqsPptQsmMUvnrCAmBaMIQSWH3JfJ4ly3
 upgini/utils/progress_bar.py,sha256=iNXyqT3vKCeHpfiG5HHwr7Lk2cTtKViM93Fl8iZnjGc,1564
 upgini/utils/sklearn_ext.py,sha256=IMx2La70AXAggApVpT7sMEjWqVWon5AMZt4MARDsIMQ,43847
 upgini/utils/target_utils.py,sha256=cu52icjhDIPpEStHYMXrD2hIl9gzvfnxZr0Ra5osV0k,1616
-upgini/utils/track_info.py,sha256=2IGGyHPXBLhWcLO8-Q-5qir52k_kD6DtdU-sv_Z2hHY,5325
+upgini/utils/track_info.py,sha256=87ZFhpoi1g0Z3kl34CwAN60ZelBUvfuQNzkuloZrQQ8,5701
 upgini/utils/warning_counter.py,sha256=vnmdFo5-7GBkU2bK9h_uC0K0Y_wtfcYstxOdeRfacO0,228
-upgini-1.1.203a1.dist-info/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.1.203a1.dist-info/METADATA,sha256=LAiihS45VXx2j-oXEAXJROgqDMobq0uP-V_JhTVC5WE,48308
-upgini-1.1.203a1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-upgini-1.1.203a1.dist-info/top_level.txt,sha256=OFhTGiDIWKl5gFI49qvWq1R9IKflPaE2PekcbDXDtx4,7
-upgini-1.1.203a1.dist-info/RECORD,,
+upgini-1.1.205.dist-info/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.1.205.dist-info/METADATA,sha256=R3mdJs-XrPe9Q8bc_jCvKGXDkigCONQRJfSLNjZs_C8,48306
+upgini-1.1.205.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+upgini-1.1.205.dist-info/top_level.txt,sha256=OFhTGiDIWKl5gFI49qvWq1R9IKflPaE2PekcbDXDtx4,7
+upgini-1.1.205.dist-info/RECORD,,