upgini 1.2.71a3810.dev4__tar.gz → 1.2.71a3810.dev5__tar.gz

{upgini-1.2.71a3810.dev4 → upgini-1.2.71a3810.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.71a3810.dev4
+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.dev5/src/upgini/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.71a3810.dev5"

{upgini-1.2.71a3810.dev4 → upgini-1.2.71a3810.dev5}/src/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-1.2.71a3810.dev4 → upgini-1.2.71a3810.dev5}/src/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.dev4/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.71a3810.dev4"