upgini 1.1.299a3511.dev6__py3-none-any.whl → 1.1.299a3511.dev8__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.1.299a3511.dev6"
+__version__ = "1.1.299a3511.dev8"

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.dist-info → upgini-1.1.299a3511.dev8.dist-info}/METADATA

@@ -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.dev6.dist-info → upgini-1.1.299a3511.dev8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-upgini/__about__.py,sha256=_0z3wkU1Qyf7uc0tWztaZ9d93IS373XBtHXVE9Apmzw,34
+upgini/__about__.py,sha256=ei6RvoNtv22CaQR9tHaCSKgxiM1In9evAYXD9G5KI5Q,34
 upgini/__init__.py,sha256=ObEtjFkIssl83qeKNMLpIQygfwK8TzztwiI43YTsAP0,353
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=7TLVVhGtjgx_9yaiaIUK3kZSe_R9wg5dY0d4F5qCGM4,45636
@@ -17,7 +17,7 @@ upgini/autofe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upgini/autofe/all_operands.py,sha256=3LiH9iU-ArGmYpS8FHWH7yCFx40ILfvlSXJlKIa75BQ,2542
 upgini/autofe/binary.py,sha256=ml0MszLARZqp3UGUqTGsVjT4DD69zTisfBBEqbZ7klU,6767
 upgini/autofe/date.py,sha256=Qq11EGLFHJxy5DQF2V1CBMtH2j4g5RpinRcw-7SobMs,8442
-upgini/autofe/feature.py,sha256=cPbLJYAfzT8VqMDOGuEOBslJEDTdVphozQf6fCD8uuk,13587
+upgini/autofe/feature.py,sha256=Rs-1_6UhObbA2UMz-_QeHjV1u2hTEY0h43HQjnA2OQo,13689
 upgini/autofe/groupby.py,sha256=4WjDzQxqpZxB79Ih4ihMMI5GDxaFqiH6ZelfV82ClT4,3091
 upgini/autofe/operand.py,sha256=MKEsl3zxpWzRDpTkE0sNJxTu62U20sWOvEKhPjUWS6s,2915
 upgini/autofe/unary.py,sha256=B4wp8oKnlJ0nUng-DRMKSiF8MHlhAFYbgmo9Nd_0ZaA,3777
@@ -57,7 +57,7 @@ upgini/utils/sklearn_ext.py,sha256=13jQS_k7v0aUtudXV6nGUEWjttPQzAW9AFYL5wgEz9k,4
 upgini/utils/target_utils.py,sha256=Y96_PJ5cC-WsEbeqg20v9uqywDQobLoTb-xoP7S3o4E,7807
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/warning_counter.py,sha256=dIWBB4dI5XRRJZudvIlqlIYKEiwLLPcXarsZuYRt338,227
-upgini-1.1.299a3511.dev6.dist-info/METADATA,sha256=KzZj0GPmhe4dHrujcrKXrqe3xtQCN7OMGYPUjLKJGpA,48230
-upgini-1.1.299a3511.dev6.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.1.299a3511.dev6.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.1.299a3511.dev6.dist-info/RECORD,,
+upgini-1.1.299a3511.dev8.dist-info/METADATA,sha256=3j3N-27UXVRN1I_0fEVzdz-ZgQ8iqVmiKbhXvy-RTj0,48230
+upgini-1.1.299a3511.dev8.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.1.299a3511.dev8.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.1.299a3511.dev8.dist-info/RECORD,,