upgini 1.1.282a3418.post1__tar.gz → 1.1.282a3418.post3__tar.gz

{upgini-1.1.282a3418.post1 → upgini-1.1.282a3418.post3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.1.282a3418.post1
+Version: 1.1.282a3418.post3
 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.282a3418.post3/src/upgini/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.1.282a3418-3"

{upgini-1.1.282a3418.post1 → upgini-1.1.282a3418.post3}/src/upgini/autofe/date.py

@@ -1,4 +1,3 @@
-from datetime import date
 from typing import Any, Dict, List, Optional, Union
 
 import numpy as np

{upgini-1.1.282a3418.post1 → upgini-1.1.282a3418.post3}/src/upgini/autofe/feature.py

@@ -1,6 +1,6 @@
 import hashlib
 import itertools
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Set, Tuple, Union
 
 import numpy as np
 import pandas as pd
@@ -94,6 +94,11 @@ class Feature:
         self.alias = alias
         return self
 
+    def get_all_operand_names(self) -> Set[str]:
+        return {self.op.name}.union(
+            {n for f in self.children if isinstance(f, Feature) for n in f.get_all_operand_names()}
+        )
+
     def rename_columns(self, mapping: Dict[str, str]) -> "Feature":
         for child in self.children:
             child.rename_columns(mapping)

{upgini-1.1.282a3418.post1 → upgini-1.1.282a3418.post3}/src/upgini/features_enricher.py

@@ -1442,15 +1442,12 @@ class FeaturesEnricher(TransformerMixin):
             if len(decimal_columns_to_fix) > 0:
                 for col in decimal_columns_to_fix:
                     fitting_eval_X[col] = (
-                        fitting_eval_X[col]
-                        .astype("string").str
-                        .replace(",", ".", regex=False)
-                        .astype(np.float64)
+                        fitting_eval_X[col].astype("string").str.replace(",", ".", regex=False).astype(np.float64)
                     )
                     fitting_enriched_eval_X[col] = (
                         fitting_enriched_eval_X[col]
-                        .astype("string").str
-                        .replace(",", ".", regex=False)
+                        .astype("string")
+                        .str.replace(",", ".", regex=False)
                         .astype(np.float64)
                     )
 
@@ -3269,10 +3266,16 @@ class FeaturesEnricher(TransformerMixin):
 
             descriptions = []
             for m in autofe_meta:
-                autofe_feature = Feature.from_formula(m.formula)
                 orig_to_hashed = {base_column.original_name: base_column.hashed_name for base_column in m.base_columns}
-                autofe_feature.rename_columns(orig_to_hashed)
-                autofe_feature.set_display_index(m.display_index)
+
+                autofe_feature = (
+                    Feature.from_formula(m.formula)
+                    .set_display_index(m.display_index)
+                    .set_alias(m.alias)
+                    .set_op_params(m.operator_params or {})
+                    .rename_columns(orig_to_hashed)
+                )
+
                 if autofe_feature.op.is_vector:
                     continue
 
@@ -3293,7 +3296,7 @@ class FeaturesEnricher(TransformerMixin):
                     description[f"Feature {feature_idx}"] = bc.hashed_name
                     feature_idx += 1
 
-                description["Function"] = autofe_feature.op.name
+                description["Function"] = ",".join(sorted(autofe_feature.get_all_operand_names()))
 
                 descriptions.append(description)
 

{upgini-1.1.282a3418.post1 → upgini-1.1.282a3418.post3}/src/upgini/metadata.py

@@ -256,9 +256,11 @@ class BaseColumnMetadata(BaseModel):
 
 
 class GeneratedFeatureMetadata(BaseModel):
-    formula: str  # on hashed names
+    alias: Optional[str]
+    formula: str
     display_index: str
     base_columns: List[BaseColumnMetadata]
+    operator_params: Optional[Dict[str, str]]
 
 
 class ProviderTaskMetadataV2(BaseModel):

upgini-1.1.282a3418.post1/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.1.282a3418-1"