upgini 1.2.71a3810.dev6__tar.gz → 1.2.71a3810.dev8__tar.gz

{upgini-1.2.71a3810.dev6 → upgini-1.2.71a3810.dev8}/PKG-INFO

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

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

{upgini-1.2.71a3810.dev6 → upgini-1.2.71a3810.dev8}/src/upgini/autofe/feature.py

@@ -154,10 +154,10 @@ class Feature:
         for child in self.children:
             child.delete_data()
 
-    def get_op_display_name(self) -> str:
-        return (self.op.alias or self.op.to_formula()).lower()
+    def get_op_display_name(self, use_alias: bool = True) -> str:
+        return (self.op.alias or self.op.to_formula()).lower() if use_alias else self.op.to_formula()
 
-    def get_display_name(self, cache: bool = True, shorten: bool = False, **kwargs) -> str:
+    def get_display_name(self, cache: bool = True, shorten: bool = False, use_op_alias: bool = True, **kwargs) -> str:
         if self.cached_display_name is not None and cache:
             return self.cached_display_name
 
@@ -168,12 +168,20 @@ class Feature:
             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()]
+                [
+                    self.children[0].get_display_name(
+                        cache=cache, shorten=shorten, use_op_alias=use_op_alias, **kwargs
+                    ),
+                    self.get_op_display_name(use_alias=use_op_alias),
+                ]
             )
-        elif shorten:
-            components.extend(["f_autofe", self.get_op_display_name()])
+        elif shorten and not self.op.is_unary:
+            components.extend(["f_autofe", self.get_op_display_name(use_alias=use_op_alias)])
         else:
-            components = ["f_" + "_f_".join(self.get_columns(**kwargs))] + ["autofe", self.get_op_display_name()]
+            components = ["f_" + "_f_".join(self.get_columns(**kwargs))] + [
+                "autofe",
+                self.get_op_display_name(use_alias=use_op_alias),
+            ]
         components.extend([str(self.display_index)] if self.display_index is not None else [])
         display_name = "_".join(components)
 

{upgini-1.2.71a3810.dev6 → upgini-1.2.71a3810.dev8}/src/upgini/metrics.py

@@ -765,9 +765,6 @@ class LightGBMWrapper(EstimatorWrapper):
         if LIGHTGBM_EARLY_STOPPING_ROUNDS is not None:
             params["callbacks"] = [lgb.early_stopping(stopping_rounds=LIGHTGBM_EARLY_STOPPING_ROUNDS, verbose=False)]
         self.cat_features = _get_cat_features(x)
-        print("prepare to fit")
-        print(x.dtypes.to_dict())
-        print(self.cat_features)
         if self.cat_features:
             x = fill_na_cat_features(x, self.cat_features)
             encoder = OrdinalEncoder(handle_unknown="use_encoded_value", unknown_value=-1)
@@ -783,9 +780,6 @@ class LightGBMWrapper(EstimatorWrapper):
 
     def _prepare_to_calculate(self, x: pd.DataFrame, y: pd.Series) -> Tuple[pd.DataFrame, np.ndarray, dict]:
         x, y_numpy, 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)
             if self.cat_encoder is not None:

upgini-1.2.71a3810.dev6/src/upgini/__about__.py

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