upgini 1.2.71a3810.dev3__py3-none-any.whl → 1.2.71a3810.dev5__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.71a3810.dev3"
+__version__ = "1.2.71a3810.dev5"

upgini/autofe/date.py

@@ -187,16 +187,21 @@ class DateListDiff(PandasOperator, DateDiffMixin, ParametrizedOperator):
 class DateListDiffBounded(DateListDiff, ParametrizedOperator):
     lower_bound: Optional[int] = None
     upper_bound: Optional[int] = None
+    normalize: Optional[bool] = None
 
     def to_formula(self) -> str:
         lower_bound = "minusinf" if self.lower_bound is None else self.lower_bound
         upper_bound = "plusinf" if self.upper_bound is None else self.upper_bound
-        return f"date_diff_{self.diff_unit}_{lower_bound}_{upper_bound}_{self.aggregation}"
+        norm = "_norm" if self.normalize else ""
+        return f"date_diff_{self.diff_unit}_{lower_bound}_{upper_bound}_{self.aggregation}{norm}"
 
     @classmethod
     def from_formula(cls, formula: str) -> Optional["DateListDiffBounded"]:
         import re
 
+        normalize = formula.endswith("_norm")
+        formula = formula.replace("_norm", "")
+
         pattern = r"^date_diff_([^_]+)_((minusinf|\d+))_((plusinf|\d+))_(\w+)$"
         match = re.match(pattern, formula)
 
@@ -207,8 +212,13 @@ class DateListDiffBounded(DateListDiff, ParametrizedOperator):
         lower_bound = None if match.group(2) == "minusinf" else int(match.group(2))
         upper_bound = None if match.group(4) == "plusinf" else int(match.group(4))
         aggregation = match.group(6)
-
-        return cls(diff_unit=diff_unit, lower_bound=lower_bound, upper_bound=upper_bound, aggregation=aggregation)
+        return cls(
+            diff_unit=diff_unit,
+            lower_bound=lower_bound,
+            upper_bound=upper_bound,
+            aggregation=aggregation,
+            normalize=normalize,
+        )
 
     def get_params(self) -> Dict[str, Optional[str]]:
         res = super().get_params()
@@ -216,14 +226,20 @@ class DateListDiffBounded(DateListDiff, ParametrizedOperator):
             res["lower_bound"] = str(self.lower_bound)
         if self.upper_bound is not None:
             res["upper_bound"] = str(self.upper_bound)
+        if self.normalize is not None:
+            res["normalize"] = str(self.normalize)
         return res
 
     def _agg(self, x):
+        orig_len = len(x)
         x = x[
             (x >= (self.lower_bound if self.lower_bound is not None else -np.inf))
             & (x < (self.upper_bound if self.upper_bound is not None else np.inf))
         ]
-        return super()._agg(x)
+        agg_res = super()._agg(x)
+        if self.normalize and orig_len > 0:
+            return agg_res / orig_len
+        return agg_res
 
 
 class DatePercentileBase(PandasOperator, abc.ABC):

upgini/autofe/feature.py

@@ -162,16 +162,18 @@ class Feature:
             return self.cached_display_name
 
         should_stack_op = not isinstance(self.children[0], Column) if self.op.is_unary else False
-        prev_name = [self.children[0].get_op_display_name()] if should_stack_op else []
+        components = []
 
         if self.alias:
-            components = ["f_autofe", self.alias]
-        elif shorten and (not self.op.is_unary or should_stack_op):
-            components = ["f_autofe"] + prev_name + [self.get_op_display_name()]
-        else:
-            components = (
-                ["f_" + "_f_".join(self.get_columns(**kwargs))] + ["autofe"] + prev_name + [self.get_op_display_name()]
+            components.extend(["f_autofe", self.alias])
+        elif should_stack_op:
+            components.extend(
+                [self.children[0].get_display_name(cache=cache, shorten=shorten, **kwargs), self.get_op_display_name()]
             )
+        elif shorten:
+            components.extend(["f_autofe", self.get_op_display_name()])
+        else:
+            components = ["f_" + "_f_".join(self.get_columns(**kwargs))] + ["autofe", self.get_op_display_name()]
         components.extend([str(self.display_index)] if self.display_index is not None else [])
         display_name = "_".join(components)
 

upgini/autofe/unary.py

@@ -160,12 +160,12 @@ class Embeddings(PandasOperator):
 class Bin(PandasOperator):
     name: str = "bin"
     is_unary: bool = True
-    output_type: Optional[str] = "string"
+    output_type: Optional[str] = "category"
     bin_bounds: List[int] = []
     is_categorical: bool = True
 
     def calculate_unary(self, data: pd.Series) -> pd.Series:
-        return data.apply(self._bin, bounds=self.bin_bounds).fillna(-1).astype(int).astype(str)
+        return data.apply(self._bin, bounds=self.bin_bounds).fillna(-1).astype(int).astype("category")
 
     def _bin(self, f, bounds):
         if f is None or np.isnan(f):

upgini/autofe/vector.py

@@ -22,3 +22,12 @@ class Sum(PandasOperator, VectorizableMixin):
 
     def calculate_vector(self, data: List[pd.Series]) -> pd.Series:
         return pd.DataFrame(data).T.fillna(0).sum(axis=1)
+
+
+class Vectorize(PandasOperator, VectorizableMixin):
+    name: str = "vectorize"
+    is_vector: bool = True
+    group_index: int = 0
+
+    def calculate_vector(self, data: List[pd.Series]) -> pd.Series:
+        return pd.DataFrame(data).T.apply(lambda x: x.to_list(), axis=1)

upgini/metrics.py

@@ -697,6 +697,9 @@ class LightGBMWrapper(EstimatorWrapper):
     def _prepare_to_fit(self, x: pd.DataFrame, y: pd.Series) -> Tuple[pd.DataFrame, pd.Series, np.ndarray, dict]:
         x, y, groups, params = super()._prepare_to_fit(x, y)
         self.cat_features = _get_cat_features(x)
+        print("prepare to fit")
+        print(x.dtypes.to_dict())
+        print(self.cat_features)
         x = fill_na_cat_features(x, self.cat_features)
         for feature in self.cat_features:
             x[feature] = x[feature].astype("category").cat.codes
@@ -707,6 +710,9 @@ class LightGBMWrapper(EstimatorWrapper):
 
     def _prepare_to_calculate(self, x: pd.DataFrame, y: pd.Series) -> Tuple[pd.DataFrame, np.ndarray, dict]:
         x, y, params = super()._prepare_to_calculate(x, y)
+        print("prepare to calculate")
+        print(x.dtypes.to_dict())
+        print(self.cat_features)
         if self.cat_features is not None:
             x = fill_na_cat_features(x, self.cat_features)
             for feature in self.cat_features:

{upgini-1.2.71a3810.dev3.dist-info → upgini-1.2.71a3810.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.71a3810.dev3
+Version: 1.2.71a3810.dev5
 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.71a3810.dev3.dist-info → upgini-1.2.71a3810.dev5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-upgini/__about__.py,sha256=HJUMYeAgyipX6d-hLqm0G7l9lH2D5uJGT9KFNz20JM0,33
+upgini/__about__.py,sha256=QR5uw20nhIxDI34CnHAuXHBaXYnOBpyCMHIjl0vktNQ,33
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=nCPfkQIlAanLgCpcmsDfxFXmg99dRm9m0K_ibdLUr-4,35365
@@ -7,7 +7,7 @@ upgini/features_enricher.py,sha256=KqDQ29sU1Aty5Z40DDqO869Y_CClQfmU58nE9rScxRc,2
 upgini/http.py,sha256=ud0Cp7h0jNeHuuZGpU_1dAAEiabGoJjGxc1X5oeBQr4,43496
 upgini/lazy_import.py,sha256=74gQ8JuA48BGRLxAo7lNHNKY2D2emMxrUxKGdxVGhuY,1012
 upgini/metadata.py,sha256=Yd6iW2f7Wz6vUkg5uvR4xylN16ANnCKVKqAsAkap7p8,12354
-upgini/metrics.py,sha256=t7uOOnlDYvP6E3DLjPMQcFBjyhJfUQY8aUlx7N0Mh-s,35477
+upgini/metrics.py,sha256=KqSoT-TOnSpYGEY3ZC7Hq8YrYdxNXbjtyorCAk86MzU,35681
 upgini/search_task.py,sha256=EuCGp0iCWz2fpuJgN6M47aP_CtIi3Oq9zw78w0mkKiU,17595
 upgini/spinner.py,sha256=4iMd-eIe_BnkqFEMIliULTbj6rNI2HkN_VJ4qYe0cUc,1118
 upgini/version_validator.py,sha256=DvbaAvuYFoJqYt0fitpsk6Xcv-H1BYDJYHUMxaKSH_Y,1509
@@ -16,13 +16,13 @@ upgini/ads_management/ads_manager.py,sha256=igVbN2jz80Umb2BUJixmJVj-zx8unoKpecVo
 upgini/autofe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upgini/autofe/all_operators.py,sha256=rdjF5eaE4bC6Q4eu_el5Z7ekYt8DjOFermz2bePPbUc,333
 upgini/autofe/binary.py,sha256=MnQuFiERpocjCPQUjOljlsq5FE-04GPfwtNjzvfNMyU,7671
-upgini/autofe/date.py,sha256=C86F7sPiscUGq2a45UtQA9ADWBWg0kt54mePHHzjbLE,10633
-upgini/autofe/feature.py,sha256=y1x3wijhTVBmloayQAHiscqKU9Ll8kLcGm1PdvS357I,14910
+upgini/autofe/date.py,sha256=MM1S-6imNSzCDOhbNnmsc_bwSqUWBcS8vWAdHF8j1kY,11134
+upgini/autofe/feature.py,sha256=md43NwDof0s_nWn_WfOO0l2wYItQ416nEzHm5u29XOA,14945
 upgini/autofe/groupby.py,sha256=IYmQV9uoCdRcpkeWZj_kI3ObzoNCNx3ff3h8sTL01tk,3603
 upgini/autofe/operator.py,sha256=EOffJw6vKXpEh5yymqb1RFNJPxGxmnHdFRo9dB5SCFo,4969
-upgini/autofe/unary.py,sha256=3lvwtWrgIHziypwUTetrUv1iCqwDhabbKH4OySkQDhs,5722
+upgini/autofe/unary.py,sha256=Sx11IoHRh5nwyALzjgG9GQOrVNIs8NZ1JzunAJuN66A,5731
 upgini/autofe/utils.py,sha256=fK1am2_tQj3fL2vDslblye8lmyfWgGIUOX1beYVBz4k,2420
-upgini/autofe/vector.py,sha256=l0KdKg-txlZxDSE4hPPfCtfGQofYbl7oaABPr830sPI,667
+upgini/autofe/vector.py,sha256=zehv1J9ChHdZKWjKlkRf6RpfQMCJduZmqCEePYNUfkQ,943
 upgini/autofe/timeseries/__init__.py,sha256=PGwwDAMwvkXl3el12tXVEmZUgDUvlmIPlXtROm6bD18,738
 upgini/autofe/timeseries/base.py,sha256=MYK260n3h9kEbgunbyp0cpR0pgNHml3N2WDLGW5BLDU,3603
 upgini/autofe/timeseries/cross.py,sha256=xpHHVITXYUK20BgEZlqKN1Uy2uxKnHz72gngjt7BxVE,5316
@@ -71,7 +71,7 @@ upgini/utils/target_utils.py,sha256=b1GzO8_gMcwXSZ2v98CY50MJJBzKbWHId_BJGybXfkM,
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/ts_utils.py,sha256=26vhC0pN7vLXK6R09EEkMK3Lwb9IVPH7LRdqFIQ3kPs,1383
 upgini/utils/warning_counter.py,sha256=-GRY8EUggEBKODPSuXAkHn9KnEQwAORC0mmz_tim-PM,254
-upgini-1.2.71a3810.dev3.dist-info/METADATA,sha256=tZWeZpg4Bh8rhogD7KDK-Sq7oFXDHzH0ljKi3Q1Z6AQ,49075
-upgini-1.2.71a3810.dev3.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.2.71a3810.dev3.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.71a3810.dev3.dist-info/RECORD,,
+upgini-1.2.71a3810.dev5.dist-info/METADATA,sha256=F7wqhbZWwxUebgf0hxfovlBTpUh9-mz4d5LX8TcJP5Q,49075
+upgini-1.2.71a3810.dev5.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.2.71a3810.dev5.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.71a3810.dev5.dist-info/RECORD,,