upgini 1.1.299a3511.dev6__tar.gz → 1.1.299a3511.dev8__tar.gz

{upgini-1.1.299a3511.dev6 → upgini-1.1.299a3511.dev8}/PKG-INFO

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

@@ -0,0 +1 @@
+__version__ = "1.1.299a3511.dev8"

{upgini-1.1.299a3511.dev6 → upgini-1.1.299a3511.dev8}/src/upgini/autofe/feature.py

@@ -138,16 +138,17 @@ class Feature:
         if self.cached_display_name is not None and cache:
             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 []
+
         if self.alias:
             components = ["f_autofe", self.alias]
-        elif shorten and not (self.op.is_unary and all(isinstance(c, Column) for c in self.children)):
-            prev_name = [self.children[0].get_op_display_name()] if self.op.is_unary else []
+        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",
-                self.get_op_display_name(),
-            ]
+            components = (
+                ["f_" + "_f_".join(self.get_columns(**kwargs))] + ["autofe"] + prev_name + [self.get_op_display_name()]
+            )
         components.extend([str(self.display_index)] if self.display_index is not None else [])
         display_name = "_".join(components)
 
@@ -322,10 +323,10 @@ class FeatureGroup:
             lower_order_names = [ch.get_display_name() for ch in lower_order_children]
             if any(isinstance(f, Feature) for f in lower_order_children):
                 child_data = pd.concat(
-                    [data[main_column]] + [ch.calculate(data) for ch in lower_order_children],
+                    [data[main_column or []]] + [ch.calculate(data) for ch in lower_order_children],
                     axis=1,
                 )
-                child_data.columns = [main_column] + lower_order_names
+                child_data.columns = ([main_column] if main_column is not None else []) + lower_order_names
             else:
                 child_data = data[columns]
 

upgini-1.1.299a3511.dev6/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.1.299a3511.dev6"