upgini 1.2.56a3675.dev1__tar.gz → 1.2.56a3818.dev1__tar.gz

{upgini-1.2.56a3675.dev1 → upgini-1.2.56a3818.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.56a3675.dev1
+Version: 1.2.56a3818.dev1
 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.56a3818.dev1/src/upgini/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.56a3818.dev1"

{upgini-1.2.56a3675.dev1 → upgini-1.2.56a3818.dev1}/src/upgini/autofe/date.py

@@ -64,9 +64,6 @@ class DateDiff(PandasOperand, DateDiffMixin):
         return res
 
     def calculate_binary(self, left: pd.Series, right: pd.Series) -> pd.Series:
-        if left.isna().all() or right.isna().all():
-            return pd.Series([None] * len(left))
-
         left = self._convert_to_date(left, self.left_unit)
         right = self._convert_to_date(right, self.right_unit)
         diff = self._convert_diff_to_unit(left.dt.date - right.dt.date)
@@ -145,9 +142,6 @@ class DateListDiff(PandasOperand, DateDiffMixin, ParametrizedOperand):
         return cls(aggregation=aggregation)
 
     def calculate_binary(self, left: pd.Series, right: pd.Series) -> pd.Series:
-        if left.isna().all() or right.isna().all():
-            return pd.Series([None] * len(left), dtype=np.float64)
-
         left = self._convert_to_date(left, self.left_unit)
         right_mask = right.apply(lambda x: len(x) > 0)
         mask = left.notna() & right.notna() & right_mask
@@ -236,8 +230,6 @@ class DatePercentileBase(PandasOperand, abc.ABC):
         pass
 
     def _perc(self, f, bounds):
-        if f is None or np.isnan(f):
-            return np.nan
         hit = np.where(f >= np.array(bounds))[0]
         if hit.size > 0:
             return np.max(hit) + 1

{upgini-1.2.56a3675.dev1 → upgini-1.2.56a3818.dev1}/src/upgini/autofe/feature.py

@@ -26,18 +26,9 @@ class Column:
         return dict()
 
     def rename_columns(self, mapping: Dict[str, str]) -> "Column":
-        self.name = mapping.get(self.name) or self.name
+        self.name = self._unhash(mapping.get(self.name) or self.name)
         return self
 
-    def _unhash(self, feature_name: str) -> str:
-        last_component_idx = feature_name.rfind("_")
-        if not feature_name.startswith("f_"):
-            return feature_name  # etalon feature
-        elif last_component_idx == 1:
-            return feature_name[2:]  # fully hashed name, cannot unhash
-        else:
-            return feature_name[2:last_component_idx]
-
     def delete_data(self):
         self.data = None
 

{upgini-1.2.56a3675.dev1 → upgini-1.2.56a3818.dev1}/src/upgini/autofe/vector.py

@@ -2,7 +2,11 @@ import abc
 from typing import Dict, List, Optional
 
 import pandas as pd
-from pydantic import validator
+
+try:
+    from pydantic import field_validator as validator  # V2
+except ImportError:
+    from pydantic import validator  # V1
 
 from upgini.autofe.operand import PandasOperand, ParametrizedOperand, VectorizableMixin
 
@@ -29,12 +33,16 @@ class Sum(PandasOperand, VectorizableMixin):
 class TimeSeriesBase(PandasOperand, abc.ABC):
     is_vector: bool = True
     date_unit: Optional[str] = None
+    offset_size: int = 0
+    offset_unit: str = "D"
 
     def get_params(self) -> Dict[str, Optional[str]]:
         res = super().get_params()
         res.update(
             {
                 "date_unit": self.date_unit,
+                "offset_size": self.offset_size,
+                "offset_unit": self.offset_unit,
             }
         )
         return res
@@ -46,6 +54,13 @@ class TimeSeriesBase(PandasOperand, abc.ABC):
         ts.drop_duplicates(subset=ts.columns[:-1], keep="first", inplace=True)
         ts.set_index(date.name, inplace=True)
         ts = ts[ts.index.notna()].sort_index()
+        if self.offset_size > 0:
+            ts = ts.iloc[:, :-1].merge(
+                ts.iloc[:, -1].shift(freq=f"{self.offset_size}{self.offset_unit}"),
+                left_index=True,
+                right_index=True,
+                how="left",
+            )
         ts = ts.groupby([c.name for c in data[1:-1]]) if len(data) > 2 else ts
         ts = self._aggregate(ts)
         ts = ts.reindex(data[1:-1] + [date] if len(data) > 2 else date).reset_index()
@@ -67,6 +82,7 @@ class Roll(TimeSeriesBase, ParametrizedOperand):
     window_unit: str = "D"
 
     @validator("window_unit")
+    @classmethod
     def validate_window_unit(cls, v: str) -> str:
         try:
             pd.tseries.frequencies.to_offset(v)
@@ -107,7 +123,7 @@ class Roll(TimeSeriesBase, ParametrizedOperand):
         return res
 
     def _aggregate(self, ts: pd.DataFrame) -> pd.DataFrame:
-        return ts.rolling(f"{self.window_size}{self.window_unit}", min_periods=self.window_size).agg(
+        return ts.rolling(f"{self.window_size}{self.window_unit}", min_periods=1).agg(
             _roll_aggregations.get(self.aggregation, self.aggregation)
         )
 

{upgini-1.2.56a3675.dev1 → upgini-1.2.56a3818.dev1}/src/upgini/features_enricher.py

@@ -3733,7 +3733,7 @@ if response.status_code == 200:
         features_info_without_links = []
         internal_features_info = []
 
-        original_shaps = {fm.name: fm.shap_value for fm in features_meta}
+        original_shaps = {original_names_dict.get(fm.name, fm.name): fm.shap_value for fm in features_meta}
 
         if updated_shaps is not None:
             for fm in features_meta:

upgini-1.2.56a3675.dev1/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.56a3675.dev1"