upgini 1.1.262a3250.post4__tar.gz → 1.1.262a3250.post6__tar.gz

{upgini-1.1.262a3250.post4/src/upgini.egg-info → upgini-1.1.262a3250.post6}/PKG-INFO

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

{upgini-1.1.262a3250.post4 → upgini-1.1.262a3250.post6}/setup.py

@@ -40,7 +40,7 @@ def send_log(msg: str):
 
 
 here = Path(__file__).parent.resolve()
-version = "1.1.262a3250.post4"
+version = "1.1.262a3250.post6"
 try:
     send_log(f"Start setup PyLib version {version}")
     setup(

{upgini-1.1.262a3250.post4 → upgini-1.1.262a3250.post6}/src/upgini/autofe/all_operands.py

@@ -1,5 +1,5 @@
 from typing import Dict
-from upgini.autofe.date import DateDiff, DateDiffFuture
+from upgini.autofe.date import DateDiff, DateDiffType2
 from upgini.autofe.groupby import GroupByThenAgg, GroupByThenRank
 from upgini.autofe.operand import Operand
 from upgini.autofe.unary import Abs, Log, Residual, Sqrt, Square, Sigmoid, Floor, Freq
@@ -37,7 +37,7 @@ ALL_OPERANDS: Dict[str, Operand] = {
         Operand(name="GroupByThenFreq", output_type="float", is_grouping=True),
         Sim(),
         DateDiff(),
-        DateDiffFuture(),
+        DateDiffType2(),
     ]
 }
 

{upgini-1.1.262a3250.post4 → upgini-1.1.262a3250.post6}/src/upgini/autofe/date.py

@@ -34,8 +34,8 @@ class DateDiff(PandasOperand, DateDiffMixin):
         return x
 
 
-class DateDiffFuture(PandasOperand, DateDiffMixin):
-    name = "date_diff_future"
+class DateDiffType2(PandasOperand, DateDiffMixin):
+    name = "date_diff_type2"
     is_binary = True
     has_symmetry_importance = True
     is_vectorizable = False
@@ -43,9 +43,11 @@ class DateDiffFuture(PandasOperand, DateDiffMixin):
     def calculate_binary(self, left: pd.Series, right: pd.Series) -> pd.Series:
         left = self._convert_to_date(left, self.left_unit)
         right = self._convert_to_date(right, self.right_unit)
-        future = pd.to_datetime(dict(day=right.dt.day, month=right.dt.month, year=left.dt.year))
+        future = right + (left.dt.year - right.dt.year).apply(
+            lambda y: np.datetime64("NaT") if np.isnan(y) else pd.tseries.offsets.DateOffset(years=y)
+        )
         before = future[future < left]
-        future[future < left] = pd.to_datetime(dict(day=before.dt.day, month=before.dt.month, year=before.dt.year + 1))
+        future[future < left] = before + pd.tseries.offsets.DateOffset(years=1)
         diff = (future - left) / np.timedelta64(1, self.diff_unit)
 
         return diff

{upgini-1.1.262a3250.post4 → upgini-1.1.262a3250.post6/src/upgini.egg-info}/PKG-INFO

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

{upgini-1.1.262a3250.post4 → upgini-1.1.262a3250.post6}/tests/test_autofe_operands.py

@@ -1,5 +1,5 @@
 import pandas as pd
-from upgini.autofe.date import DateDiff, DateDiffFuture
+from upgini.autofe.date import DateDiff, DateDiffType2
 
 from datetime import datetime
 from pandas.testing import assert_series_equal
@@ -22,6 +22,6 @@ def test_date_diff_future():
         columns=["date1", "date2"],
     )
 
-    operand = DateDiffFuture()
+    operand = DateDiffType2()
     expected_result = pd.Series([61.0, 182.0])
     assert_series_equal(operand.calculate_binary(df.date2, df.date1), expected_result)